diff -Nru midori-0.2.8/.gitignore midori-0.4.6/.gitignore --- midori-0.2.8/.gitignore 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/.gitignore 2012-05-14 22:13:42.000000000 +0000 @@ -2,7 +2,7 @@ .waf-* .lock-wscript -_build_ +_build po/.intltool-merge-cache po/LINGUAS @@ -12,3 +12,5 @@ po/*.gmo midori.desktop + +packages.version diff -Nru midori-0.2.8/ChangeLog midori-0.4.6/ChangeLog --- midori-0.2.8/ChangeLog 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/ChangeLog 2012-05-14 22:13:42.000000000 +0000 @@ -1,5 +1,287 @@ This file is licensed under the terms of the expat license, see the file EXPAT. +v0.4.6: + + Fix crasher in geolocation infobar + + Fix crasher in about:version on some systems + + Fix crasher opening bookmarks from Unity global menu + + Use WebKitFaviconDatabase as of WebKit 1.8.0 + + Use midori-prefixed temp folder in midori_view_save_source + + Fix cancelling downloads with SteadyFlow or Aria2 + + Fix crash dialog instead of opening tab in a running window + + Fix page icons in multi-frame sites (gmail, tumbler) + + Distinguish Simplified and Traditional Chinese + + Support go-jump-symbolic + + Handle empty tabs due to download links with a target + + Handle frame load interrupted in the unholy trinity + + Fix libsoup version check and wrong SSL status in location + +v0.4.5: + + Work around black border around widgets on Win32 + + Whitelist direct/ re-directed navigation requests in adblock + + Require Vala 0.14 + + Provide geolocation diagnostics in about:geolocation + + List available about: URLs and app instance name in about:version + + Replace illegal characters in download filenames + + Tweak app options on Win32 and use ShellExecuteEx in sokoke_show_uri + + Use sokoke_show_uri in midori_browser_download_status_cb + + External Download manager Steadyflow and Aria2 (with cookies) + + Ensure adblock config folder when blocking images + + Use sqlite WAL mode for history if available + + Allow relative -c/ --config path + + Context menus on Back and Forward toolbar items + + Always show the tabbar by default + + Use ubuntu-bug if it exists + + Show inline find while typing and statusbar text in overlay with GTK+ 3.2 + + Esc/ closing "downloads still active" should cancel, not continue + + Optional Granite support for notebook and bookmark dialog as pop-over + + Ctrl+j to toggle statusbar aka downloads + + Show at most 3 search engines in completion + + Don't replace existing onclick/ blur with autosuggest + + Implement low_memory_profile for FreeBSD and Win32 + + Use var in internal javascript, to fix Google apps + + Handle download requests in frames + +v0.4.4: + + Disable page cache with < 352 MB RAM + + Display filename in download dialog + + Fix box packing in GTK+3 (in most cases) + + Enable experimental HTML5 fullscreen API + + Harden IPv6 address recognition in location + + Experimental site data policy support (see FAQ) + + Close tabs by middle clicking close button + + Merge cookies and other data in Clear Private Data + + Improve KatzeArrayAction for Unity menuproxy compatibility + + Use GDateTime for history to avoid broken C runtimes + + Add Midori tag to DuckDuckGo default URI + + Rewrite completion popup resizing + + Streamline page icon loading stages and fallbacks + + Disable clipboard work-around for WebKit >= 1.4.3 + + Re-word .desktop entry as an action + + Display informative text in private browsing + + Consistent clear icons in entries + + Revised download filename generation + + Add 'Open in Image Viewer' menu item + + Formhistory 2.0 with GDOM support + + Handle javascript: and mailto: links better + + Handle = key in Ukrainian layout better + + Fix bookmark export and deletion of bookmark folders + + Speed dial shortcut re-reordering by DND + +v0.4.3: + + Implement about:widgets to test rendering + + Fix resizing of inspector by applying a minimum size + + Use dark theme with GTK+ 3 in private browsing + + Use channel-(in)secure-symbolic icons if available + + Use .security-(un)trusted classes with GTK+ + + Improve notebook resizing peformance + + Fix tab icons in GTK+3 and don't look for GTK+ jscore + + Use system-wide CA file with libSoup 2.37.1 + + Improve cookie manager performance + + Action and tab creation for faster startup + + Fix number of items in trash in private browsing + + Add Cairo version to about:version + + Add X-GNOME-Keywords and X-AppInstall-Keywords to .desktop + + Add easy privacy list to default Adblock filters + + Fully implement speed dial for GTK+3 + + Disable box shadows with WebKitGTK+ 1.2.7 + + Fine-grained monospace font overriding + + Implement resizing of Location and Search in toolbar + + Don't show empty speed dial shortcuts in-between + + Use Midori's name in midori-private.desktop + + Hide all bars in fullscreen and a menu to Unfullscreen + +v0.4.2: + + Improve -moz-document parsing in user stylesheets + + Render verified secure sites in green, not yellow + + Version details for extensions built against a different release + + More detailed and more condensed about:version output + + Refresh missing speed dial thumbnails automatically + + Use faster global CSS mechanism for adblock and addons + + Show crash dialog only if there's a session + + Don't complete on a leading space or search token + + Support user stylesheets on about: and file:// locations + + Implement 'Always use my font choices' preferences + + Allow smaller tabs when close buttons are disabled + + Merge 'Closed Tabs' with 'History' in Clear Private Data + + Correctly use user-home and bookmark-new icon names + + Use versioned file speeddial-head-0.4.2.html + + Split proxy server preference into host and port + + Support localized 'next' and 'previous' links + + Implement 'Only accept cookies cookies from sites you visit' + + Fix crash in Add/ Import Bookmark feature + + Fix size of tabs with GTK+ 3 + + Detect existing Firefox profiles for bookmark import + + Work-around "omg!" in local directory browsing + + Rework '--run' feature to allow window.open() and console.info() + + Automatically clear finnished downloads from the transferbar + + Add 'Create desktop shortcut' to the app menu + + Require GLib 2.22 and libSoup 2.27.90 + + Don't register recent files in private browsing mode + + Findbar and speed dial honor close button position + + Use sqlite3-based backend for cookie storage + + Make '--snapshot' create png images with GTK+ 2.20 + + Automatically resizing, embossed speed dial, close on hover + +v0.4.1: + + Experimental, unfinnished GTK+ 3 support + + 'Automatic' identification with quirks + + Build fix for WebKitGTK+ >= 1.4.3 + + Register downloaded files as recent files + + Fix Flash window on background tabs + + Fix regression with clearing cookies on quit + + Fix opening tabs from toolbar buttons + + Use symbolic find and clear icons + + Drop usage of mootools + + Install separate Private Browsing shortcut + + Support dragging tabs out of the window + + Use feed: to support Thunderbird news reader + + Re-open closed tabs in private browsing + + Compare link-fingerprints caselessly + +v0.4.0: + + Provide buttons to choose how to startup after crash + + Fix crash on corrupted datbase + + Never delay URIs given as command line arguments + + Space at the bottom of the page: Go to next page + + Initialize session in app/ private before adding URIs + + Add 'Last open tabs' option to Clear Private Data + + Show kinetic scrolling option regardless of Hildon + + Interpret Shift+Backspace as going forward + + Advertise SVG images as a supported MIME type + + Zoom in steps of 10% and support Ctr+= + + Fix a crasher on invalid geo: links + + Integrate Adblock and History List options in list + + Skip empty lines, ignore subdocument rules in Adblock + + Respect VALAC at configuration time + + URL cache, faster JS generator, inline parsing in Adblock + + Reuse source of webview instead of redownloading + + Remove the description field from bookmark dialog + + Add --log-file/ -l switch to log to a file + + Pass through javascript: URIS from the command line + + Tab and Window items in Unity Quicklist + + Adjust the preferences dialog + + Require WebKitGTK+ 1.1.17 and Vala 0.10 + +v0.3.6: + + Track selected search engine per window + + Improve preference dialogue size and alignments + + Validate URIs in Adblock, homepage and bookmarks + + Fix loading of Adblock lists from https + + Support Backspace as Go Back and F5 as Reload + + Show 'Private Browsing' in Unity Quicklist + + Ignore Network Cancelled errors + + Reduce allocations when preparing speed dial + + Fix icon sie of scalable stock icons + + Implement geo URI support as per RFC 5870 + + Fix crash after clearing cookies + + Faster javascript-based JSON import + + Improve speed dial markup, without scripts + + Allow Escape to cancel History List + + Fix crashes in completion + +v0.3.5: + + Remove frame titles from preference dialogue + + Show search engine icons in completion + + Add Liferea news aggregator workaround + + Support libSoup cache + size with WebKitGTK+ 1.3.11 + + No language, no encryption but Mozilla in user agent + + Support F6, F7, Ctrl+(Shift)+Tab and Tab to complete + + Strip scheme and www. in completion + + Render filename as title of patch files + + Turn location into a plain entry + + Fix tab panel foreground colours + + Mask timezone, language and plugins in private mode + + Add 'Strip referrer details' preference + + Embed extension list in preferences + + Remove the Page Holder and Download Manager option + + Disable prefetching and HTML5 storage in private mode + + Handle 'Plugin will handle load' error + + Show access keys next to numbers in link search + + Introduce --private/ -p command line switch + + Don't show toolbar preferences if running a DE + + Show script alerts as infobars + + Improve URI handling with addon installer + + Change Ctrl+Q for Quit to Ctrl+Shift+Q + + Make speed dial faster and mandatory + + Load speed dial in private browsing mode + + Show video formats in about:(version) + + Move speed dial to key file instead of JSON + + Add Offline Application Cache to Clear Private Data + +v0.3.3: + + Use 60 connections and 6 per host + + Allow re-ordering of search engines + + Resurrect right-click button on the panel + + Page Next finds a and link tags again + + Always save state when quitting + + Support MD5 and SHA1 Link Fingerprints + + Use lock-secure and lock-insecure icons + + Replace unmaintained docs with FAQ + + Work around copying bug in WebKitGTK+ + + In doubt always focus page on key press + + Show transfer speed in tooltips + + Support x-scheme-handler for GLib < 2.28 + + Improve link search, always require Return + + Re-order tabs with Ctrl+Shift-PageUp/Down + + Improve fragment (#) handling + + Show Netscape plugins in about:version + + Add Zoom Level combobox to Statusbar Features + + Improve handling of cookie updates + + Always show a minimum visible progress + + Don't limit search engines in completion popup + +v0.3.2 + + Fix opening address with Go button + + Fix automigration of existing bookmarks + + Fix crash on opening autocompletion + + Fix adblock handling of frames + + Reflect tab order in the saved session + + Don't show multiple user addon infobars + + Provide distribution setting for close on left + + Export to Netscape HTML format + + Avoid config update on state changes + + Always show progress and search engines in location + + Default to app menu and no menubar + + Fix GTK+ 2.14 build problems + + Show 'Private Browsing' in window title + + Uncached reload with Ctrl+Shift+R + +v0.3.0 + + Support libnotify 0.7 + + Copy-friendly URIs with %20 + + No blocking of typed URLs with adblock + + Import from Netscape HTML + + Bookmark im- and export fixes + + Unit tests cleaned up and updated + + Correct bookmark and search icon names + + Better link menu handling + + Certificate location on FreeBSD + + Fix Russian keyboard issues + + Stylesheet parsing improvements + + Simplify language and panel options + + Default to DuckDuckGo search + + No Netscape plugins in extension panel + + Easy user addon install infobar + +v0.2.9 + + Add 'Identify As' to Statusbar Features + + Don't restrict length of HTTP login passwords + + Implement Find Links by number with '.' + + Reflect security in icon tooltip + + Use GIO to determine special URI schemes + + Upgrade waf (addresses threading issues) + + Allow clearing HTML5 databases and form history + + Add --help-execute command line switch + + Improve private mode, with search and hotkeys + + Support no-desktop-files and internal Open With + + Support x-scheme-handler spec + + Infobar for location and HTML5 database + + Optimise cookie storing, reduce wakeups + + Avoid deprecated GTK+ interfaces + + Remove console in favour of Inspector + + Simplify and explain cookie preferences + + Fix Google Reader incompatibility + v0.2.8 + Re-implement Bookmarks menu and toolbar button + Show transferbar even if statusbar is hidden diff -Nru midori-0.2.8/HACKING midori-0.4.6/HACKING --- midori-0.2.8/HACKING 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/HACKING 2012-05-14 22:13:42.000000000 +0000 @@ -13,7 +13,7 @@ For translating, have a look at the file TRANSLATE. -For helping with testing and triaging bug reports, you should registers with the bug tracker at http://www.twotoasts.de/bugs and join #midori on irc.freenode.net where a lot of problems are discussed. You can start right away by trying to reproduce bug reports and comment with your findings. +For helping with testing and triaging bug reports, you should register with the bug tracker at https://bugs.launchpad.net/midori and join #midori on irc.freenode.net where a lot of problems are discussed. You can start right away by trying to reproduce bug reports and comment with your findings. If you are interested in contributing code, there are a few options. You can join #midori to discuss a particular problem you would like to look into, or a feature you would want to implement. Opening a bug report or feature request if there isn't already one is the next step. To attract some attention, if you attached a patch or have questions, ask in #midori. diff -Nru midori-0.2.8/INSTALL midori-0.4.6/INSTALL --- midori-0.2.8/INSTALL 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/INSTALL 2012-05-14 22:13:42.000000000 +0000 @@ -37,7 +37,9 @@ Make sure you have installed 'gdb', the GNU Debugger. -Run Midori as 'gdb _build_/default/midori/midori'. +Run Midori as 'gdb _build/default/midori/midori'. + +Inside gdb, type 'run'. Try to reproduce a crash that you experienced earlier, this time Midori will freeze at the point of the crash. @@ -47,23 +49,33 @@ If the problem is a warning and not a crash, try this: -'G_DEBUG=all gdb _build_/default/midori/midori' +'G_DEBUG=all gdb _build/default/midori/midori' If you are interested in HTTP communication, try this: -'MIDORI_SOUP_DEBUG=2 _build_/default/midori/midori' +'MIDORI_SOUP_DEBUG=2 _build/default/midori/midori' 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=1 _build/default/midori/midori', or -'MIDORI_TOUCHSCREEN=0 _build_/default/midori/midori' +'MIDORI_TOUCHSCREEN=0 _build/default/midori/midori' If you want to "dry run" without WebKitGTK+ rendering, try this: -'MIDORI_UNARMED=1 _build_/default/midori/midori' +'MIDORI_UNARMED=1 _build/default/midori/midori' + +If you want to test bookmarks, you can enable database tracing: + +'MIDORI_BOOKMARKS_DEBUG=1 _build/default/midori/midori' + +To disable Netscape plugins, use MOZ_PLUGIN_PATH=/. + +To debug extensions you can specify the path: + +'export MIDORI_EXTENSION_PATH=_build/default/extensions' For further information a tutorial for gdb and reading up on how you can install debugging diff -Nru midori-0.2.8/README midori-0.4.6/README --- midori-0.2.8/README 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/README 2012-05-14 22:13:42.000000000 +0000 @@ -2,23 +2,24 @@ Midori is a lightweight web browser. -* Full integration with GTK+2. -* Fast rendering with WebKit. +* Full integration with GTK+2 and GTK+3. +* Fast rendering with WebKit and HTML5 video with GStreamer. * Tabs, windows and session management. -* Flexibly configurable Web Search. +* History completion and configurable Web Search. * User scripts and user styles support. +* Adblock Plus compatible, external download manager support. * Straightforward bookmark management. -* Customizable and extensible interface. -* Extensions written in C. +* Customizable interface, extensions written in C and Vala. -Requirements: GTK+ 2.10, WebkitGTK+ 1.1.1, libXML2, libsoup 2.25.2, sqlite 3.0 +Requirements: GLib 2.22, GTK+ 2.10, WebkitGTK+ 1.1.17, libXML2, + libsoup 2.27.90, sqlite 3.0, Vala 0.14 -Optional: Unique 0.9, libidn, docutils, libnotify, Vala +Optional: GTK+ 3.0, Unique 0.9, libnotify For installation instructions read INSTALL. Please report comments, suggestions and bugs to: - http://www.twotoasts.de/bugs + https://bugs.launchpad.net/midori And join the IRC channel #midori on irc.freenode.net diff -Nru midori-0.2.8/TODO midori-0.4.6/TODO --- midori-0.2.8/TODO 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/TODO 2012-05-14 22:13:42.000000000 +0000 @@ -5,58 +5,30 @@ . Request network if not connected and re-open the url on success . Make cookie manager horizontal if the window is wide . Handle SSL like SSH: confirm any cert on first connection, warn about any change in subsequent connections - . Open on startup: Ask (Last open pages, Blank, Homepage, [x] Don't ask anymore) . Support @run-at document-start: http://dev.chromium.org/developers/design-documents/user-scripts - . Add an 'install' button to addons - . Dragging a link onto the web view to open it - . Extension: Ask Google if an address cannot be found, ie. typo - . View source is not always equal to Save As . Show New Window icon in statusbar for new-window links . Validate search engine tokens . Easily register stock items in extensions (mouse gestures, input-mouse) . Show graphical error when a bookmarklet fails to run - . Unit test katze array action - . There is no way to reset the toolbar - . Estimate download speed . Implement no_proxy, https_proxy - . Make it possible to use extra C or C++ libraries in extensions - . Add icon cache size preference . Fix icons with white background to be transparent? . Visually indicate that a tab is being opened even if outside the visible tabs - . gget/ eatmonkey/ Transmission dbus in Transfers - . Add Midori to autostart, and remove it if it's quit, optionally disabled - . Use @include and @exclude with userstyles - . Support -moz-document domain: http://userstyles.org/styles/22837 - . Need a throbber with invisible menubar: make compact-menu throbb? . Implement live bookmarks, see http://johnbokma.com/firefox/rss-and-live-bookmarks.html . Add a dialog (right-cick) to Addons, to edit @include and @exclude . Show URI in css overlay tooltips if statusbar is hidden - . "Menu" tool buttons aren't depressed while a menu is open - . Statusbar doesn't show right-click menu + . Statusbar/ transferbar doesn't show right-click menu . Consider pango_layout_set_auto_dir - . Make it possible to change ident string for particular domains . Support max-age for Flash cookies - . Update speed dial thumbnail when loading the according page from speed dial . Implement "Open image" which opens an image with an external application . Add custom actions extension; example Set Wallpaper - . Offer restoring session after crash, if session isn't opened at startup AND crash dialogue is enabled - . Vi extension, modelled after vimprobable . Show loading tabs in the tab panel extension - . Let extensions add preferences - . Show syntax errors in userscripts/ styles - . Add HTTP_PRAGMA: no-cache when Ctrl+Shift+R - . Honor HTTP_PRAGMA: no-cache in web cache . Switching browser window: Ctrl+Shift+PageUp/PageDown . Switching panel: Ctrl+Alt+PageUp/PageDown . Bookmark folder context menu, "Sort by Name" . Adblock Block image: dialog to edit regex before adding - . KatzeArrayAction should support "activate" signal - . Remove extra inner panel border - . Move statusbar_contents below panel if statusbar is hidden - . Teplace "disable plugins" with showing a "load plugins automatically", where unchecking that keeps a placeholder that can be clicked to play + . Replace "disable plugins" with showing a "load plugins automatically", where unchecking that keeps a placeholder that can be clicked to play . Show "Type an address or keywords to search" in empty location even when focussed . Show "Search hostname" in (can't resolve) error page, www.heyarnold.twotoastsde == typo? - . Enable extensions in private (app) mode . Allow -e Set setting or so . Remember if inspector was attached or not . Icon in empty entry to paste from clipboard @@ -64,16 +36,11 @@ . Warn when closing tab with unsubmitted form . Always allow popups, keep hidden, show icon to ask whether to show popups . Make Shift + Click download the link - . Use an update timeout in KatzePropertyProxy instead of only focus-out . Show a loading mouse pointer . Export of the bookmarks file, or using one from a specific path . Custom context menu actions, like in Thunar or Epiphany . 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' - . Per-site settings accessible via statusbar icons, ie. cookies, popups, plugins - . CookieSafe like, a list of cookies, with type, block, allow - . Automatic update checks (browser, extensions)? . Auto-group tabs by opener, with colors? . Mark (dogear) a selection so that it isn't cleared implicitly, multiply on one page . Check specific bookmarks for updates automatically (extension) @@ -83,18 +50,16 @@ . Honor design principle "no warnings but undo of backups"? . Support widgets 1.0 spec in tool windows and standalone? . Protected tabs prompt when attempting to close them - . Provide a 'sleep mode' after a crash where open documents are loaded manually - . Option to run plugins or scripts only on demand, like NoScript, per-site . Optional http redirection manually or on timeout via SoupMessage::restarted . 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) . Shared bookmarks and config . Prevent dead tabs: download, aborted page - -BOOKMARK ISSUES: - . Bookmark menu is not populated - . Bookmark toolbar is broken - . Import is broken - . Integration with locationbar search - . Remove separator from submenu before showing it + . In right to left pages the scroll bar should be on the left + . drag tab between windows + . zeitgeist extension to add history + . kiosk mode: http://www.twotoasts.de/bugs/index.php?do=details&task_id=605#comment2651 + . Find Inline → → Open selected hyperlink + . open selected addresses in tabs + . scrolling by just moving the mouse pointer to the edge of the window diff -Nru midori-0.2.8/configure midori-0.4.6/configure --- midori-0.2.8/configure 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/configure 2012-05-14 22:13:42.000000000 +0000 @@ -38,6 +38,9 @@ checkPython() { if [ -z "$PYTHON" ] ; then + PYTHON=`which python2 2>/dev/null` + fi + if [ -z "$PYTHON" ] ; then PYTHON=`which python 2>/dev/null` fi printf "Checking for Python\t\t\t: " @@ -85,6 +88,7 @@ else printf $GREEN"$WAF"$NORMAL"\n" fi + WAF="$PYTHON $WAF" } # Generates a Makefile. Requires that $WAF is set. @@ -126,7 +130,7 @@ distclean: @$WAF distclean - @-rm -rf _build_ + @-rm -rf _build @-rm -f Makefile check: diff -Nru midori-0.2.8/data/about.css midori-0.4.6/data/about.css --- midori-0.2.8/data/about.css 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/data/about.css 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,57 @@ +/* + about: page style template for Midori. + This file is licensed under the terms of the expat license, see the file EXPAT. + */ +body { + background-color: #eee; + margin: 0; + padding: 0; +} + +#container { + background: #f6fff3; + min-width: 70%; + max-width: 70%; + margin: 2em auto 1em; + padding: 1em; + border: 0.2em solid #9acb7f; + -webkit-border-radius: 1em; +} + +icon { + float: left; + padding-left: 1%; + padding-top: 1%; +} + +#main { + float: right; + width: 90%; +} + +h1 { + font-size: 1.4em; + font-weight: bold; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +#logo { + position: absolute; right: 15px; bottom: 15px; + z-index: -1; +} + +button span, +button img { + vertical-align: middle; + padding: 2px 1px; +} + +message { + font-size: 1.1em; +} + +description { + font-size: 1em; +} diff -Nru midori-0.2.8/data/autosuggestcontrol.js midori-0.4.6/data/autosuggestcontrol.js --- midori-0.2.8/data/autosuggestcontrol.js 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/data/autosuggestcontrol.js 2012-05-14 22:13:42.000000000 +0000 @@ -186,10 +186,10 @@ }; //assign onblur event handler (hides suggestions) - this.textbox.onblur = - this.textbox.onclick = function () { - oThis.hideSuggestions(); - }; + if (!this.textbox.onblur) + this.textbox.onblur = function () { oThis.hideSuggestions(); }; + if (!this.textbox.onclick) + this.textbox.onclick = function () { oThis.hideSuggestions(); }; //create the suggestions dropdown this.createDropDown(); @@ -299,7 +299,7 @@ if (inputs.length == 0) return false; - for (i=0;i - {title} - + +
- - + +

{title}

{message}

{description}

- +
+ +

diff -Nru midori-0.2.8/data/extensions/adblock/config midori-0.4.6/data/extensions/adblock/config --- midori-0.2.8/data/extensions/adblock/config 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/data/extensions/adblock/config 2012-05-14 22:13:42.000000000 +0000 @@ -1,2 +1,2 @@ [settings] -filters=http://adblockplus.mozdev.org/easylist/easylist.txt +filters=http://adblockplus.mozdev.org/easylist/easylist.txt;https://easylist-downloads.adblockplus.org/easyprivacy.txt diff -Nru midori-0.2.8/data/faq.css midori-0.4.6/data/faq.css --- midori-0.2.8/data/faq.css 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/data/faq.css 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,114 @@ +/* +:Author: Christian Dywan +:Contact: christian@twotoasts.de +:Copyright: This file is licensed under the terms of the expat license, see the file EXPAT. + +Stylesheet for Midori's documentation based on a version of Enrico Troeger. +*/ + +@media screen { + + body { + background-color: #f6fff3; + color: #404040; + margin-left: 0.4em; + width: 60em; + font-size: 90%; + } + + a { + color: #013100; + } + + a:visited { + color: #7E558E; + } + + a:hover { + text-decoration: none; + } + + h1, h2, h3 { + font-family: sans-serif; + color: #002a00; + } + + h1 { + border-top: 1px dotted; + margin-top: 2em; + } + + h1.title { + text-align: left } + + h2 { + margin-top: 30px; + } + + h2.subtitle { + text-align: left } + + h3 { + padding-left: 3px; + } + + blockquote, pre { + border: 1px solid; + padding: 0.4em; + } + + blockquote { + font-family: sans-serif; + background-color: #DBEDD5; + border: 1px dotted; + border-left: 4px solid; + border-color: #9FD98C; + } + + pre { + background-color: #deefd4; + border: 1px dotted; + border-left: 4px solid; + border-color: #9acb7d; + } + + tt, pre, code { + color: #002a00; + } + + table { + border: 1px solid #9acb7f; + } + + th { + border: none; + background-color: #9acb7d; + } + + tr:nth-child(even) { + background-color: #d3eac6; + } + + td { + border: none; + } + + .docinfo-name { + color: #002a00; + } + + p.admonition-title { + color: #990000; + font-weight: bold; + } + + div.note { + margin: 1em 3em; + padding: 0em; + } + + dt { + font-style: italic; + } + +} diff -Nru midori-0.2.8/data/faq.html midori-0.4.6/data/faq.html --- midori-0.2.8/data/faq.html 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/data/faq.html 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,903 @@ + + + + + midori:faq + + + + + + + + + + + + + + + + + + + +
+ +
+
Table of Contents
+
+ + +
+
+ + +

Midori - Frequently asked questions

+
+ +

+This document is licensed under the LGPL 2.1. +

+ +

+This is a list of frequently asked questions about the Midori Web Browser. Anyone feel free to improve and/ or extend this page, but keep it clean and easy to read for other Xfce users. +

+ +
+ +

Getting started

+
+ +
+ +

What is "Midori" and why should I use it?

+
+ +

+Midori is a Web Browser, that aims to be lightweight and fast. It aligns well with the Xfce philosophy of making the most out of available resources. +

+ +
+ +

How to pronounce Midori and what does the name mean?

+
+ +

+Pronounce it “midoɺi”, with a Spanish/ Japanese “r” or “Mee-Doh-Ree” in English or read it Italian. The name comes from the Japanese word 緑 (みどり) for the colour “green”. +

+ +
+ +

What does the logo mean?

+
+ +

+The paw of a green cat. Obviously. Also it resembles the letter “M” in “Midori”. The curving is supposed to emphasize speed. +

+ +
+ +

On which platforms does Midori run currently?

+
+ +

+Midori is basically very portable and should run on all platforms that its dependencies support. +

+ +
+ +

Under which license is Midori distributed?

+
+ +

+Midori and all delivered artwork are licensed under the LGPL2. +

+ +
+ +

Common problems

+
+ +
+ +

Why does Google Mail/ Calendar/ Maps, Facebook not work or show mobile version?

+
+ +

+Some websites discriminate against your browser. +

+ +

+If you have Midori older than 0.3.5, go to Preferences > Network > Identify As, and choose Custom. Paste this into the entry: +

+ +

+Mozilla/5.0 (X11; Linux) AppleWebKit/531.2+ Midori/0.3 +

+ +

+If this doesn't do the trick, try choosing Safari or Firefox. +

+ +

+Many other websites use similar means of detecting the browser. +

+ +

+Ideally Google would follow their own recommendation at some point. +

+ +
+ +

There are missing icons/ warnings

+
+ +

+The set of themed icons Midori can use is very limited. For instance icons for a new tab or the throbber are not guaranteed to be available. To fix this, install a Freedesktop.org spec compliant icon theme, such as Elementary, Faenza, Buuf or GNOME. +

+ +
+ +

Tweaking Midori on the Gtk level

+
+ +

+If you don't have a desktop application that takes care of Gtk settings or if your interface doesn't support a particular feature, you can modify any settings easily manually by specifying them in a text file called ~/.gtkrc-2.0 or /etc/gtk-2.0/gtkrc: +

+ +

+Use Tango as a fallback for your icon theme: +

+
gtk-icon-theme-name = "MySuperFancyTheme"
+gtk-fallback-icon-theme = "Tango"
+ +

+Use a smaller toolbar: +

+
gtk-toolbar-icon-size = GTK_ICON_SIZE_SMALL_TOOLBAR
+ +

+Only for those not running a complete DE like Xfce, Elementary, etc…
+ +There is a preference: Preferences → Browsing → Toolbar Style: Small icons +

+ +

+Enable changing hotkeys while hovering menu items: +

+
gtk-can-change-accels = 1
+ +
+ +

Midori crashes shortly before pages are loaded

+
+ +

+There appears to be an issue with Glib 2.16. The recommended solution is to upgrade your Glib package to 2.18. +

+ +
+ +

How can I change the cache folder (to tmpfs)?

+
+ +

+On Linux and BSD, you can set XDG_CACHE_HOME for all applications, or just Midori. Midori saves icons and cache files in that location. The default is ~/.cache. +

+ +

+export XDG_CACHE_HOME=/dev/shm +

+ +
+ +

Flash doesn't work

+
+ +
+ +

Windows support

+
+ +

+WebKitGTK+ and thusly Midori on Windows doesn't support Flash or any other plugins. If WebKitGTK+ adds the feature in the future, we will support it. For now there's nothing we can do. +

+ +
+ +

Netscape plugins on Linux, BSD and OS X

+
+ +

+You need to set MOZ_PLUGIN_PATH, for example like this: +

+
export MOZ_PLUGIN_PATH="/usr/lib/mozilla/plugins"
+ +

+The official Flash plugin is called libflashplayer.so . +

+ +

+You can either run that above line and run Midori in the same terminal afterwards or, for the long term, put it in ~/.bash_profile or /etc/profile.d or your respective distribution's place for this. +

+ +
+ +

Flash is crashing all the time

+
+ +

+Try searching for a package named nspluginwrapper or similar in your distribution repositories. It implements plugins in their own process so they can't drag down the whole browser. +

+ +
+ +

HTTPS URLS won't load

+
+ +

+That's a problem with WebKit. You can work around it to some extent if you start Midori like so: +

+
export WEBKIT_IGNORE_SSL_ERRORS="1" midori
+ +
+ +

Scroll with middle mouse button/ pan-scrolling

+
+ +

+http://ubuntuforums.org/showthread.php?t=478418 +

+ +

+Bug: https://bugs.launchpad.net/webkit/+bug/871425 +Upstream Bug: https://bugs.webkit.org/show_bug.cgi?id=50561 +

+ +
+ +

HTML5 Video doesn't play

+
+ +

+You need to have GStreamer plugins installed which implement the codecs. +

+
    +
  1. You need gstreamer0.10-pulse if you're using PulseAudio.
    +
    2. +
  2. You may need gstreamer0.10-alsa for ALSA, depending on your distribution.
    +
    3. +
  3. You need plugins for Theora, gstreamer0.10-base and MPEG-4 incluing aac (e.g. gst-plugins-faad), gstreamer0.10-bad. For WebM, you'll need plugins for vorbis (-base), matroska (-good), and vp8 (-bad). Have a look at http://www.gstreamer.net/documentation/plugins.html for details.
    +
    4. +
  4. For Youtube or Vimeo, you need WebKitGTK+ 1.1.20 or newer.
    +
    5. +
  5. You can test your installed codecs here..
    +
    6. +
  6. Since Midori 0.3.5 you can look at “about:version” to see which video codecs you have installed.
    +
    7. +
+ +
+ +

Java doesn't work, applets don't show up

+
+ +

+Java is supported in WebKitGTK+ since 1.1.22. If you need Java, you need to upgrade to at least that version. Sun/ Oracle Java as well as IcedTea are known to work. Distribution specific setup might be required, such as setting LD_LIBRARY_PATH to include the location of libxul.so and making a symbolic link for libnpjp2.so to /usr/lib/mozilla. +

+ +

+icedtea6 version 1.8 and above has been known to crash midori. If this is the case for you, try sun-jre. +

+ +
+ +

How do I get rid of the menubar?

+
+ +

+In the menubar, go to View → Toolbars → Menubar, voilà the menubar is gone and a new icon appears at the right end of the toolbar. Click the icon to access functionality that otherwise sits in the menubar. +Midori 0.3.2 disables the menubar by default. +

+ +
+ +

Why can't I use periods when searching from the location bar?

+
+ +

+Midori tries to make a smart guess on whether you are searching for something or typing a valid address by hand. Yet there are ambiguous cases so it fails. +

+ +

+Try using 'g' in front of the search terms, like 'g Ms.Marple'. The 'g' is a token that tells the browser you want to use Google. See Tools > Manage Search Engines or right-click the location bar and select the menu item, to look at search engines and tokens. +

+ +
+ +

How can I reload and bypass the cache?

+
+ +

+Hold the Shift key while clicking Refresh in the toolbar (this works in Chromium, Mozilla, Opera and Safari, too). +Since Midori 0.3.2 you can use Ctrl+Shift+R. +

+ +
+ +

How do I make tabs pinned/ sticky/ minimized?

+
+ +

+Right-click the tab label, and click 'Minimize' or 'Show Tab Icon Only' (Midori 0.3.5 or older). +

+ +
+ +

Why doesn't Google "live search" work?

+
+ +

+You need to set Preferences > Network > Identify As to Firefox. +

+ +
+ +

Opening html email with Mutt

+
+ +

+Place the following in ~/.mutt/mailcap or ~/.mailcap: +

+
text/html; midori -a '%s'; test=test -n "$DISPLAY"; nametemplate=%s.html
+ +
+ +

Scrolling on website xyz is very slow

+
+
    +
  1. Go to Tools > Extensions
    +
    2. +
  2. Enable 'User Addons' if it's not yet enabled
    +
    3. +
  3. Create a text file .local/share/midori/styles/scrollfix.user.css
    +
    4. +
  4. Put this into the file: * {-webkit-box-shadow: none !important;}
    +
    5. +
+ +
+ +

File opening doesn't work/ PDFs are opened with GIMP

+
+ +

+Midori opens files with GIO, and falls back to xdg-open, exo-open or gnome-open if these are available. All of this relies on freedesktop.org MIME configuration. To tweak this there are multiple options: +

+
    +
  1. Use 'Open With' with a graphical file manager
    +
    2. +
  2. Edit ~/.local/share/applications/defaults.list with a text editor
    +
    3. +
  3. Run something like ‘xdg-mime default evince.desktop application/pdf’
    +
    4. +
+ +

+xdg-open knows how to handle GNOME, KDE and Xfce. +LXDE is unfortunately not supported yet, see https://bugs.freedesktop.org/show_bug.cgi?id=26058 +

+ +
+ +

Open magnet:, irc:, apt: and friends with an application

+
+ +

+As of git 2011-03-05 02:40:00 UTC and Midori 0.3.3 you can +

+ +

+Add a line to ~/.local/share/applications/mimeapps.list: +

+
x-scheme-handler/magnet=transmission-gtk.desktop
+ +

+Or install an application which advertises the scheme like so: +

+
MimeType=x-scheme-handler/magnet;
+ +

+Note that incomplete .desktop files will silently fail and it will look as if it doesn't exist. +

+ +
+ +

Spell check

+
+ +

+First enable spell checking: +Edit→Preferences→Behavior and check “Enable Spell Checking”. +

+ +

+Now while typing any errors should get underlined in red. To get suggestions, highlight the word and right-click. Should see a list of suggestions on the top of the menu. +

+ +
+ +

Privacy

+
+ +
+ +

Blacklist cookies

+
+ +

+As of Midori 0.4.4 you can add a hidden option to ~/.config/midori/config like so: +

+
site-data-rules=-google.com,-facebook.com,!bugzilla.gnome.org,+bugs.launchpad.net
+
    +
  1. Values prefixed with ”-” are always blocked
    +
    2. +
  2. Values prefixed with ”+” are always accepted
    +
    3. +
  3. Values prefixed with ”!” are not cleared in Clear Private Data
    +
    4. +
  4. No wildcards.
    +
    5. +
  5. LSO, local storage and application caches ignore all policies.
    +
    6. +
+ +

+The feature is currently experimental and will change in future versions. +

+ +
+ +

Adblock

+
+ +

+The Advertisement Blocker can be activated under Extensions. It uses the same lists as Adblock Plus. URLs are blocked completely and never loaded. Lists can be added through the option button on the right side in the extension list. +

+ +
+ +

Modes

+
+ +
+ +

Web Applications

+
+ +

+There are two closely related features to open websites as dedicated windows of their own. You can do the following to use them: +

+
    +
  1. Right-click a hyperlink → Open as Web Application
    +
    2. +
  2. Add or Edit a bookmark → [x] Run as web application
    +
    3. +
  3. Type ‘midori -a http://foo.bar’ on a command line
    +
    4. +
+ +

+ You can also add options such as ‘-e Fullscreen’, ‘-e Navigationbar’ or ‘-e Statusbar’ (as of Midori 0.2.9 ‘midori –help-execute will list all available commands’) +

+ +
+ +

Private Browsing

+
+ +

+File menu/ App Menu button → Private Browsing +

+ +

+A private window is a separate process, so crashes don't affect the normal browser session. No sensitive data such as cookies, history or bookmarks are stored. No extensions are loaded. Panels are not available. +

+ +

+As of Midori 0.2.9 Private Browsing uses preferences, cookies, keyboard shortcuts and search engines from the normal session, but it won't save any changes. This behaviour can be emulated from the command line with ”-a” and ”-c”. +

+ +

+As of Midori 0.3.4 the –private command line switch opens a private browsing instance with normal preferences, cookies, shortcuts and search engines. But no changes will be saved. +DNS prefetching is disabled in this mode, also referrers are stripped down to the hostname when navigating between different websites. +

+ +

+The same options available to -a/ –app can be used for private browsing mode. +

+ +
+ +

Kiosk mode

+
+ +

+There is no specific mode, instead you use several command line switches. A typical fullscreen setup with no toolbar that opens about:blank and resets the session after 2 minutes of inactivity for instance: +

+
midori -i 120 -e Fullscreen -e Navigationbar -a about:blank
+ +

+Available commands for -e can be listed with “midori –help-execute”. +

+ +

+If needed, a customized profile can be created with “midori -c /path/to/folder”. Using the shortcut editor extension, keyboard shortcuts can be removed as needed. Afterwards just append ”-c /path/to/folder” to the kiosk mode command line. +

+ +

+To restrict pages that can be opened, you can use a regular expression. The expression is a blacklist. To block undesirable sites you can do something like: +

+
-b 'youtube|youporn'
+ +

+By negating the expression you can also whitelist pages. +

+
-b '^(?!.*?(gmail|mail\.google|accounts\.google)).*'
+ +

+Any links outside end up in an error page. All images and other files won't be loaded. +

+ +
+ +

Proxy servers

+
+ +

+By running a local proxy you can modify web content even before it has reached Midori. That allows you to do things similar to what user scripts and user styles provide and even others that neither is suitable for. +

+ +
+ +

Privoxy

+
+ +

+Privoxy is a non-caching web proxy with filter capabilites and particular support for blocking advertisements before even loading them. +

+ +

+http://www.privoxy.org/faq/ +

+ +
+ +

Mousehole

+
+ +

+Mousehole is a scriptable proxy server written in Ruby. +

+ +

+http://code.whytheluckystiff.net/mouseHole/ +

+ +
+ +

Polipo

+
+ +

+ Polipo is a caching web proxy (a web cache) designed to be used by one + person or a small group of people. It is similar in spirit to WWWOFFLE, but + the implementation techniques are more like the ones used by Squid. +

+ +

+http://www.pps.jussieu.fr/~jch/software/polipo/ +

+ +
+ +

Are SOCKS proxy servers supported?

+
+ +

+Currently only HTTP proxy servers are supported directly. A way to use SOCKS on Unix is to use tsocks with SSH as follows: +

+
    +
  1. Install 'tsocks'
    +
    2. +
  2. Open /etc/tsocks.conf in an editor
    +
    3. +
  3. Type something like this, you can choose the port freely: 
    server = 127.0.0.1
+server_type = 5
+server_port = 5555
    +
    +
    4. +
  4. Open an SSH connection with the same port: 
     ssh -D localhost:5555 myhost.com
    +
    +
    5. +
  5. Run Midori with “tsocks” in front of it: 
     tsocks midori
    +
    +
    6. +
  6. Now you can use for example http://www.whatsmyip.org/ to verify that you are using a SOCKS connection. The IP address should match the one of your SSH host. Remember to keep the SSH login running, and don't suspend it, otherwise it won't work.
    +
    7. +
  7. If the connection fails for some reason, you should see a connection error.
    +
    8. +
+ +
+ +

Keyboard Hotkeys

+
+ +
+ +

HJKL

+
+ +

+You can use the Vim-like key bindings [hjkl] to navigate a page. h=left j=down k=up l=right In a picture: +

+
	       k
+	   h     l
+	     j
+ +

+You can also use the arrow keys to do the same. +

+ +
+ +

Following Links

+
+ +

+To enable Hints in Midori [similar to those vimperator provides in Firefox], press . +

+ +

+With hints enabled, type the link number, and press Enter to open the link in the current tab, or Ctrl-Enter to open the link in a new tab. To clear a typed link number before pressing Enter or Ctrl-Enter, use Escape. +

+ +
+ +

Use Ctrl(+Shift)+Tab to switch between pages

+
+ +

+Since Midori 0.3.5 Ctrl+Tab is supported by default. +

+ +

+In older versions you can enable the History List extension under Tools → Extensions. +

+ +
+ +

Customizing keyboard shortcuts

+
+ +

+Enable the Shortcuts extension Tools → Extensions. To edit a keybinding Tools → Customize Shortcuts… +

+ +
+ +

Using Find

+
+ +

+Default shortcuts for Find are: +

+ +

+Find: Ctrl+f ”/” and ”,”
+ +FindNext: Ctrl+g and Enter
+ +FindPrevious: Shift+Ctrl+g
+ +

+ +

+Dismissing Find: +

+ +

+When using Ctrl+f to bring up Find, use Ctrl+f again or ESC. When using ”/” or ”,” to bring up Find, the previous works here as well and by simply moving focus away from the Find box. For example: a Tab or a mouse click anywhere[besides links of course]. +

+ +
+ +

Mouse Gestures

+
+ +

+By default the right mouse button initiates gestures. +

+ +

+You can change the button using a hidden option: +

+
    +
  1. Create a text file ~/.config/midori/extensions/libmouse-gestures.so/config .
    +
    2. +
  2. Type the following in there:
    +
    3. +
+
  [settings]
+  button=2
+ +

+For a quick and dirty overview of the gestures in the current release take a look at the preliminary manual. +Further information is available at the MGX website. +

+ +

+Additionally, there are programs allowing mouse gestures system-wide, for example EasyStroke. +

+ +
+ +

User scripts and styles

+
+ +

+UserScripts are scripts applied on some, or on all web pages. They can modify pages locally to add or alter functionality. That includes fixing bugs in web pages. User scripts are also available in other browsers, in the form of Mozilla's Greasemonkey or Opera's User JavaScript. +

+ +
+ +

How to install a UserScript

+
+ +

+First enable the “User Addons” extension. It will show up as a “User Scripts” panel (and it also provides “User Styles”). +

+ +

+Now you need to find some scripts. You can find some at userscripts.org. Most scripts work fine, some may be written specifically for other browsers. +

+ +

+If you have Midori 0.3.0 or newer, you will be offered to install scripts as soon as you see them on the page. +

+ +

+To manually install a userscript, you have to download the script as a file, and put it in the folder ~/.local/share/midori/scripts. You need to create that folder if it doesn't exist yet. Midori will automatically see and use it, which you can also see in the user scripts panel. +

+ +

+If the script is only shown as source code on the page, you first have to create a new text file in a text editor, copy the source code into the new file, and save it as my-user-script.js where ”.js” is the extension. +

+ +
+ +

Compatibility with GreaseMonkey

+
+ +

+As previously mentioned, Midori can use most scripts you will find. Midori supports Greasemonkey's @include and @exclude metadata so that scripts are only loaded on appropriate pages. Midori doesn't support advanced metadata, such as @require and @resource, so user scripts can't define dependencies on other scripts - most of the time this isn't a problem. Midori also does not support Greasemonkey API. Scripts must also be compatible with Webkit, since Midori is based on WebKit. A Greasemonkey script that makes use of functionality of Gecko/ Firefox will not work in Midori. +

+ +
+ +

Flash blocking via a User script

+
+ +

+You can use BlockFlash2 as a user script which replaces all Flash elements with a button that says “Play Flash”. +

+ +
+ +

Flash blocking via a User style

+
+ +

+You can also use FlashBlock WannaBe as a user script in order to replace Flash elements with placeholders and load them on click. The script is pretty advanced compared to most Flash blockers found on the web. +

+ +
+ +

User styles

+
+ +

+User styles are CSS Cascading Style sheets that are loaded locally and applied on top of web pages, similar to User scripts, in order to add or alter functionality and also fix bugs. +

+ +
+ +

How to install a user style

+
+ +

+First, you need to find some styles (or write your own). You can find some at userstyles.org. Many styles may or may not work, depending on whether the author decided to use browser specific features. +

+ +

+To install a user style, you have to download the style as a file, and put it in the following directory ~/.local/share/midori/styles (you may need to create that directory if it does not exist). Midori will automatically see and use it, which you can also see in the user styles panel. +

+ +

+Note, if the style is only shown as source code on the page, you first have to create a new text file in a text editor, copy the source code into the new file, and save it as my-user-style.css where ”.css” is the extension. +

+ +
+ +

How to install a user style before Midori 0.0.20

+
+ +

+Open up the Preferences and use the file chooser button beside User Stylesheet to choose a style sheet file. The style sheet will from now on be applied to all sites automatically. +

+ +
+ +

A user css to display the url when a link is hovered

+
+ +

+This user css is used to display the corresponding url when a link is hovered. This is similar to what chromium/chrome provides when hovering over a link, shown on the bottom left of the page. Add the following to ~/.local/share/midori/styles, then restart Midori and make sure that it is enabled Tools → Userstyles. +

+ +

+Customize as needed: +

+
a[href]:hover {
+            text-decoration: none !important;
+        }
+        a[href]:hover:after {
+            content: attr(href);
+            position: fixed; left: 4px; bottom: 4px;
+            padding: 0 6px !important;
+            max-width: 95%; overflow: hidden;
+            white-space: nowrap; text-overflow: ellipsis;
+            font:10pt sans-serif !important; text-shadow: 0 0 12px white;
+            background-color: ButtonFace !important; color: ButtonText !important;
+            opacity: 0.8; outline: ButtonFace solid thick;
+            z-index: 9999;
+        }
+ +
+
+ + diff -Nru midori-0.2.8/data/midori-private.desktop.in midori-0.4.6/data/midori-private.desktop.in --- midori-0.2.8/data/midori-private.desktop.in 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/data/midori-private.desktop.in 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,14 @@ +[Desktop Entry] +Version=1.0 +Type=Application +_Name=Midori Private Browsing +_GenericName=Private Browsing +_Comment=Open a new private browsing window +Categories=GTK;Network;WebBrowser; +Exec=midori --private %U +Icon=midori +Terminal=false +StartupNotify=true +X-Osso-Type=application/x-executable +X-Osso-Service=midori + diff -Nru midori-0.2.8/data/midori.desktop.in midori-0.4.6/data/midori.desktop.in --- midori-0.2.8/data/midori.desktop.in 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/data/midori.desktop.in 2012-05-14 22:13:42.000000000 +0000 @@ -3,12 +3,31 @@ Type=Application _Name=Midori _GenericName=Web Browser -_Comment=Lightweight web browser +_Comment=Browse the Web +_X-GNOME-Keywords=Internet;WWW;Explorer +_X-AppInstall-Keywords=Internet;WWW;Explorer Categories=GTK;Network;WebBrowser; -MimeType=text/html;text/xml;application/xhtml+xml;application/xml; -Exec=midori %u +MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo;image/svg+xml; +Exec=midori %U Icon=midori Terminal=false StartupNotify=true X-Osso-Type=application/x-executable X-Osso-Service=midori +X-Ayatana-Desktop-Shortcuts=TabNew;WindowNew;Private + +[TabNew Shortcut Group] +Name=New _Tab +Exec=midori -e TabNew +TargetEnvironment=Unity + +[WindowNew Shortcut Group] +Name=New _Window +Exec=midori -e WindowNew +TargetEnvironment=Unity + +[Private Shortcut Group] +Name=New P_rivate Browsing Window +Exec=midori --private +TargetEnvironment=Unity + diff -Nru midori-0.2.8/data/mootools.js midori-0.4.6/data/mootools.js --- midori-0.2.8/data/mootools.js 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/data/mootools.js 1970-01-01 00:00:00.000000000 +0000 @@ -1,313 +0,0 @@ -//MooTools, , My Object Oriented (JavaScript) Tools. Copyright (c) 2006-2009 Valerio Proietti, , MIT Style License. - -var MooTools={version:"1.2.2",build:"f0491d62fbb7e906789aa3733d6a67d43e5af7c9"};var Native=function(k){k=k||{};var a=k.name;var i=k.legacy;var b=k.protect; -var c=k.implement;var h=k.generics;var f=k.initialize;var g=k.afterImplement||function(){};var d=f||i;h=h!==false;d.constructor=Native;d.$family={name:"native"}; -if(i&&f){d.prototype=i.prototype;}d.prototype.constructor=d;if(a){var e=a.toLowerCase();d.prototype.$family={name:e};Native.typize(d,e);}var j=function(n,l,o,m){if(!b||m||!n.prototype[l]){n.prototype[l]=o; -}if(h){Native.genericize(n,l,b);}g.call(n,l,o);return n;};d.alias=function(n,l,o){if(typeof n=="string"){if((n=this.prototype[n])){return j(this,l,n,o); -}}for(var m in n){this.alias(m,n[m],l);}return this;};d.implement=function(m,l,o){if(typeof m=="string"){return j(this,m,l,o);}for(var n in m){j(this,n,m[n],l); -}return this;};if(c){d.implement(c);}return d;};Native.genericize=function(b,c,a){if((!a||!b[c])&&typeof b.prototype[c]=="function"){b[c]=function(){var d=Array.prototype.slice.call(arguments); -return b.prototype[c].apply(d.shift(),d);};}};Native.implement=function(d,c){for(var b=0,a=d.length;b-1:this.indexOf(a)>-1;},trim:function(){return this.replace(/^\s+|\s+$/g,"");},clean:function(){return this.replace(/\s+/g," ").trim(); -},camelCase:function(){return this.replace(/-\D/g,function(a){return a.charAt(1).toUpperCase();});},hyphenate:function(){return this.replace(/[A-Z]/g,function(a){return("-"+a.charAt(0).toLowerCase()); -});},capitalize:function(){return this.replace(/\b[a-z]/g,function(a){return a.toUpperCase();});},escapeRegExp:function(){return this.replace(/([-.*+?^${}()|[\]\/\\])/g,"\\$1"); -},toInt:function(a){return parseInt(this,a||10);},toFloat:function(){return parseFloat(this);},hexToRgb:function(b){var a=this.match(/^#?(\w{1,2})(\w{1,2})(\w{1,2})$/); -return(a)?a.slice(1).hexToRgb(b):null;},rgbToHex:function(b){var a=this.match(/\d{1,3}/g);return(a)?a.rgbToHex(b):null;},stripScripts:function(b){var a=""; -var c=this.replace(/]*>([\s\S]*?)<\/script>/gi,function(){a+=arguments[1]+"\n";return"";});if(b===true){$exec(a);}else{if($type(b)=="function"){b(a,c); -}}return c;},substitute:function(a,b){return this.replace(b||(/\\?\{([^{}]+)\}/g),function(d,c){if(d.charAt(0)=="\\"){return d.slice(1);}return(a[c]!=undefined)?a[c]:""; -});}});Hash.implement({has:Object.prototype.hasOwnProperty,keyOf:function(b){for(var a in this){if(this.hasOwnProperty(a)&&this[a]===b){return a;}}return null; -},hasValue:function(a){return(Hash.keyOf(this,a)!==null);},extend:function(a){Hash.each(a,function(c,b){Hash.set(this,b,c);},this);return this;},combine:function(a){Hash.each(a,function(c,b){Hash.include(this,b,c); -},this);return this;},erase:function(a){if(this.hasOwnProperty(a)){delete this[a];}return this;},get:function(a){return(this.hasOwnProperty(a))?this[a]:null; -},set:function(a,b){if(!this[a]||this.hasOwnProperty(a)){this[a]=b;}return this;},empty:function(){Hash.each(this,function(b,a){delete this[a];},this); -return this;},include:function(a,b){if(this[a]==undefined){this[a]=b;}return this;},map:function(b,c){var a=new Hash;Hash.each(this,function(e,d){a.set(d,b.call(c,e,d,this)); -},this);return a;},filter:function(b,c){var a=new Hash;Hash.each(this,function(e,d){if(b.call(c,e,d,this)){a.set(d,e);}},this);return a;},every:function(b,c){for(var a in this){if(this.hasOwnProperty(a)&&!b.call(c,this[a],a)){return false; -}}return true;},some:function(b,c){for(var a in this){if(this.hasOwnProperty(a)&&b.call(c,this[a],a)){return true;}}return false;},getKeys:function(){var a=[]; -Hash.each(this,function(c,b){a.push(b);});return a;},getValues:function(){var a=[];Hash.each(this,function(b){a.push(b);});return a;},toQueryString:function(a){var b=[]; -Hash.each(this,function(f,e){if(a){e=a+"["+e+"]";}var d;switch($type(f)){case"object":d=Hash.toQueryString(f,e);break;case"array":var c={};f.each(function(h,g){c[g]=h; -});d=Hash.toQueryString(c,e);break;default:d=e+"="+encodeURIComponent(f);}if(f!=undefined){b.push(d);}});return b.join("&");}});Hash.alias({keyOf:"indexOf",hasValue:"contains"}); -var Event=new Native({name:"Event",initialize:function(a,f){f=f||window;var k=f.document;a=a||f.event;if(a.$extended){return a;}this.$extended=true;var j=a.type; -var g=a.target||a.srcElement;while(g&&g.nodeType==3){g=g.parentNode;}if(j.test(/key/)){var b=a.which||a.keyCode;var m=Event.Keys.keyOf(b);if(j=="keydown"){var d=b-111; -if(d>0&&d<13){m="f"+d;}}m=m||String.fromCharCode(b).toLowerCase();}else{if(j.match(/(click|mouse|menu)/i)){k=(!k.compatMode||k.compatMode=="CSS1Compat")?k.html:k.body; -var i={x:a.pageX||a.clientX+k.scrollLeft,y:a.pageY||a.clientY+k.scrollTop};var c={x:(a.pageX)?a.pageX-f.pageXOffset:a.clientX,y:(a.pageY)?a.pageY-f.pageYOffset:a.clientY}; -if(j.match(/DOMMouseScroll|mousewheel/)){var h=(a.wheelDelta)?a.wheelDelta/120:-(a.detail||0)/3;}var e=(a.which==3)||(a.button==2);var l=null;if(j.match(/over|out/)){switch(j){case"mouseover":l=a.relatedTarget||a.fromElement; -break;case"mouseout":l=a.relatedTarget||a.toElement;}if(!(function(){while(l&&l.nodeType==3){l=l.parentNode;}return true;}).create({attempt:Browser.Engine.gecko})()){l=false; -}}}}return $extend(this,{event:a,type:j,page:i,client:c,rightClick:e,wheel:h,relatedTarget:l,target:g,code:b,key:m,shift:a.shiftKey,control:a.ctrlKey,alt:a.altKey,meta:a.metaKey}); -}});Event.Keys=new Hash({enter:13,up:38,down:40,left:37,right:39,esc:27,space:32,backspace:8,tab:9,"delete":46});Event.implement({stop:function(){return this.stopPropagation().preventDefault(); -},stopPropagation:function(){if(this.event.stopPropagation){this.event.stopPropagation();}else{this.event.cancelBubble=true;}return this;},preventDefault:function(){if(this.event.preventDefault){this.event.preventDefault(); -}else{this.event.returnValue=false;}return this;}});function Class(b){if(b instanceof Function){b={initialize:b};}var a=function(){Object.reset(this);if(a._prototyping){return this; -}this._current=$empty;var c=(this.initialize)?this.initialize.apply(this,arguments):this;delete this._current;delete this.caller;return c;}.extend(this); -a.implement(b);a.constructor=Class;a.prototype.constructor=a;return a;}Function.prototype.protect=function(){this._protected=true;return this;};Object.reset=function(a,c){if(c==null){for(var e in a){Object.reset(a,e); -}return a;}delete a[c];switch($type(a[c])){case"object":var d=function(){};d.prototype=a[c];var b=new d;a[c]=Object.reset(b);break;case"array":a[c]=$unlink(a[c]); -break;}return a;};new Native({name:"Class",initialize:Class}).extend({instantiate:function(b){b._prototyping=true;var a=new b;delete b._prototyping;return a; -},wrap:function(a,b,c){if(c._origin){c=c._origin;}return function(){if(c._protected&&this._current==null){throw new Error('The method "'+b+'" cannot be called.'); -}var e=this.caller,f=this._current;this.caller=f;this._current=arguments.callee;var d=c.apply(this,arguments);this._current=f;this.caller=e;return d;}.extend({_owner:a,_origin:c,_name:b}); -}});Class.implement({implement:function(a,d){if($type(a)=="object"){for(var e in a){this.implement(e,a[e]);}return this;}var f=Class.Mutators[a];if(f){d=f.call(this,d); -if(d==null){return this;}}var c=this.prototype;switch($type(d)){case"function":if(d._hidden){return this;}c[a]=Class.wrap(this,a,d);break;case"object":var b=c[a]; -if($type(b)=="object"){$mixin(b,d);}else{c[a]=$unlink(d);}break;case"array":c[a]=$unlink(d);break;default:c[a]=d;}return this;}});Class.Mutators={Extends:function(a){this.parent=a; -this.prototype=Class.instantiate(a);this.implement("parent",function(){var b=this.caller._name,c=this.caller._owner.parent.prototype[b];if(!c){throw new Error('The method "'+b+'" has no parent.'); -}return c.apply(this,arguments);}.protect());},Implements:function(a){$splat(a).each(function(b){if(b instanceof Function){b=Class.instantiate(b);}this.implement(b); -},this);}};var Chain=new Class({$chain:[],chain:function(){this.$chain.extend(Array.flatten(arguments));return this;},callChain:function(){return(this.$chain.length)?this.$chain.shift().apply(this,arguments):false; -},clearChain:function(){this.$chain.empty();return this;}});var Events=new Class({$events:{},addEvent:function(c,b,a){c=Events.removeOn(c);if(b!=$empty){this.$events[c]=this.$events[c]||[]; -this.$events[c].include(b);if(a){b.internal=true;}}return this;},addEvents:function(a){for(var b in a){this.addEvent(b,a[b]);}return this;},fireEvent:function(c,b,a){c=Events.removeOn(c); -if(!this.$events||!this.$events[c]){return this;}this.$events[c].each(function(d){d.create({bind:this,delay:a,"arguments":b})();},this);return this;},removeEvent:function(b,a){b=Events.removeOn(b); -if(!this.$events[b]){return this;}if(!a.internal){this.$events[b].erase(a);}return this;},removeEvents:function(c){var d;if($type(c)=="object"){for(d in c){this.removeEvent(d,c[d]); -}return this;}if(c){c=Events.removeOn(c);}for(d in this.$events){if(c&&c!=d){continue;}var b=this.$events[d];for(var a=b.length;a--;a){this.removeEvent(d,b[a]); -}}return this;}});Events.removeOn=function(a){return a.replace(/^on([A-Z])/,function(b,c){return c.toLowerCase();});};var Options=new Class({setOptions:function(){this.options=$merge.run([this.options].extend(arguments)); -if(!this.addEvent){return this;}for(var a in this.options){if($type(this.options[a])!="function"||!(/^on[A-Z]/).test(a)){continue;}this.addEvent(a,this.options[a]); -delete this.options[a];}return this;}});var Element=new Native({name:"Element",legacy:window.Element,initialize:function(a,b){var c=Element.Constructors.get(a); -if(c){return c(b);}if(typeof a=="string"){return document.newElement(a,b);}return $(a).set(b);},afterImplement:function(a,b){Element.Prototype[a]=b;if(Array[a]){return; -}Elements.implement(a,function(){var c=[],g=true;for(var e=0,d=this.length;e";}return $.element(this.createElement(a)).set(b);},newTextNode:function(a){return this.createTextNode(a); -},getDocument:function(){return this;},getWindow:function(){return this.window;}});Window.implement({$:function(b,c){if(b&&b.$family&&b.uid){return b;}var a=$type(b); -return($[a])?$[a](b,c,this.document):null;},$$:function(a){if(arguments.length==1&&typeof a=="string"){return this.document.getElements(a);}var f=[];var c=Array.flatten(arguments); -for(var d=0,b=c.length;d1);a.each(function(e){var f=this.getElementsByTagName(e.trim());(b)?c.extend(f):c=f;},this);return new Elements(c,{ddup:b,cash:!d}); -}});(function(){var h={},f={};var i={input:"checked",option:"selected",textarea:(Browser.Engine.webkit&&Browser.Engine.version<420)?"innerHTML":"value"}; -var c=function(l){return(f[l]||(f[l]={}));};var g=function(n,l){if(!n){return;}var m=n.uid;if(Browser.Engine.trident){if(n.clearAttributes){var q=l&&n.cloneNode(false); -n.clearAttributes();if(q){n.mergeAttributes(q);}}else{if(n.removeEvents){n.removeEvents();}}if((/object/i).test(n.tagName)){for(var o in n){if(typeof n[o]=="function"){n[o]=$empty; -}}Element.dispose(n);}}if(!m){return;}h[m]=f[m]=null;};var d=function(){Hash.each(h,g);if(Browser.Engine.trident){$A(document.getElementsByTagName("object")).each(g); -}if(window.CollectGarbage){CollectGarbage();}h=f=null;};var j=function(n,l,s,m,p,r){var o=n[s||l];var q=[];while(o){if(o.nodeType==1&&(!m||Element.match(o,m))){if(!p){return $(o,r); -}q.push(o);}o=o[l];}return(p)?new Elements(q,{ddup:false,cash:!r}):null;};var e={html:"innerHTML","class":"className","for":"htmlFor",text:(Browser.Engine.trident||(Browser.Engine.webkit&&Browser.Engine.version<420))?"innerText":"textContent"}; -var b=["compact","nowrap","ismap","declare","noshade","checked","disabled","readonly","multiple","selected","noresize","defer"];var k=["value","accessKey","cellPadding","cellSpacing","colSpan","frameBorder","maxLength","readOnly","rowSpan","tabIndex","useMap"]; -b=b.associate(b);Hash.extend(e,b);Hash.extend(e,k.associate(k.map(String.toLowerCase)));var a={before:function(m,l){if(l.parentNode){l.parentNode.insertBefore(m,l); -}},after:function(m,l){if(!l.parentNode){return;}var n=l.nextSibling;(n)?l.parentNode.insertBefore(m,n):l.parentNode.appendChild(m);},bottom:function(m,l){l.appendChild(m); -},top:function(m,l){var n=l.firstChild;(n)?l.insertBefore(m,n):l.appendChild(m);}};a.inside=a.bottom;Hash.each(a,function(l,m){m=m.capitalize();Element.implement("inject"+m,function(n){l(this,$(n,true)); -return this;});Element.implement("grab"+m,function(n){l($(n,true),this);return this;});});Element.implement({set:function(o,m){switch($type(o)){case"object":for(var n in o){this.set(n,o[n]); -}break;case"string":var l=Element.Properties.get(o);(l&&l.set)?l.set.apply(this,Array.slice(arguments,1)):this.setProperty(o,m);}return this;},get:function(m){var l=Element.Properties.get(m); -return(l&&l.get)?l.get.apply(this,Array.slice(arguments,1)):this.getProperty(m);},erase:function(m){var l=Element.Properties.get(m);(l&&l.erase)?l.erase.apply(this):this.removeProperty(m); -return this;},setProperty:function(m,n){var l=e[m];if(n==undefined){return this.removeProperty(m);}if(l&&b[m]){n=!!n;}(l)?this[l]=n:this.setAttribute(m,""+n); -return this;},setProperties:function(l){for(var m in l){this.setProperty(m,l[m]);}return this;},getProperty:function(m){var l=e[m];var n=(l)?this[l]:this.getAttribute(m,2); -return(b[m])?!!n:(l)?n:n||null;},getProperties:function(){var l=$A(arguments);return l.map(this.getProperty,this).associate(l);},removeProperty:function(m){var l=e[m]; -(l)?this[l]=(l&&b[m])?false:"":this.removeAttribute(m);return this;},removeProperties:function(){Array.each(arguments,this.removeProperty,this);return this; -},hasClass:function(l){return this.className.contains(l," ");},addClass:function(l){if(!this.hasClass(l)){this.className=(this.className+" "+l).clean(); -}return this;},removeClass:function(l){this.className=this.className.replace(new RegExp("(^|\\s)"+l+"(?:\\s|$)"),"$1");return this;},toggleClass:function(l){return this.hasClass(l)?this.removeClass(l):this.addClass(l); -},adopt:function(){Array.flatten(arguments).each(function(l){l=$(l,true);if(l){this.appendChild(l);}},this);return this;},appendText:function(m,l){return this.grab(this.getDocument().newTextNode(m),l); -},grab:function(m,l){a[l||"bottom"]($(m,true),this);return this;},inject:function(m,l){a[l||"bottom"](this,$(m,true));return this;},replaces:function(l){l=$(l,true); -l.parentNode.replaceChild(this,l);return this;},wraps:function(m,l){m=$(m,true);return this.replaces(m).grab(m,l);},getPrevious:function(l,m){return j(this,"previousSibling",null,l,false,m); -},getAllPrevious:function(l,m){return j(this,"previousSibling",null,l,true,m);},getNext:function(l,m){return j(this,"nextSibling",null,l,false,m);},getAllNext:function(l,m){return j(this,"nextSibling",null,l,true,m); -},getFirst:function(l,m){return j(this,"nextSibling","firstChild",l,false,m);},getLast:function(l,m){return j(this,"previousSibling","lastChild",l,false,m); -},getParent:function(l,m){return j(this,"parentNode",null,l,false,m);},getParents:function(l,m){return j(this,"parentNode",null,l,true,m);},getSiblings:function(l,m){return this.getParent().getChildren(l,m).erase(this); -},getChildren:function(l,m){return j(this,"nextSibling","firstChild",l,true,m);},getWindow:function(){return this.ownerDocument.window;},getDocument:function(){return this.ownerDocument; -},getElementById:function(o,n){var m=this.ownerDocument.getElementById(o);if(!m){return null;}for(var l=m.parentNode;l!=this;l=l.parentNode){if(!l){return null; -}}return $.element(m,n);},getSelected:function(){return new Elements($A(this.options).filter(function(l){return l.selected;}));},getComputedStyle:function(m){if(this.currentStyle){return this.currentStyle[m.camelCase()]; -}var l=this.getDocument().defaultView.getComputedStyle(this,null);return(l)?l.getPropertyValue([m.hyphenate()]):null;},toQueryString:function(){var l=[]; -this.getElements("input, select, textarea",true).each(function(m){if(!m.name||m.disabled){return;}var n=(m.tagName.toLowerCase()=="select")?Element.getSelected(m).map(function(o){return o.value; -}):((m.type=="radio"||m.type=="checkbox")&&!m.checked)?null:m.value;$splat(n).each(function(o){if(typeof o!="undefined"){l.push(m.name+"="+encodeURIComponent(o)); -}});});return l.join("&");},clone:function(o,l){o=o!==false;var r=this.cloneNode(o);var n=function(v,u){if(!l){v.removeAttribute("id");}if(Browser.Engine.trident){v.clearAttributes(); -v.mergeAttributes(u);v.removeAttribute("uid");if(v.options){var w=v.options,s=u.options;for(var t=w.length;t--;){w[t].selected=s[t].selected;}}}var x=i[u.tagName.toLowerCase()]; -if(x&&u[x]){v[x]=u[x];}};if(o){var p=r.getElementsByTagName("*"),q=this.getElementsByTagName("*");for(var m=p.length;m--;){n(p[m],q[m]);}}n(r,this);return $(r); -},destroy:function(){Element.empty(this);Element.dispose(this);g(this,true);return null;},empty:function(){$A(this.childNodes).each(function(l){Element.destroy(l); -});return this;},dispose:function(){return(this.parentNode)?this.parentNode.removeChild(this):this;},hasChild:function(l){l=$(l,true);if(!l){return false; -}if(Browser.Engine.webkit&&Browser.Engine.version<420){return $A(this.getElementsByTagName(l.tagName)).contains(l);}return(this.contains)?(this!=l&&this.contains(l)):!!(this.compareDocumentPosition(l)&16); -},match:function(l){return(!l||(l==this)||(Element.get(this,"tag")==l));}});Native.implement([Element,Window,Document],{addListener:function(o,n){if(o=="unload"){var l=n,m=this; -n=function(){m.removeListener("unload",n);l();};}else{h[this.uid]=this;}if(this.addEventListener){this.addEventListener(o,n,false);}else{this.attachEvent("on"+o,n); -}return this;},removeListener:function(m,l){if(this.removeEventListener){this.removeEventListener(m,l,false);}else{this.detachEvent("on"+m,l);}return this; -},retrieve:function(m,l){var o=c(this.uid),n=o[m];if(l!=undefined&&n==undefined){n=o[m]=l;}return $pick(n);},store:function(m,l){var n=c(this.uid);n[m]=l; -return this;},eliminate:function(l){var m=c(this.uid);delete m[l];return this;}});window.addListener("unload",d);})();Element.Properties=new Hash;Element.Properties.style={set:function(a){this.style.cssText=a; -},get:function(){return this.style.cssText;},erase:function(){this.style.cssText="";}};Element.Properties.tag={get:function(){return this.tagName.toLowerCase(); -}};Element.Properties.html=(function(){var c=document.createElement("div");var a={table:[1,"","
"],select:[1,""],tbody:[2,"","
"],tr:[3,"","
"]}; -a.thead=a.tfoot=a.tbody;var b={set:function(){var e=Array.flatten(arguments).join("");var f=Browser.Engine.trident&&a[this.get("tag")];if(f){var g=c;g.innerHTML=f[1]+e+f[2]; -for(var d=f[0];d--;){g=g.firstChild;}this.empty().adopt(g.childNodes);}else{this.innerHTML=e;}}};b.erase=b.set;return b;})();if(Browser.Engine.webkit&&Browser.Engine.version<420){Element.Properties.text={get:function(){if(this.innerText){return this.innerText; -}var a=this.ownerDocument.newElement("div",{html:this.innerHTML}).inject(this.ownerDocument.body);var b=a.innerText;a.destroy();return b;}};}Element.Properties.events={set:function(a){this.addEvents(a); -}};Native.implement([Element,Window,Document],{addEvent:function(e,g){var h=this.retrieve("events",{});h[e]=h[e]||{keys:[],values:[]};if(h[e].keys.contains(g)){return this; -}h[e].keys.push(g);var f=e,a=Element.Events.get(e),c=g,i=this;if(a){if(a.onAdd){a.onAdd.call(this,g);}if(a.condition){c=function(j){if(a.condition.call(this,j)){return g.call(this,j); -}return true;};}f=a.base||f;}var d=function(){return g.call(i);};var b=Element.NativeEvents[f];if(b){if(b==2){d=function(j){j=new Event(j,i.getWindow()); -if(c.call(i,j)===false){j.stop();}};}this.addListener(f,d);}h[e].values.push(d);return this;},removeEvent:function(c,b){var a=this.retrieve("events");if(!a||!a[c]){return this; -}var f=a[c].keys.indexOf(b);if(f==-1){return this;}a[c].keys.splice(f,1);var e=a[c].values.splice(f,1)[0];var d=Element.Events.get(c);if(d){if(d.onRemove){d.onRemove.call(this,b); -}c=d.base||c;}return(Element.NativeEvents[c])?this.removeListener(c,e):this;},addEvents:function(a){for(var b in a){this.addEvent(b,a[b]);}return this; -},removeEvents:function(a){var c;if($type(a)=="object"){for(c in a){this.removeEvent(c,a[c]);}return this;}var b=this.retrieve("events");if(!b){return this; -}if(!a){for(c in b){this.removeEvents(c);}this.eliminate("events");}else{if(b[a]){while(b[a].keys[0]){this.removeEvent(a,b[a].keys[0]);}b[a]=null;}}return this; -},fireEvent:function(d,b,a){var c=this.retrieve("events");if(!c||!c[d]){return this;}c[d].keys.each(function(e){e.create({bind:this,delay:a,"arguments":b})(); -},this);return this;},cloneEvents:function(d,a){d=$(d);var c=d.retrieve("events");if(!c){return this;}if(!a){for(var b in c){this.cloneEvents(d,b);}}else{if(c[a]){c[a].keys.each(function(e){this.addEvent(a,e); -},this);}}return this;}});Element.NativeEvents={click:2,dblclick:2,mouseup:2,mousedown:2,contextmenu:2,mousewheel:2,DOMMouseScroll:2,mouseover:2,mouseout:2,mousemove:2,selectstart:2,selectend:2,keydown:2,keypress:2,keyup:2,focus:2,blur:2,change:2,reset:2,select:2,submit:2,load:1,unload:1,beforeunload:2,resize:1,move:1,DOMContentLoaded:1,readystatechange:1,error:1,abort:1,scroll:1}; -(function(){var a=function(b){var c=b.relatedTarget;if(c==undefined){return true;}if(c===false){return false;}return($type(this)!="document"&&c!=this&&c.prefix!="xul"&&!this.hasChild(c)); -};Element.Events=new Hash({mouseenter:{base:"mouseover",condition:a},mouseleave:{base:"mouseout",condition:a},mousewheel:{base:(Browser.Engine.gecko)?"DOMMouseScroll":"mousewheel"}}); -})();Element.Properties.styles={set:function(a){this.setStyles(a);}};Element.Properties.opacity={set:function(a,b){if(!b){if(a==0){if(this.style.visibility!="hidden"){this.style.visibility="hidden"; -}}else{if(this.style.visibility!="visible"){this.style.visibility="visible";}}}if(!this.currentStyle||!this.currentStyle.hasLayout){this.style.zoom=1;}if(Browser.Engine.trident){this.style.filter=(a==1)?"":"alpha(opacity="+a*100+")"; -}this.style.opacity=a;this.store("opacity",a);},get:function(){return this.retrieve("opacity",1);}};Element.implement({setOpacity:function(a){return this.set("opacity",a,true); -},getOpacity:function(){return this.get("opacity");},setStyle:function(b,a){switch(b){case"opacity":return this.set("opacity",parseFloat(a));case"float":b=(Browser.Engine.trident)?"styleFloat":"cssFloat"; -}b=b.camelCase();if($type(a)!="string"){var c=(Element.Styles.get(b)||"@").split(" ");a=$splat(a).map(function(e,d){if(!c[d]){return"";}return($type(e)=="number")?c[d].replace("@",Math.round(e)):e; -}).join(" ");}else{if(a==String(Number(a))){a=Math.round(a);}}this.style[b]=a;return this;},getStyle:function(g){switch(g){case"opacity":return this.get("opacity"); -case"float":g=(Browser.Engine.trident)?"styleFloat":"cssFloat";}g=g.camelCase();var a=this.style[g];if(!$chk(a)){a=[];for(var f in Element.ShortStyles){if(g!=f){continue; -}for(var e in Element.ShortStyles[f]){a.push(this.getStyle(e));}return a.join(" ");}a=this.getComputedStyle(g);}if(a){a=String(a);var c=a.match(/rgba?\([\d\s,]+\)/); -if(c){a=a.replace(c[0],c[0].rgbToHex());}}if(Browser.Engine.presto||(Browser.Engine.trident&&!$chk(parseInt(a,10)))){if(g.test(/^(height|width)$/)){var b=(g=="width")?["left","right"]:["top","bottom"],d=0; -b.each(function(h){d+=this.getStyle("border-"+h+"-width").toInt()+this.getStyle("padding-"+h).toInt();},this);return this["offset"+g.capitalize()]-d+"px"; -}if((Browser.Engine.presto)&&String(a).test("px")){return a;}if(g.test(/(border(.+)Width|margin|padding)/)){return"0px";}}return a;},setStyles:function(b){for(var a in b){this.setStyle(a,b[a]); -}return this;},getStyles:function(){var a={};Array.each(arguments,function(b){a[b]=this.getStyle(b);},this);return a;}});Element.Styles=new Hash({left:"@px",top:"@px",bottom:"@px",right:"@px",width:"@px",height:"@px",maxWidth:"@px",maxHeight:"@px",minWidth:"@px",minHeight:"@px",backgroundColor:"rgb(@, @, @)",backgroundPosition:"@px @px",color:"rgb(@, @, @)",fontSize:"@px",letterSpacing:"@px",lineHeight:"@px",clip:"rect(@px @px @px @px)",margin:"@px @px @px @px",padding:"@px @px @px @px",border:"@px @ rgb(@, @, @) @px @ rgb(@, @, @) @px @ rgb(@, @, @)",borderWidth:"@px @px @px @px",borderStyle:"@ @ @ @",borderColor:"rgb(@, @, @) rgb(@, @, @) rgb(@, @, @) rgb(@, @, @)",zIndex:"@",zoom:"@",fontWeight:"@",textIndent:"@px",opacity:"@"}); -Element.ShortStyles={margin:{},padding:{},border:{},borderWidth:{},borderStyle:{},borderColor:{}};["Top","Right","Bottom","Left"].each(function(g){var f=Element.ShortStyles; -var b=Element.Styles;["margin","padding"].each(function(h){var i=h+g;f[h][i]=b[i]="@px";});var e="border"+g;f.border[e]=b[e]="@px @ rgb(@, @, @)";var d=e+"Width",a=e+"Style",c=e+"Color"; -f[e]={};f.borderWidth[d]=f[e][d]=b[d]="@px";f.borderStyle[a]=f[e][a]=b[a]="@";f.borderColor[c]=f[e][c]=b[c]="rgb(@, @, @)";});Native.implement([Document,Element],{getElements:function(h,g){h=h.split(","); -var c,e={};for(var d=0,b=h.length;d1),cash:!g});}});Element.implement({match:function(b){if(!b||(b==this)){return true;}var d=Selectors.Utils.parseTagAndID(b); -var a=d[0],e=d[1];if(!Selectors.Filters.byID(this,e)||!Selectors.Filters.byTag(this,a)){return false;}var c=Selectors.Utils.parseSelector(b);return(c)?Selectors.Utils.filter(this,c,{}):true; -}});var Selectors={Cache:{nth:{},parsed:{}}};Selectors.RegExps={id:(/#([\w-]+)/),tag:(/^(\w+|\*)/),quick:(/^(\w+|\*)$/),splitter:(/\s*([+>~\s])\s*([a-zA-Z#.*:\[])/g),combined:(/\.([\w-]+)|\[(\w+)(?:([!*^$~|]?=)(["']?)([^\4]*?)\4)?\]|:([\w-]+)(?:\(["']?(.*?)?["']?\)|$)/g)}; -Selectors.Utils={chk:function(b,c){if(!c){return true;}var a=$uid(b);if(!c[a]){return c[a]=true;}return false;},parseNthArgument:function(h){if(Selectors.Cache.nth[h]){return Selectors.Cache.nth[h]; -}var e=h.match(/^([+-]?\d*)?([a-z]+)?([+-]?\d*)?$/);if(!e){return false;}var g=parseInt(e[1],10);var d=(g||g===0)?g:1;var f=e[2]||false;var c=parseInt(e[3],10)||0; -if(d!=0){c--;while(c<1){c+=d;}while(c>=d){c-=d;}}else{d=c;f="index";}switch(f){case"n":e={a:d,b:c,special:"n"};break;case"odd":e={a:2,b:0,special:"n"}; -break;case"even":e={a:2,b:1,special:"n"};break;case"first":e={a:0,special:"index"};break;case"last":e={special:"last-child"};break;case"only":e={special:"only-child"}; -break;default:e={a:(d-1),special:"index"};}return Selectors.Cache.nth[h]=e;},parseSelector:function(e){if(Selectors.Cache.parsed[e]){return Selectors.Cache.parsed[e]; -}var d,h={classes:[],pseudos:[],attributes:[]};while((d=Selectors.RegExps.combined.exec(e))){var i=d[1],g=d[2],f=d[3],b=d[5],c=d[6],j=d[7];if(i){h.classes.push(i); -}else{if(c){var a=Selectors.Pseudo.get(c);if(a){h.pseudos.push({parser:a,argument:j});}else{h.attributes.push({name:c,operator:"=",value:j});}}else{if(g){h.attributes.push({name:g,operator:f,value:b}); -}}}}if(!h.classes.length){delete h.classes;}if(!h.attributes.length){delete h.attributes;}if(!h.pseudos.length){delete h.pseudos;}if(!h.classes&&!h.attributes&&!h.pseudos){h=null; -}return Selectors.Cache.parsed[e]=h;},parseTagAndID:function(b){var a=b.match(Selectors.RegExps.tag);var c=b.match(Selectors.RegExps.id);return[(a)?a[1]:"*",(c)?c[1]:false]; -},filter:function(f,c,e){var d;if(c.classes){for(d=c.classes.length;d--;d){var g=c.classes[d];if(!Selectors.Filters.byClass(f,g)){return false;}}}if(c.attributes){for(d=c.attributes.length; -d--;d){var b=c.attributes[d];if(!Selectors.Filters.byAttribute(f,b.name,b.operator,b.value)){return false;}}}if(c.pseudos){for(d=c.pseudos.length;d--;d){var a=c.pseudos[d]; -if(!Selectors.Filters.byPseudo(f,a.parser,a.argument,e)){return false;}}}return true;},getByTagAndID:function(b,a,d){if(d){var c=(b.getElementById)?b.getElementById(d,true):Element.getElementById(b,d,true); -return(c&&Selectors.Filters.byTag(c,a))?[c]:[];}else{return b.getElementsByTagName(a);}},search:function(o,h,t){var b=[];var c=h.trim().replace(Selectors.RegExps.splitter,function(k,j,i){b.push(j); -return":)"+i;}).split(":)");var p,e,A;for(var z=0,v=c.length;z":function(h,g,j,a,f){var c=Selectors.Utils.getByTagAndID(g,j,a);for(var e=0,d=c.length;ea){return false;}}return(c==a);},even:function(b,a){return Selectors.Pseudo["nth-child"].call(this,"2n+1",a); -},odd:function(b,a){return Selectors.Pseudo["nth-child"].call(this,"2n",a);},selected:function(){return this.selected;}});Element.Events.domready={onAdd:function(a){if(Browser.loaded){a.call(this); -}}};(function(){var b=function(){if(Browser.loaded){return;}Browser.loaded=true;window.fireEvent("domready");document.fireEvent("domready");};if(Browser.Engine.trident){var a=document.createElement("div"); -(function(){($try(function(){a.doScroll("left");return $(a).inject(document.body).set("html","temp").dispose();}))?b():arguments.callee.delay(50);})(); -}else{if(Browser.Engine.webkit&&Browser.Engine.version<525){(function(){(["loaded","complete"].contains(document.readyState))?b():arguments.callee.delay(50); -})();}else{window.addEvent("load",b);document.addEvent("DOMContentLoaded",b);}}})();var JSON=new Hash({$specialChars:{"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},$replaceChars:function(a){return JSON.$specialChars[a]||"\\u00"+Math.floor(a.charCodeAt()/16).toString(16)+(a.charCodeAt()%16).toString(16); -},encode:function(b){switch($type(b)){case"string":return'"'+b.replace(/[\x00-\x1f\\"]/g,JSON.$replaceChars)+'"';case"array":return"["+String(b.map(JSON.encode).filter($defined))+"]"; -case"object":case"hash":var a=[];Hash.each(b,function(e,d){var c=JSON.encode(e);if(c){a.push(JSON.encode(d)+":"+c);}});return"{"+a+"}";case"number":case"boolean":return String(b); -case false:return"null";}return null;},decode:function(string,secure){if($type(string)!="string"||!string.length){return null;}if(secure&&!(/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(string.replace(/\\./g,"@").replace(/"[^"\\\n\r]*"/g,""))){return null; -}return eval("("+string+")");}});Native.implement([Hash,Array,String,Number],{toJSON:function(){return JSON.encode(this);}});var Cookie=new Class({Implements:Options,options:{path:false,domain:false,duration:false,secure:false,document:document},initialize:function(b,a){this.key=b; -this.setOptions(a);},write:function(b){b=encodeURIComponent(b);if(this.options.domain){b+="; domain="+this.options.domain;}if(this.options.path){b+="; path="+this.options.path; -}if(this.options.duration){var a=new Date();a.setTime(a.getTime()+this.options.duration*24*60*60*1000);b+="; expires="+a.toGMTString();}if(this.options.secure){b+="; secure"; -}this.options.document.cookie=this.key+"="+b;return this;},read:function(){var a=this.options.document.cookie.match("(?:^|;)\\s*"+this.key.escapeRegExp()+"=([^;]*)"); -return(a)?decodeURIComponent(a[1]):null;},dispose:function(){new Cookie(this.key,$merge(this.options,{duration:-1})).write("");return this;}});Cookie.write=function(b,c,a){return new Cookie(b,a).write(c); -};Cookie.read=function(a){return new Cookie(a).read();};Cookie.dispose=function(b,a){return new Cookie(b,a).dispose();};var Fx=new Class({Implements:[Chain,Events,Options],options:{fps:50,unit:false,duration:500,link:"ignore"},initialize:function(a){this.subject=this.subject||this; -this.setOptions(a);this.options.duration=Fx.Durations[this.options.duration]||this.options.duration.toInt();var b=this.options.wait;if(b===false){this.options.link="cancel"; -}},getTransition:function(){return function(a){return -(Math.cos(Math.PI*a)-1)/2;};},step:function(){var a=$time();if(a=(7-4*d)/11){e=c*c-Math.pow((11-6*d-11*f)/4,2); -break;}}return e;},Elastic:function(b,a){return Math.pow(2,10*--b)*Math.cos(20*b*Math.PI*(a[0]||1)/3);}});["Quad","Cubic","Quart","Quint"].each(function(b,a){Fx.Transitions[b]=new Fx.Transition(function(c){return Math.pow(c,[a+2]); -});});var Request=new Class({Implements:[Chain,Events,Options],options:{url:"",data:"",headers:{"X-Requested-With":"XMLHttpRequest",Accept:"text/javascript, text/html, application/xml, text/xml, */*"},async:true,format:false,method:"post",link:"ignore",isSuccess:null,emulation:true,urlEncoded:true,encoding:"utf-8",evalScripts:false,evalResponse:false,noCache:false},initialize:function(a){this.xhr=new Browser.Request(); -this.setOptions(a);this.options.isSuccess=this.options.isSuccess||this.isSuccess;this.headers=new Hash(this.options.headers);},onStateChange:function(){if(this.xhr.readyState!=4||!this.running){return; -}this.running=false;this.status=0;$try(function(){this.status=this.xhr.status;}.bind(this));if(this.options.isSuccess.call(this,this.status)){this.response={text:this.xhr.responseText,xml:this.xhr.responseXML}; -this.success(this.response.text,this.response.xml);}else{this.response={text:null,xml:null};this.failure();}this.xhr.onreadystatechange=$empty;},isSuccess:function(){return((this.status>=200)&&(this.status<300)); -},processScripts:function(a){if(this.options.evalResponse||(/(ecma|java)script/).test(this.getHeader("Content-type"))){return $exec(a);}return a.stripScripts(this.options.evalScripts); -},success:function(b,a){this.onSuccess(this.processScripts(b),a);},onSuccess:function(){this.fireEvent("complete",arguments).fireEvent("success",arguments).callChain(); -},failure:function(){this.onFailure();},onFailure:function(){this.fireEvent("complete").fireEvent("failure",this.xhr);},setHeader:function(a,b){this.headers.set(a,b); -return this;},getHeader:function(a){return $try(function(){return this.xhr.getResponseHeader(a);}.bind(this));},check:function(){if(!this.running){return true; -}switch(this.options.link){case"cancel":this.cancel();return true;case"chain":this.chain(this.caller.bind(this,arguments));return false;}return false;},send:function(j){if(!this.check(j)){return this; -}this.running=true;var h=$type(j);if(h=="string"||h=="element"){j={data:j};}var d=this.options;j=$extend({data:d.data,url:d.url,method:d.method},j);var f=j.data,b=j.url,a=j.method; -switch($type(f)){case"element":f=$(f).toQueryString();break;case"object":case"hash":f=Hash.toQueryString(f);}if(this.options.format){var i="format="+this.options.format; -f=(f)?i+"&"+f:i;}if(this.options.emulation&&["put","delete"].contains(a)){var g="_method="+a;f=(f)?g+"&"+f:g;a="post";}if(this.options.urlEncoded&&a=="post"){var c=(this.options.encoding)?"; charset="+this.options.encoding:""; -this.headers.set("Content-type","application/x-www-form-urlencoded"+c);}if(this.options.noCache){var e="noCache="+new Date().getTime();f=(f)?e+"&"+f:e; -}if(f&&a=="get"){b=b+(b.contains("?")?"&":"?")+f;f=null;}this.xhr.open(a.toUpperCase(),b,this.options.async);this.xhr.onreadystatechange=this.onStateChange.bind(this); -this.headers.each(function(l,k){try{this.xhr.setRequestHeader(k,l);}catch(m){this.fireEvent("exception",[k,l]);}},this);this.fireEvent("request");this.xhr.send(f); -if(!this.options.async){this.onStateChange();}return this;},cancel:function(){if(!this.running){return this;}this.running=false;this.xhr.abort();this.xhr.onreadystatechange=$empty; -this.xhr=new Browser.Request();this.fireEvent("cancel");return this;}});(function(){var a={};["get","post","put","delete","GET","POST","PUT","DELETE"].each(function(b){a[b]=function(){var c=Array.link(arguments,{url:String.type,data:$defined}); -return this.send($extend(c,{method:b.toLowerCase()}));};});Request.implement(a);})(); \ No newline at end of file diff -Nru midori-0.2.8/data/search midori-0.4.6/data/search --- midori-0.2.8/data/search 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/data/search 2012-05-14 22:13:42.000000000 +0000 @@ -1,28 +1,29 @@ +[Duck Duck Go] +name=Duck Duck Go +text=Privacy-aware Web Search +uri=https://duckduckgo.com/?q=%s +token=dd [Yahoo] name=Yahoo text=Yahoo Web Search uri=http://search.yahoo.com/search?p= -icon= token=y [Google] name=Google text=Web Search uri=http://www.google.com/search?q=%s -icon= token=g [Wikipedia] name=Wikipedia text=The free encyclopedia uri=http://en.wikipedia.org/wiki/Special:Search/%s -icon= token=wp [TheFreeDictionary] name=The Free Dictionary text=Dictionary, Encyclopedia and Thesaurus uri=http://www.thefreedictionary.com/%s -icon= token=fd diff -Nru midori-0.2.8/data/speeddial-head.html midori-0.4.6/data/speeddial-head.html --- midori-0.2.8/data/speeddial-head.html 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/data/speeddial-head.html 2012-05-14 22:13:42.000000000 +0000 @@ -1,178 +1,117 @@ - {title} - -
-
- {set_dial_size} - {set_thumb_size} - {set_thumb_small} - {set_thumb_normal} - {set_thumb_big} -
-
-
-
-
- - - +
diff -Nru midori-0.2.8/data/speeddial.json midori-0.4.6/data/speeddial.json --- midori-0.2.8/data/speeddial.json 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/data/speeddial.json 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -'{"shortcuts":[{"id":"s1","href":"#","title":"","img":""},{"id":"s2","href":"#","title":"","img":""},{"id":"s3","href":"#","title":"","img":""},{"id":"s4","href":"#","title":"","img":""},{"id":"s5","href":"#","title":"","img":""},{"id":"s6","href":"#","title":"","img":""},{"id":"s7","href":"#","title":"","img":""},{"id":"s8","href":"#","title":"","img":""},{"id":"s9","href":"#","title":"","img":""}]}' diff -Nru midori-0.2.8/debian/Debian-config midori-0.4.6/debian/Debian-config --- midori-0.2.8/debian/Debian-config 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/debian/Debian-config 2012-03-11 19:40:09.000000000 +0000 @@ -0,0 +1,3 @@ +[settings] + +homepage=file:///usr/share/doc/midori/faq.html diff -Nru midori-0.2.8/debian/Ubuntu-config midori-0.4.6/debian/Ubuntu-config --- midori-0.2.8/debian/Ubuntu-config 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/debian/Ubuntu-config 2012-03-11 19:40:09.000000000 +0000 @@ -0,0 +1,2 @@ +[settings] +homepage=file:///usr/share/ubuntu-artwork/home/index.html diff -Nru midori-0.2.8/debian/changelog midori-0.4.6/debian/changelog --- midori-0.2.8/debian/changelog 2010-09-20 07:15:21.000000000 +0000 +++ midori-0.4.6/debian/changelog 2012-09-29 15:20:12.000000000 +0000 @@ -1,19 +1,177 @@ -midori (0.2.8-1~llwkt1) lucid; urgency=low +midori (0.4.6-1~lucid~ppa2) lucid; urgency=low - * New upstream Version - - Re-implement Bookmarks menu and toolbar button - - Show transferbar even if statusbar is hidden - - Smart case for inline search while typing - - Use Alt+Shift+Right instead of Ctrl+Right for Next Page - - Adding, edit and delete buttons for user scripts/ styles - - Rename 'Minimize Tab' to 'Show Tab Icon Only' - - Delete key in completion deletes items - - Don't show homepage in bookmarkbar - - Fix crash when using location arrow button + * New upstream release. + + -- Liviu Andronic Wed, 16 May 2012 16:30:47 +0100 + +midori (0.4.5-1~lucid~ppa3) lucid; urgency=low + + * Disable compilation of 'extensions/external-download-manager.vala' (see Bug #976139) + + -- Liviu Andronic Sun, 29 Apr 2012 16:30:47 +0100 + +midori (0.4.5-1~lucid~ppa1) lucid; urgency=low + + * New upstream release. + + -- Liviu Andronic Sun, 22 Apr 2012 16:30:47 +0100 + +midori (0.4.4-1~lucid~ppa2) lucid; urgency=low + + * Remove dpkg-maintscript-helper in midori.preinst and postrm + + -- Liviu Andronic Tue, 27 Mar 2012 16:30:47 +0100 + +midori (0.4.4-1~lucid~ppa1) lucid; urgency=low + + * New upstream release. + * Initial import. + + -- Liviu Andronic Sun, 11 Mar 2012 16:30:47 +0100 + +midori (0.4.2-1~llwkt2) lucid; urgency=low + + [Yves-Alexis Perez] + * New upstream release. + * debian/midori.{preinst,postinst,postrm}: + - handle adblock configuration file rename. + + -- Stéphane Marguet (Stemp) Tue, 15 Nov 2011 16:30:47 +0100 + +midori (0.4.1-2) unstable; urgency=low + + * debian/control: + - update libwebkitgtk-dev build-dep to 1.4.3 + * As a side effect, the rebuild against webkit 1.6.1 fix midori crashing + because of missing webkit_web_view_get_selected_text() closes: #646198 + + -- Yves-Alexis Perez Sat, 22 Oct 2011 14:46:34 +0200 + +midori (0.4.1-1) unstable; urgency=low + + * New upstream release. + - fix middle click on back/forward button. closes: #644840 + - correctly clear private data on quit when asked. closes: #644658 + * debian/patches: + - 0001-Fix-for-Bug-819688 dropped, included upstream. + * debian/control: + - drop libjs-mootools from depends, it's not needed anymore. + * debian/rules: + - don't remove mootools.js since it's not even shipped anymore. + + -- Yves-Alexis Perez Mon, 10 Oct 2011 08:24:46 +0200 + +midori (0.4.0-2) unstable; urgency=low + + * debian/patches: + - 0001-Fix-for-Bug-819688 added, correctly restore tab panel when needed. + + -- Yves-Alexis Perez Tue, 06 Sep 2011 09:30:33 +0200 + +midori (0.4.0-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - bump webkit build-dep to 1.1.17. + - bump valac build-dep to 0.10. + + -- Yves-Alexis Perez Tue, 02 Aug 2011 09:44:09 +0200 + +midori (0.3.6-2) unstable; urgency=low + + * debian/rules: + - don't install upstream changelog twice. closes: #614692 + * debian/Debian-config: + - update homepage to point to faq.html. + * debian/control: + - build-dep on libwebkitgtk-dev instead of libwebkit-dev. - -- Stéphane Marguet (Stemp) Mon, 20 Sep 2010 09:14:40 +0200 + -- Yves-Alexis Perez Tue, 26 Jul 2011 00:24:23 +0200 -midori (0.2.7-1.1~llwkt3) lucid; urgency=low +midori (0.3.6-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - update vcs info. + + -- Yves-Alexis Perez Mon, 16 May 2011 08:32:33 +0200 + +midori (0.3.5-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - add myself to uploaders... + - update standards version to 3.9.2. + + -- Yves-Alexis Perez Mon, 02 May 2011 21:50:53 +0200 + +midori (0.3.3-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream release. + * debian/rules: + - install ChangeLog file as changelog and remove the one installed by make + install. + * debian/control: + - drop dpkg PreDepends. + + -- Yves-Alexis Perez Tue, 15 Mar 2011 22:36:00 +0100 + +midori (0.3.2-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream release. + - fix bookmarks multiplication. closes: #613739 + * debian/patches: + - 0001-Only-no-adblock-if-main-frame-in-provisional-state dropped, included + upstream. + + -- Yves-Alexis Perez Sun, 20 Feb 2011 10:50:11 +0100 + +midori (0.3.0-1.3) unstable; urgency=low + + * Non-maintainer upload. + * debian/control: + - replace hardening-includes build-dep by hardening-wrapper. + * debian/rules: + - enable hardening. + + -- Yves-Alexis Perez Fri, 04 Feb 2011 09:01:07 +0100 + +midori (0.3.0-1.2) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches: + - 0001-Only-no-adblock-if-main-frame-in-provisional-state added, fix + adblock extension. closes: #611682 + * debian/rules: + - remove .lock-script in clean target. + + -- Yves-Alexis Perez Wed, 02 Feb 2011 21:01:25 +0100 + +midori (0.3.0-1.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream release. + * debian/rules: + - pick {C,LD}FLAGS from dpkg-buildflags. + - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS. + - add hardening flags to {C,LD}FLAGS. + * debian/rules: + - remove waf stuff, midori waf has been updated so it's no longer needed + to dynamically patch waf for HPPA. + - install $(DISTRO)-config to /etc/xdg/midori to tune the default homepage + - add -O1 to LDFLAGS. + * debian/{Ubuntu,Debian}-config added, with default homepage setting. + * debian/patches: + - add-debian-search refreshed. + - fix-serial-build dropped thanks to waf upgrade in midori. + * debian/control: + - drop quilt build-dep, useless now. + + -- Yves-Alexis Perez Mon, 31 Jan 2011 17:49:21 +0100 + +midori (0.2.7-1.1) unstable; urgency=low * Non-maintainer upload. @@ -35,10 +193,7 @@ - add build-dep on valac to build certain extensions. - update standards version to 3.9.1 - [Stéphane Marguet] - * drop dpkg-maintscript-helper to avoid dependeny on dpkg (>= 1.15.7.2) - - -- Stéphane Marguet Tue, 24 Aug 2010 17:19:13 +0200 + -- Yves-Alexis Perez Tue, 17 Aug 2010 22:11:21 +0200 midori (0.2.4-3) unstable; urgency=low diff -Nru midori-0.2.8/debian/control midori-0.4.6/debian/control --- midori-0.2.8/debian/control 2010-08-24 12:02:15.000000000 +0000 +++ midori-0.4.6/debian/control 2012-03-11 19:40:09.000000000 +0000 @@ -2,12 +2,12 @@ Section: web Priority: optional Maintainer: Ryan Niebur +Uploaders: Yves-Alexis Perez Build-Depends: debhelper (>= 7.0.50), - quilt (>= 0.46-7), lsb-release, libgtk2.0-dev (>= 2.10), libglib2.0-dev, - libwebkit-dev (>= 1.1.15), + libwebkit-dev (>= 1.1.17), libxml2-dev (>= 2.6), # For waf: python, @@ -18,25 +18,27 @@ libsqlite3-dev, libunique-dev (>= 1.0.6), python-docutils, - libsoup2.4-dev (>= 2.25.2), + libsoup2.4-dev (>= 2.27.90), libnotify-dev, - valac, + valac (>= 0.10), # For testing under xvfb: xvfb, xauth, - xfonts-base + xfonts-base, + hardening-wrapper, + libxss-dev # Disabled optional dependencies: Build-Conflicts: gtk-doc-tools, libgtksourceview2.0-dev (>= 2.0), libhildon-1-dev -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://www.twotoasts.de/index.php?/pages/midori_summary.html -Vcs-Git: git://git.ryan52.info/git/midori -Vcs-Browser: http://git.ryan52.info/?p=midori;a=summary +Vcs-Git: git://git.debian.org/collab-maint/midori.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/midori.git;a=summary Package: midori Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, dbus-x11, libjs-mootools +Depends: ${shlibs:Depends}, ${misc:Depends}, dbus-x11 Recommends: gnome-icon-theme Provides: www-browser # For http://bugs.debian.org/522436 (missing symbols): diff -Nru midori-0.2.8/debian/midori.postinst.base midori-0.4.6/debian/midori.postinst.base --- midori-0.2.8/debian/midori.postinst.base 2010-08-24 15:17:20.000000000 +0000 +++ midori-0.4.6/debian/midori.postinst.base 2012-03-27 21:38:14.000000000 +0000 @@ -9,5 +9,10 @@ x-www-browser.1.gz /usr/share/man/man1/midori.1.gz ;; esac +#dpkg-maintscript-helper mv_conffile \ +# /etc/xdg/midori/extensions/libadblock.so/config \ +# /etc/xdg/midori/extensions/adblock/config \ +# 0.4.1-2 midori -- "$@" +#rmdir /etc/xdg/midori/extensions/libadblock.so || true #DEBHELPER# exit 0 diff -Nru midori-0.2.8/debian/midori.postrm midori-0.4.6/debian/midori.postrm --- midori-0.2.8/debian/midori.postrm 2010-08-24 15:17:32.000000000 +0000 +++ midori-0.4.6/debian/midori.postrm 2012-03-27 21:38:36.000000000 +0000 @@ -1,4 +1,8 @@ #!/bin/sh set -e +#dpkg-maintscript-helper mv_conffile \ +# /etc/xdg/midori/extensions/libadblock.so/config \ +# /etc/xdg/midori/extensions/adblock/config \ +# 0.4.1-2 midori -- "$@" #DEBHELPER# exit 0 diff -Nru midori-0.2.8/debian/midori.preinst midori-0.4.6/debian/midori.preinst --- midori-0.2.8/debian/midori.preinst 2010-08-24 15:17:43.000000000 +0000 +++ midori-0.4.6/debian/midori.preinst 2012-03-27 21:37:32.000000000 +0000 @@ -1,4 +1,8 @@ #!/bin/sh set -e +#dpkg-maintscript-helper mv_conffile \ +# /etc/xdg/midori/extensions/libadblock.so/config \ +# /etc/xdg/midori/extensions/adblock/config \ +# 0.4.1-2 midori -- "$@" #DEBHELPER# exit 0 diff -Nru midori-0.2.8/debian/patches/add-debian-searches midori-0.4.6/debian/patches/add-debian-searches --- midori-0.2.8/debian/patches/add-debian-searches 2010-08-17 05:50:05.000000000 +0000 +++ midori-0.4.6/debian/patches/add-debian-searches 2012-03-11 19:40:09.000000000 +0000 @@ -1,10 +1,10 @@ -Fix #520381 - add a Debian search to the default search list. -and #525991 - Adding debian bugs search to pre-installed searches +diff --git a/data/search b/data/search +index e759642..59341ee 100644 --- a/data/search +++ b/data/search -@@ -19,3 +19,17 @@ +@@ -27,3 +27,17 @@ name=The Free Dictionary + text=Dictionary, Encyclopedia and Thesaurus uri=http://www.thefreedictionary.com/%s - icon= token=fd + +[Debian Packages] diff -Nru midori-0.2.8/debian/patches/debian-changes-0.2.7-1.1 midori-0.4.6/debian/patches/debian-changes-0.2.7-1.1 --- midori-0.2.8/debian/patches/debian-changes-0.2.7-1.1 2010-08-17 20:19:07.000000000 +0000 +++ midori-0.4.6/debian/patches/debian-changes-0.2.7-1.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,636 +0,0 @@ -Description: Upstream changes introduced in version 0.2.7-1.1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - midori (0.2.7-1.1) unstable; urgency=low - . - * Non-maintainer upload. - . - [Ryan Niebur] - * New Upstream Version (Closes: #582213) - - fixes segfault (Closes: #579118) - - correct link to FAQ (Closes: #582512) - * refresh patches - * update copyright - * use dpkg-maintscript-helper to remove old config file - /etc/midori/extensions/libadblock.so (Closes: #573208) - . - [Yves-Alexis Perez] - * New 2.7 upstream release. - * debian/watch edited to correctly track upstream versions. - * debian/rules: - - use --fail-missing in dh_install - * debian/control: - - add build-dep on valac to build certain extensions. - - update standards version to 3.9.1 - . - The person named in the Author field signed this changelog entry. -Author: Yves-Alexis Perez -Bug-Debian: http://bugs.debian.org/573208 -Bug-Debian: http://bugs.debian.org/579118 -Bug-Debian: http://bugs.debian.org/582213 -Bug-Debian: http://bugs.debian.org/582512 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- /dev/null -+++ midori-0.2.7/.lock-wscript -@@ -0,0 +1,7 @@ -+argv = ['./waf', '--nocache', 'configure', '--prefix', '/usr'] -+blddir = '/server/home/ryan52/projects/deb/midori/midori/_build_' -+commands = {'dist': 0, 'configure': True, 'distcheck': 0, 'install': 0, 'build': 0, 'clean': 0, 'distclean': 0, 'check': 0, 'uninstall': 0} -+files = [] -+hash = 0 -+options = {'enable_apidocs': False, 'disable_hildon': True, 'force': False, 'verbose': 0, 'SHAREDSTATEDIR': '', 'destdir': '', 'disable_libidn': False, 'zones': '', 'enable_libidn': False, 'prefix': '/usr', 'run': False, 'enable_libnotify': False, 'disable_sqlite': False, 'enable_addons': False, 'blddir': '', 'compile_targets': '', 'INFODIR': '', 'nocache': True, 'progress_bar': 0, 'EXEC_PREFIX': '', 'disable_apidocs': True, 'LOCALSTATEDIR': '', 'disable_libnotify': False, 'datadir': '', 'INCLUDEDIR': '', 'build': None, 'LIBEXECDIR': '', 'MANDIR': '', 'PSDIR': '', 'BINDIR': '', 'enable_hildon': False, 'enable_unique': False, 'DOCDIR': '', 'SYSCONFDIR': '', 'jobs': 2, 'DATAROOTDIR': '', 'disable_userdocs': False, 'PDFDIR': '', 'DATADIR': '', 'LIBDIR': '', 'SBINDIR': '', 'disable_docs': False, 'enable_sqlite': False, 'srcdir': '', 'enable_nls': False, 'want_rpath': 1, 'disable_unique': False, 'enable_userdocs': False, 'disable_addons': False, 'disable_maintainer_mode': None, 'debug_level': '', 'HTMLDIR': '', 'LOCALEDIR': '', 'keep': False, 'disable_nls': False, 'enable_docs': False, 'update_po': False, 'DVIDIR': '', 'check_c_compiler': 'gcc icc suncc', 'OLDINCLUDEDIR': ''} -+srcdir = '/server/home/ryan52/projects/deb/midori/midori' ---- /dev/null -+++ midori-0.2.7/panels/midori-bookmark-store.h -@@ -0,0 +1,44 @@ -+/* -+ 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. -+*/ -+ -+#ifndef __MIDORI_BOOKMARK_STORE_H__ -+#define __MIDORI_BOOKMARK_STORE_H__ -+ -+#include -+ -+G_BEGIN_DECLS -+ -+#define MIDORI_TYPE_BOOKMARK_STORE \ -+ (midori_bookmark_store_get_type ()) -+#define MIDORI_BOOKMARK_STORE(obj) \ -+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_BOOKMARK_STORE, MidoriBookmarkStore)) -+#define MIDORI_BOOKMARK_STORE_CLASS(klass) \ -+ (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_BOOKMARK_STORE, MidoriBookmarkStoreClass)) -+#define MIDORI_IS_BOOKMARK_STORE(obj) \ -+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_BOOKMARK_STORE)) -+#define MIDORI_IS_BOOKMARK_STORE_CLASS(klass) \ -+ (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_BOOKMARK_STORE)) -+#define MIDORI_BOOKMARK_STORE_GET_CLASS(obj) \ -+ (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_BOOKMARK_STORE, MidoriBookmarkStoreClass)) -+ -+typedef struct _MidoriBookmarkStore MidoriBookmarkStore; -+typedef struct _MidoriBookmarkStoreClass MidoriBookmarkStoreClass; -+ -+GType -+midori_bookmark_store_get_type (void); -+ -+GtkTreeStore* -+midori_bookmark_store_new (gint n_columns, -+ ...); -+ -+G_END_DECLS -+ -+#endif /* __MIDORI_BOOKMARK_STORE_H__ */ ---- /dev/null -+++ midori-0.2.7/panels/midori-bookmark-store.c -@@ -0,0 +1,110 @@ -+/* -+ 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 "midori-bookmark-store.h" -+ -+struct _MidoriBookmarkStore -+{ -+ GtkTreeStore parent_instance; -+}; -+ -+struct _MidoriBookmarkStoreClass -+{ -+ GtkTreeStoreClass parent_class; -+}; -+ -+static void -+midori_bookmark_store_drag_source_iface_init (GtkTreeDragSourceIface* iface); -+ -+static void -+midori_bookmark_store_drag_dest_iface_init (GtkTreeDragDestIface* iface); -+ -+G_DEFINE_TYPE_WITH_CODE (MidoriBookmarkStore, midori_bookmark_store, GTK_TYPE_TREE_STORE, -+ G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE, -+ midori_bookmark_store_drag_source_iface_init) -+ G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_DEST, -+ midori_bookmark_store_drag_dest_iface_init)); -+ -+static void -+midori_bookmark_store_finalize (GObject* object); -+ -+static void -+midori_bookmark_store_class_init (MidoriBookmarkStoreClass* class) -+{ -+ GObjectClass* gobject_class; -+ -+ gobject_class = G_OBJECT_CLASS (class); -+ gobject_class->finalize = midori_bookmark_store_finalize; -+} -+ -+static void -+midori_bookmark_store_init (MidoriBookmarkStore* bookmark_store) -+{ -+ /* Nothing to do */ -+} -+ -+static void -+midori_bookmark_store_finalize (GObject* object) -+{ -+ /* Nothing to do */ -+} -+ -+static void -+midori_bookmark_store_drag_source_iface_init (GtkTreeDragSourceIface* iface) -+{ -+ /*iface->row_draggable = real_gtk_tree_store_row_draggable; -+ iface->drag_data_delete = gtk_tree_store_drag_data_delete; -+ iface->drag_data_get = gtk_tree_store_drag_data_get;*/ -+} -+ -+static void -+midori_bookmark_store_drag_dest_iface_init (GtkTreeDragDestIface* iface) -+{ -+ /*iface->drag_data_received = gtk_tree_store_drag_data_received; -+ iface->row_drop_possible = gtk_tree_store_row_drop_possible;*/ -+} -+ -+/** -+ * midori_bookmark_store_new: -+ * -+ * Creates a new empty bookmark_store. -+ * -+ * Return value: a new #MidoriBookmarkStore -+ * -+ * Since: 0.1.8 -+ **/ -+GtkTreeStore* -+midori_bookmark_store_new (gint n_columns, -+ ...) -+{ -+ GtkTreeStore* treestore; -+ va_list args; -+ gint i; -+ GType* types; -+ -+ g_return_val_if_fail (n_columns > 0, NULL); -+ -+ treestore = g_object_new (MIDORI_TYPE_BOOKMARK_STORE, NULL); -+ -+ va_start (args, n_columns); -+ -+ types = g_new (GType, n_columns); -+ for (i = 0; i < n_columns; i++) -+ { -+ GType type = va_arg (args, GType); -+ types[i] = type; -+ } -+ va_end (args); -+ -+ gtk_tree_store_set_column_types (treestore, i, types); -+ -+ return treestore; -+} ---- /dev/null -+++ midori-0.2.7/extensions/tab-switcher.c -@@ -0,0 +1,416 @@ -+/* -+ 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 = midori_view_get_web_view (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 -Nru midori-0.2.8/debian/patches/default-homepage midori-0.4.6/debian/patches/default-homepage --- midori-0.2.8/debian/patches/default-homepage 2010-08-17 05:50:05.000000000 +0000 +++ midori-0.4.6/debian/patches/default-homepage 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -Some users install a web browser to look at HTML documentation when -they are offline. In this case, it is not nice to have the default -page be a site that will time out. Instead, we should use a local -"launch" page, similar to what Konqueror and Iceweasel do already. - -Unfortunately there is no generic page of that sort, and I can't be -bothered writing one. So for now, I will just make the homepage -Midori's user documentation. This is similar to what Dillo did/does. - ---- a/midori/midori-websettings.c -+++ b/midori/midori-websettings.c -@@ -10,6 +10,7 @@ - */ - - #include "midori-websettings.h" -+#include "midori-debian.h" - - #include "sokoke.h" - -@@ -623,7 +624,7 @@ - "homepage", - _("Homepage:"), - _("The homepage"), -- "http://www.google.com", -+ DEBIAN_DISTRO_DEFAULT_HOMEPAGE, - flags)); - - /** diff -Nru midori-0.2.8/debian/patches/disable-compilation_external-download-manager.patch midori-0.4.6/debian/patches/disable-compilation_external-download-manager.patch --- midori-0.2.8/debian/patches/disable-compilation_external-download-manager.patch 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/debian/patches/disable-compilation_external-download-manager.patch 2012-04-29 18:31:58.000000000 +0000 @@ -0,0 +1,36 @@ +Description: Upstream changes introduced in version 0.4.5-1~lucid~ppa3 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + midori (0.4.5-1~lucid~ppa3) lucid; urgency=low + . + * Disable compilation of 'extensions/external-download-manager.vala' (see Bug #976139) + . + The person named in the Author field signed this changelog entry. +Author: Liviu Andronic + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- midori-0.4.5.orig/extensions/wscript_build ++++ midori-0.4.5/extensions/wscript_build +@@ -28,7 +28,7 @@ for extension in extensions: + continue + source = extension + +- if bld.env['platform'] == 'win32' and target in ['external-download-manager']: ++ if target in ['external-download-manager']: + continue + + obj = bld.new_task_gen ('cc', 'shlib') diff -Nru midori-0.2.8/debian/patches/fix-serial-build midori-0.4.6/debian/patches/fix-serial-build --- midori-0.2.8/debian/patches/fix-serial-build 2010-08-17 05:50:05.000000000 +0000 +++ midori-0.4.6/debian/patches/fix-serial-build 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -fix building in Serial mode (on HPPA) - ---- a/wscript -+++ b/wscript -@@ -490,7 +490,7 @@ - obj.source = 'data/' + APPNAME + '.desktop.in' - obj.install_path = appdir - obj.flags = ['-d', '-c'] -- bld.install_files (appdir, 'data/' + APPNAME + '.desktop') -+ bld.install_files (appdir, blddir + '/default/data/' + APPNAME + '.desktop') - else: - folder = os.path.abspath (blddir + '/default/data') - Utils.check_dir (folder) diff -Nru midori-0.2.8/debian/patches/series midori-0.4.6/debian/patches/series --- midori-0.2.8/debian/patches/series 2010-08-17 20:11:42.000000000 +0000 +++ midori-0.4.6/debian/patches/series 2012-04-29 18:38:15.000000000 +0000 @@ -1,4 +1 @@ -fix-serial-build -default-homepage -add-debian-searches -debian-changes-0.2.7-1.1 +disable-compilation_external-download-manager.patch diff -Nru midori-0.2.8/debian/rules midori-0.4.6/debian/rules --- midori-0.2.8/debian/rules 2010-08-17 06:16:44.000000000 +0000 +++ midori-0.4.6/debian/rules 2012-03-11 19:40:09.000000000 +0000 @@ -1,8 +1,18 @@ #!/usr/bin/make -f +LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS) +CFLAGS=$(shell dpkg-buildflags --get CFLAGS) +LDFLAGS+=-Wl,--as-needed -Wl,-O1 + +# waf, thank you _so_ much +export LINKFLAGS=$(LDFLAGS) +export CCFLAGS=$(CFLAGS) + +export DEB_BUILD_HARDENING=1 + CMD=$(shell echo $@ | sed 's/override_//') -LIBWEBKIT_PKG=$(shell dpkg-query -p libwebkit-dev | grep Depends | sed -r 's/.*(libwebkit[^ ]+).*/\1/') +LIBWEBKIT_PKG=$(shell dpkg-query -p libwebkitgtk-dev | grep Depends | sed -r 's/.*(libwebkitgtk[^ ]+).*/\1/') GTKLAUNCHER=$(shell dpkg-query -L $(LIBWEBKIT_PKG) | grep GtkLauncher) DISTRO=$(shell lsb_release -is) CONFIG_FILE=debian/config/$(DISTRO).h @@ -11,69 +21,54 @@ endif %: - dh --with quilt $@ + dh $@ -override_dh_quilt_patch: - ln -sf ../$(CONFIG_FILE) midori/midori-debian.h - test -e midori/midori-debian.h - $(CMD) - -#WAF=/usr/bin/waf -BASE_WAF=./waf -WAF=env WAFDIR=debian/ $(BASE_WAF) +WAF=./waf debian/presubj: debian/presubj.in @echo "presubj parameters:" @echo "Replacing %LIBWEBKIT_PKG% with $(LIBWEBKIT_PKG)" @echo "Replacing %GTKLAUNCHER% with $(GTKLAUNCHER)" - test -f "/var/lib/dpkg/info/$(LIBWEBKIT_PKG).list" - test -f "$(GTKLAUNCHER)" - test -n "$(GTKLAUNCHER)" - sed -e "s,%LIBWEBKIT_PKG%,$(LIBWEBKIT_PKG),g" -e "s,%GTKLAUNCHER%,$(GTKLAUNCHER),g" $@.in > $@ +# test -f "/var/lib/dpkg/info/$(LIBWEBKIT_PKG).list" +# test -f "$(GTKLAUNCHER)" +# test -n "$(GTKLAUNCHER)" +# sed -e "s,%LIBWEBKIT_PKG%,$(LIBWEBKIT_PKG),g" -e "s,%GTKLAUNCHER%,$(GTKLAUNCHER),g" $@.in > $@ + cp $@.in $@ override_dh_install: debian/presubj $(CMD) --fail-missing -WAFADMIN_FILE=debian/wafadmin/Runner.py -WAFADMIN_APPEND=debian/runner-append - -override_dh_auto_clean: $(WAFADMIN_FILE) +override_dh_auto_clean: $(WAF) --nocache distclean rm -rf _build_ + rm -rf .waf* + rm -rf .lock-wscript -override_dh_auto_configure: $(WAFADMIN_FILE) - $(WAF) --nocache configure --prefix /usr +override_dh_auto_configure: + $(WAF) --nocache configure --debug-level=none --prefix /usr -override_dh_auto_build: $(WAFADMIN_FILE) - $(WAF) --nocache build --debug full +override_dh_auto_build: + $(WAF) build --nocache -v -#override_dh_auto_test: $(WAFADMIN_FILE) +#override_dh_auto_test: # xvfb-run $(WAF) --nocache check -override_dh_auto_install: $(WAFADMIN_FILE) +override_dh_auto_install: $(WAF) --nocache install --destdir debian/tmp rm -f debian/tmp/usr/share/doc/midori/COPYING debian/tmp/usr/share/doc/midori/TRANSLATE - rm -f debian/tmp/usr/share/midori/res/mootools.js - ln -s /usr/share/javascript/mootools/mootools.js debian/tmp/usr/share/midori/res/mootools.js + install -m 0644 debian/$(DISTRO)-config debian/tmp/etc/xdg/midori/config PRIORITY=$(shell sed -r -e '/DEBIAN_WWW_ALTERNATIVES_PRIORITY/ !d' -e 's/.* ([^ ]*)$$/\1/' $(CONFIG_FILE)) debian/midori.postinst: debian/midori.postinst.base sed "s/DEBIAN_WWW_ALTERNATIVES_PRIORITY/$(PRIORITY)/g" debian/midori.postinst.base > debian/midori.postinst -$(WAFADMIN_FILE): $(BASE_WAF) $(WAFADMIN_APPEND) - rm -fr debian/wafadmin/ .waf-* - $(BASE_WAF) --help >/dev/null - cp -a ./.waf-*/wafadmin debian/ - rm -fr .waf-* - cat $(WAFADMIN_APPEND) >> $(WAFADMIN_FILE) - -override_dh_clean: - rm -fr debian/wafadmin - $(CMD) - override_dh_installdeb: debian/midori.postinst $(CMD) override_dh_strip: $(CMD) --dbg-package=midori-dbg + +override_dh_installchangelogs: + rm -f debian/midori/usr/share/doc/midori/ChangeLog + dh_installchangelogs ChangeLog diff -Nru midori-0.2.8/debian/runner-append midori-0.4.6/debian/runner-append --- midori-0.2.8/debian/runner-append 2010-08-17 05:50:05.000000000 +0000 +++ midori-0.4.6/debian/runner-append 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ -# curl "http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=43;filename=xmms2-hppa.diff;att=1;bug=558983" | grep ^+ | grep -v ^+++ | sed 's/^+//' > debian/runner-append - -class Serial(object): - - def __init__(self, bld, j=1): - self.manager = bld.task_manager - self.outstanding = [] - - # progress bar - self.total = self.manager.total() - self.processed = 0 - self.error = 0 - - self.switchflag = 1 # postpone - - self.consumers = None - - # warning, this one is recursive .. - def get_next(self): - if self.outstanding: - t = self.outstanding.pop(0) - self.processed += 1 - return t - - # handle case where only one wscript exist - # that only install files - if not self.manager.groups: - return None - - (_, self.outstanding) = self.manager.get_next_set() - if not self.outstanding: return None - - return self.get_next() - - def postpone(self, tsk): - self.processed -= 1 - self.switchflag *= -1 - # this actually shuffle the list - if self.switchflag>0: self.outstanding.insert(0, tsk) - else: self.outstanding.append(tsk) - - def start(self): - debug('runner: Serial start called') - while 1: - # get next Task - tsk = self.get_next() - if tsk is None: break - - if Logs.verbose: debug('runner: retrieving %r' % tsk) - - st = tsk.runnable_status() - if st == ASK_LATER: - debug('runner: postponing %r' % tsk) - self.postpone(tsk) - continue - - #continue - if st == SKIP_ME: - tsk.hasrun = SKIPPED - self.manager.add_finished(tsk) - continue - - tsk.position = (self.processed, self.total) - - # display the command that we are about to run - tsk.generator.bld.printout(tsk.display()) - - # run the command - if tsk.__class__.stat: ret = tsk.__class__.stat(tsk) - else: ret = tsk.run() - self.manager.add_finished(tsk) - - # non-zero means something went wrong - if ret: - self.error = 1 - tsk.hasrun = CRASHED - tsk.err_code = ret - if Options.options.keep: continue - else: return -1 - - try: - tsk.post_run() - except OSError: - self.error = 1 - tsk.hasrun = MISSING - if Options.options.keep: continue - else: return -1 - else: - tsk.hasrun = SUCCESS - - if self.error: - return -1 - -import subprocess -print "== Using patched Runner.py for HPPA ==" -p = subprocess.Popen(['dpkg', '--print-architecture'], stdout=subprocess.PIPE) -arch = p.stdout.read().strip() -p.wait() -if arch == 'hppa': - Parallel = Serial diff -Nru midori-0.2.8/docs/api/wscript_build midori-0.4.6/docs/api/wscript_build --- midori-0.2.8/docs/api/wscript_build 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/docs/api/wscript_build 2012-05-14 22:13:42.000000000 +0000 @@ -6,18 +6,20 @@ import os import Utils +blddir = '_build' # recognized by ack + for module in ('midori', 'katze'): try: - if not os.access ('_build_', os.F_OK): - Utils.check_dir ('_build_') - if not os.access ('_build_/docs', os.F_OK): - Utils.check_dir ('_build_/docs') - if not os.access ('_build_/docs/api', os.F_OK): - Utils.check_dir ('_build_/docs/api') + if not os.access (blddir, os.F_OK): + Utils.check_dir (blddir) + if not os.access (blddir + '/docs', os.F_OK): + Utils.check_dir (blddir + '/docs') + if not os.access (blddir + '/docs/api', os.F_OK): + Utils.check_dir (blddir + '/docs/api') subprocess.call (['gtkdoc-scan', '--module=' + module, - '--source-dir=' + module, '--output-dir=_build_/docs/api/' + module, + '--source-dir=' + module, '--output-dir=' + blddir + '/docs/api/' + module, '--rebuild-sections', '--rebuild-types']) - os.chdir ('_build_/docs/api/' + module) + os.chdir (blddir + '/docs/api/' + module) subprocess.call (['gtkdoc-mktmpl', '--module=' + module, '--output-dir=.' + module]) subprocess.call (['gtkdoc-mkdb', '--module=' + module, diff -Nru midori-0.2.8/docs/user/midori.css midori-0.4.6/docs/user/midori.css --- midori-0.2.8/docs/user/midori.css 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/docs/user/midori.css 1970-01-01 00:00:00.000000000 +0000 @@ -1,114 +0,0 @@ -/* -:Author: Christian Dywan -:Contact: christian@twotoasts.de -:Copyright: This file is licensed under the terms of the expat license, see the file EXPAT. - -Stylesheet for Midori's documentation based on a version of Enrico Troeger. -*/ - -@media screen { - - body { - background-color: #f6fff3; - color: #404040; - margin-left: 0.4em; - width: 60em; - font-size: 90%; - } - - a { - color: #013100; - } - - a:visited { - color: #7E558E; - } - - a:hover { - text-decoration: none; - } - - h1, h2, h3 { - font-family: sans-serif; - color: #002a00; - } - - h1 { - border-top: 1px dotted; - margin-top: 2em; - } - - h1.title { - text-align: left } - - h2 { - margin-top: 30px; - } - - h2.subtitle { - text-align: left } - - h3 { - padding-left: 3px; - } - - blockquote, pre { - border: 1px solid; - padding: 0.4em; - } - - blockquote { - font-family: sans-serif; - background-color: #DBEDD5; - border: 1px dotted; - border-left: 4px solid; - border-color: #9FD98C; - } - - pre { - background-color: #deefd4; - border: 1px dotted; - border-left: 4px solid; - border-color: #9acb7d; - } - - tt, pre, code { - color: #002a00; - } - - table { - border: 1px solid #9acb7f; - } - - th { - border: none; - background-color: #9acb7d; - } - - tr:nth-child(even) { - background-color: #d3eac6; - } - - td { - border: none; - } - - .docinfo-name { - color: #002a00; - } - - p.admonition-title { - color: #990000; - font-weight: bold; - } - - div.note { - margin: 1em 3em; - padding: 0em; - } - - dt { - font-style: italic; - } - -} diff -Nru midori-0.2.8/docs/user/midori.txt midori-0.4.6/docs/user/midori.txt --- midori-0.2.8/docs/user/midori.txt 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/docs/user/midori.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,255 +0,0 @@ -.. |(version)| replace:: 0.2.2 - -''''''' - Midori -''''''' - ------------------------------------------ - A lightweight, portable GTK+ web browser ------------------------------------------ - -:Authors: Christian Dywan -:Date: $Date: 2009-11-18 18:20:11 +0100 (Wed, 18 Nov 2009) $ -:Version: |(version)| - -Copyright © 2008-2009 - -This documentation is distributed under the terms of the -`GNU Lesser General Public License`_; 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. - - -.. contents:: - - - -Introduction -'''''''''''' - - -What is Midori --------------- - -Midori is a lightweight and portable web browser based on Gtk+. The -interface is designed to be intuitive yet powerful. - -* Full integration with GTK+2. -* Fast rendering with WebKit. -* Tabs, windows and session management. -* Flexibly configurable Web Search. -* User scripts and user styles support. -* Straightforward bookmark management. -* Customizable and extensible interface. -* Extensions written in C. - - -Running Midori --------------- - - -* If you are using a graphical desktop environment you will usually find - Midori in the menu under Network. - -* You can also run Midori from a console or a Run dialog. - See also `Command line usage`. - - $ midori - -A browser window appears where you can start navigating the web right away. - - -The main interface --------------------------- - - -The main browser window consists of a few basic elements: - - -* The menubar. It's pretty much standardized and gives you access to - allmost all features, many of the items have a keyboard shortcut by default. - See also `Keyboard shortcuts`_. - -* The navigationbar. It lets you open tabs, go back and forward, enter - addresses, search the web and reopen closed tabs. - See also `The navigationbar`. - -* The sidepanel. It takes a pretty central role in the functionality it provides, - yet it can be hidden and resized to not distract you. - See also `The sidepanel`. - -* The statusbar. It displays informational text when hovering something - with a pointer. That's it. - - -Taking a closer look -'''''''''''''''''''' - - -Command line usage ------------------- - - -Running Midori normally works as follows: - - -* $ midori - - Just run a new instance of Midori. If an instance of Midori is already - running a new window in that instance will be opened. - -* $ midori [URIs] - - You can supply any number of URIs to open as arguments. If you have a - saved session or a running instance they will be added to the last - active window. - -* $ midori [URI1]|[URI2]|... - - You can separate URIS by a pipe (|) as well. They are handled as if you - provided all URIs as separate arguments. - -* $ midori --run [JAVASCRIPT] - - If you pass the filename of a javascript Midori will attempt to run - the contents of the file as javascript code. - - -Note that support for opening tabs in an existing instance depends on -your build and may not be available on some platforms. - - -The following arguments are supported if you call Midori from a command line. - - -+-------+--------------------+------------------------------------------------+ -| Short | Long option | Function | -+=======+====================+================================================+ -| -a | --app | Run ADDRESS as a web application | -+-------+--------------------+------------------------------------------------+ -| -c | --config | Use FOLDER as configuration folder | -+-------+--------------------+------------------------------------------------+ -| -r | --run | Run the specified filename as javascript | -+-------+--------------------+------------------------------------------------+ -| -s | --snapshot + Take a snapshot of the specified URI | -+-------+--------------------+------------------------------------------------+ -| -V | --version | Show version information and exit. | -+-------+--------------------+------------------------------------------------+ - - -Configuration files -------------------- - - -The configuration files in Midori that save related states are by default -stored in the folder ~/.config/midori in the home directory. It is possible -to use a different folder by specifying '--config' on the command line. - -The files stored in the primary configuration folder are the following: - -+----------------+------------------------------------------------------------+ -| Filename | Contents | -+================+============================================================+ -| accels | Keyboard shortcuts, GtkAccelMap resource | -+----------------+------------------------------------------------------------+ -| bookmarks.xbel | Bookmarks, XBEL | -+----------------+------------------------------------------------------------+ -| config | Preferences, text key file | -+----------------+------------------------------------------------------------+ -| cookies.txt | Cookies, Mozilla text cookies | -+----------------+------------------------------------------------------------+ -| history.db | History, sqlite3 | -+----------------+------------------------------------------------------------+ -| logins | Usernames and passwords, plain text | -+----------------+------------------------------------------------------------+ -| running | A file created to track whether Midori quit cleanly | -+----------------+------------------------------------------------------------+ -| search | Search engines, text key file | -+----------------+------------------------------------------------------------+ -| session.xbel | The current or last session, ie. open tabs, | -+----------------+------------------------------------------------------------+ -| tabtrash.xbel | The 10 last closed tabs | -+----------------+------------------------------------------------------------+ - -Note that generally manual modifications to these files aren't recommended. As -an exception, while Midori is *not* running, it is possible to edit or -replace the 'bookmarks.xbel' as long as it is valid XBEL/ XML. - -Currently while Midori is running it will happily overwrite files as needed and -never read back any changes. - - -Keyboard shortcuts ------------------- - - -... - - -The navigationbar ------------------ - - -The navigationbar is the primary toolbar containing notably back and forward -buttons, the location entry and a search entry. The "Toolbar Editor" extension -can be used to add or remove items. - - -The sidepanel -------------- - - -... - - -Extensions ----------- - - -... - - -Frequently asked questions -'''''''''''''''''''''''''' - - -How do you pronounce Midori and what does it mean anyway? ---------------------------------------------------------- - -Pronounce it "midoɺi", with a Bavarian/ Japanese "r" or "Mee-Doh-Ree" -in English or read it Italian. The name comes from the Japanese word -緑 (みどり) for the colour "green". - - -What does the logo mean? ------------------------- - -The paw of a green cat. Obviously. Also it resembles the letter "M" -in "Midori". The curving is supposed to emphasize speed. - - -On which platforms does Midori run currently? ---------------------------------------------- - -Midori is basically very portable and should run on all platforms that -its dependencies support. - - - -Under which license is Midori distributed? ------------------------------------------- - -Midori, documentation and all delivered artwork are licensed under the LGPL2. - - -GNU Lesser General Public License -''''''''''''''''''''''''''''''''' - -:: - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - FIXME: Provide full license text - diff -Nru midori-0.2.8/extensions/adblock.c midori-0.4.6/extensions/adblock.c --- midori-0.2.8/extensions/adblock.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/adblock.c 2012-05-14 22:13:42.000000000 +0000 @@ -1,6 +1,6 @@ /* - Copyright (C) 2009-2010 Christian Dywan - Copyright (C) 2009 Alexander Butenko + Copyright (C) 2009-2012 Christian Dywan + Copyright (C) 2009-2012 Alexander Butenko This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -9,19 +9,14 @@ See the file COPYING for the full license text. */ - #include +#include -#include #include "config.h" - -#include #if HAVE_UNISTD_H #include #endif -#define HAVE_WEBKIT_RESOURCE_REQUEST WEBKIT_CHECK_VERSION (1, 1, 14) - #define SIGNATURE_SIZE 8 #define USE_PATTERN_MATCHING 1 #define CUSTOM_LIST_NAME "custom.list" @@ -29,9 +24,9 @@ (__filter && (g_str_has_prefix (__filter, "http") \ || g_str_has_prefix (__filter, "file"))) #define ADBLOCK_FILTER_SET(__filter,__active) \ - filter[4] = __active ? (__filter[5] == ':' ? 's' : ':') : '-' + __filter[4] = __active ? (__filter[5] == ':' ? 's' : ':') : '-' #define ADBLOCK_FILTER_IS_SET(__filter) \ - filter[4] != '-' + (__filter[4] != '-' && __filter[5] != '-') #ifdef G_ENABLE_DEBUG #define adblock_debug(dmsg, darg1, darg2) \ do { if (debug == 1) g_debug (dmsg, darg1, darg2); } while (0) @@ -39,11 +34,13 @@ #define adblock_debug(dmsg, darg1, darg2) /* nothing */ #endif -static GHashTable* pattern; -static GHashTable* keys; -static gchar* blockcss = NULL; -static gchar* blockcssprivate = NULL; -static gchar* blockscript = NULL; +static GHashTable* pattern = NULL; +static GHashTable* keys = NULL; +static GHashTable* optslist = NULL; +static GHashTable* urlcache = NULL; +static GHashTable* blockcssprivate = NULL; +static GHashTable* navigationwhitelist = NULL; +static GString* blockcss = NULL; #ifdef G_ENABLE_DEBUG static guint debug; #endif @@ -51,37 +48,89 @@ static gboolean adblock_parse_file (gchar* path); +static void +adblock_reload_rules (MidoriExtension* extension, + gboolean custom_only); + static gchar* -adblock_build_js (const gchar* style, - const gchar* private) +adblock_build_js (const gchar* uri) { - return g_strdup_printf ( + gchar* domain; + const gchar* style; + GString* subdomain; + GString* code; + int cnt = 0, blockscnt = 0; + gchar** subdomains; + + domain = midori_uri_parse_hostname (uri, NULL); + subdomains = g_strsplit (domain, ".", -1); + g_free (domain); + if (!subdomains) + return NULL; + + code = g_string_new ( "window.addEventListener ('DOMContentLoaded'," "function () {" " if (document.getElementById('madblock'))" " return;" - " var URL = location.href;" - " var sites = new Array(); %s;" - " var public = '%s';" - " for (var i in sites) {" - " if (URL.indexOf(i) != -1 && sites[i] ){" - " public += ', .'+sites[i];" - " break;" - " }}" - " public += ' {display: none !important}';" + " public = '"); + + cnt = g_strv_length (subdomains) - 1; + subdomain = g_string_new (subdomains [cnt]); + g_string_prepend_c (subdomain, '.'); + cnt--; + while (cnt >= 0) + { + g_string_prepend (subdomain, subdomains[cnt]); + if ((style = g_hash_table_lookup (blockcssprivate, subdomain->str))) + { + g_string_append (code, style); + g_string_append_c (code, ','); + blockscnt++; + } + g_string_prepend_c (subdomain, '.'); + cnt--; + } + g_string_free (subdomain, TRUE); + g_strfreev (subdomains); + + if (blockscnt == 0) + return g_string_free (code, TRUE); + + g_string_append (code, + " zz-non-existent {display: none !important}';" " var mystyle = document.createElement('style');" " mystyle.setAttribute('type', 'text/css');" " mystyle.setAttribute('id', 'madblock');" " mystyle.appendChild(document.createTextNode(public));" " var head = document.getElementsByTagName('head')[0];" " if (head) head.appendChild(mystyle);" - "}, true);", - private, - style); + "}, true);"); + return g_string_free (code, FALSE); } -static gchar * -adblock_fixup_regexp (gchar* src); +static GString* +adblock_fixup_regexp (const gchar* prefix, + gchar* src); + +static void +adblock_destroy_db () +{ + if (blockcss) + g_string_free (blockcss, TRUE); + blockcss = NULL; + + g_hash_table_destroy (pattern); + pattern = NULL; + g_hash_table_destroy (optslist); + optslist = NULL; + g_hash_table_destroy (urlcache); + urlcache = NULL; + g_hash_table_destroy (blockcssprivate); + blockcssprivate = NULL; + g_hash_table_destroy (navigationwhitelist); + navigationwhitelist = NULL; +} static void adblock_init_db () @@ -92,25 +141,33 @@ keys = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, (GDestroyNotify)g_regex_unref); - katze_assign (blockcss, g_strdup ("z-non-exist")); - katze_assign (blockcssprivate, g_strdup ("")); + optslist = g_hash_table_new_full (g_str_hash, g_str_equal, + NULL, + (GDestroyNotify)g_free); + urlcache = g_hash_table_new_full (g_str_hash, g_str_equal, + (GDestroyNotify)g_free, + (GDestroyNotify)g_free); + blockcssprivate = g_hash_table_new_full (g_str_hash, g_str_equal, + (GDestroyNotify)g_free, + (GDestroyNotify)g_free); + navigationwhitelist = g_hash_table_new_full (g_direct_hash, g_str_equal, + NULL, + (GDestroyNotify)g_free); + + if (blockcss && blockcss->len > 0) + g_string_free (blockcss, TRUE); + blockcss = g_string_new ("z-non-exist"); } -#if WEBKIT_CHECK_VERSION (1, 1, 2) static void -adblock_download_notify_status_cb (WebKitDownload* download, - GParamSpec* pspec, - gchar* path) +adblock_download_notify_status_cb (WebKitDownload* download, + GParamSpec* pspec, + MidoriExtension* extension) { if (webkit_download_get_status (download) != WEBKIT_DOWNLOAD_STATUS_FINISHED) return; - - adblock_parse_file (path); - katze_assign (blockscript, adblock_build_js (blockcss, blockcssprivate)); - g_free (path); - /* g_object_unref (download); */ + adblock_reload_rules (extension, FALSE); } -#endif static gchar* adblock_get_filename_for_uri (const gchar* uri) @@ -119,7 +176,7 @@ gchar* folder; gchar* path; - if (strchr (uri + 4,'-')) + if (!ADBLOCK_FILTER_IS_SET (uri)) return NULL; if (!strncmp (uri, "file", 4)) @@ -145,7 +202,11 @@ gchar* custom_list; gchar** filters; guint i = 0; + MidoriApp* app = midori_extension_get_app (extension); + MidoriWebSettings* settings = katze_object_get_object (app, "settings"); + if (pattern) + adblock_destroy_db (); adblock_init_db (); custom_list = g_build_filename (midori_extension_get_config_dir (extension), @@ -167,7 +228,6 @@ if (!adblock_parse_file (path)) { - #if WEBKIT_CHECK_VERSION (1, 1, 2) WebKitNetworkRequest* request; WebKitDownload* download; gchar* destination = g_filename_to_uri (path, NULL, NULL); @@ -178,25 +238,21 @@ webkit_download_set_destination_uri (download, destination); g_free (destination); g_signal_connect (download, "notify::status", - G_CALLBACK (adblock_download_notify_status_cb), path); + G_CALLBACK (adblock_download_notify_status_cb), extension); webkit_download_start (download); - #endif } - else - g_free (path); + g_free (path); i++; } } g_strfreev (filters); + g_string_append (blockcss, " {display: none !important}\n"); - katze_assign (blockscript, adblock_build_js (blockcss, blockcssprivate)); + midori_web_settings_add_style (settings, "adblock-blockcss", blockcss->str); + g_object_unref (settings); } static void -adblock_browser_populate_tool_menu_cb (MidoriBrowser* browser, - GtkWidget* menu, - MidoriExtension* extension); -static void adblock_preferences_render_tick_cb (GtkTreeViewColumn* column, GtkCellRenderer* renderer, GtkTreeModel* model, @@ -245,7 +301,7 @@ ADBLOCK_FILTER_SET (filter, TRUE); if (gtk_cell_renderer_toggle_get_active (renderer)) { - if (!strncmp (filter, "http", 4)) + if (midori_uri_is_http (filter)) { gchar* filename = adblock_get_filename_for_uri (filter); g_unlink (filename); @@ -327,7 +383,8 @@ adblock_preferences_add_clicked_cb (GtkWidget* button, GtkTreeModel* model) { - GtkEntry* entry = g_object_get_data (G_OBJECT (button), "entry"); + GtkEntry* entry = GTK_IS_ENTRY (button) + ? button : g_object_get_data (G_OBJECT (button), "entry"); gtk_list_store_insert_with_values (GTK_LIST_STORE (model), NULL, 0, 0, gtk_entry_get_text (entry), -1); gtk_entry_set_text (entry, ""); @@ -391,6 +448,7 @@ GtkWidget* browser; const gchar* dialog_title; GtkWidget* dialog; + GtkWidget* content_area; gint width, height; GtkWidget* xfce_heading; GtkWidget* hbox; @@ -422,6 +480,7 @@ GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, #endif NULL); + content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); g_signal_connect (dialog, "destroy", G_CALLBACK (gtk_widget_destroyed), &dialog); gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES); @@ -435,11 +494,9 @@ /* TODO: We need mnemonics */ if ((xfce_heading = sokoke_xfce_header_new ( gtk_window_get_icon_name (GTK_WINDOW (dialog)), dialog_title))) - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), - xfce_heading, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (content_area), xfce_heading, FALSE, FALSE, 0); hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, - TRUE, TRUE, 12); + gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 12); vbox = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 4); button = gtk_label_new (NULL); @@ -460,7 +517,7 @@ g_free (description); gtk_label_set_line_wrap (GTK_LABEL (button), TRUE); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 4); - entry = gtk_entry_new (); + entry = katze_uri_entry_new (NULL); gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 4); liststore = gtk_list_store_new (1, G_TYPE_STRING); treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (liststore)); @@ -517,6 +574,8 @@ g_object_set_data (G_OBJECT (button), "entry", entry); g_signal_connect (button, "clicked", G_CALLBACK (adblock_preferences_add_clicked_cb), liststore); + g_signal_connect (entry, "activate", + 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); @@ -550,10 +609,10 @@ G_CALLBACK (adblock_preferences_help_clicked_cb), dialog); */ gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 4); - gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_end (GTK_BOX (content_area), hbox, FALSE, FALSE, 0); #endif - gtk_widget_show_all (GTK_DIALOG (dialog)->vbox); + gtk_widget_show_all (content_area); g_object_unref (browser); @@ -561,8 +620,7 @@ } static void -adblock_menu_configure_filters_activate_cb (GtkWidget* menuitem, - MidoriExtension* extension) +adblock_open_preferences_cb (MidoriExtension* extension) { static GtkWidget* dialog = NULL; @@ -577,127 +635,121 @@ gtk_window_present (GTK_WINDOW (dialog)); } -static void -adblock_browser_populate_tool_menu_cb (MidoriBrowser* browser, - GtkWidget* menu, - MidoriExtension* extension) +static inline gint +adblock_check_rule (GRegex* regex, + const gchar* patt, + const gchar* req_uri, + const gchar* page_uri) { - GtkWidget* menuitem; + gchar* opts; - menuitem = gtk_menu_item_new_with_mnemonic (_("Configure _Advertisement filters...")); - g_signal_connect (menuitem, "activate", - G_CALLBACK (adblock_menu_configure_filters_activate_cb), extension); - gtk_widget_show (menuitem); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); -} + if (!g_regex_match_full (regex, req_uri, -1, 0, 0, NULL, NULL)) + return FALSE; -static inline gboolean -adblock_check_filter_options (GRegex* regex, - const gchar* opts, - const gchar* req_uri, - const gchar* page_uri) -{ - if (g_regex_match_simple (",third-party", opts, + opts = g_hash_table_lookup (optslist, patt); + if (opts && g_regex_match_simple (",third-party", opts, G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)) { if (page_uri && g_regex_match_full (regex, page_uri, -1, 0, 0, NULL, NULL)) - return TRUE; + return FALSE; } /* TODO: Domain opt check */ - return FALSE; + #ifdef G_ENABLE_DEBUG + adblock_debug ("blocked by pattern regexp=%s -- %s", g_regex_get_pattern (regex), req_uri); + #endif + return TRUE; } static inline gboolean -adblock_is_matched_by_pattern (const gchar* req_uri, - const gchar* page_uri) +adblock_is_matched_by_pattern (const gchar* req_uri, + const gchar* page_uri) { GHashTableIter iter; - gpointer opts, regex; + gpointer patt, regex; if (USE_PATTERN_MATCHING == 0) return FALSE; g_hash_table_iter_init (&iter, pattern); - while (g_hash_table_iter_next (&iter, &opts, ®ex)) + while (g_hash_table_iter_next (&iter, &patt, ®ex)) { - if (g_regex_match_full (regex, req_uri, -1, 0, 0, NULL, NULL)) - { - if (opts && adblock_check_filter_options (regex, opts, req_uri, page_uri) == TRUE) - return FALSE; - else - { - adblock_debug ("blocked by pattern regexp=%s -- %s", g_regex_get_pattern (regex), req_uri); - return TRUE; - } - } + if (adblock_check_rule (regex, patt, req_uri, page_uri)) + return TRUE; } return FALSE; } static inline gboolean -adblock_is_matched_by_key (const gchar* opts, - const gchar* req_uri, - const gchar* page_uri) +adblock_is_matched_by_key (const gchar* req_uri, + const gchar* page_uri) { gchar* uri; gint len; int pos = 0; GList* regex_bl = NULL; + GString* guri; + gboolean ret = FALSE; + gchar sig[SIGNATURE_SIZE + 1]; + + memset (&sig[0], 0, sizeof (sig)); + /* Signatures are made on pattern, so we need to convert url to a pattern as well */ + guri = adblock_fixup_regexp ("", (gchar*)req_uri); + uri = guri->str; + len = guri->len; - uri = adblock_fixup_regexp ((gchar*)req_uri); - len = strlen (uri); for (pos = len - SIGNATURE_SIZE; pos >= 0; pos--) { - gchar* sig = g_strndup (uri + pos, SIGNATURE_SIZE); - GRegex* regex = g_hash_table_lookup (keys, sig); - if (regex && !g_list_find (regex_bl, regex)) - { - if (g_regex_match_full (regex, req_uri, -1, 0, 0, NULL, NULL)) - { - g_free (uri); - g_free (sig); - if (opts && adblock_check_filter_options (regex, opts, req_uri, page_uri)) - { - g_list_free (regex_bl); - return FALSE; - } - else - { - adblock_debug ("blocked by regexp=%s -- %s", g_regex_get_pattern (regex), uri); - g_list_free (regex_bl); - return TRUE; - } - } - regex_bl = g_list_prepend (regex_bl, regex); - } - g_free (sig); + GRegex* regex; + strncpy (sig, uri + pos, SIGNATURE_SIZE); + regex = g_hash_table_lookup (keys, sig); + + /* Dont check if regex is already blacklisted */ + if (!regex || g_list_find (regex_bl, regex)) + continue; + ret = adblock_check_rule (regex, sig, req_uri, page_uri); + if (ret) + break; + regex_bl = g_list_prepend (regex_bl, regex); } - g_free (uri); + g_string_free (guri, TRUE); g_list_free (regex_bl); - return FALSE; + return ret; } static gboolean -adblock_is_matched (const gchar* opts, - const gchar* req_uri, +adblock_is_matched (const gchar* req_uri, const gchar* page_uri) { + gchar* value; - if (adblock_is_matched_by_key (opts, req_uri, page_uri) == TRUE) + if ((value = g_hash_table_lookup (urlcache, req_uri))) + { + if (value[0] == '0') + return FALSE; + else + return TRUE; + } + + if (adblock_is_matched_by_key (req_uri, page_uri)) + { + g_hash_table_insert (urlcache, g_strdup (req_uri), g_strdup("1")); return TRUE; - else - return adblock_is_matched_by_pattern (req_uri, page_uri); + } + + if (adblock_is_matched_by_pattern (req_uri, page_uri)) + { + g_hash_table_insert (urlcache, g_strdup (req_uri), g_strdup("1")); + return TRUE; + } + g_hash_table_insert (urlcache, g_strdup (req_uri), g_strdup("0")); + return FALSE; } -#if HAVE_WEBKIT_RESOURCE_REQUEST static gchar* adblock_prepare_urihider_js (GList* uris) { GList* li = NULL; - gchar* out; - gchar* cmd = g_strdup (""); - gchar* tmp; - const char *js = + GString* js = g_string_new ( "(function() {" "function getElementsByAttribute (strTagName, strAttributeName, arrAttributeValue) {" " var arrElements = document.getElementsByTagName (strTagName);" @@ -723,58 +775,78 @@ " oElements[i].style.height = '0';" " }" "};" - "var uris=new Array ();" - "%s" - "hideElementBySrc (uris);" - "})();"; + "var uris=new Array ();"); for (li = uris; li != NULL; li = g_list_next (li)) + g_string_append_printf (js, "uris.push ('%s');", (gchar*)li->data); + + g_string_append (js, "hideElementBySrc (uris);})();"); + + return g_string_free (js, FALSE); +} + +static gboolean +adblock_navigation_policy_decision_requested_cb (WebKitWebView* web_view, + WebKitWebFrame* web_frame, + WebKitNetworkRequest* request, + WebKitWebNavigationAction* action, + WebKitWebPolicyDecision* decision, + MidoriView* view) +{ + if (web_frame == webkit_web_view_get_main_frame (web_view)) { - tmp = g_strdup_printf ("uris.push ('%s');%s", (gchar*)li->data, cmd); - katze_assign (cmd, tmp); + const gchar* req_uri = webkit_network_request_get_uri (request); + g_hash_table_replace (navigationwhitelist, web_view, g_strdup (req_uri)); } - out = g_strdup_printf (js, cmd); - g_free (cmd); - - return out; + return false; } + static void adblock_resource_request_starting_cb (WebKitWebView* web_view, WebKitWebFrame* web_frame, WebKitWebResource* web_resource, WebKitNetworkRequest* request, WebKitNetworkResponse* response, - GtkWidget* image) + MidoriView* view) { SoupMessage* msg; GList* blocked_uris; const gchar* req_uri; const char *page_uri; + page_uri = webkit_web_view_get_uri (web_view); + /* Skip checks on about: pages */ + if (midori_uri_is_blank (page_uri)) + return; + req_uri = webkit_network_request_get_uri (request); - if (!req_uri) + if (!g_strcmp0 (req_uri, g_hash_table_lookup (navigationwhitelist, web_view))) return; - if (!strncmp (req_uri, "data", 4) || !strncmp (req_uri, "file", 4)) + + if (!midori_uri_is_http (req_uri) + || g_str_has_suffix (req_uri, "favicon.ico")) return; msg = webkit_network_request_get_message (request); - if (!msg) - return; - if (msg->method && !strncmp (msg->method, "POST", 4)) + if (!(msg && !g_strcmp0 (msg->method, "GET"))) return; - page_uri = webkit_web_view_get_uri (web_view); - if (!page_uri || !strcmp (page_uri, "about:blank")) - page_uri = req_uri; + if (response != NULL) /* request is caused by redirect */ + { + if (web_frame == webkit_web_view_get_main_frame (web_view)) + { + g_hash_table_replace (navigationwhitelist, web_view, g_strdup (req_uri)); + return; + } + } #ifdef G_ENABLE_DEBUG if (debug == 2) g_test_timer_start (); #endif - /* TODO: opts should be defined */ - if (adblock_is_matched (NULL, req_uri, page_uri)) + if (adblock_is_matched (req_uri, page_uri)) { blocked_uris = g_object_get_data (G_OBJECT (web_view), "blocked-uris"); blocked_uris = g_list_prepend (blocked_uris, g_strdup (req_uri)); @@ -787,39 +859,7 @@ #endif } -#else -static void -adblock_session_request_queued_cb (SoupSession* session, - SoupMessage* msg) -{ - SoupURI* soup_uri; - gchar* req_uri; - gchar* page_uri; - - if (msg->method && !strncmp (msg->method, "POST", 4)) - return; - - soup_uri = soup_message_get_uri (msg); - req_uri = soup_uri_to_string (soup_uri, FALSE); - - page_uri = NULL; /* FIXME */ - if (!page_uri || !strcmp (page_uri, "about:blank")) - page_uri = req_uri; - - if (adblock_is_matched (NULL, req_uri, page_uri)) - { - soup_uri = soup_uri_new ("http://.invalid"); - soup_message_set_uri (msg, soup_uri); - soup_uri_free (soup_uri); - g_free (req_uri); - return; - } - g_free (req_uri); -} -#endif - -#if WEBKIT_CHECK_VERSION (1, 1, 15) static void adblock_custom_block_image_cb (GtkWidget* widget, MidoriExtension* extension) @@ -829,6 +869,7 @@ MidoriApp* app; GtkWidget* browser; GtkWidget* dialog; + GtkWidget* content_area; GtkSizeGroup* sizegroup; GtkWidget* hbox; GtkWidget* label; @@ -844,9 +885,10 @@ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT, NULL); + content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_ADD); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); + gtk_container_set_border_width (GTK_CONTAINER (content_area), 5); sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); hbox = gtk_hbox_new (FALSE, 8); @@ -859,7 +901,7 @@ gtk_entry_set_text (GTK_ENTRY (entry), g_object_get_data (G_OBJECT (widget), "uri")); gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_container_add (GTK_CONTAINER (content_area), hbox); gtk_widget_show_all (hbox); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); @@ -871,16 +913,16 @@ custom_list = g_build_filename (midori_extension_get_config_dir (extension), CUSTOM_LIST_NAME, NULL); - if (!(list = g_fopen (custom_list, "a+"))) + katze_mkdir_with_parents (midori_extension_get_config_dir (extension), 0700); + if ((list = g_fopen (custom_list, "a+"))) { - g_free (custom_list); - return; + g_fprintf (list, "%s\n", gtk_entry_get_text (GTK_ENTRY (entry))); + fclose (list); + adblock_reload_rules (extension, TRUE); + g_debug ("%s: Updated custom list\n", G_STRFUNC); } - - g_fprintf (list, "%s\n", gtk_entry_get_text (GTK_ENTRY (entry))); - fclose (list); - adblock_reload_rules (extension, TRUE); - + else + g_debug ("%s: Failed to open custom list %s\n", G_STRFUNC, custom_list); g_free (custom_list); gtk_widget_destroy (dialog); } @@ -897,7 +939,7 @@ WebKitHitTestResultContext context; WebKitHitTestResult* hit_test; - gdk_window_get_pointer (GTK_WIDGET (web_view)->window, &x, &y, NULL); + gdk_window_get_pointer (gtk_widget_get_window(GTK_WIDGET (web_view)), &x, &y, NULL); event.x = x; event.y = y; hit_test = webkit_web_view_get_hit_test_result (web_view, &event); @@ -920,15 +962,12 @@ g_signal_connect (menuitem, "activate", G_CALLBACK (adblock_custom_block_image_cb), extension); } -#endif -#if HAVE_WEBKIT_RESOURCE_REQUEST static void adblock_load_finished_cb (WebKitWebView *web_view, WebKitWebFrame *web_frame, gpointer user_data) { - JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); GList* uris = g_object_get_data (G_OBJECT (web_view), "blocked-uris"); gchar* script; GList* li; @@ -938,14 +977,12 @@ script = adblock_prepare_urihider_js (uris); webkit_web_view_execute_script (web_view, script); - sokoke_js_script_eval (js_context, script, NULL); li = NULL; for (li = uris; li != NULL; li = g_list_next (li)) uris = g_list_remove (uris, li->data); g_free (script); g_object_set_data (G_OBJECT (web_view), "blocked-uris", uris); } -#endif static void adblock_window_object_cleared_cb (WebKitWebView* web_view, @@ -953,7 +990,20 @@ JSContextRef js_context, JSObjectRef js_window) { - webkit_web_view_execute_script (web_view, blockscript); + const char *page_uri; + gchar* script; + + page_uri = webkit_web_frame_get_uri (web_frame); + /* Don't add adblock css into speeddial and about: pages */ + if (!midori_uri_is_http (page_uri)) + return; + + script = adblock_build_js (page_uri); + if (!script) + return; + + g_free (sokoke_js_script_eval (js_context, script, NULL)); + g_free (script); } static void @@ -962,43 +1012,42 @@ MidoriExtension* extension) { GtkWidget* web_view = midori_view_get_web_view (view); - #if HAVE_WEBKIT_RESOURCE_REQUEST - GtkWidget* image = g_object_get_data (G_OBJECT (browser), "status-image"); - #endif g_signal_connect (web_view, "window-object-cleared", G_CALLBACK (adblock_window_object_cleared_cb), 0); - #if WEBKIT_CHECK_VERSION (1, 1, 15) + g_signal_connect_after (web_view, "populate-popup", G_CALLBACK (adblock_populate_popup_cb), extension); - #endif - #if HAVE_WEBKIT_RESOURCE_REQUEST + g_signal_connect (web_view, "navigation-policy-decision-requested", + G_CALLBACK (adblock_navigation_policy_decision_requested_cb), view); g_signal_connect (web_view, "resource-request-starting", - G_CALLBACK (adblock_resource_request_starting_cb), image); + G_CALLBACK (adblock_resource_request_starting_cb), view); g_signal_connect (web_view, "load-finished", - G_CALLBACK (adblock_load_finished_cb), image); - #endif + G_CALLBACK (adblock_load_finished_cb), view); } static void -adblock_deactivate_cb (MidoriExtension* extension, - MidoriBrowser* browser); - -static void -adblock_add_tab_foreach_cb (MidoriView* view, - MidoriBrowser* browser, - MidoriExtension* extension) +adblock_remove_tab_cb (MidoriBrowser* browser, + MidoriView* view, + MidoriExtension* extension) { - adblock_add_tab_cb (browser, view, extension); + GtkWidget* web_view = midori_view_get_web_view (view); + g_hash_table_remove (navigationwhitelist, web_view); } static void +adblock_deactivate_cb (MidoriExtension* extension, + MidoriBrowser* browser); + +static void adblock_app_add_browser_cb (MidoriApp* app, MidoriBrowser* browser, MidoriExtension* extension) { GtkWidget* statusbar; GtkWidget* image; + GtkWidget* view; + gint i; statusbar = katze_object_get_object (browser, "statusbar"); image = NULL; @@ -1008,28 +1057,32 @@ g_object_set_data_full (G_OBJECT (browser), "status-image", image, (GDestroyNotify)gtk_widget_destroy); - midori_browser_foreach (browser, - (GtkCallback)adblock_add_tab_foreach_cb, extension); + i = 0; + while((view = midori_browser_get_nth_tab(browser, i++))) + adblock_add_tab_cb (browser, MIDORI_VIEW (view), extension); + g_signal_connect (browser, "add-tab", G_CALLBACK (adblock_add_tab_cb), extension); - g_signal_connect (browser, "populate-tool-menu", - G_CALLBACK (adblock_browser_populate_tool_menu_cb), extension); + g_signal_connect (browser, "remove-tab", + G_CALLBACK (adblock_remove_tab_cb), extension); + g_signal_connect (extension, "open-preferences", + G_CALLBACK (adblock_open_preferences_cb), extension); g_signal_connect (extension, "deactivate", G_CALLBACK (adblock_deactivate_cb), browser); g_object_unref (statusbar); } -static gchar * -adblock_fixup_regexp (gchar* src) +static GString* +adblock_fixup_regexp (const gchar* prefix, + gchar* src) { - gchar* dst; GString* str; - int len; + int len = 0; if (!src) return NULL; - str = g_string_new (""); + str = g_string_new (prefix); /* lets strip first .* */ if (src[0] == '*') @@ -1051,14 +1104,10 @@ g_string_append (str, "\\?"); break; case '|': - g_string_append (str, ""); - break; /* FIXME: We actually need to match :[0-9]+ or '/'. Sign means "here could be port number or nothing". So bla.com^ will match bla.com/ or bla.com:8080/ but not bla.com.au/ */ case '^': - g_string_append (str, ""); - break; case '+': break; default: @@ -1069,27 +1118,30 @@ } while (*src); - dst = g_strdup (str->str); - g_string_free (str, TRUE); + len = str->len; /* We dont need .* in the end of url. Thats stupid */ - len = strlen (dst); - if (dst && dst[len-1] == '*' && dst[len-2] == '.') - { - dst[len-2] = '\0'; - } - return dst; + if (str->str && str->str[len-1] == '*' && str->str[len-2] == '.') + g_string_erase (str, len-2, 2); + + return str; } -static void -adblock_compile_regexp (GHashTable* tbl, - GHashTable* keystbl, - gchar* patt, - gchar* opts) +static gboolean +adblock_compile_regexp (GString* gpatt, + gchar* opts) { GRegex* regex; GError* error = NULL; int pos = 0; gchar *sig; + gchar *patt; + int len; + + if (!gpatt) + return FALSE; + + patt = gpatt->str; + len = gpatt->len; /* TODO: Play with optimization flags */ regex = g_regex_new (patt, G_REGEX_OPTIMIZE, @@ -1098,88 +1150,123 @@ { g_warning ("%s: %s", G_STRFUNC, error->message); g_error_free (error); - return; + return TRUE; } if (!g_regex_match_simple ("^/.*[\\^\\$\\*].*/$", patt, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY)) { - int len = strlen (patt); int signature_count = 0; + for (pos = len - SIGNATURE_SIZE; pos >= 0; pos--) { sig = g_strndup (patt + pos, SIGNATURE_SIZE); if (!g_regex_match_simple ("[\\*]", sig, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY) && - !g_hash_table_lookup (keystbl, sig)) + !g_hash_table_lookup (keys, sig)) { + #ifdef G_ENABLE_DEBUG adblock_debug ("sig: %s %s", sig, patt); - g_hash_table_insert (keystbl, sig, regex); + #endif + g_hash_table_insert (keys, sig, regex); + g_hash_table_insert (optslist, sig, g_strdup (opts)); signature_count++; } else { if (g_regex_match_simple ("^\\*", sig, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY) && - !g_hash_table_lookup (tbl, opts)) + !g_hash_table_lookup (pattern, patt)) { + #ifdef G_ENABLE_DEBUG adblock_debug ("patt2: %s %s", sig, patt); - g_hash_table_insert (tbl, opts, regex); + #endif + g_hash_table_insert (pattern, patt, regex); + g_hash_table_insert (optslist, patt, g_strdup (opts)); } g_free (sig); } } - if (signature_count > 1 && g_hash_table_lookup (tbl, opts)) - g_hash_table_steal (tbl, opts); + if (signature_count > 1 && g_hash_table_lookup (pattern, patt)) + { + g_hash_table_steal (pattern, patt); + return TRUE; + } + return FALSE; } else { + #ifdef G_ENABLE_DEBUG adblock_debug ("patt: %s%s", patt, ""); + #endif /* Pattern is a regexp chars */ - g_hash_table_insert (tbl, opts, regex); + g_hash_table_insert (pattern, patt, regex); + g_hash_table_insert (optslist, patt, g_strdup (opts)); + return FALSE; } } -static gchar* -adblock_add_url_pattern (gchar* format, +static inline gchar* +adblock_add_url_pattern (gchar* prefix, gchar* type, gchar* line) { gchar** data; gchar* patt; - gchar* fixed_patt; - gchar* format_patt; + GString* format_patt; gchar* opts; + gboolean should_free; data = g_strsplit (line, "$", -1); - if (data && data[0] && data[1] && data[2]) + if (!data || !data[0]) + { + g_strfreev (data); + return NULL; + } + + if (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]); + patt = g_strconcat (data[0], data[1], NULL); + opts = g_strconcat (type, ",", data[2], NULL); } - else if (data && data[0] && data[1]) + else if (data[1]) { - patt = g_strdup (data[0]); - opts = g_strdup_printf ("type=%s,regexp=%s,%s", type, patt, data[1]); + patt = data[0]; + opts = g_strconcat (type, ",", data[1], NULL); } else { - patt = g_strdup (data[0]); - opts = g_strdup_printf ("type=%s,regexp=%s", type, patt); + patt = data[0]; + opts = type; } - fixed_patt = adblock_fixup_regexp (patt); - format_patt = g_strdup_printf (format, fixed_patt); + if (g_regex_match_simple ("subdocument", opts, + G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)) + { + if (data[1] && data[2]) + g_free (patt); + if (data[1]) + g_free (opts); + g_strfreev (data); + return NULL; + } - adblock_debug ("got: %s opts %s", format_patt, opts); - adblock_compile_regexp (pattern, keys, format_patt, opts); + format_patt = adblock_fixup_regexp (prefix, patt); + #ifdef G_ENABLE_DEBUG + adblock_debug ("got: %s opts %s", format_patt->str, opts); + #endif + should_free = adblock_compile_regexp (format_patt, opts); + + if (data[1] && data[2]) + g_free (patt); + if (data[1]) + g_free (opts); g_strfreev (data); - g_free (patt); - g_free (fixed_patt); - return format_patt; + + return g_string_free (format_patt, should_free); } -static void +static inline void adblock_frame_add (gchar* line) { - gchar* new_blockcss; + const gchar* separator = " , "; (void)*line++; (void)*line++; @@ -1190,15 +1277,30 @@ { return; } - new_blockcss = g_strdup_printf ("%s, %s", blockcss, line); - katze_assign (blockcss, new_blockcss); + g_string_append (blockcss, separator); + g_string_append (blockcss, line); } -static void +static inline void +adblock_update_css_hash (gchar* domain, + gchar* value) +{ + const gchar* olddata; + gchar* newdata; + + if ((olddata = g_hash_table_lookup (blockcssprivate, domain))) + { + newdata = g_strconcat (olddata, " , ", value, NULL); + g_hash_table_replace (blockcssprivate, g_strdup (domain), newdata); + } + else + g_hash_table_insert (blockcssprivate, g_strdup (domain), g_strdup (value)); +} + +static inline void adblock_frame_add_private (const gchar* line, const gchar* sep) { - gchar* new_blockcss; gchar** data; data = g_strsplit (line, sep, 2); @@ -1215,22 +1317,27 @@ if (strchr (data[0], ',')) { gchar** domains; - gint max, i; + gint i; domains = g_strsplit (data[0], ",", -1); - for (max = i = 0; domains[i]; i++) + for (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); + gchar* domain; + + domain = domains[i]; + /* Ignore Firefox-specific option */ + if (!g_strcmp0 (domain, "~pregecko2")) + continue; + /* FIXME: ~ should negate match */ + if (domain[0] == '~') + domain++; + adblock_update_css_hash (g_strstrip (domain), data[1]); } g_strfreev (domains); } else { - new_blockcss = g_strdup_printf ("%s;\nsites['%s']+=',%s'", - blockcssprivate, data[0], data[1]); - katze_assign (blockcssprivate, new_blockcss); + adblock_update_css_hash (data[0], data[1]); } g_strfreev (data); } @@ -1238,12 +1345,92 @@ static gchar* adblock_parse_line (gchar* line) { - if (!line) - return NULL; - g_strchomp (line); - /* Ignore comments and new lines */ - if (line[0] == '!') + /* + * AdblockPlus rule reference based on http://adblockplus.org/en/filters + * Block URL: + * http://example.com/ads/banner123.gif + * http://example.com/ads/banner*.gif + * http://example.com/ads/* + * Partial match for "ad": + * *ad* + * ad + * Block example.com/annoyingflash.swf but not example.com/swf/: + * swf| + * Block bad.example/banner.gif but not good.example/analyze?http://bad.example: + * |http://baddomain.example/ + * Block http(s) example.com but not badexample.com or good.example/analyze?http://bad.example: + * ||example.com/banner.gif + * Block example.com/ and example.com:8000/ but not example.com.ar/: + * http://example.com^ + * A ^ matches anything that isn't A-Za-z0-0_-.% + * Block example.com:8000/foo.bar?a=12&b=%D1%82%D0%B5: + * ^example.com^ + * ^%D1%82%D0%B5^ + * ^foo.bar^ + * TODO: ^ is partially supported by Midori + * Block banner123 and banner321 with a regex: + * /banner\d+/ + * Never block URIs with "advice": + * @@advice + * No blocking at all: + * @@http://example.com + * @@|http://example.com + * TODO: @@ is currently ignored by Midori. + * Element hiding by class: + * ##textad + * ##div.textad + * Element hiding by id: + * ##div#sponsorad + * ##*#sponsorad + * Match example.com/ and something.example.com/ but not example.org/ + * example.com##*.sponsor + * Match multiple domains: + * domain1.example,domain2.example,domain3.example##*.sponsor + * Match on any domain but "example.com": + * ~example.com##*.sponsor + * Match on "example.com" except "foo.example.com": + * example.com,~foo.example.com##*.sponsor + * By design rules only apply to full domain names: + * "domain" is NOT equal to "domain.example,domain.test." + * In Firefox rules can apply to browser UI: + * browser##menuitem#javascriptConsole will hide the Console menuitem + * Hide tables with width attribute 80%: + * ##table[width="80%"] + * Hide all div with title attribute containing "adv": + * ##div[title*="adv"] + * Hide div with title starting with "adv" and ending with "ert": + * ##div[title^="adv"][title$="ert"] + * Match tables with width attribute 80% and bgcolor attribute white: + * table[width="80%"][bgcolor="white"] + * TODO: [] is currently ignored by Midori + * Hide anything following div with class "adheader": + * ##div.adheader + * + * Old CSS element hiding syntax, officially deprecated: + * #div(id=foo) + * Match anything but "example.com" + * ~example.com##*.sponsor + * TODO: ~ is currently ignored by Midori + * Match "example.com" domain except "foo.example.com": + * example.com,~foo.example.com##*.sponsor + * ! Comment + * Supported options after a trailing $: + * domain,third-party,~pregecko2 + * Official options (not all supported by Midori): + * script,image,stylesheet,object,xmlhttprequest,object-subrequest, + * subdocument,document,elemhide,popup,third-party,sitekey,match-case + * collapse,donottrack,pregecko2 + * Deprecated: + * background,xbl,ping,dtd + * Inverse options: + * ~script,~image,~stylesheet,~object,~xmlhttprequest,~collapse, + * ~object-subrequest,~subdocument,~document,~elemhide,~third-party, + * ~pregecko2 + **/ + + /* Skip invalid, empty and comment lines */ + if (!(line && line[0] != ' ' && line[0] != '!' && line[0])) return NULL; + /* FIXME: No support for whitelisting */ if (line[0] == '@' && line[1] == '@') return NULL; @@ -1251,6 +1438,8 @@ if (line[0] == '[') return NULL; + g_strchomp (line); + /* Got CSS block hider */ if (line[0] == '#' && line[1] == '#' ) { @@ -1267,26 +1456,26 @@ adblock_frame_add_private (line, "##"); return NULL; } - /* Got per domain CSS hider rule. Workaround */ if (strchr (line, '#')) { adblock_frame_add_private (line, "#"); return NULL; } + /* Got URL blocker rule */ if (line[0] == '|' && line[1] == '|' ) { (void)*line++; (void)*line++; - return adblock_add_url_pattern ("%s", "fulluri", line); + return adblock_add_url_pattern ("", "fulluri", line); } if (line[0] == '|') { (void)*line++; - return adblock_add_url_pattern ("^%s", "fulluri", line); + return adblock_add_url_pattern ("^", "fulluri", line); } - return adblock_add_url_pattern ("%s", "uri", line); + return adblock_add_url_pattern ("", "uri", line); } static gboolean @@ -1298,7 +1487,7 @@ if ((file = g_fopen (path, "r"))) { while (fgets (line, 2000, file)) - g_free (adblock_parse_line (line)); + adblock_parse_line (line); fclose (file); return TRUE; } @@ -1311,51 +1500,46 @@ MidoriExtension* extension) { GtkWidget* web_view = midori_view_get_web_view (view); - #if HAVE_WEBKIT_RESOURCE_REQUEST - GtkWidget* image = g_object_get_data (G_OBJECT (browser), "status-image"); - #endif g_signal_handlers_disconnect_by_func ( - browser, adblock_add_tab_cb, extension); - g_signal_handlers_disconnect_by_func ( web_view, adblock_window_object_cleared_cb, 0); - #if WEBKIT_CHECK_VERSION (1, 1, 15) g_signal_handlers_disconnect_by_func ( web_view, adblock_populate_popup_cb, extension); - #endif - #if HAVE_WEBKIT_RESOURCE_REQUEST g_signal_handlers_disconnect_by_func ( - web_view, adblock_resource_request_starting_cb, image); + web_view, adblock_resource_request_starting_cb, view); g_signal_handlers_disconnect_by_func ( - web_view, adblock_load_finished_cb, image); - #endif + web_view, adblock_load_finished_cb, view); + g_signal_handlers_disconnect_by_func ( + web_view, adblock_navigation_policy_decision_requested_cb, view); } static void adblock_deactivate_cb (MidoriExtension* extension, MidoriBrowser* browser) { + gint i; + GtkWidget* view; MidoriApp* app = midori_extension_get_app (extension); + MidoriWebSettings* settings = katze_object_get_object (app, "settings"); - #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); + browser, adblock_open_preferences_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); g_signal_handlers_disconnect_by_func ( browser, adblock_add_tab_cb, extension); - midori_browser_foreach (browser, (GtkCallback)adblock_deactivate_tabs, browser); + g_signal_handlers_disconnect_by_func ( + browser, adblock_remove_tab_cb, extension); - katze_assign (blockcss, NULL); - katze_assign (blockcssprivate, NULL); - g_hash_table_destroy (pattern); + i = 0; + while((view = midori_browser_get_nth_tab(browser, i++))) + adblock_deactivate_tabs (MIDORI_VIEW (view), browser, extension); + + adblock_destroy_db (); + midori_web_settings_remove_style (settings, "adblock-blockcss"); + g_object_unref (settings); } static void @@ -1367,12 +1551,6 @@ #endif KatzeArray* browsers; MidoriBrowser* browser; - #if !HAVE_WEBKIT_RESOURCE_REQUEST - SoupSession* session = webkit_get_default_session (); - - g_signal_connect (session, "request-queued", - G_CALLBACK (adblock_session_request_queued_cb), NULL); - #endif #ifdef G_ENABLE_DEBUG debug_mode = g_getenv ("MIDORI_ADBLOCK"); @@ -1446,28 +1624,28 @@ adblock_parse_file (filename); g_test_timer_start (); - g_assert (adblock_is_matched (NULL, "http://www.engadget.com/_uac/adpage.html", "")); - g_assert (adblock_is_matched (NULL, "http://test.dom/test?var=1", "")); - g_assert (adblock_is_matched (NULL, "http://ads.foo.bar/teddy", "")); - g_assert (!adblock_is_matched (NULL, "http://ads.fuu.bar/teddy", "")); - g_assert (adblock_is_matched (NULL, "https://ads.bogus.name/blub", "")); - g_assert (adblock_is_matched (NULL, "http://ads.bla.blub/kitty", "")); - g_assert (adblock_is_matched (NULL, "http://ads.blub.boing/soda", "")); - g_assert (!adblock_is_matched (NULL, "http://ads.foo.boing/beer", "")); - g_assert (adblock_is_matched (NULL, "https://testsub.engine.adct.ru/test?id=1", "")); + g_assert (adblock_is_matched ("http://www.engadget.com/_uac/adpage.html", "")); + g_assert (adblock_is_matched ("http://test.dom/test?var=1", "")); + g_assert (adblock_is_matched ("http://ads.foo.bar/teddy", "")); + g_assert (!adblock_is_matched ("http://ads.fuu.bar/teddy", "")); + g_assert (adblock_is_matched ("https://ads.bogus.name/blub", "")); + g_assert (adblock_is_matched ("http://ads.bla.blub/kitty", "")); + g_assert (adblock_is_matched ("http://ads.blub.boing/soda", "")); + g_assert (!adblock_is_matched ("http://ads.foo.boing/beer", "")); + g_assert (adblock_is_matched ("https://testsub.engine.adct.ru/test?id=1", "")); if (USE_PATTERN_MATCHING) - g_assert (adblock_is_matched (NULL, "http://test.ltd/addyn/test/test?var=adtech;&var2=1", "")); - g_assert (adblock_is_matched (NULL, "http://add.doubleclick.net/pfadx/aaaa.mtvi", "")); - g_assert (!adblock_is_matched (NULL, "http://add.doubleclick.net/pfadx/aaaa.mtv", "")); - g_assert (adblock_is_matched (NULL, "http://objects.tremormedia.com/embed/xml/list.xml?r=", "")); - g_assert (!adblock_is_matched (NULL, "http://qq.videostrip.c/sub/admatcherclient.php", "")); - g_assert (adblock_is_matched (NULL, "http://qq.videostrip.com/sub/admatcherclient.php", "")); - g_assert (adblock_is_matched (NULL, "http://qq.videostrip.com/sub/admatcherclient.php", "")); - g_assert (adblock_is_matched (NULL, "http://br.gcl.ru/cgi-bin/br/test", "")); - g_assert (!adblock_is_matched (NULL, "https://bugs.webkit.org/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&query_based_on=gtkport&field0-0-0=keywords&type0-0-0=anywordssubstr&value0-0-0=Gtk%20Cairo%20soup&field0-0-1=short_desc&type0-0-1=anywordssubstr&value0-0-1=Gtk%20Cairo%20soup%20autoconf%20automake%20autotool&field0-0-2=component&type0-0-2=equals&value0-0-2=WebKit%20Gtk", "")); - g_assert (!adblock_is_matched (NULL, "http://www.engadget.com/2009/09/24/google-hits-android-rom-modder-with-a-cease-and-desist-letter/", "")); - g_assert (!adblock_is_matched (NULL, "http://karibik-invest.com/es/bienes_raices/search.php?sqT=19&sqN=&sqMp=&sqL=0&qR=1&sqMb=&searchMode=1&action=B%FAsqueda", "")); - g_assert (!adblock_is_matched (NULL, "http://google.com", "")); + g_assert (adblock_is_matched ("http://test.ltd/addyn/test/test?var=adtech;&var2=1", "")); + g_assert (adblock_is_matched ("http://add.doubleclick.net/pfadx/aaaa.mtvi", "")); + g_assert (!adblock_is_matched ("http://add.doubleclick.net/pfadx/aaaa.mtv", "")); + g_assert (adblock_is_matched ("http://objects.tremormedia.com/embed/xml/list.xml?r=", "")); + g_assert (!adblock_is_matched ("http://qq.videostrip.c/sub/admatcherclient.php", "")); + g_assert (adblock_is_matched ("http://qq.videostrip.com/sub/admatcherclient.php", "")); + g_assert (adblock_is_matched ("http://qq.videostrip.com/sub/admatcherclient.php", "")); + g_assert (adblock_is_matched ("http://br.gcl.ru/cgi-bin/br/test", "")); + g_assert (!adblock_is_matched ("https://bugs.webkit.org/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&query_based_on=gtkport&field0-0-0=keywords&type0-0-0=anywordssubstr&value0-0-0=Gtk%20Cairo%20soup&field0-0-1=short_desc&type0-0-1=anywordssubstr&value0-0-1=Gtk%20Cairo%20soup%20autoconf%20automake%20autotool&field0-0-2=component&type0-0-2=equals&value0-0-2=WebKit%20Gtk", "")); + g_assert (!adblock_is_matched ("http://www.engadget.com/2009/09/24/google-hits-android-rom-modder-with-a-cease-and-desist-letter/", "")); + g_assert (!adblock_is_matched ("http://karibik-invest.com/es/bienes_raices/search.php?sqT=19&sqN=&sqMp=&sqL=0&qR=1&sqMb=&searchMode=1&action=B%FAsqueda", "")); + g_assert (!adblock_is_matched ("http://google.com", "")); g_print ("Search took %f seconds\n", g_test_timer_elapsed ()); @@ -1491,7 +1669,7 @@ MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", _("Advertisement blocker"), "description", _("Block advertisements according to a filter list"), - "version", "0.5", + "version", "0.6" MIDORI_VERSION_SUFFIX, "authors", "Christian Dywan ", NULL); midori_extension_install_string_list (extension, "filters", NULL, G_MAXSIZE); diff -Nru midori-0.2.8/extensions/addons.c midori-0.4.6/extensions/addons.c --- midori-0.2.8/extensions/addons.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/addons.c 2012-05-14 22:13:42.000000000 +0000 @@ -1,6 +1,7 @@ /* Copyright (C) 2008 Christian Dywan Copyright (C) 2008-2010 Arno Renevier + Copyright (C) 2010-2011 Paweł Forysiuk This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -13,12 +14,9 @@ /* This extensions add support for user addons: userscripts and userstyles */ #include -#include -#include #include #include "config.h" - #if HAVE_UNISTD_H #include #endif @@ -68,6 +66,9 @@ static void addons_iface_init (MidoriViewableIface* iface); +static gchar* +addons_convert_to_simple_regexp (const gchar* pattern); + G_DEFINE_TYPE_WITH_CODE (Addons, addons, GTK_TYPE_VBOX, G_IMPLEMENT_INTERFACE (MIDORI_TYPE_VIEWABLE, addons_iface_init)); @@ -93,8 +94,196 @@ }; static void -midori_addons_button_add_clicked_cb (GtkToolItem* toolitem, - Addons* addons) +addons_install_response (GtkWidget* infobar, + gint response_id, + MidoriView* view) +{ + if (response_id == GTK_RESPONSE_ACCEPT) + { + const gchar* uri = midori_view_get_display_uri (view); + if (uri && *uri) + { + gchar* hostname, *path; + gchar* dest_uri, *filename, *dest_path, *temp_uri, *folder_path; + const gchar* folder; + WebKitNetworkRequest* request; + WebKitDownload* download; + + hostname = midori_uri_parse_hostname (uri, &path); + temp_uri = NULL; + filename = NULL; + folder = NULL; + + if (g_str_has_suffix (uri, ".user.js")) + folder = "scripts"; + else if (g_str_has_suffix (uri, ".user.css")) + folder = "styles"; + else if (!g_strcmp0 (hostname, "userscripts.org")) + { + /* http://userscripts.org/scripts/ACTION/SCRIPT_ID/NAME */ + gchar* subpage = strchr (strchr (path + 1, '/') + 1, '/'); + if (subpage && subpage[0] == '/' && g_ascii_isdigit (subpage[1])) + { + const gchar* js_script; + WebKitWebView* web_view; + WebKitWebFrame* web_frame; + + js_script = "document.getElementById('heading').childNodes[3].childNodes[1].textContent"; + web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (view)); + web_frame = webkit_web_view_get_main_frame (web_view); + + if (WEBKIT_IS_WEB_FRAME (web_frame)) + { + JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); + gchar* value = sokoke_js_script_eval (js_context, js_script, NULL); + if (value && *value) + filename = g_strdup_printf ("%s.user.js", value); + g_free (value); + } + + /* rewrite uri to get source js */ + temp_uri = g_strdup_printf ("http://%s/scripts/source/%s.user.js", + hostname, subpage + 1); + uri = temp_uri; + folder = "scripts"; + } + } + else if (!g_strcmp0 (hostname, "userstyles.org")) + { + /* http://userstyles.org/styles/STYLE_ID/NAME */ + gchar* subpage = strchr (path + 1, '/'); + if (subpage && subpage[0] == '/' && g_ascii_isdigit (subpage[1])) + { + const gchar* js_script; + WebKitWebView* web_view; + WebKitWebFrame* web_frame; + gchar** style_id; + + js_script = "document.getElementById('stylish-description').innerHTML;"; + web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (view)); + web_frame = webkit_web_view_get_main_frame (web_view); + + if (WEBKIT_IS_WEB_FRAME (web_frame)) + { + JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); + gchar* value = sokoke_js_script_eval (js_context, js_script, NULL); + if (value && *value) + filename = g_strdup_printf ("%s.css", value); + g_free (value); + } + /* rewrite uri to get css */ + style_id = g_strsplit (subpage + 1, "/", 2); + temp_uri = g_strdup_printf ("http://%s/styles/%s.css", hostname, style_id[0]); + g_strfreev (style_id); + uri = temp_uri; + folder = "styles"; + } + } + + if (!filename) + filename = g_path_get_basename (uri); + folder_path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (), + PACKAGE_NAME, folder, NULL); + + if (!g_file_test (folder_path, G_FILE_TEST_EXISTS)) + katze_mkdir_with_parents (folder_path, 0700); + dest_path = g_build_path (G_DIR_SEPARATOR_S, folder_path, filename, NULL); + + request = webkit_network_request_new (uri); + download = webkit_download_new (request); + g_object_unref (request); + + dest_uri = g_filename_to_uri (dest_path, NULL, NULL); + webkit_download_set_destination_uri (download, dest_uri); + webkit_download_start (download); + + g_free (filename); + g_free (dest_uri); + g_free (temp_uri); + g_free (dest_path); + g_free (folder_path); + g_free (hostname); + } + } + gtk_widget_destroy (GTK_WIDGET (infobar)); +} + +static void +addons_uri_install (MidoriView* view, + AddonsKind kind) +{ + const gchar* message; + const gchar* button_text; + + if (kind == ADDONS_USER_SCRIPTS) + { + /* i18n: An infobar shows up when viewing a script on userscripts.org */ + message = _("This page appears to contain a user script. Do you wish to install it?"); + button_text = _("_Install user script"); + } + else if (kind == ADDONS_USER_STYLES) + { + /* i18n: An infobar shows up when viewing a style on userstyles.org */ + message = _("This page appears to contain a user style. Do you wish to install it?"); + button_text = _("_Install user style"); + } + else + g_assert_not_reached (); + + midori_view_add_info_bar (view, GTK_MESSAGE_QUESTION, message, + G_CALLBACK (addons_install_response), view, + button_text, GTK_RESPONSE_ACCEPT, + _("Don't install"), GTK_RESPONSE_CANCEL, NULL); +} + +static void +addons_notify_load_status_cb (MidoriView* view, + GParamSpec* pspec, + MidoriExtension* extension) +{ + const gchar* uri = midori_view_get_display_uri (view); + WebKitWebView* web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (view)); + + if (webkit_web_view_get_view_source_mode (web_view)) + return; + + if (uri && *uri) + { + if (midori_view_get_load_status (view) == MIDORI_LOAD_COMMITTED) + { + /* casual sites goes by uri suffix */ + if (g_str_has_suffix (uri, ".user.js")) + addons_uri_install (view, ADDONS_USER_SCRIPTS); + else if (g_str_has_suffix (uri, ".user.css")) + addons_uri_install (view, ADDONS_USER_STYLES); + else + { + gchar* path; + gchar* hostname = midori_uri_parse_hostname (uri, &path); + if (!g_strcmp0 (hostname, "userscripts.org") + && (g_str_has_prefix (path, "/scripts/show/") + || g_str_has_prefix (path, "/scripts/review/"))) + { + /* Main (with desc) and "source view" pages */ + addons_uri_install (view, ADDONS_USER_SCRIPTS); + } + else if (!g_strcmp0 (hostname, "userstyles.org") + && g_str_has_prefix (path, "/styles/")) + { + gchar* subpage = strchr (path + 1, '/'); + /* Main page with style description */ + if (subpage && subpage[0] == '/' && g_ascii_isdigit (subpage[1])) + addons_uri_install (view, ADDONS_USER_STYLES); + } + g_free (hostname); + } + } + } +} + +static void +addons_button_add_clicked_cb (GtkToolItem* toolitem, + Addons* addons) { gchar* addons_type; gchar* path; @@ -209,8 +398,8 @@ } static void -midori_addons_button_delete_clicked_cb (GtkWidget* toolitem, - Addons* addons) +addons_button_delete_clicked_cb (GtkWidget* toolitem, + Addons* addons) { GtkTreeModel* model; GtkTreeIter iter; @@ -221,6 +410,7 @@ struct AddonElement* element; gint delete_response; GtkWidget* dialog; + gchar* markup; gtk_tree_model_get (model, &iter, 0, &element, -1); dialog = gtk_message_dialog_new ( @@ -237,10 +427,12 @@ ? _("Delete user script") : _("Delete user style")); - gtk_message_dialog_format_secondary_markup ( - GTK_MESSAGE_DIALOG (dialog), + markup = g_markup_printf_escaped ( _("The file %s will be permanently deleted."), element->fullpath); + gtk_message_dialog_format_secondary_markup ( + GTK_MESSAGE_DIALOG (dialog), "%s", markup); + g_free (markup); delete_response = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (GTK_WIDGET (dialog)); @@ -278,8 +470,8 @@ } } static void -midori_addons_open_in_editor_clicked_cb (GtkWidget* toolitem, - Addons* addons) +addons_open_in_editor_clicked_cb (GtkWidget* toolitem, + Addons* addons) { GtkTreeModel* model; GtkTreeIter iter; @@ -291,29 +483,30 @@ MidoriWebSettings* settings; MidoriBrowser* browser; gchar* text_editor; - gchar* element_uri; browser = midori_browser_get_for_widget (GTK_WIDGET (addons->treeview)); - settings = katze_object_get_object (browser, "settings"); + settings = midori_browser_get_settings (browser); gtk_tree_model_get (model, &iter, 0, &element, -1); - element_uri = g_filename_to_uri (element->fullpath, NULL, NULL); g_object_get (settings, "text-editor", &text_editor, NULL); if (text_editor && *text_editor) - sokoke_spawn_program (text_editor, element_uri, TRUE); + sokoke_spawn_program (text_editor, element->fullpath); else + { + gchar* element_uri = g_filename_to_uri (element->fullpath, NULL, NULL); sokoke_show_uri (NULL, element_uri, gtk_get_current_event_time (), NULL); + g_free (element_uri); + } - g_free (element_uri); g_free (text_editor); } } static void -midori_addons_open_target_folder_clicked_cb (GtkWidget* toolitem, - Addons* addons) +addons_open_target_folder_clicked_cb (GtkWidget* toolitem, + Addons* addons) { GtkTreeModel* model; GtkTreeIter iter; @@ -342,12 +535,12 @@ } static void -midori_addons_popup_item (GtkMenu* menu, - const gchar* stock_id, - const gchar* label, - struct AddonElement* element, - gpointer callback, - Addons* addons) +addons_popup_item (GtkMenu* menu, + const gchar* stock_id, + const gchar* label, + struct AddonElement* element, + gpointer callback, + Addons* addons) { GtkWidget* menuitem; @@ -366,26 +559,26 @@ } static void -midori_addons_popup (GtkWidget* widget, - GdkEventButton* event, - struct AddonElement* element, - Addons* addons) +addons_popup (GtkWidget* widget, + GdkEventButton* event, + struct AddonElement* element, + Addons* addons) { GtkWidget* menu; menu = gtk_menu_new (); - midori_addons_popup_item (GTK_MENU (menu), GTK_STOCK_EDIT, _("Open in Text Editor"), - element, midori_addons_open_in_editor_clicked_cb, addons); - midori_addons_popup_item (GTK_MENU (menu), GTK_STOCK_OPEN, _("Open Target Folder"), - element, midori_addons_open_target_folder_clicked_cb, addons); - midori_addons_popup_item (GTK_MENU (menu), GTK_STOCK_DELETE, NULL, - element, midori_addons_button_delete_clicked_cb, addons); + addons_popup_item (GTK_MENU (menu), GTK_STOCK_EDIT, _("Open in Text Editor"), + element, addons_open_in_editor_clicked_cb, addons); + addons_popup_item (GTK_MENU (menu), GTK_STOCK_OPEN, _("Open Target Folder"), + element, addons_open_target_folder_clicked_cb, addons); + addons_popup_item (GTK_MENU (menu), GTK_STOCK_DELETE, NULL, + element, addons_button_delete_clicked_cb, addons); katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR); } static gboolean -midori_addons_popup_menu_cb (GtkWidget *widget, - Addons* addons) +addons_popup_menu_cb (GtkWidget *widget, + Addons* addons) { GtkTreeModel* model; GtkTreeIter iter; @@ -394,16 +587,16 @@ { struct AddonElement* element; gtk_tree_model_get (model, &iter, 0, &element, -1); - midori_addons_popup (widget, NULL, element, addons); + addons_popup (widget, NULL, element, addons); return TRUE; } return FALSE; } static gboolean -midori_addons_button_release_event_cb (GtkWidget* widget, - GdkEventButton* event, - Addons* addons) +addons_button_release_event_cb (GtkWidget* widget, + GdkEventButton* event, + Addons* addons) { GtkTreeModel* model; GtkTreeIter iter; @@ -414,7 +607,7 @@ { struct AddonElement* element; gtk_tree_model_get (model, &iter, 0, &element, -1); - midori_addons_popup (widget, NULL, element, addons); + addons_popup (widget, NULL, element, addons); return TRUE; } return FALSE; @@ -440,7 +633,7 @@ toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD); gtk_tool_item_set_is_important (toolitem, TRUE); g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_addons_button_add_clicked_cb), viewable); + G_CALLBACK (addons_button_add_clicked_cb), viewable); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Add new addon")); gtk_widget_show (GTK_WIDGET (toolitem)); @@ -448,7 +641,7 @@ /* Text editor button */ toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_EDIT); g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_addons_open_in_editor_clicked_cb), viewable); + G_CALLBACK (addons_open_in_editor_clicked_cb), viewable); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Open in Text Editor")); @@ -457,7 +650,7 @@ /* Target folder button */ toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY); g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_addons_open_target_folder_clicked_cb), viewable); + G_CALLBACK (addons_open_target_folder_clicked_cb), viewable); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Open Target Folder")); @@ -466,10 +659,8 @@ /* Delete button */ toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE); g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_addons_button_delete_clicked_cb), viewable); + G_CALLBACK (addons_button_delete_clicked_cb), viewable); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); - gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), - _("Open target folder for selected addon")); gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Remove selected addon")); gtk_widget_show (GTK_WIDGET (toolitem)); ADDONS (viewable)->toolbar = toolbar; @@ -516,7 +707,6 @@ addons_free_elements (GSList* elements) { struct AddonElement* element; - GSList* start = elements; while (elements) { @@ -527,11 +717,10 @@ g_free (element->script_content); g_slist_free (element->includes); g_slist_free (element->excludes); + g_slice_free (struct AddonElement, element); elements = g_slist_next (elements); } - - g_slist_free (start); } static void @@ -654,7 +843,7 @@ { path = g_build_path (G_DIR_SEPARATOR_S, *datadirs, PACKAGE_NAME, folder_name, NULL); - if (g_access (path, X_OK) == 0) + if (g_slist_find (directories, path) == NULL && g_access (path, X_OK) == 0) directories = g_slist_prepend (directories, path); else g_free (path); @@ -680,9 +869,11 @@ g_assert (kind == ADDONS_USER_SCRIPTS || kind == ADDONS_USER_STYLES); if (kind == ADDONS_USER_SCRIPTS) - file_extension = g_strdup (".js"); + file_extension = ".js"; else if (kind == ADDONS_USER_STYLES) - file_extension = g_strdup (".css"); + file_extension = ".css"; + else + g_assert_not_reached (); files = NULL; @@ -697,7 +888,8 @@ if (g_str_has_suffix (filename, file_extension)) { fullname = g_build_filename (dirname, filename, NULL); - files = g_slist_prepend (files, fullname); + if (g_slist_find (files, fullname) == NULL) + files = g_slist_prepend (files, fullname); } } g_dir_close (addon_dir); @@ -706,7 +898,7 @@ directories = g_slist_next (directories); } - g_free (file_extension); + g_slist_free (directories); return files; } @@ -735,14 +927,15 @@ while (g_io_channel_read_line (channel, &line, NULL, NULL, NULL) == G_IO_STATUS_NORMAL) { + g_strstrip (line); if (g_str_has_prefix (line, "// ==UserScript==")) found_meta = TRUE; else if (found_meta) { if (g_str_has_prefix (line, "// ==/UserScript==")) found_meta = FALSE; - else if (g_str_has_prefix (line, "// @require ") || - g_str_has_prefix (line, "// @resource ")) + else if (g_str_has_prefix (line, "// @require") + || g_str_has_prefix (line, "// @resource")) { /* We don't support these, so abort here */ g_free (line); @@ -753,27 +946,33 @@ *excludes = NULL; return FALSE; } - else if (includes && g_str_has_prefix (line, "// @include ")) + else if (includes && g_str_has_prefix (line, "// @include")) { - rest_of_line = g_strdup (line + strlen ("// @include ")); + gchar* re = NULL; + rest_of_line = g_strdup (line + strlen ("// @include")); rest_of_line = g_strstrip (rest_of_line); - *includes = g_slist_prepend (*includes, rest_of_line); + re = addons_convert_to_simple_regexp (rest_of_line); + *includes = g_slist_prepend (*includes, re); } - else if (excludes && g_str_has_prefix (line, "// @exclude ")) + else if (excludes && g_str_has_prefix (line, "// @exclude")) { - rest_of_line = g_strdup (line + strlen ("// @exclude ")); + gchar* re = NULL; + rest_of_line = g_strdup (line + strlen ("// @exclude")); rest_of_line = g_strstrip (rest_of_line); - *excludes = g_slist_prepend (*excludes, rest_of_line); + re = addons_convert_to_simple_regexp (rest_of_line); + *excludes = g_slist_prepend (*excludes, re); } - else if (name && g_str_has_prefix (line, "// @name ")) + else if (name && g_str_has_prefix (line, "// @name")) { - rest_of_line = g_strdup (line + strlen ("// @name ")); + if (!strncmp (line, "// @namespace", 13)) + continue; + rest_of_line = g_strdup (line + strlen ("// @name")); rest_of_line = g_strstrip (rest_of_line); *name = rest_of_line; } - else if (description && g_str_has_prefix (line, "// @description ")) + else if (description && g_str_has_prefix (line, "// @description")) { - rest_of_line = g_strdup (line + strlen ("// @description ")); + rest_of_line = g_strdup (line + strlen ("// @description")); rest_of_line = g_strstrip (rest_of_line); *description = rest_of_line; } @@ -794,6 +993,7 @@ GIOChannel* channel; gchar* line; gchar* rest_of_line; + gboolean line_has_meta; if (!g_file_test (filename, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) return FALSE; @@ -802,60 +1002,68 @@ if (!channel) return FALSE; + line_has_meta = FALSE; while (g_io_channel_read_line (channel, &line, NULL, NULL, NULL) == G_IO_STATUS_NORMAL) { - if (g_str_has_prefix (line, "@-moz-document")) + g_strstrip (line); + if (g_str_has_prefix (line, "@-moz-document") || line_has_meta) { /* FIXME: We merely look for includes. We should honor blocks. */ if (includes) { gchar** parts; guint i; - rest_of_line = g_strdup (line + strlen ("@-moz-document")); + if (g_str_has_prefix (line, "@-moz-document")) + rest_of_line = g_strdup (line + strlen ("@-moz-document")); + else + rest_of_line = g_strdup (line); + rest_of_line = g_strstrip (rest_of_line); - parts = g_strsplit (rest_of_line, " ", 0); + line_has_meta = !g_str_has_suffix (rest_of_line, "{"); + + parts = g_strsplit_set (rest_of_line, " ,", 0); i = 0; - while (parts[i]) + while (parts[i] && *parts[i] != '{') { gchar* value = NULL; if (g_str_has_prefix (parts[i], "url-prefix(")) - value = g_strdup (parts[i] + strlen ("url-prefix(")); + value = &parts[i][strlen ("url-prefix(")]; + else if (g_str_has_prefix (parts[i], "domain(")) + value = &parts[i][strlen ("domain(")]; else if (g_str_has_prefix (parts[i], "url(")) - value = g_strdup (parts[i] + strlen ("url(")); + value = &parts[i][strlen ("url(")]; if (value) { - guint j; - - if (value[0] != '\'' && value[0] != '"') - { - /* Wrong syntax, abort */ - g_free (value); - g_strfreev (parts); - g_free (line); - g_io_channel_shutdown (channel, false, 0); - g_slist_free (*includes); - g_slist_free (*excludes); - *includes = NULL; - *excludes = NULL; - return FALSE; - } - j = 1; - while (value[j] != '\0') - { - if (value[j] == value[0]) - break; - j++; - } - *includes = g_slist_prepend (*includes, g_strndup (value + 1, j - 1)); - g_free (value); + guint begin, end; + gchar* domain; + gchar* tmp_domain; + gchar* re = NULL; + + line_has_meta = TRUE; + begin = value[0] == '"' || value[0] == '\'' ? 1 : 0; + end = 1; + while (value[end] != '\0' && value[end] != ')') + ++end; + + domain = g_strndup (value + begin, end - begin * 2); + if (!midori_uri_is_location (domain) + && !g_str_has_prefix (domain, "file://")) + tmp_domain = g_strdup_printf ("http://*%s/*", domain); + else + tmp_domain = domain; + + re = addons_convert_to_simple_regexp (tmp_domain); + *includes = g_slist_prepend (*includes, re); + g_free (domain); } - - /* FIXME: Recognize "domain" */ i++; } g_strfreev (parts); + g_free (rest_of_line); } + else + line_has_meta = FALSE; } g_free (line); } @@ -868,10 +1076,12 @@ static gboolean addons_get_element_content (gchar* file_path, AddonsKind kind, + gboolean has_metadata, gchar** content) { gchar* file_content; - guint meta; + GString* content_chunks; + guint meta, comment; guint i, n; g_assert (kind == ADDONS_USER_SCRIPTS || kind == ADDONS_USER_STYLES); @@ -887,7 +1097,9 @@ else if (kind == ADDONS_USER_STYLES) { meta = 0; + comment = 0; n = strlen (file_content); + content_chunks = g_string_new_len (NULL, n); for (i = 0; i < n; i++) { /* Replace line breaks with spaces */ @@ -896,23 +1108,19 @@ /* Change all single quotes to double quotes */ if (file_content[i] == '\'') file_content[i] = '\"'; - /* Turn metadata we inspected earlier into comments */ if (!meta && file_content[i] == '@') { - file_content[i] = '/'; meta++; } else if (meta == 1 && (file_content[i] == '-' || file_content[i] == 'n')) { - file_content[i] = '*'; meta++; } else if (meta == 2 && file_content[i] == '{') { - file_content[i - 1] = '*'; - file_content[i] = '/'; meta++; + continue; } else if (meta == 3 && file_content[i] == '{') meta++; @@ -920,11 +1128,37 @@ meta--; else if (meta == 3 && file_content[i] == '}') { - file_content[i] = ' '; meta = 0; + continue; } + + if (file_content[i] == '/' && file_content[i+1] == '*') + comment++; + /* Check whether we have comment ending, merely '*' or '/' */ + else if (comment == 2 + && file_content[i] == '*' && file_content[i+1] == '/') + { + comment--; + } + else if (comment == 1 + && file_content[i-1] == '*' && file_content[i] == '/') + { + comment--; + continue; + } + + /* Skip consecutive spaces */ + if (file_content[i] == ' ' + && i > 0 && file_content[i - 1] == ' ') + continue; + + /* Append actual data to string */ + if ((meta == 0 || meta >= 3) && !comment) + g_string_append_c (content_chunks, file_content[i]); } + if (has_metadata) + { *content = g_strdup_printf ( "window.addEventListener ('DOMContentLoaded'," "function () {" @@ -936,8 +1170,14 @@ "else document.documentElement.insertBefore" "(mystyle, document.documentElement.firstChild);" "}, true);", - file_content); - + content_chunks->str); + g_string_free (content_chunks, TRUE); + } + else + { + *content = content_chunks->str; + g_string_free (content_chunks, FALSE); + } } g_free (file_content); if (*content) @@ -951,7 +1191,6 @@ AddonsKind kind) { GSList* addon_files; - GSList* files_list; gchar* name; gchar* fullpath; struct AddonElement* element; @@ -992,7 +1231,6 @@ g_key_file_load_from_file (keyfile, config_file, G_KEY_FILE_NONE, NULL); addon_files = addons_get_files (kind); - files_list = addon_files; elements = NULL; while (addon_files) @@ -1001,7 +1239,7 @@ gchar* tooltip; fullpath = addon_files->data; - element = g_new (struct AddonElement, 1); + element = g_slice_new (struct AddonElement); element->displayname = g_filename_display_basename (fullpath); element->fullpath = fullpath; element->enabled = TRUE; @@ -1023,7 +1261,7 @@ katze_assign (element->displayname, name); if (!element->broken) - if (!addons_get_element_content (fullpath, kind, + if (!addons_get_element_content (fullpath, kind, FALSE, &(element->script_content))) element->broken = TRUE; @@ -1039,6 +1277,7 @@ if (!element->broken) if (!addons_get_element_content (fullpath, kind, + element->includes || element->excludes, &(element->script_content))) element->broken = TRUE; @@ -1048,13 +1287,11 @@ filename = g_path_get_basename (element->fullpath); if (element->description) - { - tooltip = g_strdup_printf ("%s\n\n%s", + tooltip = g_markup_printf_escaped ("%s\n\n%s", filename, element->description); - g_free (filename); - } else - tooltip = filename; + tooltip = g_markup_escape_text (filename, -1); + g_free (filename); gtk_list_store_append (liststore, &iter); gtk_list_store_set (liststore, &iter, @@ -1065,13 +1302,11 @@ addon_files = g_slist_next (addon_files); elements = g_slist_prepend (elements, element); } - g_slist_free (files_list); g_free (config_file); g_key_file_free (keyfile); - if (addons_list) - g_free (addons_list); - addons_list = g_new (struct AddonsList, 1); + g_slice_free (struct AddonsList, addons_list); + addons_list = g_slice_new (struct AddonsList); addons_list->elements = elements; addons_list->liststore = liststore; @@ -1111,10 +1346,10 @@ G_CALLBACK (addons_treeview_row_activated_cb), addons); g_signal_connect (addons->treeview, "button-release-event", - G_CALLBACK (midori_addons_button_release_event_cb), + G_CALLBACK (addons_button_release_event_cb), addons); g_signal_connect (addons->treeview, "popup-menu", - G_CALLBACK (midori_addons_popup_menu_cb), + G_CALLBACK (addons_popup_menu_cb), addons); gtk_widget_show (addons->treeview); gtk_box_pack_start (GTK_BOX (addons), addons->treeview, TRUE, TRUE, 0); @@ -1130,7 +1365,7 @@ gchar c; len = strlen (pattern); - dest = g_malloc0 (len * 2 + 1); + dest = g_malloc0 (len * 2 + 2); dest[0] = '^'; pos = 1; @@ -1188,9 +1423,7 @@ list = *includes; while (list) { - gchar* re = addons_convert_to_simple_regexp (list->data); - gboolean matched = g_regex_match_simple (re, uri, 0, 0); - g_free (re); + gboolean matched = g_regex_match_simple (list->data, uri, 0, 0); if (matched) { match = TRUE; @@ -1204,9 +1437,7 @@ list = *excludes; while (list) { - gchar* re = addons_convert_to_simple_regexp (list->data); - gboolean matched = g_regex_match_simple (re, uri, 0, 0); - g_free (re); + gboolean matched = g_regex_match_simple (list->data, uri, 0, 0); if (matched) { match = FALSE; @@ -1240,15 +1471,17 @@ GSList* scripts, *styles; struct AddonElement* script, *style; struct AddonsList* scripts_list, *styles_list; + const gchar* page_uri; - uri = katze_object_get_string (web_view, "uri"); - /* Don't run scripts or styles on blank or special pages */ - if (!(uri && *uri && strncmp (uri, "about:", 6))) - { - g_free (uri); + page_uri = webkit_web_frame_get_uri (web_frame); + if (!midori_uri_is_http (page_uri) && !midori_uri_is_blank (page_uri)) + return; + + /* Not a main frame! Abort */ + if (web_frame != webkit_web_view_get_main_frame (web_view)) return; - } + uri = katze_object_get_string (web_view, "uri"); scripts_list = g_object_get_data (G_OBJECT (extension), "scripts-list"); scripts = scripts_list->elements; while (scripts) @@ -1289,6 +1522,8 @@ GtkWidget* web_view = midori_view_get_web_view (view); g_signal_connect (web_view, "window-object-cleared", G_CALLBACK (addons_context_ready_cb), extension); + g_signal_connect (view, "notify::load-status", + G_CALLBACK (addons_notify_load_status_cb), extension); } static void @@ -1323,6 +1558,41 @@ gtk_widget_destroy (styles); } +static char* +addons_generate_global_stylesheet (MidoriExtension* extension) +{ + GSList* styles; + struct AddonElement* style; + struct AddonsList* styles_list; + GString* style_string = g_string_new (""); + + styles_list = g_object_get_data (G_OBJECT (extension), "styles-list"); + styles = styles_list->elements; + while (styles != NULL) + { + style = styles->data; + if (style->enabled && + !(style->includes || style->excludes || style->broken)) + { + style_string = g_string_append (style_string, style->script_content); + } + styles = g_slist_next (styles); + } + + return g_string_free (style_string, FALSE); +} + +static void +addons_apply_global_stylesheet (MidoriExtension* extension) +{ + MidoriApp* app = midori_extension_get_app (extension); + MidoriWebSettings* settings = katze_object_get_object (app, "settings"); + gchar* data = addons_generate_global_stylesheet (extension); + midori_web_settings_add_style (settings, "addons", data); + g_free (data); + g_object_unref (settings); +} + GtkWidget* addons_new (AddonsKind kind, MidoriExtension* extension) { @@ -1345,6 +1615,10 @@ GTK_TREE_MODEL (liststore)); gtk_widget_queue_draw (GTK_WIDGET (ADDONS(addons)->treeview)); + if (kind == ADDONS_USER_STYLES) + g_signal_connect_swapped (liststore, "row-changed", + G_CALLBACK (addons_apply_global_stylesheet), extension); + return addons; } @@ -1415,7 +1689,8 @@ config_file = g_build_filename (config_dir, "addons", NULL); katze_mkdir_with_parents (config_dir, 0700); sokoke_key_file_save_to_file (keyfile, config_file, &error); - if (error) + /* If the folder is /, this is a test run, thus no error */ + if (error && !g_str_equal (config_dir, "/")) { g_warning (_("The configuration of the extension '%s' couldn't be saved: %s\n"), _("User addons"), error->message); @@ -1444,12 +1719,14 @@ addons_deactivate_cb (MidoriExtension* extension, MidoriApp* app) { + MidoriWebSettings* settings = katze_object_get_object (app, "settings"); KatzeArray* browsers; MidoriBrowser* browser; GSource* source; addons_disable_monitors (extension); addons_save_settings (NULL, extension); + midori_web_settings_remove_style (settings, "addons"); browsers = katze_object_get_object (app, "browsers"); KATZE_ARRAY_FOREACH_ITEM (browser, browsers) @@ -1467,6 +1744,7 @@ extension, addons_deactivate_cb, app); g_object_unref (browsers); + g_object_unref (settings); } static gboolean @@ -1486,13 +1764,19 @@ GFileMonitorEvent flags, MidoriExtension* extension) { - char* basename; + GFileInfo* info; GSource* source; - basename = g_file_get_basename (child); - if (g_str_has_prefix (basename, ".") || - g_str_has_suffix (basename, "~")) /* Hidden or temporary files */ - return; + info = g_file_query_info (child, + "standard::is-hidden,standard::is-backup", 0, NULL, NULL); + if (info != NULL) + { + gboolean hidden = g_file_info_get_is_hidden (info) + || g_file_info_get_is_backup (info); + g_object_unref (info); + if (hidden) + return; + } /* We receive a lot of change events, so we use a timeout to trigger elements update only once */ @@ -1553,18 +1837,24 @@ addons_activate_cb (MidoriExtension* extension, MidoriApp* app) { + MidoriWebSettings* settings = katze_object_get_object (app, "settings"); KatzeArray* browsers; MidoriBrowser* browser; + gchar* data; browsers = katze_object_get_object (app, "browsers"); addons_update_elements (extension, ADDONS_USER_STYLES); addons_monitor_directories (extension, ADDONS_USER_STYLES); addons_update_elements (extension, ADDONS_USER_SCRIPTS); addons_monitor_directories (extension, ADDONS_USER_SCRIPTS); + data = addons_generate_global_stylesheet (extension); + midori_web_settings_add_style (settings, "addons", data); KATZE_ARRAY_FOREACH_ITEM (browser, browsers) addons_app_add_browser_cb (app, browser, extension); g_object_unref (browsers); + g_object_unref (settings); + g_free (data); g_signal_connect (app, "add-browser", G_CALLBACK (addons_app_add_browser_cb), extension); @@ -1576,13 +1866,54 @@ G_CALLBACK (addons_deactivate_cb), app); } +#ifdef G_ENABLE_DEBUG +static void +test_addons_simple_regexp (void) +{ + typedef struct + { + const gchar* before; + const gchar* after; + } RegexItem; + guint i; + + static const RegexItem items[] = { + { "*", "^.*" }, + { "http://", "^http://" }, + { "https://", "^https://" }, + { "about:blank", "^about:blank" }, + { "file://", "^file://" }, + { "ftp://", "^ftp://" }, + { "https://bugzilla.mozilla.org/", "^https://bugzilla\\.mozilla\\.org/" }, + { "http://92.48.103.52/fantasy3/*", "^http://92\\.48\\.103\\.52/fantasy3/.*" }, + { "http://www.rpg.co.uk/fantasy/*", "^http://www\\.rpg\\.co\\.uk/fantasy/.*" }, + { "http://cookpad.com/recipe/*", "^http://cookpad\\.com/recipe/.*" }, + { "https://*/*post_bug.cgi", "^https://.*/.*post_bug\\.cgi" }, + }; + + for (i = 0; i < G_N_ELEMENTS (items); i++) + { + gchar* result = addons_convert_to_simple_regexp (items[i].before); + const gchar* after = items[i].after ? items[i].after : items[i].before; + katze_assert_str_equal (items[i].before, result, after); + g_free (result); + } +} + +void +extension_test (void) +{ + g_test_add_func ("/extensions/addons/simple_regexp", test_addons_simple_regexp); +} +#endif + MidoriExtension* extension_init (void) { MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", _("User addons"), "description", _("Support for userscripts and userstyles"), - "version", "0.1", + "version", "0.1" MIDORI_VERSION_SUFFIX, "authors", "Arno Renevier ", NULL); g_signal_connect (extension, "activate", diff -Nru midori-0.2.8/extensions/colorful-tabs.c midori-0.4.6/extensions/colorful-tabs.c --- midori-0.2.8/extensions/colorful-tabs.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/colorful-tabs.c 2012-05-14 22:13:42.000000000 +0000 @@ -13,14 +13,23 @@ #include static void -colorful_tabs_modify_fg (GtkWidget* child, - GdkColor* color) +colorful_tabs_modify_fg (GtkWidget* label, + GdkColor* color) { - if (GTK_IS_LABEL (child)) + GtkWidget* box = gtk_bin_get_child (GTK_BIN (label)); + GList* children = gtk_container_get_children (GTK_CONTAINER (box)); + for (; children != NULL; children = g_list_next (children)) { - gtk_widget_modify_fg (child, GTK_STATE_ACTIVE, color); - gtk_widget_modify_fg (child, GTK_STATE_NORMAL, color); + if (GTK_IS_LABEL (children->data)) + { + gtk_widget_modify_fg (children->data, GTK_STATE_ACTIVE, color); + gtk_widget_modify_fg (children->data, GTK_STATE_NORMAL, color); + /* Also modify the label itself, for Tab Panel */ + gtk_widget_modify_fg (label, GTK_STATE_NORMAL, color); + break; + } } + g_list_free (children); } static void @@ -28,9 +37,8 @@ GParamSpec* pspec, MidoriExtension* extension) { - GtkWidget* box; GtkWidget* label; - SoupURI* uri; + gchar* hostname; gchar* colorstr; GdkColor color; GdkColor fgcolor; @@ -38,12 +46,12 @@ label = midori_view_get_proxy_tab_label (view); - if ((uri = soup_uri_new (midori_view_get_display_uri (view))) - && uri->host && (katze_object_get_enum (view, "load-status") == MIDORI_LOAD_FINISHED)) + if (!midori_uri_is_blank (midori_view_get_display_uri (view)) + && (hostname = midori_uri_parse_hostname (midori_view_get_display_uri (view), NULL)) + && midori_view_get_icon_uri (view) != NULL) { icon = midori_view_get_icon (view); - - if (midori_view_get_icon_uri (view) != NULL) + if (icon != NULL) { GdkPixbuf* newpix; guchar* pixels; @@ -57,13 +65,13 @@ } else { - gchar* hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri->host, 1); + gchar* hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, hostname, 1); colorstr = g_strndup (hash, 6 + 1); g_free (hash); colorstr[0] = '#'; gdk_color_parse (colorstr, &color); } - soup_uri_free (uri); + g_free (hostname); if ((color.red < 35000) && (color.green < 35000) @@ -82,14 +90,9 @@ else gdk_color_parse ("#000", &fgcolor); - box = gtk_bin_get_child (GTK_BIN (label)); - gtk_event_box_set_visible_window (GTK_EVENT_BOX (label), TRUE); - gtk_container_foreach (GTK_CONTAINER (box), - (GtkCallback) colorful_tabs_modify_fg, - &fgcolor); - + colorful_tabs_modify_fg (label, &fgcolor); gtk_widget_modify_bg (label, GTK_STATE_NORMAL, &color); if (color.red < 10000) @@ -111,9 +114,7 @@ { gtk_widget_modify_bg (label, GTK_STATE_NORMAL, NULL); gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, NULL); - gtk_container_foreach (GTK_CONTAINER (gtk_bin_get_child (GTK_BIN (label))), - (GtkCallback) colorful_tabs_modify_fg, - NULL); + colorful_tabs_modify_fg (label, NULL); } } @@ -153,9 +154,7 @@ 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); - gtk_container_foreach (GTK_CONTAINER (gtk_bin_get_child (GTK_BIN (label))), - (GtkCallback) colorful_tabs_modify_fg, - NULL); + colorful_tabs_modify_fg (label, NULL); g_signal_handlers_disconnect_by_func ( view, colorful_tabs_view_notify_uri_cb, extension); } @@ -201,7 +200,7 @@ MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", _("Colorful Tabs"), "description", _("Tint each tab distinctly"), - "version", "0.5", + "version", "0.5" MIDORI_VERSION_SUFFIX, "authors", "Christian Dywan , Samuel Creshal ", NULL); diff -Nru midori-0.2.8/extensions/cookie-manager/cookie-manager-page.c midori-0.4.6/extensions/cookie-manager/cookie-manager-page.c --- midori-0.2.8/extensions/cookie-manager/cookie-manager-page.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/cookie-manager/cookie-manager-page.c 2012-05-14 22:13:42.000000000 +0000 @@ -9,24 +9,15 @@ See the file COPYING for the full license text. */ -#include #include #include -#include #include #include #include "cookie-manager.h" #include "cookie-manager-page.h" - -typedef struct _CookieManagerPagePrivate CookieManagerPagePrivate; - -#define COOKIE_MANAGER_PAGE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj),\ - COOKIE_MANAGER_PAGE_TYPE, CookieManagerPagePrivate)) - - #define CM_EMPTY_LABEL_TEXT "\n\n\n\n\n\n" @@ -85,13 +76,13 @@ static const gchar *cookie_manager_page_get_stock_id(MidoriViewable *viewable) { - return STOCK_COOKIE_MANAGER; + return GTK_STOCK_DIALOG_AUTHENTICATION; } static void cm_create_toolbar(CookieManagerPage *cmp) { - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + CookieManagerPagePrivate *priv = cmp->priv; GtkWidget *toolbar; GtkToolItem *toolitem; @@ -143,7 +134,8 @@ static GtkWidget *cookie_manager_page_get_toolbar(MidoriViewable *viewable) { - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(viewable); + CookieManagerPage *cmp = COOKIE_MANAGER_PAGE(viewable); + CookieManagerPagePrivate *priv = cmp->priv; return priv->toolbar; } @@ -159,7 +151,7 @@ static void cookie_manager_page_pre_cookies_change_cb(CookieManager *cm, CookieManagerPage *cmp) { - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + CookieManagerPagePrivate *priv = cmp->priv; g_object_ref(priv->filter); gtk_tree_view_set_model(GTK_TREE_VIEW(priv->treeview), NULL); @@ -169,7 +161,7 @@ static void cookie_manager_page_cookies_changed_cb(CookieManager *cm, CookieManagerPage *cmp) { const gchar *filter_text; - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + CookieManagerPagePrivate *priv = cmp->priv; gtk_tree_view_set_model(GTK_TREE_VIEW(priv->treeview), GTK_TREE_MODEL(priv->filter)); g_object_unref(priv->filter); @@ -187,7 +179,7 @@ static void cookie_manager_page_filter_changed_cb(CookieManager *cm, const gchar *text, CookieManagerPage *cmp) { - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + CookieManagerPagePrivate *priv = cmp->priv; priv->ignore_changed_filter = TRUE; gtk_entry_set_text(GTK_ENTRY(priv->filter_entry), text); @@ -197,7 +189,8 @@ static void cookie_manager_page_finalize(GObject *object) { - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(object); + CookieManagerPage *cmp = COOKIE_MANAGER_PAGE(object); + CookieManagerPagePrivate *priv = cmp->priv; gtk_widget_destroy(priv->popup_menu); @@ -215,7 +208,8 @@ static void cookie_manager_page_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(object); + CookieManagerPage *cmp = COOKIE_MANAGER_PAGE(object); + CookieManagerPagePrivate *priv = cmp->priv; switch (prop_id) { case PROP_STORE: @@ -290,7 +284,7 @@ static void cm_set_button_sensitiveness(CookieManagerPage *cmp, gboolean set) { - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + CookieManagerPagePrivate *priv = cmp->priv; gboolean expand_set = (gtk_tree_model_iter_n_children(priv->filter, NULL) > 0); guint i, len; @@ -330,7 +324,7 @@ static void cm_tree_popup_collapse_activate_cb(GtkMenuItem *item, CookieManagerPage *cmp) { - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + CookieManagerPagePrivate *priv = cmp->priv; gtk_tree_view_collapse_all(GTK_TREE_VIEW(priv->treeview)); } @@ -338,7 +332,7 @@ static void cm_tree_popup_expand_activate_cb(GtkMenuItem *item, CookieManagerPage *cmp) { - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + CookieManagerPagePrivate *priv = cmp->priv; gtk_tree_view_expand_all(GTK_TREE_VIEW(priv->treeview)); } @@ -347,7 +341,7 @@ static void cm_store_remove(CookieManagerPage *cmp, GtkTreeIter *iter_model) { GtkTreeIter iter_store; - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + CookieManagerPagePrivate *priv = cmp->priv; gtk_tree_model_filter_convert_iter_to_child_iter( GTK_TREE_MODEL_FILTER(priv->filter), &iter_store, iter_model); @@ -358,7 +352,7 @@ static void cm_delete_cookie(CookieManagerPage *cmp, GtkTreeModel *model, GtkTreeIter *child) { SoupCookie *cookie; - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + CookieManagerPagePrivate *priv = cmp->priv; gtk_tree_model_get(model, child, COOKIE_MANAGER_COL_COOKIE, &cookie, -1); @@ -405,7 +399,7 @@ /* select an item after deletion */ static void cm_select_path(CookieManagerPage *cmp, GtkTreeModel *model, GtkTreePath *path) { - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + CookieManagerPagePrivate *priv = cmp->priv; GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(priv->treeview)); CMPathWalkFunc path_funcs[] = { (CMPathWalkFunc) gtk_tree_path_prev, (CMPathWalkFunc) gtk_tree_path_up, @@ -434,7 +428,7 @@ GtkTreeSelection *selection; GList *rows, *row; GList *refs = NULL; - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + CookieManagerPagePrivate *priv = cmp->priv; selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(priv->treeview)); rows = gtk_tree_selection_get_selected_rows(selection, &model); @@ -530,7 +524,7 @@ static void cm_delete_all_cookies_real(CookieManagerPage *cmp) { - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + CookieManagerPagePrivate *priv = cmp->priv; GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(priv->treeview)); GtkTreeIter iter, iter_store, child; GtkTreePath *path_first, *path; @@ -569,7 +563,7 @@ GtkWidget *dialog; const gchar *filter_text; MidoriBrowser *toplevel = midori_browser_get_for_widget(GTK_WIDGET(button)); - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + CookieManagerPagePrivate *priv = cmp->priv; dialog = gtk_message_dialog_new(GTK_WINDOW(toplevel), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -610,7 +604,7 @@ GtkTreeSelection *selection; GtkTreeModel *model; GList *rows; - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + CookieManagerPagePrivate *priv = cmp->priv; selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(priv->treeview)); rows = gtk_tree_selection_get_selected_rows(selection, &model); @@ -774,7 +768,7 @@ gint i, n; gchar *name; gchar *domain; - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + CookieManagerPagePrivate *priv = cmp->priv; model = GTK_TREE_MODEL(priv->store); if (! gtk_tree_model_get_iter_first(model, &iter)) @@ -813,7 +807,7 @@ static void cm_filter_entry_changed_cb(GtkEditable *editable, CookieManagerPage *cmp) { const gchar *text; - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + CookieManagerPagePrivate *priv = cmp->priv; if (priv->ignore_changed_filter) return; @@ -847,7 +841,7 @@ gboolean delete_possible = TRUE; guint rows_len; SoupCookie *cookie; - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + CookieManagerPagePrivate *priv = cmp->priv; rows = gtk_tree_selection_get_selected_rows(selection, &model); rows_len = cm_list_length(rows); @@ -906,7 +900,7 @@ static void cm_tree_show_popup_menu(GtkWidget *widget, GdkEventButton *event, CookieManagerPage *cmp) { gint button, event_time; - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + CookieManagerPagePrivate *priv = cmp->priv; if (event != NULL) { @@ -933,7 +927,7 @@ static gboolean cm_tree_button_release_event_cb(GtkWidget *widget, GdkEventButton *ev, CookieManagerPage *cmp) { - if (ev->button == 3) + if (MIDORI_EVENT_CONTEXT_MENU(ev)) { cm_tree_show_popup_menu(widget, ev, cmp); return TRUE; @@ -944,7 +938,7 @@ static gboolean cm_tree_key_press_cb(GtkWidget *widget, GdkEventKey *event, CookieManagerPage *cmp) { - if (event->keyval == GDK_Delete && ! + if (event->keyval == GDK_KEY_Delete && ! (event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK))) { cm_delete_item(cmp); @@ -1021,7 +1015,7 @@ GtkWidget *item; GtkWidget *menu; GtkWidget *treeview; - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + CookieManagerPagePrivate *priv = cmp->priv; treeview = priv->treeview = gtk_tree_view_new(); @@ -1108,10 +1102,11 @@ GtkWidget *filter_hbox; GtkWidget *filter_label; GtkWidget *treeview; - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(self); + CookieManagerPagePrivate *priv; - priv->parent = NULL; - priv->store = NULL; + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + COOKIE_MANAGER_PAGE_TYPE, CookieManagerPagePrivate); + priv = self->priv; priv->ignore_changed_filter = FALSE; cm_create_toolbar(self); diff -Nru midori-0.2.8/extensions/cookie-manager/cookie-manager-page.h midori-0.4.6/extensions/cookie-manager/cookie-manager-page.h --- midori-0.2.8/extensions/cookie-manager/cookie-manager-page.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/cookie-manager/cookie-manager-page.h 2012-05-14 22:13:42.000000000 +0000 @@ -26,10 +26,12 @@ typedef struct _CookieManagerPage CookieManagerPage; typedef struct _CookieManagerPageClass CookieManagerPageClass; +typedef struct _CookieManagerPagePrivate CookieManagerPagePrivate; struct _CookieManagerPage { GtkVBox parent; + CookieManagerPagePrivate* priv; }; struct _CookieManagerPageClass diff -Nru midori-0.2.8/extensions/cookie-manager/cookie-manager.c midori-0.4.6/extensions/cookie-manager/cookie-manager.c --- midori-0.2.8/extensions/cookie-manager/cookie-manager.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/cookie-manager/cookie-manager.c 2012-05-14 22:13:42.000000000 +0000 @@ -18,12 +18,10 @@ typedef struct _CookieManagerPrivate CookieManagerPrivate; -#define COOKIE_MANAGER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj),\ - COOKIE_MANAGER_TYPE, CookieManagerPrivate)) - struct _CookieManager { GObject parent; + CookieManagerPrivate* priv; }; struct _CookieManagerClass @@ -114,9 +112,9 @@ } -static void cookie_manager_page_destroy_cb(GtkObject *page, CookieManager *cm) +static void cookie_manager_page_destroy_cb(GObject *page, CookieManager *cm) { - CookieManagerPrivate *priv = COOKIE_MANAGER_GET_PRIVATE(cm); + CookieManagerPrivate *priv = cm->priv; priv->panel_pages = g_slist_remove(priv->panel_pages, page); } @@ -127,7 +125,7 @@ { MidoriPanel *panel; GtkWidget *page; - CookieManagerPrivate *priv = COOKIE_MANAGER_GET_PRIVATE(cm); + CookieManagerPrivate *priv = cm->priv; panel = katze_object_get_object(browser, "panel"); @@ -144,7 +142,7 @@ static void cookie_manager_free_cookie_list(CookieManager *cm) { - CookieManagerPrivate *priv = COOKIE_MANAGER_GET_PRIVATE(cm); + CookieManagerPrivate *priv = cm->priv; if (priv->cookies != NULL) { @@ -165,7 +163,7 @@ GtkTreeIter iter; GtkTreeIter *parent_iter; SoupCookie *cookie; - CookieManagerPrivate *priv = COOKIE_MANAGER_GET_PRIVATE(cm); + CookieManagerPrivate *priv = cm->priv; g_signal_emit(cm, signals[PRE_COOKIES_CHANGE], 0); @@ -213,7 +211,7 @@ static gboolean cookie_manager_delayed_refresh(CookieManager *cm) { - CookieManagerPrivate *priv = COOKIE_MANAGER_GET_PRIVATE(cm); + CookieManagerPrivate *priv = cm->priv; cookie_manager_refresh_store(cm); priv->timer_id = 0; @@ -225,7 +223,7 @@ static void cookie_manager_jar_changed_cb(SoupCookieJar *jar, SoupCookie *old, SoupCookie *new, CookieManager *cm) { - CookieManagerPrivate *priv = COOKIE_MANAGER_GET_PRIVATE(cm); + CookieManagerPrivate *priv = cm->priv; if (priv->ignore_changed_count > 0) { @@ -243,7 +241,7 @@ static void cookie_manager_finalize(GObject *object) { CookieManager *cm = COOKIE_MANAGER(object); - CookieManagerPrivate *priv = COOKIE_MANAGER_GET_PRIVATE(cm); + CookieManagerPrivate *priv = cm->priv; g_signal_handlers_disconnect_by_func(priv->app, cookie_manager_app_add_browser_cb, cm); g_signal_handlers_disconnect_by_func(priv->jar, cookie_manager_jar_changed_cb, cm); @@ -267,11 +265,12 @@ static void cookie_manager_init(CookieManager *self) { - CookieManagerPrivate *priv = COOKIE_MANAGER_GET_PRIVATE(self); + CookieManagerPrivate *priv; SoupSession *session; - priv->filter_text = NULL; - priv->panel_pages = NULL; + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + COOKIE_MANAGER_TYPE, CookieManagerPrivate); + priv = self->priv; /* create the main store */ priv->store = gtk_tree_store_new(COOKIE_MANAGER_N_COLUMNS, G_TYPE_STRING, SOUP_TYPE_COOKIE, G_TYPE_BOOLEAN); @@ -289,7 +288,7 @@ void cookie_manager_update_filter(CookieManager *cm, const gchar *text) { - CookieManagerPrivate *priv = COOKIE_MANAGER_GET_PRIVATE(cm); + CookieManagerPrivate *priv = cm->priv; katze_assign(priv->filter_text, g_strdup(text)); @@ -299,7 +298,7 @@ void cookie_manager_delete_cookie(CookieManager *cm, SoupCookie *cookie) { - CookieManagerPrivate *priv = COOKIE_MANAGER_GET_PRIVATE(cm); + CookieManagerPrivate *priv = cm->priv; if (cookie != NULL) { @@ -320,7 +319,7 @@ cm = g_object_new(COOKIE_MANAGER_TYPE, NULL); - priv = COOKIE_MANAGER_GET_PRIVATE(cm); + priv = cm->priv; priv->app = app; priv->extension = extension; diff -Nru midori-0.2.8/extensions/cookie-manager/main.c midori-0.4.6/extensions/cookie-manager/main.c --- midori-0.2.8/extensions/cookie-manager/main.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/cookie-manager/main.c 2012-05-14 22:13:42.000000000 +0000 @@ -31,31 +31,10 @@ MidoriExtension *extension_init(void) { - MidoriExtension *extension; - GtkIconFactory *factory; - GtkIconSource *icon_source; - GtkIconSet *icon_set; - static GtkStockItem items[] = - { - { STOCK_COOKIE_MANAGER, N_("_Cookie Manager"), 0, 0, NULL } - }; - - factory = gtk_icon_factory_new(); - gtk_stock_add(items, G_N_ELEMENTS(items)); - icon_set = gtk_icon_set_new(); - icon_source = gtk_icon_source_new(); - gtk_icon_source_set_icon_name(icon_source, GTK_STOCK_DIALOG_AUTHENTICATION); - gtk_icon_set_add_source(icon_set, icon_source); - gtk_icon_source_free(icon_source); - gtk_icon_factory_add(factory, STOCK_COOKIE_MANAGER, icon_set); - gtk_icon_set_unref(icon_set); - gtk_icon_factory_add_default(factory); - g_object_unref(factory); - - extension = g_object_new(MIDORI_TYPE_EXTENSION, + MidoriExtension *extension = g_object_new(MIDORI_TYPE_EXTENSION, "name", _("Cookie Manager"), "description", _("List, view and delete cookies"), - "version", "0.2", + "version", "0.2" MIDORI_VERSION_SUFFIX, "authors", "Enrico Tröger ", NULL); diff -Nru midori-0.2.8/extensions/copy-tabs.c midori-0.4.6/extensions/copy-tabs.c --- midori-0.2.8/extensions/copy-tabs.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/copy-tabs.c 2012-05-14 22:13:42.000000000 +0000 @@ -10,25 +10,24 @@ */ #include -#include static void copy_tabs_apply_cb (GtkWidget* menuitem, MidoriBrowser* browser) { - guint i = 0; - GtkWidget* view; - gchar* text = g_strdup (""); + GList* children; + GString* text = g_string_sized_new (256); GtkClipboard* clipboard = gtk_widget_get_clipboard (menuitem, GDK_SELECTION_CLIPBOARD); - while ((view = midori_browser_get_nth_tab (browser, i++))) + children = midori_browser_get_tabs (MIDORI_BROWSER (browser)); + for (; children; children = g_list_next (children)) { - gchar* new_text = g_strconcat (text, - midori_view_get_display_uri (MIDORI_VIEW (view)), "\n", NULL); - katze_assign (text, new_text); + g_string_append (text, midori_view_get_display_uri (children->data)); + g_string_append_c (text, '\n'); } - gtk_clipboard_set_text (clipboard, text, -1); + gtk_clipboard_set_text (clipboard, text->str, -1); + g_string_free (text, TRUE); } static void @@ -95,7 +94,7 @@ MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", _("Copy Addresses of Tabs"), "description", _("Copy the addresses of all tabs to the clipboard"), - "version", "0.1", + "version", "0.1" MIDORI_VERSION_SUFFIX, "authors", "MonkeyOfDoom ", NULL); diff -Nru midori-0.2.8/extensions/external-applications.vala midori-0.4.6/extensions/external-applications.vala --- midori-0.2.8/extensions/external-applications.vala 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/external-applications.vala 1970-01-01 00:00:00.000000000 +0000 @@ -1,105 +0,0 @@ -/* - Copyright (C) 2010 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. -*/ - -using Gtk; -using WebKit; -using Midori; - -public class ExternalApplications : Midori.Extension { - Dialog? dialog; - bool launch (string command, string uri) { - try { - var info = GLib.AppInfo.create_from_commandline (command, "", 0); - var uris = new List(); - uris.prepend (uri); - info.launch_uris (uris, new GLib.AppLaunchContext ()); - return true; - } - catch (GLib.Error error) { - var error_dialog = new Gtk.MessageDialog (null, 0, - Gtk.MessageType.ERROR, Gtk.ButtonsType.OK, - "Failed to launch external application."); - error_dialog.format_secondary_text (error.message); - error_dialog.response.connect ((dialog, response) - => { dialog.destroy (); }); - error_dialog.show (); - } - return false; - } - bool navigating (WebFrame web_frame, NetworkRequest request, - WebNavigationAction action, WebPolicyDecision decision) { - string uri = request.get_uri (); - if (uri.has_prefix ("ftp://")) { - if (launch ("gftp", uri)) { - decision.ignore (); - return true; - } - } - return false; - } - void tab_added (View tab) { - var web_view = tab.get_web_view (); - web_view.navigation_policy_decision_requested.connect (navigating); - } - void configure_external_applications () { - if (dialog == null) { - dialog = new Dialog.with_buttons ("Configure External Applications", - get_app ().browser, - DialogFlags.DESTROY_WITH_PARENT | DialogFlags.NO_SEPARATOR, - STOCK_CLOSE, ResponseType.CLOSE); - dialog.icon_name = STOCK_PROPERTIES; - dialog.destroy.connect ((dialog) => { dialog = null; }); - dialog.response.connect ((dialog, response) => { dialog.destroy (); }); - dialog.show (); - } - else - dialog.present (); - } - void tool_menu_populated (Menu menu) { - var menuitem = new MenuItem.with_mnemonic ("Configure _External Applications..."); - menuitem.activate.connect (configure_external_applications); - menuitem.show (); - menu.append (menuitem); - } - void browser_added (Browser browser) { - foreach (var tab in browser.get_tabs ()) - tab_added (tab); - browser.add_tab.connect (tab_added); - browser.populate_tool_menu.connect (tool_menu_populated); - } - void activated (Midori.App app) { - foreach (var browser in app.get_browsers ()) - browser_added (browser); - app.add_browser.connect (browser_added); - } - void deactivated () { - var app = get_app (); - app.add_browser.disconnect (browser_added); - foreach (var browser in app.get_browsers ()) { - foreach (var tab in browser.get_tabs ()) - /* */; - browser.populate_tool_menu.disconnect (tool_menu_populated); - } - } - internal ExternalApplications () { - GLib.Object (name: _("External Applications"), - description: _("Associate URL schemes with external commands"), - version: "0.1", - authors: "Christian Dywan "); - activate.connect (activated); - deactivate.connect (deactivated); - } -} - -public Midori.Extension extension_init () { - return new ExternalApplications (); -} - diff -Nru midori-0.2.8/extensions/external-download-manager.vala midori-0.4.6/extensions/external-download-manager.vala --- midori-0.2.8/extensions/external-download-manager.vala 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/extensions/external-download-manager.vala 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,219 @@ +/* + Copyright (C) 2012 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. +*/ + +using Gtk; +using Soup; +using Katze; +using Midori; +using WebKit; + +namespace EDM { + [DBus (name = "net.launchpad.steadyflow.App")] + interface SteadyflowInterface : GLib.Object { + public abstract void AddFile (string url) throws IOError; + } + + private class DownloadRequest : GLib.Object { + public string uri; + public string auth; + public string referer; + public string? cookie_header; + } + + internal Manager manager; + + private class Manager : GLib.Object { + private CookieJar cookie_jar; + private GLib.PtrArray download_managers = new GLib.PtrArray (); + + public bool download_requested (Midori.View view, WebKit.Download download) { + if (download.get_data ("save-as-download") == null + && download.get_data ("open-download") == null + && download.get_data ("cancel-download") == null) { + var dlReq = new DownloadRequest (); + dlReq.uri = download.get_uri (); + + var request = download.get_network_request (); + var message = request.get_message (); + weak MessageHeaders headers = message.request_headers; + + dlReq.auth = headers.get ("Authorization"); + dlReq.referer = headers.get ("Referer"); + dlReq.cookie_header = this.cookie_jar.get_cookies (new Soup.URI (dlReq.uri), true); + + for (var i = 0 ; i < download_managers.len; i++) { + var dm = download_managers.index (i) as ExternalDownloadManager; + if (dm.download (dlReq)) + return true; + } + } + return false; + } + + public void tab_added (Midori.Browser browser, Midori.View view) { + view.download_requested.connect (download_requested); + } + + public void tab_removed (Midori.Browser browser, Midori.View view) { + view.download_requested.disconnect(download_requested); + } + + public void browser_added (Midori.Browser browser) { + foreach (var tab in browser.get_tabs ()) + tab_added (browser, tab); + browser.add_tab.connect (tab_added); + browser.remove_tab.connect (tab_removed); + } + + public void browser_removed (Midori.Browser browser) { + foreach (var tab in browser.get_tabs ()) + tab_removed (browser, tab); + browser.add_tab.disconnect (tab_added); + browser.remove_tab.disconnect (tab_removed); + } + + public void activated (Midori.Extension extension, Midori.App app) { + this.download_managers.add (extension); + if (this.download_managers.len == 1) { + foreach (var browser in app.get_browsers ()) + browser_added (browser); + app.add_browser.connect (browser_added); + } + } + + public void deactivated (Midori.Extension extension) { + this.download_managers.remove (extension); + if (this.download_managers.len == 0) { + var app = extension.get_app (); + foreach (var browser in app.get_browsers ()) + browser_removed (browser); + app.add_browser.disconnect (browser_added); + } + } + + construct { + var session = WebKit.get_default_session (); + this.cookie_jar = session.get_feature (typeof (CookieJar)) as CookieJar; + } + } + + private abstract class ExternalDownloadManager : Midori.Extension { + public void activated (Midori.App app) { + manager.activated (this, app); + } + + public void deactivated () { + manager.deactivated (this); + } + + public void handle_exception (GLib.Error error) { + string ext_name; + this.get ("name",out ext_name); + var dialog = new MessageDialog (null, DialogFlags.MODAL, + MessageType.ERROR, ButtonsType.CLOSE, + _("An error occurred when attempting to download a file with the following plugin:\n" + + "%s\n\n" + + "Error:\n%s\n\n" + + "Carry on without this plugin." + ), + ext_name, error.message); + dialog.response.connect ((a) => { dialog.destroy (); }); + dialog.run (); + } + + public abstract bool download (DownloadRequest dlReq); + } + + private class Aria2 : ExternalDownloadManager { + public override bool download (DownloadRequest dlReq) { + var url = value_array_new (); + value_array_insert (url, 0, typeof (string), dlReq.uri); + + GLib.HashTable options = value_hash_new (); + var referer = new GLib.Value (typeof (string)); + referer.set_string (dlReq.referer); + options.insert ("referer", referer); + + var headers = value_array_new (); + if (dlReq.cookie_header != null) { + value_array_insert (headers, 0, typeof (string), "Cookie: %s".printf(dlReq.cookie_header)); + } + + if (headers.n_values > 0) + options.insert ("header", headers); + + var message = XMLRPC.request_new ("http://127.0.0.1:6800/rpc", + "aria2.addUri", + typeof (ValueArray), url, + typeof(HashTable), options); + var session = new SessionSync (); + session.send_message (message); + + try { + Value v; + XMLRPC.parse_method_response ((string) message.response_body.flatten ().data, -1, out v); + return true; + } catch (Error e) { + this.handle_exception (e); + } + + return false; + } + + internal Aria2 () { + GLib.Object (name: _("External Download Manager - Aria2"), + description: _("Download files with Aria2"), + version: "0.1" + Midori.VERSION_SUFFIX, + authors: "André Stösel ", + key: "aria2"); + + this.activate.connect (activated); + this.deactivate.connect (deactivated); + } + } + + private class SteadyFlow : ExternalDownloadManager { + public override bool download (DownloadRequest dlReq) { + try { + SteadyflowInterface dm = Bus.get_proxy_sync ( + BusType.SESSION, + "net.launchpad.steadyflow.App", + "/net/launchpad/steadyflow/app"); + dm.AddFile (dlReq.uri); + return true; + } catch (Error e) { + this.handle_exception (e); + } + return false; + } + + internal SteadyFlow () { + GLib.Object (name: _("External Download Manager - SteadyFlow"), + description: _("Download files with SteadyFlow"), + version: "0.1" + Midori.VERSION_SUFFIX, + authors: "André Stösel ", + key: "steadyflow"); + + this.activate.connect (activated); + this.deactivate.connect (deactivated); + } + } +} + +public Katze.Array extension_init () { + EDM.manager = new EDM.Manager(); + + var extensions = new Katze.Array( typeof (Midori.Extension)); + extensions.add_item (new EDM.Aria2 ()); + extensions.add_item (new EDM.SteadyFlow ()); + return extensions; +} + diff -Nru midori-0.2.8/extensions/feed-panel/feed-panel.c midori-0.4.6/extensions/feed-panel/feed-panel.c --- midori-0.2.8/extensions/feed-panel/feed-panel.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/feed-panel/feed-panel.c 2012-05-14 22:13:42.000000000 +0000 @@ -12,13 +12,8 @@ #include "feed-panel.h" #include -#include #include -#if HAVE_CONFIG_H - #include -#endif - #define STOCK_FEED_PANEL "feed-panel" struct _FeedPanel @@ -334,15 +329,11 @@ MidoriWebSettings* settings; MidoriBrowser* browser; gint n; - browser = midori_browser_get_for_widget (GTK_WIDGET (panel)); n = midori_browser_add_item (browser, item); - - settings = katze_object_get_object (browser, "settings"); + settings = midori_browser_get_settings (browser); if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) midori_browser_set_current_page (browser, n); - g_object_unref (settings); - } g_object_unref (item); } @@ -434,11 +425,8 @@ gpointer callback, FeedPanel* panel) { - const gchar* uri; GtkWidget* menuitem; - uri = katze_item_get_uri (item); - menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); if (label) gtk_label_set_text_with_mnemonic (GTK_LABEL (gtk_bin_get_child ( @@ -485,11 +473,9 @@ browser = midori_browser_get_for_widget (GTK_WIDGET (panel)); n = midori_browser_add_item (browser, item); - - settings = katze_object_get_object (browser, "settings"); + settings = midori_browser_get_settings (browser); if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) midori_browser_set_current_page (browser, n); - g_object_unref (settings); } } @@ -584,10 +570,9 @@ browser = midori_browser_get_for_widget (GTK_WIDGET (panel)); n = midori_browser_add_item (browser, item); - settings = katze_object_get_object (browser, "settings"); + settings = midori_browser_get_settings (browser); if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) midori_browser_set_current_page (browser, n); - g_object_unref (settings); } } else @@ -632,7 +617,7 @@ GdkEventButton* event) { /* Disable the popup menu */ - return (event->button == 3); + return MIDORI_EVENT_CONTEXT_MENU (event); } static gboolean @@ -854,7 +839,12 @@ gtk_widget_show (treeview); webview = webkit_web_view_new (); +#if GTK_CHECK_VERSION(3,0,0) + font_desc = (PangoFontDescription*)gtk_style_context_get_font ( + gtk_widget_get_style_context (treeview), GTK_STATE_FLAG_NORMAL); +#else font_desc = treeview->style->font_desc; +#endif family = pango_font_description_get_family (font_desc); size = pango_font_description_get_size (font_desc) / PANGO_SCALE; settings = webkit_web_settings_new (); diff -Nru midori-0.2.8/extensions/feed-panel/main.c midori-0.4.6/extensions/feed-panel/main.c --- midori-0.2.8/extensions/feed-panel/main.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/feed-panel/main.c 2012-05-14 22:13:42.000000000 +0000 @@ -369,7 +369,7 @@ NULL); gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_ADD); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); + gtk_container_set_border_width (GTK_CONTAINER(gtk_dialog_get_content_area( GTK_DIALOG (dialog))), 5); sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); hbox = gtk_hbox_new (FALSE, 8); @@ -381,7 +381,7 @@ gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); gtk_entry_set_text (GTK_ENTRY (entry), ""); gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_container_add (GTK_CONTAINER(gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox); gtk_widget_show_all (hbox); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); @@ -517,7 +517,7 @@ extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", _("Feed Panel"), "description", _("Read Atom/ RSS feeds"), - "version", "0.1", + "version", "0.1" MIDORI_VERSION_SUFFIX, "authors", "Dale Whittaker ", NULL); diff -Nru midori-0.2.8/extensions/formhistory/formhistory-frontend.h midori-0.4.6/extensions/formhistory/formhistory-frontend.h --- midori-0.2.8/extensions/formhistory/formhistory-frontend.h 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/extensions/formhistory/formhistory-frontend.h 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,74 @@ +/* + Copyright (C) 2009-2012 Alexander Butenko + Copyright (C) 2009-2012 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. +*/ + +#ifndef __FORMHISTORY_FRONTEND_H__ +#define __FORMHISTORY_FRONTEND_H__ +#include +#include + +#include "config.h" +#if HAVE_UNISTD_H + #include +#endif + +#if WEBKIT_CHECK_VERSION (1, 3, 1) + #define FORMHISTORY_USE_GDOM 1 +#else + #define FORMHISTORY_USE_JS 1 +#endif +#define MAXPASSSIZE 64 + +typedef struct +{ + sqlite3* db; + #ifdef FORMHISTORY_USE_GDOM + WebKitDOMElement* element; + int completion_timeout; + GtkTreeModel* completion_model; + GtkWidget* treeview; + GtkWidget* popup; + gchar* oldkeyword; + glong selection_index; + #else + gchar* jsforms; + #endif + gchar* master_password; + int master_password_canceled; +} FormHistoryPriv; + +typedef struct +{ + gchar* domain; + gchar* form_data; + FormHistoryPriv* priv; +} FormhistoryPasswordEntry; + +FormHistoryPriv* +formhistory_private_new (); + +void +formhistory_private_destroy (FormHistoryPriv *priv); + +gboolean +formhistory_construct_popup_gui (FormHistoryPriv* priv); + +void +formhistory_setup_suggestions (WebKitWebView* web_view, + JSContextRef js_context, + MidoriExtension* extension); + +#ifdef FORMHISTORY_USE_GDOM +void +formhistory_suggestions_hide_cb (WebKitDOMElement* element, + WebKitDOMEvent* dom_event, + FormHistoryPriv* priv); +#endif + +#endif diff -Nru midori-0.2.8/extensions/formhistory/formhistory-gdom-frontend.c midori-0.4.6/extensions/formhistory/formhistory-gdom-frontend.c --- midori-0.2.8/extensions/formhistory/formhistory-gdom-frontend.c 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/extensions/formhistory/formhistory-gdom-frontend.c 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,516 @@ +/* + Copyright (C) 2009-2012 Alexander Butenko + Copyright (C) 2009-2012 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. +*/ +#include "formhistory-frontend.h" +#ifdef FORMHISTORY_USE_GDOM +#define COMPLETION_DELAY 200 + +FormHistoryPriv* +formhistory_private_new () +{ + FormHistoryPriv* priv; + + priv = g_slice_new (FormHistoryPriv); + priv->oldkeyword = g_strdup (""); + priv->selection_index = -1; + return priv; +} + +void +formhistory_suggestions_hide_cb (WebKitDOMElement* element, + WebKitDOMEvent* dom_event, + FormHistoryPriv* priv) +{ + if (gtk_widget_get_visible (priv->popup)) + gtk_widget_hide (priv->popup); + priv->selection_index = -1; +} + +static void +formhistory_suggestion_set (GtkTreePath* path, + FormHistoryPriv* priv) +{ + GtkTreeIter iter; + gchar* value; + + if (!gtk_tree_model_get_iter (priv->completion_model, &iter, path)) + return; + + gtk_tree_model_get (priv->completion_model, &iter, 0, &value, -1); + g_object_set (priv->element, "value", value, NULL); + g_free (value); +} + +static gboolean +formhistory_suggestion_selected_cb (GtkWidget* treeview, + GdkEventButton* event, + FormHistoryPriv* priv) + +{ + GtkTreePath* path; + + if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (treeview), + event->x, event->y, &path, NULL, NULL, NULL)) + { + formhistory_suggestion_set (path, priv); + formhistory_suggestions_hide_cb (NULL, NULL, priv); + gtk_tree_path_free (path); + return TRUE; + } + return FALSE; +} +static void +formhistory_suggestion_remove (GtkTreePath* path, + FormHistoryPriv* priv) +{ + GtkTreeIter iter; + gchar* sqlcmd; + char* errmsg = NULL; + gchar* name; + gchar* value; + + if (!gtk_tree_model_get_iter (priv->completion_model, &iter, path)) + return; + + if (!priv->db) + return; + + gtk_tree_model_get (priv->completion_model, &iter, 0, &value, -1); + g_object_get (priv->element, "name", &name, NULL); + gtk_list_store_remove (GTK_LIST_STORE (priv->completion_model), &iter); + + sqlcmd = sqlite3_mprintf ("DELETE FROM forms WHERE field = '%q' AND value = '%q'", + name, value); + g_free (name); + g_free (value); + sqlite3_exec (priv->db, sqlcmd, NULL, NULL, &errmsg); + sqlite3_free (sqlcmd); +} + +static void +get_absolute_offset_for_element (WebKitDOMElement* element, + WebKitDOMDocument* element_document, + WebKitDOMNodeList* frames, + glong* x, + glong* y, + gboolean ismainframe) +{ + WebKitDOMElement* offset_parent; + gint offset_top = 0, offset_left = 0; + gulong i; + + g_object_get (element, "offset-left", &offset_left, + "offset-top", &offset_top, + "offset-parent", &offset_parent, + NULL); + *x += offset_left; + *y += offset_top; + /* To avoid deadlock check only first element of the mainframe parent */ + if (ismainframe == TRUE) + return; + if (offset_parent) + goto finish; + + /* Element havent returned any parents. Thats mean or there is no parents or we are inside the frame + Loop over all frames we have to find frame == element_document which is a root for our element + and get its offsets */ + for (i = 0; i < webkit_dom_node_list_get_length (frames); i++) + { + WebKitDOMDocument *fdoc; + WebKitDOMNode *frame = webkit_dom_node_list_item (frames, i); + + if (WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (frame)) + fdoc = webkit_dom_html_iframe_element_get_content_document (WEBKIT_DOM_HTML_IFRAME_ELEMENT (frame)); + else + fdoc = webkit_dom_html_frame_element_get_content_document (WEBKIT_DOM_HTML_FRAME_ELEMENT (frame)); + if (fdoc == element_document) + { + offset_parent = WEBKIT_DOM_ELEMENT (frame); + ismainframe = TRUE; + /* Add extra 4px to ~cover size of borders */ + *y += 4; + break; + } + } +finish: + if (offset_parent) + get_absolute_offset_for_element (offset_parent, element_document, frames, x, y, ismainframe); +} + +static void +formhistory_reposition_popup (FormHistoryPriv* priv) +{ + WebKitDOMDocument* element_document; + WebKitDOMNodeList* frames; + GtkWidget* view; + GdkWindow* window; + GtkWidget* toplevel; + gint rx, ry; + gint wx, wy; + glong x = 0, y = 0; + glong height; + + view = g_object_get_data (G_OBJECT (priv->element), "webview"); + toplevel = gtk_widget_get_toplevel (view); + /* Position of a root window */ + window = gtk_widget_get_window (toplevel); + gdk_window_get_position (window, &rx, &ry); + + /* Postion of webview in root window */ + window = gtk_widget_get_window (view); + gdk_window_get_position (window, &wx, &wy); + + /* Position of editbox on the webview */ + frames = g_object_get_data (G_OBJECT (priv->element), "framelist"); + element_document = g_object_get_data (G_OBJECT (priv->element), "doc"); + get_absolute_offset_for_element (priv->element, element_document, frames, &x, &y, FALSE); + /* Add height as menu should start under editbox, now on top of it */ + g_object_get (priv->element, "client-height", &height, NULL); + y += height + 1; + gtk_window_move (GTK_WINDOW (priv->popup), rx + wx + x, ry +wy + y); + + /* Window configuration */ + gtk_window_set_screen (GTK_WINDOW (priv->popup), gtk_widget_get_screen (view)); + gtk_window_set_transient_for (GTK_WINDOW (priv->popup), GTK_WINDOW (toplevel)); + gtk_tree_view_columns_autosize (GTK_TREE_VIEW (priv->treeview)); + /* FIXME: Adjust size according to treeview width and some reasonable height */ + gtk_window_resize (GTK_WINDOW (priv->popup), 50, 80); +} + +static gboolean +formhistory_suggestions_show (FormHistoryPriv* priv) +{ + GtkListStore* store; + static sqlite3_stmt* stmt; + gchar* value, * name; + const char* sqlcmd; + gint result; + gchar* likedvalue; + int pos = 0; + + g_return_val_if_fail (priv->element, FALSE); + + g_object_get (priv->element, + "name", &name, + "value", &value, + NULL); + + katze_assign (priv->oldkeyword, g_strdup (value)); + if (!priv->popup) + formhistory_construct_popup_gui (priv); + + if (!stmt) + { + if (!priv->db) + goto free_data; + + sqlcmd = "SELECT DISTINCT value FROM forms WHERE field = ?1 and value like ?2"; + sqlite3_prepare_v2 (priv->db, sqlcmd, strlen (sqlcmd) + 1, &stmt, NULL); + } + + likedvalue = g_strdup_printf ("%s%%", value); + sqlite3_bind_text (stmt, 1, name, -1, NULL); + sqlite3_bind_text (stmt, 2, likedvalue, -1, g_free); + result = sqlite3_step (stmt); + + if (result != SQLITE_ROW) + { + if (result == SQLITE_ERROR) + g_print (_("Failed to select suggestions\n")); + sqlite3_reset (stmt); + sqlite3_clear_bindings (stmt); + formhistory_suggestions_hide_cb (NULL, NULL, priv); + goto free_data; + } + + store = GTK_LIST_STORE (priv->completion_model); + gtk_list_store_clear (store); + + while (result == SQLITE_ROW) + { + const unsigned char* text = sqlite3_column_text (stmt, 0); + pos++; + gtk_list_store_insert_with_values (store, NULL, pos, 0, text, -1); + result = sqlite3_step (stmt); + } + sqlite3_reset (stmt); + sqlite3_clear_bindings (stmt); + + if (!gtk_widget_get_visible (priv->popup)) + { + formhistory_reposition_popup (priv); + gtk_widget_show_all (priv->popup); + } + +free_data: + g_free (name); + g_free (value); + return FALSE; +} + +static void +formhistory_editbox_key_pressed_cb (WebKitDOMElement* element, + WebKitDOMEvent* dom_event, + FormHistoryPriv* priv) +{ + glong key; + GtkTreePath* path; + gchar* keyword; + gint matches; + + /* FIXME: Priv is still set after module is disabled */ + g_return_if_fail (priv); + g_return_if_fail (element); + + if (priv->completion_timeout > 0) + g_source_remove (priv->completion_timeout); + + katze_object_assign (priv->element, g_object_ref (element)); + + key = webkit_dom_ui_event_get_key_code (WEBKIT_DOM_UI_EVENT (dom_event)); + switch (key) + { + /* ESC key*/ + case 27: + case 35: + case 36: + /* Left key*/ + case 37: + /* Right key*/ + case 39: + /* Enter key*/ + case 13: + if (key == 27) + g_object_set (element, "value", priv->oldkeyword, NULL); + formhistory_suggestions_hide_cb (element, dom_event, priv); + return; + break; + /* Del key */ + case 46: + /* Up key */ + case 38: + /* Down key */ + case 40: + + if (!gtk_widget_get_visible (priv->popup)) + { + formhistory_suggestions_show (priv); + return; + } + matches = gtk_tree_model_iter_n_children (priv->completion_model, NULL); + if (key == 38) + { + if (priv->selection_index <= 0) + priv->selection_index = matches - 1; + else + priv->selection_index = MAX (priv->selection_index - 1, 0); + } + else if (key == 40) + { + if (priv->selection_index == matches - 1) + priv->selection_index = 0; + else + priv->selection_index = MIN (priv->selection_index + 1, matches -1); + } + if (priv->selection_index == -1) + { + /* No element is selected */ + return; + } + + path = gtk_tree_path_new_from_indices (priv->selection_index, -1); + if (key == 46) + { + g_object_set (element, "value", priv->oldkeyword, NULL); + formhistory_suggestion_remove (path, priv); + matches--; + } + + if (matches == 0) + formhistory_suggestions_hide_cb (element, dom_event, priv); + else + { + gtk_tree_view_set_cursor (GTK_TREE_VIEW (priv->treeview), path, NULL, FALSE); + formhistory_suggestion_set (path, priv); + } + gtk_tree_path_free (path); + return; + break; + /* PgUp, PgDn, Ins */ + case 33: + case 34: + case 45: + /* Shift, Ctrl, Alt, Tab, Caps Lock*/ + case 16: + case 17: + case 18: + case 20: + case 9: + return; + break; + } + + g_object_get (element, "value", &keyword, NULL); + if (!(keyword && *keyword && *keyword != ' ')) + { + formhistory_suggestions_hide_cb (element, dom_event, priv); + goto free_data; + } + + /* If the same keyword is submitted there's no need to regenerate suggestions */ + if (gtk_widget_get_visible (priv->popup) && + !g_strcmp0 (keyword, priv->oldkeyword)) + goto free_data; + priv->completion_timeout = g_timeout_add (COMPLETION_DELAY, + (GSourceFunc)formhistory_suggestions_show, priv); +free_data: + g_free (keyword); +} + +static void +formhistory_DOMContentLoaded_cb (WebKitDOMElement* window, + WebKitDOMEvent* dom_event, + FormHistoryPriv* priv) +{ + gulong i; + WebKitDOMDocument* doc; + WebKitDOMNodeList* inputs; + WebKitDOMNodeList* frames; + GtkWidget* web_view; + + if (WEBKIT_DOM_IS_DOCUMENT (window)) + doc = WEBKIT_DOM_DOCUMENT (window); + else + doc = webkit_dom_dom_window_get_document (WEBKIT_DOM_DOM_WINDOW (window)); + inputs = webkit_dom_document_query_selector_all (doc, "input[type='text']", NULL); + frames = g_object_get_data (G_OBJECT (window), "framelist"); + web_view = g_object_get_data (G_OBJECT (window), "webview"); + + for (i = 0; i < webkit_dom_node_list_get_length (inputs); i++) + { + WebKitDOMNode* element = webkit_dom_node_list_item (inputs, i); + #if WEBKIT_CHECK_VERSION (1, 6, 1) + gchar* autocomplete = webkit_dom_html_input_element_get_autocomplete ( + WEBKIT_DOM_HTML_INPUT_ELEMENT (element)); + gboolean off = !g_strcmp0 (autocomplete, "off"); + g_free (autocomplete); + if (off) + continue; + #endif + + g_object_set_data (G_OBJECT (element), "doc", doc); + g_object_set_data (G_OBJECT (element), "webview", web_view); + g_object_set_data (G_OBJECT (element), "framelist", frames); + /* Add dblclick? */ + webkit_dom_event_target_add_event_listener ( + WEBKIT_DOM_EVENT_TARGET (element), "keyup", + G_CALLBACK (formhistory_editbox_key_pressed_cb), false, + priv); + webkit_dom_event_target_add_event_listener ( + WEBKIT_DOM_EVENT_TARGET (element), "blur", + G_CALLBACK (formhistory_suggestions_hide_cb), false, + priv); + } +} + +void +formhistory_setup_suggestions (WebKitWebView* web_view, + JSContextRef js_context, + MidoriExtension* extension) +{ + WebKitDOMDocument* doc; + WebKitDOMNodeList* frames; + gulong i; + + FormHistoryPriv* priv = g_object_get_data (G_OBJECT (extension), "priv"); + doc = webkit_web_view_get_dom_document (web_view); + frames = webkit_dom_document_query_selector_all (doc, "iframe, frame", NULL); + g_object_set_data (G_OBJECT (doc), "framelist", frames); + g_object_set_data (G_OBJECT (doc), "webview", web_view); + /* Connect to DOMContentLoaded of the main frame */ + webkit_dom_event_target_add_event_listener( + WEBKIT_DOM_EVENT_TARGET (doc), "DOMContentLoaded", + G_CALLBACK (formhistory_DOMContentLoaded_cb), false, + priv); + + /* Connect to DOMContentLoaded of frames */ + for (i = 0; i < webkit_dom_node_list_get_length (frames); i++) + { + WebKitDOMDOMWindow* framewin; + + WebKitDOMNode* frame = webkit_dom_node_list_item (frames, i); + if (WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (frame)) + framewin = webkit_dom_html_iframe_element_get_content_window (WEBKIT_DOM_HTML_IFRAME_ELEMENT (frame)); + else + framewin = webkit_dom_html_frame_element_get_content_window (WEBKIT_DOM_HTML_FRAME_ELEMENT (frame)); + g_object_set_data (G_OBJECT (framewin), "framelist", frames); + g_object_set_data (G_OBJECT (framewin), "webview", (GtkWidget*)web_view); + webkit_dom_event_target_add_event_listener ( + WEBKIT_DOM_EVENT_TARGET (framewin), "DOMContentLoaded", + G_CALLBACK (formhistory_DOMContentLoaded_cb), false, + priv); + } + formhistory_suggestions_hide_cb (NULL, NULL, priv); +} + +void +formhistory_private_destroy (FormHistoryPriv *priv) +{ + if (priv->db) + { + sqlite3_close (priv->db); + priv->db = NULL; + } + katze_assign (priv->oldkeyword, NULL); + gtk_widget_destroy (priv->popup); + priv->popup = NULL; + katze_object_assign (priv->element, NULL); + g_slice_free (FormHistoryPriv, priv); +} + +gboolean +formhistory_construct_popup_gui (FormHistoryPriv* priv) +{ + GtkTreeModel* model = NULL; + GtkWidget* popup; + GtkWidget* popup_frame; + GtkWidget* scrolled; + GtkWidget* treeview; + GtkCellRenderer* renderer; + GtkTreeViewColumn* column; + + model = (GtkTreeModel*) gtk_list_store_new (1, G_TYPE_STRING); + priv->completion_model = model; + popup = gtk_window_new (GTK_WINDOW_POPUP); + gtk_window_set_type_hint (GTK_WINDOW (popup), GDK_WINDOW_TYPE_HINT_COMBO); + popup_frame = gtk_frame_new (NULL); + gtk_frame_set_shadow_type (GTK_FRAME (popup_frame), GTK_SHADOW_ETCHED_IN); + gtk_container_add (GTK_CONTAINER (popup), popup_frame); + scrolled = g_object_new (GTK_TYPE_SCROLLED_WINDOW, + "hscrollbar-policy", GTK_POLICY_NEVER, + "vscrollbar-policy", GTK_POLICY_AUTOMATIC, NULL); + gtk_container_add (GTK_CONTAINER (popup_frame), scrolled); + treeview = gtk_tree_view_new_with_model (model); + priv->treeview = treeview; + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); + gtk_tree_view_set_hover_selection (GTK_TREE_VIEW (treeview), TRUE); + gtk_container_add (GTK_CONTAINER (scrolled), treeview); + gtk_widget_set_size_request (gtk_scrolled_window_get_vscrollbar ( + GTK_SCROLLED_WINDOW (scrolled)), -1, 0); + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("suggestions", renderer, "text", 0, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); + priv->popup = popup; + + g_signal_connect (treeview, "button-press-event", + G_CALLBACK (formhistory_suggestion_selected_cb), priv); + return TRUE; +} +#endif diff -Nru midori-0.2.8/extensions/formhistory/formhistory-js-frontend.c midori-0.4.6/extensions/formhistory/formhistory-js-frontend.c --- midori-0.2.8/extensions/formhistory/formhistory-js-frontend.c 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/extensions/formhistory/formhistory-js-frontend.c 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,143 @@ +/* + Copyright (C) 2009-2012 Alexander Butenko + Copyright (C) 2009-2012 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. +*/ +#include "formhistory-frontend.h" +#ifdef FORMHISTORY_USE_JS + +FormHistoryPriv* +formhistory_private_new () +{ + FormHistoryPriv* priv; + + priv = g_slice_new (FormHistoryPriv); + return priv; +} + +gboolean +formhistory_construct_popup_gui (FormHistoryPriv* priv) +{ + gchar* autosuggest; + gchar* style; + guint i; + gchar* file; + + file = sokoke_find_data_filename ("autosuggestcontrol.js", TRUE); + if (!g_file_get_contents (file, &autosuggest, NULL, NULL)) + { + g_free (file); + return FALSE; + } + g_strchomp (autosuggest); + + katze_assign (file, sokoke_find_data_filename ("autosuggestcontrol.css", TRUE)); + if (!g_file_get_contents (file, &style, NULL, NULL)) + { + g_free (file); + return FALSE; + } + g_strchomp (style); + g_free (file); + + i = 0; + while (style[i]) + { + if (style[i] == '\n') + style[i] = ' '; + i++; + } + + priv->jsforms = g_strdup_printf ( + "%s" + "window.addEventListener ('DOMContentLoaded'," + "function () {" + " if (document.getElementById('formhistory'))" + " return;" + " if (!initSuggestions ())" + " return;" + " var mystyle = document.createElement('style');" + " mystyle.setAttribute('type', 'text/css');" + " mystyle.setAttribute('id', 'formhistory');" + " mystyle.appendChild(document.createTextNode('%s'));" + " var head = document.getElementsByTagName('head')[0];" + " if (head) head.appendChild(mystyle);" + "}, true);", + autosuggest, + style); + g_strstrip (priv->jsforms); + g_free (style); + g_free (autosuggest); + return TRUE; +} + +void +formhistory_setup_suggestions (WebKitWebView* web_view, + JSContextRef js_context, + MidoriExtension* extension) +{ + GString* suggestions; + FormHistoryPriv* priv; + static sqlite3_stmt* stmt; + const char* sqlcmd; + const unsigned char* key; + const unsigned char* value; + + gint result, pos; + + priv = g_object_get_data (G_OBJECT (extension), "priv"); + if (!priv->db) + return; + + if (!stmt) + { + sqlcmd = "SELECT DISTINCT group_concat(value,'\",\"'), field FROM forms \ + GROUP BY field ORDER BY field"; + sqlite3_prepare_v2 (priv->db, sqlcmd, strlen (sqlcmd) + 1, &stmt, NULL); + } + result = sqlite3_step (stmt); + if (result != SQLITE_ROW) + { + if (result == SQLITE_ERROR) + g_print (_("Failed to select suggestions\n")); + sqlite3_reset (stmt); + return; + } + suggestions = g_string_new ( + "function FormSuggestions(eid) { " + "arr = new Array();"); + + while (result == SQLITE_ROW) + { + pos++; + value = sqlite3_column_text (stmt, 0); + key = sqlite3_column_text (stmt, 1); + if (value) + { + g_string_append_printf (suggestions, " arr[\"%s\"] = [\"%s\"]; ", + (gchar*)key, (gchar*)value); + } + result = sqlite3_step (stmt); + } + g_string_append (suggestions, "this.suggestions = arr[eid]; }"); + g_string_append (suggestions, priv->jsforms); + sokoke_js_script_eval (js_context, suggestions->str, NULL); + g_string_free (suggestions, TRUE); +} + +void +formhistory_private_destroy (FormHistoryPriv *priv) +{ + if (priv->db) + { + sqlite3_close (priv->db); + priv->db = NULL; + } + katze_assign (priv->jsforms, NULL); + g_slice_free (FormHistoryPriv, priv); +} +#endif diff -Nru midori-0.2.8/extensions/formhistory/formhistory.c midori-0.4.6/extensions/formhistory/formhistory.c --- midori-0.2.8/extensions/formhistory/formhistory.c 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/extensions/formhistory/formhistory.c 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,681 @@ +/* + Copyright (C) 2009-2012 Alexander Butenko + Copyright (C) 2009-2012 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. +*/ +#define MAXCHARS 60 +#define MINCHARS 2 +#define GTK_RESPONSE_IGNORE 99 +#include "formhistory-frontend.h" + +static void +formhistory_toggle_state_cb (GtkAction* action, + MidoriBrowser* browser); + +static void +formhistory_update_database (gpointer db, + const gchar* host, + const gchar* key, + const gchar* value) +{ + gchar* sqlcmd; + gchar* errmsg; + gint success; + + if (!(value && *value)) + return; + + sqlcmd = sqlite3_mprintf ("INSERT INTO forms VALUES" + "('%q', '%q', '%q')", + host, key, value); + success = sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg); + sqlite3_free (sqlcmd); + if (success != SQLITE_OK) + { + g_printerr (_("Failed to add form value: %s\n"), errmsg); + g_free (errmsg); + return; + } +} + +static gchar* +formhistory_get_login_data (gpointer db, + const gchar* domain) +{ + static sqlite3_stmt* stmt; + const char* sqlcmd; + gint result; + gchar* value = NULL; + + if (!stmt) + { + sqlcmd = "SELECT value FROM forms WHERE domain = ?1 and field = 'MidoriPasswordManager' limit 1"; + sqlite3_prepare_v2 (db, sqlcmd, strlen (sqlcmd) + 1, &stmt, NULL); + } + sqlite3_bind_text (stmt, 1, domain, -1, NULL); + result = sqlite3_step (stmt); + if (result == SQLITE_ROW) + value = g_strdup ((gchar*)sqlite3_column_text (stmt, 0)); + sqlite3_reset (stmt); + sqlite3_clear_bindings (stmt); + return value; +} + +static gboolean +formhistory_check_master_password (GtkWidget* parent, + FormHistoryPriv* priv) +{ + GtkWidget* dialog; + GtkWidget* content_area; + GtkWidget* hbox; + GtkWidget* image; + GtkWidget* label; + GtkWidget* entry; + const gchar* title; + static int alive; + gboolean ret = FALSE; + + /* Password is set */ + if (priv->master_password && *priv->master_password) + return TRUE; + + /* Other prompt is active */ + if (alive == 1) + return FALSE; + + /* Prompt was cancelled */ + if (priv->master_password_canceled == 1) + return FALSE; + + alive = 1; + title = _("Form history"); + dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (parent), + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, GTK_RESPONSE_OK, + NULL); + content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); + gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_DIALOG_AUTHENTICATION); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); + gtk_container_set_border_width (GTK_CONTAINER (content_area), 5); + + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, + GTK_ICON_SIZE_DIALOG); + gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); + + label = gtk_label_new (_("Master password required\n" + "to open password database")); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (content_area), hbox); + + entry = gtk_entry_new (); + g_object_set (entry, "truncate-multiline", TRUE, NULL); + gtk_entry_set_visibility(GTK_ENTRY (entry),FALSE); + gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); + gtk_container_add (GTK_CONTAINER (content_area), entry); + + gtk_widget_show_all (entry); + gtk_widget_show_all (hbox); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) + { + /* FIXME: add password verification */ + katze_assign (priv->master_password, + g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)))); + ret = TRUE; + } + else + priv->master_password_canceled = 1; + + gtk_widget_destroy (dialog); + alive = 0; + + return ret; +} + +static gchar* +formhistory_encrypt (const gchar* data, + const gchar* password) +{ + /* TODO: Implement persistent storage/ keyring support */ + return NULL; +} + +static void +formhistory_remember_password_response (GtkWidget* infobar, + gint response_id, + FormhistoryPasswordEntry* entry) +{ + gchar* encrypted_form; + + if (response_id == GTK_RESPONSE_IGNORE) + goto cleanup; + + if (formhistory_check_master_password (NULL, entry->priv)) + { + if (response_id != GTK_RESPONSE_ACCEPT) + katze_assign (entry->form_data, g_strdup ("never")); + + if ((encrypted_form = formhistory_encrypt (entry->form_data, + entry->priv->master_password))) + formhistory_update_database (entry->priv->db, entry->domain, "MidoriPasswordManager", encrypted_form); + g_free (encrypted_form); + } + +cleanup: + g_free (entry->form_data); + g_free (entry->domain); + g_slice_free (FormhistoryPasswordEntry, entry); + gtk_widget_destroy (infobar); +} + +static gboolean +formhistory_navigation_decision_cb (WebKitWebView* web_view, + WebKitWebFrame* web_frame, + WebKitNetworkRequest* request, + WebKitWebNavigationAction* action, + WebKitWebPolicyDecision* decision, + MidoriExtension* extension) +{ + FormHistoryPriv* priv; + JSContextRef js_context; + gchar* value; + + /* 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 (var i = 0; i < inputs.length; i++) {" + " if (inputs[i].getAttribute('autocomplete') == 'off' && " + " inputs[i].type == 'text')" + " continue;" + " if (inputs[i].value && (inputs[i].type == 'text' || inputs[i].type == 'password')) {" + " var ename = inputs[i].getAttribute('name');" + " var eid = inputs[i].getAttribute('id');" + " if (!eid && ename)" + " eid=ename;" + " out += eid+'|,|'+inputs[i].value +'|,|'+inputs[i].type +'|||';" + " }" + " }" + " return out;" + "}" + "dumpForm (document.getElementsByTagName('input'))"; + + if (webkit_web_navigation_action_get_reason (action) != WEBKIT_WEB_NAVIGATION_REASON_FORM_SUBMITTED) + return FALSE; + + priv = g_object_get_data (G_OBJECT (extension), "priv"); + js_context = webkit_web_frame_get_global_context (web_frame); + value = sokoke_js_script_eval (js_context, script, NULL); + +#ifdef FORMHISTORY_USE_GDOM + formhistory_suggestions_hide_cb (NULL, NULL, priv); +#endif + if (value && *value) + { + gchar** inputs = g_strsplit (value, "|||", 0); + guint i = 0; + while (inputs[i] != NULL) + { + gchar** parts = g_strsplit (inputs[i], "|,|", 3); + if (parts && parts[0] && parts[1] && parts[2]) + { + if (strcmp (parts[2], "password")) + formhistory_update_database (priv->db, NULL, parts[0], parts[1]); + #if WEBKIT_CHECK_VERSION (1, 3, 8) + else + { + gchar* data; + gchar* domain; + #if 0 + FormhistoryPasswordEntry* entry; + #endif + + domain = midori_uri_parse_hostname (webkit_web_frame_get_uri (web_frame), NULL); + data = formhistory_get_login_data (priv->db, domain); + if (data) + { + g_free (data); + g_free (domain); + break; + } + #if 0 + entry = g_slice_new (FormhistoryPasswordEntry); + /* Domain and form data are freed from infopanel callback*/ + entry->form_data = g_strdup (value); + entry->domain = domain; + entry->priv = priv; + g_object_set_data (G_OBJECT (web_view), "FormHistoryPasswordEntry", entry); + #endif + } + #endif + } + g_strfreev (parts); + i++; + } + g_strfreev (inputs); + g_free (value); + } + return FALSE; +} + +static void +formhistory_window_object_cleared_cb (WebKitWebView* web_view, + WebKitWebFrame* web_frame, + JSContextRef js_context, + JSObjectRef js_window, + MidoriExtension* extension) +{ + const gchar* page_uri; + FormhistoryPasswordEntry* entry; + GtkWidget* view; + + page_uri = webkit_web_frame_get_uri (web_frame); + if (!page_uri) + return; + + if (!midori_uri_is_http (page_uri) && !g_str_has_prefix (page_uri, "file")) + return; + + formhistory_setup_suggestions (web_view, js_context, extension); + + #if WEBKIT_CHECK_VERSION (1, 3, 8) + entry = g_object_get_data (G_OBJECT (web_view), "FormHistoryPasswordEntry"); + if (entry) + { + const gchar* message = _("Remember password on this page?"); + view = midori_browser_get_current_tab (midori_app_get_browser ( + midori_extension_get_app (extension))); + midori_view_add_info_bar (MIDORI_VIEW (view), GTK_MESSAGE_QUESTION, message, + G_CALLBACK (formhistory_remember_password_response), entry, + _("Remember"), GTK_RESPONSE_ACCEPT, + _("Not now"), GTK_RESPONSE_IGNORE, + _("Never for this page"), GTK_RESPONSE_CANCEL, NULL); + g_object_set_data (G_OBJECT (web_view), "FormHistoryPasswordEntry", NULL); + } + #endif +} + +#if WEBKIT_CHECK_VERSION (1, 3, 8) +static gchar* +formhistory_decrypt (const gchar* data, + const gchar* password) +{ + /* TODO: Implement persistent storage/ keyring support */ + return NULL; +} + +static void +formhistory_fill_login_data (JSContextRef js_context, + FormHistoryPriv* priv, + const gchar* data) +{ + gchar* decrypted_data = NULL; + guint i = 0; + GString *script; + gchar** inputs; + + /* Handle case that user dont want to store password */ + if (!strncmp (data, "never", 5)) + return; + + #if 0 + if (!formhistory_check_master_password (NULL, priv)) + return; + #endif + + if (!(decrypted_data = formhistory_decrypt (data, priv->master_password))) + return; + + script = g_string_new (""); + inputs = g_strsplit (decrypted_data, "|||", 0); + while (inputs[i] != NULL) + { + gchar** parts = g_strsplit (inputs[i], "|,|", 3); + if (parts && parts[0] && parts[1] && parts[2]) + { + g_string_append_printf (script, "node = null;" + "node = document.getElementById ('%s');" + "if (!node) { node = document.getElementsByName ('%s')[0]; }" + "if (node && node.type == '%s') { node.value = '%s'; }", + parts[0], parts[0], parts[2], parts[1]); + } + g_strfreev (parts); + i++; + } + g_free (decrypted_data); + g_strfreev (inputs); + g_free (sokoke_js_script_eval (js_context, script->str, NULL)); + g_string_free (script, TRUE); +} + +static void +formhistory_frame_loaded_cb (WebKitWebView* web_view, + WebKitWebFrame* web_frame, + MidoriExtension* extension) +{ + const gchar* page_uri; + const gchar* count_request; + FormHistoryPriv* priv; + JSContextRef js_context; + gchar* data; + gchar* domain; + gchar* count; + + page_uri = webkit_web_frame_get_uri (web_frame); + if (!page_uri) + return; + + count_request = "document.querySelectorAll('input[type=password]').length"; + js_context = webkit_web_frame_get_global_context (web_frame); + count = sokoke_js_script_eval (js_context, count_request, NULL); + if (count && count[0] == '0') + { + g_free (count); + return; + } + g_free (count); + + priv = g_object_get_data (G_OBJECT (extension), "priv"); + domain = midori_uri_parse_hostname (webkit_web_frame_get_uri (web_frame), NULL); + data = formhistory_get_login_data (priv->db, domain); + g_free (domain); + + if (!data) + return; + formhistory_fill_login_data (js_context, priv, data); + g_free (data); +} +#endif + +static void +formhistory_deactivate_cb (MidoriExtension* extension, + MidoriBrowser* browser); + +static void +formhistory_add_tab_cb (MidoriBrowser* browser, + MidoriView* view, + MidoriExtension* extension) +{ + GtkWidget* web_view = midori_view_get_web_view (view); + + g_signal_connect (web_view, "window-object-cleared", + G_CALLBACK (formhistory_window_object_cleared_cb), extension); + g_signal_connect (web_view, "navigation-policy-decision-requested", + G_CALLBACK (formhistory_navigation_decision_cb), extension); + + #if WEBKIT_CHECK_VERSION (1, 3, 8) + g_signal_connect (web_view, "onload-event", + G_CALLBACK (formhistory_frame_loaded_cb), extension); + #endif +} + +static void +formhistory_add_tab_foreach_cb (MidoriView* view, + MidoriExtension* extension) +{ + formhistory_add_tab_cb (NULL, view, extension); +} + +static void +formhistory_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser, + MidoriExtension* extension) +{ + + GtkAccelGroup* acg = gtk_accel_group_new (); + GtkActionGroup* action_group = midori_browser_get_action_group (browser); + GtkAction* action = gtk_action_new ("FormHistoryToggleState", + _("Toggle form history state"), + _("Activate or deactivate form history for the current tab."), NULL); + gtk_window_add_accel_group (GTK_WINDOW (browser), acg); + + g_object_set_data (G_OBJECT (browser), "FormHistoryExtension", extension); + + g_signal_connect (action, "activate", + G_CALLBACK (formhistory_toggle_state_cb), browser); + + gtk_action_group_add_action_with_accel (action_group, action, "F"); + gtk_action_set_accel_group (action, acg); + gtk_action_connect_accelerator (action); + + if (midori_extension_get_boolean (extension, "always-load")) + { + midori_browser_foreach (browser, + (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_tab (MidoriView* view, + MidoriExtension* extension) +{ + GtkWidget* web_view = midori_view_get_web_view (view); + + g_signal_handlers_disconnect_by_func ( + web_view, formhistory_window_object_cleared_cb, extension); + g_signal_handlers_disconnect_by_func ( + web_view, formhistory_navigation_decision_cb, extension); + #if WEBKIT_CHECK_VERSION (1, 3, 8) + g_signal_handlers_disconnect_by_func ( + web_view, formhistory_frame_loaded_cb, extension); + #endif +} + +static void +formhistory_deactivate_cb (MidoriExtension* extension, + MidoriBrowser* browser) +{ + MidoriApp* app = midori_extension_get_app (extension); + FormHistoryPriv* priv = g_object_get_data (G_OBJECT (extension), "priv"); + + GtkActionGroup* action_group = midori_browser_get_action_group (browser); + GtkAction* action; + + g_signal_handlers_disconnect_by_func ( + browser, formhistory_add_tab_cb, extension); + 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_tab, extension); + + g_object_set_data (G_OBJECT (browser), "FormHistoryExtension", NULL); + action = gtk_action_group_get_action (action_group, "FormHistoryToggleState"); + if (action != NULL) + { + gtk_action_group_remove_action (action_group, action); + g_object_unref (action); + } + + formhistory_private_destroy (priv); +} + +static void +formhistory_activate_cb (MidoriExtension* extension, + MidoriApp* app) +{ + const gchar* config_dir; + gchar* filename; + sqlite3* db; + char* errmsg = NULL, *errmsg2 = NULL; + KatzeArray* browsers; + MidoriBrowser* browser; + FormHistoryPriv* priv; + + priv = formhistory_private_new (); + priv->master_password = NULL; + priv->master_password_canceled = 0; + formhistory_construct_popup_gui (priv); + + 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) != SQLITE_OK) + { + /* If the folder is /, this is a test run, thus no error */ + if (!g_str_equal (midori_extension_get_config_dir (extension), "/")) + 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, + /* "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY" */ + "PRAGMA count_changes = OFF; PRAGMA journal_mode = TRUNCATE;", + NULL, NULL, &errmsg); + priv->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); + } + + g_object_set_data (G_OBJECT (extension), "priv", priv); + browsers = katze_object_get_object (app, "browsers"); + KATZE_ARRAY_FOREACH_ITEM (browser, browsers) + formhistory_app_add_browser_cb (app, browser, extension); + g_signal_connect (app, "add-browser", + G_CALLBACK (formhistory_app_add_browser_cb), extension); + + g_object_unref (browsers); +} + +static void +formhistory_preferences_response_cb (GtkWidget* dialog, + gint response_id, + MidoriExtension* extension) +{ + GtkWidget* checkbox; + gboolean old_state; + gboolean new_state; + MidoriApp* app; + KatzeArray* browsers; + MidoriBrowser* browser; + + if (response_id == GTK_RESPONSE_APPLY) + { + checkbox = g_object_get_data (G_OBJECT (dialog), "always-load-checkbox"); + new_state = !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)); + old_state = midori_extension_get_boolean (extension, "always-load"); + + if (old_state != new_state) + { + midori_extension_set_boolean (extension, "always-load", new_state); + + app = midori_extension_get_app (extension); + browsers = katze_object_get_object (app, "browsers"); + KATZE_ARRAY_FOREACH_ITEM (browser, browsers) + { + midori_browser_foreach (browser, + (GtkCallback)formhistory_deactivate_tab, extension); + g_signal_handlers_disconnect_by_func ( + browser, formhistory_add_tab_cb, extension); + + if (new_state) + { + midori_browser_foreach (browser, + (GtkCallback)formhistory_add_tab_foreach_cb, extension); + g_signal_connect (browser, "add-tab", + G_CALLBACK (formhistory_add_tab_cb), extension); + } + } + } + } + gtk_widget_destroy (dialog); +} + +static void +formhistory_preferences_cb (MidoriExtension* extension) +{ + GtkWidget* dialog; + GtkWidget* content_area; + GtkWidget* checkbox; + + dialog = gtk_dialog_new (); + + gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); + + gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_APPLY, GTK_RESPONSE_APPLY); + + content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); + checkbox = gtk_check_button_new_with_label (_("Only activate form history via hotkey (Ctrl+Shift+F) per tab")); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), + !midori_extension_get_boolean (extension, "always-load")); + g_object_set_data (G_OBJECT (dialog), "always-load-checkbox", checkbox); + gtk_container_add (GTK_CONTAINER (content_area), checkbox); + /* FIXME: Add pref to disable password manager */ + + g_signal_connect (dialog, + "response", + G_CALLBACK (formhistory_preferences_response_cb), + extension); + gtk_widget_show_all (dialog); +} + +static void +formhistory_toggle_state_cb (GtkAction* action, + MidoriBrowser* browser) +{ + MidoriView* view = MIDORI_VIEW (midori_browser_get_current_tab (browser)); + MidoriExtension* extension = g_object_get_data (G_OBJECT (browser), "FormHistoryExtension"); + GtkWidget* web_view = midori_view_get_web_view (view); + + if (g_signal_handler_find (web_view, G_SIGNAL_MATCH_FUNC, + g_signal_lookup ("window-object-cleared", MIDORI_TYPE_VIEW), 0, NULL, + formhistory_window_object_cleared_cb, extension)) + { + formhistory_deactivate_tab (view, extension); + } + else + formhistory_add_tab_cb (browser, view, extension); +} + +MidoriExtension* +extension_init (void) +{ + MidoriExtension* extension; + + + extension = g_object_new (MIDORI_TYPE_EXTENSION, + "name", _("Form history filler"), + "description", _("Stores history of entered form data"), + "version", "2.0" MIDORI_VERSION_SUFFIX, + "authors", "Alexander V. Butenko ", + NULL); + + midori_extension_install_boolean (extension, "always-load", TRUE); + g_signal_connect (extension, "activate", + G_CALLBACK (formhistory_activate_cb), NULL); + g_signal_connect (extension, "open-preferences", + G_CALLBACK (formhistory_preferences_cb), NULL); + + return extension; +} diff -Nru midori-0.2.8/extensions/formhistory.c midori-0.4.6/extensions/formhistory.c --- midori-0.2.8/extensions/formhistory.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/formhistory.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,524 +0,0 @@ -/* - 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 - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. -*/ - -#define MAXCHARS 60 -#define MINCHARS 2 - -#include - -#include "config.h" -#include "midori/sokoke.h" - -#include -#if HAVE_UNISTD_H - #include -#endif - -#include - -static GHashTable* global_keys; -static gchar* jsforms; - -static gboolean -formhistory_prepare_js () -{ - gchar* data_name; - gchar* data_path; - gchar* autosuggest; - gchar* style; - guint i; - gchar* file; - - data_name = g_build_filename (PACKAGE_NAME, "res", NULL); - data_path = sokoke_find_data_filename (data_name); - g_free (data_name); - file = g_build_filename (data_path, G_DIR_SEPARATOR_S, "autosuggestcontrol.js",NULL); - if (!g_file_get_contents (file, &autosuggest, NULL, NULL)) - return FALSE; - g_strchomp (autosuggest); - - file = g_build_filename (data_path, G_DIR_SEPARATOR_S, "autosuggestcontrol.css",NULL); - if(!g_file_get_contents (file, &style, NULL, NULL)) - return FALSE; - g_strchomp (style); - i = 0; - while (style[i]) - { - if (style[i] == '\n') - style[i] = ' '; - i++; - } - - jsforms = g_strdup_printf ( - "%s" - "window.addEventListener ('DOMContentLoaded'," - "function () {" - " if (document.getElementById('formhistory'))" - " return;" - " if (!initSuggestions ())" - " return;" - " var mystyle = document.createElement('style');" - " mystyle.setAttribute('type', 'text/css');" - " mystyle.setAttribute('id', 'formhistory');" - " mystyle.appendChild(document.createTextNode('%s'));" - " var head = document.getElementsByTagName('head')[0];" - " if (head) head.appendChild(mystyle);" - "}, true);", - autosuggest, - style); - g_strstrip (jsforms); - g_free (data_path); - g_free (file); - g_free (style); - g_free (autosuggest); - 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 () -{ - gchar* suggestions = g_strdup (""); - GHashTableIter iter; - gpointer key, value; - gchar* script; - - g_hash_table_iter_init (&iter, global_keys); - while (g_hash_table_iter_next (&iter, &key, &value)) - { - gchar* _suggestions = g_strdup_printf ("%s arr[\"%s\"] = [%s]; ", - suggestions, (char*)key, (char*)value); - katze_assign (suggestions, _suggestions); - } - script = g_strdup_printf ("function FormSuggestions(eid) { " - "arr = new Array();" - "%s" - "this.suggestions = arr[eid]; }" - "%s", - suggestions, - jsforms); - g_free (suggestions); - return script; -} - -static void -formhistory_update_database (gpointer db, - const gchar* key, - const gchar* value) -{ - 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) - { - g_printerr (_("Failed to add form value: %s\n"), errmsg); - g_free (errmsg); - return; - } -} - -static gboolean -formhistory_update_main_hash (gchar* key, - gchar* value) -{ - guint length; - gchar* tmp; - - if (!(value && *value)) - return FALSE; - length = strlen (value); - if (length > MAXCHARS || length < MINCHARS) - return FALSE; - - formhistory_fixup_value (key); - formhistory_fixup_value (value); - if ((tmp = g_hash_table_lookup (global_keys, (gpointer)key))) - { - gchar* rvalue = g_strdup_printf ("\"%s\"",value); - gchar* patt = g_regex_escape_string (rvalue, -1); - if (!g_regex_match_simple (patt, tmp, - G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)) - { - gchar* new_value = g_strdup_printf ("%s%s,", tmp, rvalue); - g_hash_table_insert (global_keys, g_strdup (key), new_value); - g_free (rvalue); - g_free (patt); - } - else - { - g_free (rvalue); - g_free (patt); - 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) -{ - /* 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_body; - if (soup_message_body_get_accumulate (body)) - { - 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); - } - } - g_free (method); -} -#endif - -static void -formhistory_window_object_cleared_cb (WebKitWebView* web_view, - WebKitWebFrame* web_frame, - JSContextRef js_context, - JSObjectRef js_window) -{ - gchar* script; - script = formhistory_build_js (); - sokoke_js_script_eval (js_context, script, NULL); - g_free (script); -} - -static void -formhistory_add_tab_cb (MidoriBrowser* browser, - MidoriView* view, - MidoriExtension* extension) -{ - GtkWidget* web_view = midori_view_get_web_view (view); - g_signal_connect (web_view, "window-object-cleared", - 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 -formhistory_deactivate_cb (MidoriExtension* extension, - MidoriBrowser* browser); - -static void -formhistory_add_tab_foreach_cb (MidoriView* view, - MidoriBrowser* browser, - MidoriExtension* extension) -{ - formhistory_add_tab_cb (browser, view, extension); -} - -static void -formhistory_app_add_browser_cb (MidoriApp* app, - MidoriBrowser* browser, - MidoriExtension* extension) -{ - midori_browser_foreach (browser, - (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, - MidoriExtension* extension) -{ - GtkWidget* web_view = midori_view_get_web_view (view); - 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_navigation_decision_cb, extension); - #else - g_signal_handlers_disconnect_by_func ( - webkit_get_default_session (), formhistory_session_request_queued_cb, extension); - #endif -} - -static void -formhistory_deactivate_cb (MidoriExtension* extension, - MidoriBrowser* browser) -{ - MidoriApp* app = midori_extension_get_app (extension); - sqlite3* db; - - g_signal_handlers_disconnect_by_func ( - browser, formhistory_add_tab_cb, extension); - 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, extension); - - katze_assign (jsforms, NULL); - if (global_keys) - g_hash_table_destroy (global_keys); - - if ((db = g_object_get_data (G_OBJECT (extension), "formhistory-db"))) - sqlite3_close (db); -} - -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; -} - -static void -formhistory_activate_cb (MidoriExtension* extension, - MidoriApp* app) -{ - const gchar* config_dir; - gchar* filename; - sqlite3* db; - char* errmsg = NULL, *errmsg2 = NULL; - KatzeArray* browsers; - MidoriBrowser* browser; - - global_keys = g_hash_table_new_full (g_str_hash, g_str_equal, - (GDestroyNotify)g_free, - (GDestroyNotify)g_free); - if(!jsforms) - formhistory_prepare_js (); - 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); - } - - browsers = katze_object_get_object (app, "browsers"); - KATZE_ARRAY_FOREACH_ITEM (browser, browsers) - formhistory_app_add_browser_cb (app, browser, extension); - g_signal_connect (app, "add-browser", - G_CALLBACK (formhistory_app_add_browser_cb), extension); - - g_object_unref (browsers); -} - -#if G_ENABLE_DEBUG -/* - - - autosuggest testcase - - -
-

-

- -
- - */ -#endif - -MidoriExtension* -extension_init (void) -{ - gboolean should_init = TRUE; - const gchar* ver; - gchar* desc; - MidoriExtension* extension; - - if (formhistory_prepare_js ()) - { - ver = "1.0"; - desc = g_strdup (_("Stores history of entered form data")); - } - else - { - desc = g_strdup_printf (_("Not available: %s"), - _("Resource files not installed")); - ver = NULL; - should_init = FALSE; - } - - extension = g_object_new (MIDORI_TYPE_EXTENSION, - "name", _("Form history filler"), - "description", desc, - "version", ver, - "authors", "Alexander V. Butenko ", - NULL); - g_free (desc); - - if (should_init) - g_signal_connect (extension, "activate", - G_CALLBACK (formhistory_activate_cb), NULL); - - return extension; -} diff -Nru midori-0.2.8/extensions/history-list.vala midori-0.4.6/extensions/history-list.vala --- midori-0.2.8/extensions/history-list.vala 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/history-list.vala 2012-05-14 22:13:42.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2010 André Stösel + Copyright (C) 2010-2011 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 @@ -14,244 +14,577 @@ using WebKit; using Midori; -enum TabTreeCells { - TREE_CELL_PIXBUF, - TREE_CELL_STRING, - TREE_CELL_POINTER, - TREE_CELL_COUNT -} +namespace HistoryList { + enum TabTreeCells { + TREE_CELL_PIXBUF, + TREE_CELL_STRING, + TREE_CELL_POINTER, + TREE_CELL_COUNT + } + + enum TabClosingBehavior { + NONE, + LAST, + NEW + } -private abstract class HistoryWindow : Gtk.Window { - public Midori.Browser browser { get; construct set; } - protected Gtk.TreeView? treeview = null; - public HistoryWindow (Midori.Browser browser) { - GLib.Object (type: Gtk.WindowType.POPUP, - window_position: Gtk.WindowPosition.CENTER, - browser: browser); + enum TabClosingBehaviorModel { + TEXT, + VALUE } - public void walk (int step) { - Gtk.TreePath? path; - Gtk.TreeViewColumn? column; - this.treeview.get_cursor (out path, out column); + private abstract class HistoryWindow : Gtk.Window { + public Midori.Browser browser { get; construct set; } + protected Gtk.TreeView? treeview = null; + + public HistoryWindow (Midori.Browser browser) { + GLib.Object (type: Gtk.WindowType.POPUP, + window_position: Gtk.WindowPosition.CENTER, + browser: browser); + } + + public virtual void walk (int step) { + Gtk.TreePath? path; + Gtk.TreeViewColumn? column; - unowned int[] indices = path.get_indices (); - int new_index = indices[0] + step; + this.treeview.get_cursor (out path, out column); - var model = this.treeview.get_model () as Gtk.ListStore; + unowned int[] indices = path.get_indices (); + int new_index = indices[0] + step; - while (new_index < 0 || new_index >= model.length) - new_index = new_index < 0 ? model.length + new_index : new_index - model.length; + var model = this.treeview.get_model () as Gtk.ListStore; - path = new Gtk.TreePath.from_indices (new_index); - this.treeview.set_cursor (path, column, false); + int length = model.iter_n_children(null); + while (new_index < 0 || new_index >= length) + new_index = new_index < 0 ? length + new_index : new_index - length; + + path = new Gtk.TreePath.from_indices (new_index); + this.treeview.set_cursor (path, column, false); + } + + public abstract void make_update (); + public abstract void clean_up (); } - public abstract void make_update (); -} -private class TabWindow : HistoryWindow { - public TabWindow (Midori.Browser browser) { - base (browser); - - var hbox = new Gtk.HBox (false, 1); - this.add (hbox); - - var sw = new Gtk.ScrolledWindow (null, null); - sw.set_size_request (320, 20); - sw.set_policy (PolicyType.NEVER , PolicyType.AUTOMATIC); - sw.set_shadow_type (ShadowType.ETCHED_IN); - hbox.pack_start (sw, true, true, 0); - - var store = new Gtk.ListStore (TabTreeCells.TREE_CELL_COUNT, - typeof (Gdk.Pixbuf), typeof (string), typeof (void*)); - - Gtk.TreeIter iter; - unowned GLib.PtrArray list = this.browser.get_data ("history-list-tab-history"); - for (var i = list.len; i > 0; i--) { - Midori.View view = list.index (i - 1) as Midori.View; - - Gdk.Pixbuf? icon = null; - view.get ("icon", ref icon); - - unowned string title = view.get_display_title (); - - store.append (out iter); - store.set (iter, TabTreeCells.TREE_CELL_PIXBUF, icon, - TabTreeCells.TREE_CELL_STRING, title, - TabTreeCells.TREE_CELL_POINTER, view); - } - - this.set_default_size (320, list.len > 10 ? 232 : (int) list.len * 23 + 2); - this.treeview = new Gtk.TreeView.with_model (store); - this.treeview.set_fixed_height_mode (true); - sw.add (treeview); - - this.treeview.set_model (store); - this.treeview.set ("headers-visible", false); - - this.treeview.insert_column_with_attributes ( - TabTreeCells.TREE_CELL_PIXBUF, "Icon", - new CellRendererPixbuf (), "pixbuf", 0); - this.treeview.insert_column_with_attributes ( - TabTreeCells.TREE_CELL_STRING, "Title", - new CellRendererText (), "text", 1); + private class TabWindow : HistoryWindow { + protected Gtk.HBox? hbox; + protected Gtk.VBox? vbox; + protected bool is_dirty = false; + + protected void store_append_row (GLib.PtrArray list, Gtk.ListStore store, out Gtk.TreeIter iter) { + for (var i = list.len; i > 0; i--) { + Midori.View view = list.index (i - 1) as Midori.View; + + Gdk.Pixbuf? icon = null; + view.get ("icon", ref icon); + + unowned string title = view.get_display_title (); + + store.append (out iter); + store.set (iter, TabTreeCells.TREE_CELL_PIXBUF, icon, + TabTreeCells.TREE_CELL_STRING, title, + TabTreeCells.TREE_CELL_POINTER, view); + } + } + + protected virtual void insert_rows (Gtk.ListStore store) { + Gtk.TreeIter iter; + unowned GLib.PtrArray list = this.browser.get_data ("history-list-tab-history"); + unowned GLib.PtrArray list_new = this.browser.get_data ("history-list-tab-history-new"); + store_append_row (list, store, out iter); + store_append_row (list_new, store, out iter); + } + + public TabWindow (Midori.Browser browser) { + base (browser); + + this.vbox = new Gtk.VBox (false, 1); + this.add (this.vbox); + + this.hbox = new Gtk.HBox (false, 1); + + var sw = new Gtk.ScrolledWindow (null, null); + sw.set_policy (PolicyType.NEVER , PolicyType.AUTOMATIC); + sw.set_shadow_type (ShadowType.ETCHED_IN); + this.hbox.pack_start (sw, true, true, 0); + + var store = new Gtk.ListStore (TabTreeCells.TREE_CELL_COUNT, + typeof (Gdk.Pixbuf), typeof (string), typeof (void*)); + + this.insert_rows (store); + + this.vbox.pack_start (this.hbox, true, true, 0); + + this.treeview = new Gtk.TreeView.with_model (store); + sw.add (treeview); + + this.treeview.set_model (store); + this.treeview.set ("headers-visible", false); + + this.treeview.insert_column_with_attributes ( + -1, "Icon", + new CellRendererPixbuf (), "pixbuf", TabTreeCells.TREE_CELL_PIXBUF); + this.treeview.insert_column_with_attributes ( + -1, "Title", + new CellRendererText (), "text", TabTreeCells.TREE_CELL_STRING); + + Requisition requisition; + int height; + int max_lines = 10; +#if HAVE_GTK3 + requisition = Requisition(); + this.treeview.get_preferred_width(out requisition.width, null); + this.treeview.get_preferred_height(out requisition.height, null); +#else + this.treeview.size_request (out requisition); +#endif + int length = store.iter_n_children(null); + if (length > max_lines) { + height = requisition.height / length * max_lines + 2; + } else { + height = requisition.height + 2; + } + sw.set_size_request (320, height); + + this.show_all (); + } - this.show_all (); + public override void make_update () { + this.is_dirty = true; + + Gtk.TreePath? path; + Gtk.TreeViewColumn? column; + + this.treeview.get_cursor (out path, out column); + + var model = this.treeview.get_model () as Gtk.ListStore; + + Gtk.TreeIter iter; + unowned Midori.View? view = null; + + model.get_iter (out iter, path); + model.get (iter, TabTreeCells.TREE_CELL_POINTER, out view); + this.browser.set ("tab", view); + } + + public override void clean_up () { + if(this.is_dirty) { + Gtk.TreePath? path; + Gtk.TreeViewColumn? column; + + this.treeview.get_cursor (out path, out column); + + path = new Gtk.TreePath.from_indices (0); + this.treeview.set_cursor (path, column, false); + + this.make_update (); + this.is_dirty = false; + } + } } - public override void make_update () { - Gtk.TreePath? path; - Gtk.TreeViewColumn? column; - this.treeview.get_cursor (out path, out column); + private class NewTabWindow : TabWindow { + protected bool old_tabs = false; + protected bool first_step = true; + + protected override void insert_rows (Gtk.ListStore store) { + Gtk.TreeIter iter; + unowned GLib.PtrArray list = this.browser.get_data ("history-list-tab-history-new"); + store_append_row (list, store, out iter); + + if ((int)list.len == 0) { + this.old_tabs = true; + var label = new Gtk.Label (_("There are no unvisited tabs")); + this.vbox.pack_start (label, true, true, 0); + unowned GLib.PtrArray list_old = this.browser.get_data ("history-list-tab-history"); + store_append_row (list_old, store, out iter); + } + } - var model = this.treeview.get_model () as Gtk.ListStore; + public override void walk (int step) { + if (this.first_step == false || step != 1) { + base.walk (step); + } + this.first_step = false; + } - Gtk.TreeIter iter; - unowned Midori.View? view = null; + public override void clean_up () { + if(this.is_dirty) { + if(this.old_tabs) { + base.clean_up (); + } else { + unowned GLib.PtrArray list = this.browser.get_data ("history-list-tab-history"); + Midori.View view = list.index (list.len - 1) as Midori.View; + this.browser.set ("tab", view); + } + } + } - model.get_iter (out iter, path); - model.get (iter, TabTreeCells.TREE_CELL_POINTER, out view); - this.browser.set ("tab", view); + public NewTabWindow (Midori.Browser browser) { + base (browser); + } } -} -private class HistoryList : Midori.Extension { - protected uint modifier_count; - protected HistoryWindow? history_window; - protected ulong[] tmp_sig_ids = new ulong[2]; - public bool key_press (Gdk.EventKey event_key) { - if (event_key.is_modifier > 0) { - this.modifier_count++; + private class PreferencesDialog : Dialog { + protected Manager hl_manager; + protected ComboBox closing_behavior; + + public PreferencesDialog (Manager manager) { + this.hl_manager = manager; + + this.title = _("Preferences for %s").printf( _("History-List")); + if (this.get_class ().find_property ("has-separator") != null) + this.set ("has-separator", false); + this.border_width = 5; + this.set_modal (true); + this.set_default_size (350, 100); + this.create_widgets (); + + this.response.connect (response_cb); + } + + private void response_cb (Dialog source, int response_id) { + switch (response_id) { + case ResponseType.APPLY: + int value; + TreeIter iter; + + this.closing_behavior.get_active_iter (out iter); + var model = this.closing_behavior.get_model (); + model.get (iter, TabClosingBehaviorModel.VALUE, out value); + + this.hl_manager.set_integer ("TabClosingBehavior", value); + this.hl_manager.preferences_changed (); + + this.destroy (); + break; + case ResponseType.CANCEL: + this.destroy (); + break; + } + } + + private void create_widgets () { + ListStore model; + TreeIter iter; + TreeIter? active_iter = null; + + var table = new Table (1, 2, true); + var renderer = new CellRendererText (); + + var label = new Label ( _("Tab closing behavior")); + table.attach_defaults (label, 0, 1, 0, 1); + + var tab_closing_behavior = this.hl_manager.get_integer ("TabClosingBehavior"); + + model = new ListStore (2, typeof (string), typeof (int)); + + model.append (out iter); + model.set (iter, TabClosingBehaviorModel.TEXT, _("Do nothing"), + TabClosingBehaviorModel.VALUE, TabClosingBehavior.NONE); + if (TabClosingBehavior.NONE == tab_closing_behavior) + active_iter = iter; + + model.append (out iter); + model.set (iter, TabClosingBehaviorModel.TEXT, _("Switch to last viewed tab"), + TabClosingBehaviorModel.VALUE, TabClosingBehavior.LAST); + if (TabClosingBehavior.LAST == tab_closing_behavior) + active_iter = iter; + + model.append (out iter); + model.set (iter, TabClosingBehaviorModel.TEXT, _("Switch to newest tab"), + TabClosingBehaviorModel.VALUE, TabClosingBehavior.NEW); + if (TabClosingBehavior.NEW == tab_closing_behavior) + active_iter = iter; + + this.closing_behavior = new ComboBox.with_model (model); + this.closing_behavior.set_active_iter (active_iter); + this.closing_behavior.pack_start (renderer, true); + this.closing_behavior.set_attributes (renderer, "text", 0); + + table.attach_defaults (this.closing_behavior, 1, 2, 0, 1); + +#if HAVE_GTK3 + (get_content_area() as Gtk.Box).pack_start (table, false, true, 0); +#else + this.vbox.pack_start (table, false, true, 0); +#endif + + this.add_button (Gtk.STOCK_CANCEL, ResponseType.CANCEL); + this.add_button (Gtk.STOCK_APPLY, ResponseType.APPLY); + + this.show_all (); } - return false; } - public bool key_release (Gdk.EventKey event_key, Browser browser) { - if (event_key.is_modifier > 0) { - this.modifier_count--; - if (this.modifier_count == 0) { + + private class Manager : Midori.Extension { + public signal void preferences_changed (); + + protected uint escKeyval; + protected uint modifier_count; + protected int closing_behavior; + protected HistoryWindow? history_window; + protected ulong[] tmp_sig_ids = new ulong[2]; + protected bool ignoreNextChange = false; + + public void preferences_changed_cb () { + this.closing_behavior = this.get_integer ("TabClosingBehavior"); + } + + public bool key_press (Gdk.EventKey event_key) { + if (event_key.is_modifier > 0) { + this.modifier_count++; + } + return false; + } + + public bool key_release (Gdk.EventKey event_key, Browser browser) { + if (event_key.is_modifier > 0) { + this.modifier_count--; + } + if (this.modifier_count == 0 || event_key.keyval == this.escKeyval) { browser.disconnect (this.tmp_sig_ids[0]); browser.disconnect (this.tmp_sig_ids[1]); - this.history_window.make_update (); + if (this.modifier_count == 0) { + this.history_window.make_update (); + } else { + this.modifier_count = 0; + this.history_window.clean_up (); + } this.history_window.destroy (); this.history_window = null; } + return false; } - return false; - } - public void walk (Gtk.Action action, Browser browser, Type type, int step) { - if (this.history_window == null || this.history_window.get_type () != type) { - if (this.history_window == null) { - this.modifier_count = Midori.Sokoke.gtk_action_count_modifiers (action); - this.tmp_sig_ids[0] = browser.key_press_event.connect ((ek) => { - return this.key_press (ek); - }); - this.tmp_sig_ids[1] = browser.key_release_event.connect ((ek) => { - return this.key_release (ek, browser); - }); - } else { - this.history_window.destroy (); - this.history_window = null; + + public void walk (Gtk.Action action, Browser browser, Type type, int step) { + Midori.View? view = null; + view = browser.get_data ("history-list-last-change"); + if (view != null) { + this.tab_list_resort (browser, view); + browser.set_data ("history-list-last-change", null); } - /* - Bug: https://bugzilla.gnome.org/show_bug.cgi?id=618750 - Code: this.history_window = (Gtk.Window) GLib.Object.new (type); - */ - if (type == typeof (TabWindow)) { - this.history_window = new TabWindow (browser); + + if (this.history_window == null || this.history_window.get_type () != type) { + if (this.history_window == null) { + this.modifier_count = Midori.Sokoke.gtk_action_count_modifiers (action); + this.tmp_sig_ids[0] = browser.key_press_event.connect ((ek) => { + return this.key_press (ek); + }); + this.tmp_sig_ids[1] = browser.key_release_event.connect ((ek) => { + return this.key_release (ek, browser); + }); + } else { + this.history_window.destroy (); + this.history_window = null; + } + /* + Bug: https://bugzilla.gnome.org/show_bug.cgi?id=618750 + Code: this.history_window = (Gtk.Window) GLib.Object.new (type); + */ + if (type == typeof (TabWindow)) { + this.history_window = new TabWindow (browser); + } else if (type == typeof (NewTabWindow)) { + this.history_window = new NewTabWindow (browser); + } } + var hw = this.history_window as HistoryWindow; + hw.walk (step); } - var hw = this.history_window as HistoryWindow; - hw.walk (step); - } - void browser_added (Midori.Browser browser) { - var acg = new Gtk.AccelGroup (); - browser.add_accel_group (acg); - var action_group = browser.get_action_group (); - - Gtk.Action action; - - action = new Gtk.Action ("HistoryListNextTab", - _("Next Tab (History List)"), - _("Next tab from history"), null); - action.activate.connect ((a) => { - this.walk (a, browser, typeof (TabWindow), 1); - }); - action_group.add_action_with_accel (action, "Tab"); - action.set_accel_group (acg); - action.connect_accelerator (); - - action = new Gtk.Action ("HistoryListPreviousTab", - _("Previous Tab (History List)"), - _("Previous tab from history"), null); - action.activate.connect ((a) => { - this.walk (a, browser, typeof (TabWindow), -1); - }); - action_group.add_action_with_accel (action, "Tab"); - action.set_accel_group (acg); - action.connect_accelerator (); - - browser.set_data ("history-list-tab-history", - new GLib.PtrArray ()); - foreach (var tab in browser.get_tabs ()) - tab_added (browser, tab); - browser.add_tab.connect (tab_added); - browser.remove_tab.connect (tab_removed); - browser.notify["tab"].connect (this.tab_changed); - } - void browser_removed (Midori.Browser browser) { - string[] callbacks = { "HistoryListNextTab", "HistoryListPreviousTab" }; - Gtk.ActionGroup action_group; - action_group = browser.get_action_group (); - for (int i = 0; i < callbacks.length; i++) { - Gtk.Action action = action_group.get_action (callbacks[i]); - if (action != null) - action_group.remove_action (action); + public void special_function (Gtk.Action action, Browser browser) { + if (this.history_window != null) { + this.ignoreNextChange = true; + this.history_window.make_update (); + } } - browser.add_tab.disconnect (tab_added); - browser.remove_tab.disconnect (tab_removed); - browser.notify["tab"].disconnect (this.tab_changed); - } - void tab_added (Midori.Browser browser, Midori.View view) { - unowned GLib.PtrArray list = browser.get_data ("history-list-tab-history"); - list.add (view); - } - void tab_removed (Midori.Browser browser, Midori.View view) { - unowned GLib.PtrArray list = browser.get_data ("history-list-tab-history"); - list.remove (view); - } - void tab_changed (GLib.Object window, GLib.ParamSpec pspec) { - Midori.Browser browser = window as Midori.Browser; - Midori.View view = null; - browser.get ("tab", ref view); - - unowned GLib.PtrArray list = browser.get_data ("history-list-tab-history"); - list.remove (view); - list.add (view); - } - void activated (Midori.App app) { - foreach (var browser in app.get_browsers ()) - browser_added (browser); - app.add_browser.connect (browser_added); - } - void deactivated () { - var app = get_app (); - foreach (var browser in app.get_browsers ()) - browser_removed (browser); - app.add_browser.disconnect (browser_added); - } - internal HistoryList () { - GLib.Object (name: _("History List"), - description: _("Allows to switch tabs by choosing from a list sorted by last usage"), - version: "0.2", - authors: "André Stösel "); - activate.connect (activated); - deactivate.connect (deactivated); + void browser_added (Midori.Browser browser) { + ulong sidTabNext, sidTabPrevious; + var acg = new Gtk.AccelGroup (); + browser.add_accel_group (acg); + var action_group = browser.get_action_group (); + + Gtk.Action action; + + action = action_group.get_action ("TabNext"); + browser.block_action (action); + sidTabNext = action.activate.connect ((a) => { + this.walk (a, browser, typeof (TabWindow), 1); + }); + + action = action_group.get_action ("TabPrevious"); + browser.block_action (action); + sidTabPrevious = action.activate.connect ((a) => { + this.walk (a, browser, typeof (TabWindow), -1); + }); + + action = new Gtk.Action ("HistoryListNextNewTab", + _("Next new Tab (History List)"), + _("Next new tab from history"), null); + action.activate.connect ((a) => { + this.walk (a, browser, typeof (NewTabWindow), 1); + }); + action_group.add_action_with_accel (action, "1"); + action.set_accel_group (acg); + action.connect_accelerator (); + + action = new Gtk.Action ("HistoryListPreviousNewTab", + _("Previous new Tab (History List)"), + _("Previous new tab from history"), null); + action.activate.connect ((a) => { + this.walk (a, browser, typeof (NewTabWindow), -1); + }); + action_group.add_action_with_accel (action, "2"); + action.set_accel_group (acg); + action.connect_accelerator (); + + action = new Gtk.Action ("HistoryListSpecialFunction", + _("Display tab in background (History List)"), + _("Display the current selected tab in background"), null); + action.activate.connect ((a) => { + this.special_function (a, browser); + }); + action_group.add_action_with_accel (action, "3"); + action.set_accel_group (acg); + action.connect_accelerator (); + + browser.set_data ("history-list-sid-tab-next", sidTabNext); + browser.set_data ("history-list-sid-tab-previous", sidTabPrevious); + + browser.set_data ("history-list-tab-history", + new GLib.PtrArray ()); + browser.set_data ("history-list-tab-history-new", + new GLib.PtrArray ()); + browser.set_data ("history-list-last-change", null); + + foreach (var tab in browser.get_tabs ()) + tab_added (browser, tab); + browser.add_tab.connect (tab_added); + browser.remove_tab.connect (tab_removed); + browser.notify["tab"].connect (this.tab_changed); + } + + void browser_removed (Midori.Browser browser) { + string[] callbacks = { "HistoryListNextNewTab", "HistoryListPreviousNewTab", + "HistoryListSpecialFunction" }; + ulong sidTabNext, sidTabPrevious; + sidTabNext = browser.get_data ("history-list-sid-tab-next"); + sidTabPrevious = browser.get_data ("history-list-sid-tab-previous"); + + Gtk.Action action; + Gtk.ActionGroup action_group; + action_group = browser.get_action_group (); + + action = action_group.get_action ("TabNext"); + action.disconnect (sidTabNext); + browser.unblock_action (action); + action = action_group.get_action ("TabPrevious"); + action.disconnect (sidTabPrevious); + browser.unblock_action (action); + + for (int i = 0; i < callbacks.length; i++) { + action = action_group.get_action (callbacks[i]); + if (action != null) + action_group.remove_action (action); + } + + browser.add_tab.disconnect (tab_added); + browser.remove_tab.disconnect (tab_removed); + browser.notify["tab"].disconnect (this.tab_changed); + } + + void tab_added (Midori.Browser browser, Midori.View view) { + unowned GLib.PtrArray list = browser.get_data ("history-list-tab-history-new"); + list.add (view); + } + + void tab_removed (Midori.Browser browser, Midori.View view) { + unowned GLib.PtrArray list = browser.get_data ("history-list-tab-history"); + unowned GLib.PtrArray list_new = browser.get_data ("history-list-tab-history-new"); + list.remove (view); + list_new.remove (view); + + if (this.closing_behavior == TabClosingBehavior.LAST || this.closing_behavior == TabClosingBehavior.NEW) { + browser.set_data ("history-list-last-change", null); + + if ((int) list.len > 0 || (int) list_new.len > 0) { + TabWindow hw; + if (this.closing_behavior == TabClosingBehavior.LAST) + hw = new TabWindow (browser); + else + hw = new NewTabWindow (browser); + hw.make_update (); + hw.destroy (); + } + } + } + + void tab_changed (GLib.Object window, GLib.ParamSpec pspec) { + if(this.ignoreNextChange) { + this.ignoreNextChange = false; + } else { + Midori.Browser browser = window as Midori.Browser; + Midori.View view = null; + Midori.View last_view = null; + browser.get ("tab", ref view); + + last_view = browser.get_data ("history-list-last-change"); + + if (last_view != null) { + this.tab_list_resort (browser, last_view); + } + browser.set_data ("history-list-last-change", view); + } + } + + void tab_list_resort (Midori.Browser browser, Midori.View view) { + unowned GLib.PtrArray list = browser.get_data ("history-list-tab-history"); + unowned GLib.PtrArray list_new = browser.get_data ("history-list-tab-history-new"); + list.remove (view); + list_new.remove (view); + list.add (view); + } + + void activated (Midori.App app) { + this.preferences_changed (); + foreach (var browser in app.get_browsers ()) + browser_added (browser); + app.add_browser.connect (browser_added); + } + + void deactivated () { + var app = get_app (); + foreach (var browser in app.get_browsers ()) + browser_removed (browser); + app.add_browser.disconnect (browser_added); + } + + void show_preferences () { + var dialog = new PreferencesDialog (this); + dialog.show (); + } + + internal Manager () { + GLib.Object (name: _("History List"), + description: _("Move to the last used tab when switching or closing tabs"), + version: "0.4" + Midori.VERSION_SUFFIX, + authors: "André Stösel "); + + this.install_integer ("TabClosingBehavior", TabClosingBehavior.LAST); + + this.activate.connect (activated); + this.deactivate.connect (deactivated); + this.open_preferences.connect (show_preferences); + this.preferences_changed.connect (preferences_changed_cb); + } + construct { + this.escKeyval = Gdk.keyval_from_name ("Escape"); + } } } public Midori.Extension extension_init () { - return new HistoryList (); + return new HistoryList.Manager (); } diff -Nru midori-0.2.8/extensions/mouse-gestures.c midori-0.4.6/extensions/mouse-gestures.c --- midori-0.2.8/extensions/mouse-gestures.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/mouse-gestures.c 2012-05-14 22:13:42.000000000 +0000 @@ -25,7 +25,7 @@ struct MouseGestureNode { double x; double y; -} MouseGestureNode_t; +}; struct _MouseGesture { MouseButton button; @@ -38,7 +38,7 @@ #define DEVIANCE 20 #define MINLENGTH 50 -MouseGesture *gesture; +MouseGesture *gesture = NULL; void mouse_gesture_clear (MouseGesture *g) { @@ -187,7 +187,7 @@ mouse_gesture_clear (gesture); } - if (event->button == 3) + if (MIDORI_EVENT_CONTEXT_MENU (event)) { GtkWidget* menu = gtk_menu_new (); midori_view_populate_popup (view, menu, TRUE); @@ -300,7 +300,7 @@ MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", _("Mouse Gestures"), "description", _("Control Midori by moving the mouse"), - "version", "0.1", + "version", "0.1" MIDORI_VERSION_SUFFIX, "authors", "Matthias Kruk ", NULL); midori_extension_install_integer (extension, "button", MOUSE_BUTTON_RIGHT); diff -Nru midori-0.2.8/extensions/page-holder.c midori-0.4.6/extensions/page-holder.c --- midori-0.2.8/extensions/page-holder.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/page-holder.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,185 +0,0 @@ -/* - Copyright (C) 2008 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 - -#define STOCK_PAGE_HOLDER "page-holder" - -static void -page_holder_app_add_browser_cb (MidoriApp* app, - MidoriBrowser* browser, - MidoriExtension* extension); - -static gint -page_holder_notebook_append_view (GtkWidget* notebook) -{ - GtkWidget* view; - MidoriBrowser* browser; - MidoriWebSettings *settings; - GtkWidget* label; - - view = midori_view_new (NULL); - browser = midori_browser_get_for_widget (notebook); - settings = katze_object_get_object (browser, "settings"); - midori_view_set_settings (MIDORI_VIEW (view), settings); - g_object_unref (settings); - gtk_widget_show (view); - label = midori_view_get_proxy_tab_label (MIDORI_VIEW (view)); - return gtk_notebook_append_page (GTK_NOTEBOOK (notebook), view, label); -} - -static void -page_holder_button_jump_to_clicked_cb (GtkWidget* button, - GtkWidget* notebook) -{ - gint n; - MidoriBrowser* browser; - const gchar* uri; - GtkWidget* view; - - n = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook)); - if (n < 0) - n = page_holder_notebook_append_view (notebook); - - browser = midori_browser_get_for_widget (notebook); - uri = midori_browser_get_current_uri (browser); - view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), n); - midori_view_set_uri (MIDORI_VIEW (view), uri); -} - -static void -page_holder_button_add_clicked_cb (GtkWidget* button, - GtkWidget* notebook) -{ - gint n; - GtkWidget* view; - MidoriBrowser* browser; - const gchar* uri; - - n = page_holder_notebook_append_view (notebook); - view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), n); - browser = midori_browser_get_for_widget (notebook); - uri = midori_browser_get_current_uri (browser); - midori_view_set_uri (MIDORI_VIEW (view), uri); -} - -static void -page_holder_deactivate_cb (MidoriExtension* extension, - GtkWidget* notebook) -{ - MidoriApp* app = midori_extension_get_app (extension); - - gtk_widget_destroy (notebook); - g_signal_handlers_disconnect_by_func ( - extension, page_holder_deactivate_cb, notebook); - g_signal_handlers_disconnect_by_func ( - app, page_holder_app_add_browser_cb, extension); -} - -static void -page_holder_app_add_browser_cb (MidoriApp* app, - MidoriBrowser* browser, - MidoriExtension* extension) -{ - GtkWidget* panel; - GtkWidget* notebook; - GtkWidget* toolbar; - GtkToolItem* toolitem; - - panel = katze_object_get_object (browser, "panel"); - notebook = gtk_notebook_new (); - gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_RIGHT); - gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook), TRUE); - gtk_widget_show (notebook); - toolbar = gtk_toolbar_new (); - gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); - gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); - gtk_widget_show (toolbar); - - toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_JUMP_TO); - gtk_tool_item_set_is_important (toolitem, TRUE); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (page_holder_button_jump_to_clicked_cb), notebook); - gtk_widget_show (GTK_WIDGET (toolitem)); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); - - toolitem = gtk_separator_tool_item_new (); - gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem), FALSE); - 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_ADD); - gtk_tool_item_set_is_important (toolitem, TRUE); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (page_holder_button_add_clicked_cb), notebook); - gtk_widget_show (GTK_WIDGET (toolitem)); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); - - midori_panel_append_widget (MIDORI_PANEL (panel), notebook, - /* i18n: A panel showing a user specified web page */ - STOCK_PAGE_HOLDER, _("Pageholder"), toolbar); - g_signal_connect (extension, "deactivate", - G_CALLBACK (page_holder_deactivate_cb), notebook); - - g_object_unref (panel); -} - -static void -page_holder_activate_cb (MidoriExtension* extension, - MidoriApp* app) -{ - KatzeArray* browsers; - MidoriBrowser* browser; - - browsers = katze_object_get_object (app, "browsers"); - KATZE_ARRAY_FOREACH_ITEM (browser, browsers) - page_holder_app_add_browser_cb (app, browser, extension); - g_object_unref (browsers); - g_signal_connect (app, "add-browser", - G_CALLBACK (page_holder_app_add_browser_cb), extension); -} - -MidoriExtension* -extension_init (void) -{ - GtkIconFactory* factory; - GtkIconSource* icon_source; - GtkIconSet* icon_set; - static GtkStockItem items[] = - { - { STOCK_PAGE_HOLDER, N_("_Pageholder"), 0, 0, NULL }, - }; - - factory = gtk_icon_factory_new (); - gtk_stock_add (items, G_N_ELEMENTS (items)); - icon_set = gtk_icon_set_new (); - icon_source = gtk_icon_source_new (); - gtk_icon_source_set_icon_name (icon_source, GTK_STOCK_ORIENTATION_PORTRAIT); - gtk_icon_set_add_source (icon_set, icon_source); - gtk_icon_source_free (icon_source); - gtk_icon_factory_add (factory, STOCK_PAGE_HOLDER, icon_set); - gtk_icon_set_unref (icon_set); - gtk_icon_factory_add_default (factory); - g_object_unref (factory); - - MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, - "name", _("Pageholder"), - "description", _("Keep one or multiple pages open in parallel to your tabs"), - "version", "0.1", - "authors", "Christian Dywan ", - NULL); - - g_signal_connect (extension, "activate", - G_CALLBACK (page_holder_activate_cb), NULL); - - return extension; -} diff -Nru midori-0.2.8/extensions/shortcuts.c midori-0.4.6/extensions/shortcuts.c --- midori-0.2.8/extensions/shortcuts.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/shortcuts.c 2012-05-14 22:13:42.000000000 +0000 @@ -11,7 +11,6 @@ #include -#include #include "config.h" static void @@ -100,10 +99,16 @@ static gchar* shortcuts_label_for_action (GtkAction* action) { + const gchar* name = gtk_action_get_name (action); gchar* label; gchar* stripped; - if ((label = katze_object_get_string (action, "label"))) + if (g_str_equal (name, "ReloadStop")) + { + label = NULL; + stripped = g_strdup (_("Reload page or stop loading")); + } + else if ((label = katze_object_get_string (action, "label"))) stripped = katze_strip_mnemonics (label); else { @@ -160,6 +165,7 @@ GList* actions; guint i; GtkAction* action; + GtkWidget* dialog_vbox; #if HAVE_OSX GtkWidget* icon; #endif @@ -174,19 +180,20 @@ GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, #endif NULL); - g_signal_connect (dialog, "destroy", - G_CALLBACK (gtk_widget_destroyed), &dialog); gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES); sokoke_widget_get_text_size (dialog, "M", &width, &height); gtk_window_set_default_size (GTK_WINDOW (dialog), width * 52, height * 24); g_signal_connect (dialog, "response", G_CALLBACK (shortcuts_preferences_response_cb), NULL); + + dialog_vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); if ((xfce_heading = sokoke_xfce_header_new ( gtk_window_get_icon_name (GTK_WINDOW (dialog)), dialog_title))) - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (dialog_vbox), xfce_heading, FALSE, FALSE, 0); hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, + + gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 12); liststore = gtk_list_store_new (7, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_BOOLEAN, @@ -242,7 +249,7 @@ 0, GTK_SORT_ASCENDING); g_object_unref (model); - gtk_widget_show_all (GTK_DIALOG (dialog)->vbox); + gtk_widget_show_all (gtk_dialog_get_content_area(GTK_DIALOG (dialog))); g_object_unref (browser); @@ -312,7 +319,7 @@ MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", _("Shortcuts"), "description", _("View and edit keyboard shortcuts"), - "version", "0.1", + "version", "0.1" MIDORI_VERSION_SUFFIX, "authors", "Christian Dywan ", NULL); diff -Nru midori-0.2.8/extensions/status-clock.c midori-0.4.6/extensions/status-clock.c --- midori-0.2.8/extensions/status-clock.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/status-clock.c 2012-05-14 22:13:42.000000000 +0000 @@ -173,7 +173,7 @@ MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", _("Statusbar Clock"), "description", _("Display date and time in the statusbar"), - "version", "0.1", + "version", "0.1" MIDORI_VERSION_SUFFIX, "authors", "Arno Renevier ", NULL); midori_extension_install_string (extension, "format", DEFAULT_FORMAT); diff -Nru midori-0.2.8/extensions/statusbar-features.c midori-0.4.6/extensions/statusbar-features.c --- midori-0.2.8/extensions/statusbar-features.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/statusbar-features.c 2012-05-14 22:13:42.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2008-2009 Christian Dywan + Copyright (C) 2008-2011 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,6 +11,23 @@ #include +typedef struct +{ + const gchar* label; + gdouble level; +} ZoomLevel; + +const ZoomLevel zoom_levels[] = +{ + { "200%", 2.0 }, + { "175%", 1.75 }, + { "150%", 1.5 }, + { "125%", 1.25 }, + { "100%", 1.0 }, + { "50%" , 0.5 }, + { "25%" , 0.25 } +}; + static void statusbar_features_app_add_browser_cb (MidoriApp* app, MidoriBrowser* browser, @@ -44,6 +61,22 @@ } static void +statusbar_features_browser_notify_tab_cb (MidoriBrowser* browser, + GParamSpec* pspec, + GtkWidget* combobox) +{ + MidoriView* view = MIDORI_VIEW (midori_browser_get_current_tab (browser)); + gchar* text; + + if (view == NULL) + return; + + text = g_strdup_printf ("%d%%", (gint)(midori_view_get_zoom_level (view) * 100)); + gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combobox))), text); + g_free (text); +} + +static void statusbar_features_deactivate_cb (MidoriExtension* extension, GtkWidget* bbox) { @@ -59,6 +92,19 @@ extension, statusbar_features_deactivate_cb, bbox); g_signal_handlers_disconnect_by_func ( app, statusbar_features_app_add_browser_cb, extension); + g_signal_handlers_disconnect_matched (browser, G_SIGNAL_MATCH_FUNC, + 0, -1, NULL, statusbar_features_browser_notify_tab_cb, NULL); +} + +static void +statusbar_features_zoom_level_changed_cb (GtkWidget* combobox, + MidoriBrowser* browser) +{ + MidoriView* view = MIDORI_VIEW (midori_browser_get_current_tab (browser)); + GtkWidget* entry = gtk_bin_get_child (GTK_BIN (combobox)); + const gchar* zoom_level_text = gtk_entry_get_text (GTK_ENTRY (entry)); + gdouble zoom_level = g_ascii_strtod (zoom_level_text, NULL); + midori_view_set_zoom_level (view, zoom_level / 100.0); } static void @@ -72,53 +118,59 @@ GtkWidget* toolbar; GtkWidget* button; GtkWidget* image; + gsize i; /* FIXME: Monitor each view and modify its settings individually instead of merely replicating the global preferences. */ statusbar = katze_object_get_object (browser, "statusbar"); bbox = gtk_hbox_new (FALSE, 0); - settings = katze_object_get_object (browser, "settings"); + settings = midori_browser_get_settings (browser); toolbar = katze_object_get_object (browser, "navigationbar"); button = katze_property_proxy (settings, "auto-load-images", "toggle"); g_object_set_data (G_OBJECT (button), "feature-label", _("Images")); image = gtk_image_new_from_stock (STOCK_IMAGE, GTK_ICON_SIZE_MENU); gtk_button_set_image (GTK_BUTTON (button), image); - #if GTK_CHECK_VERSION(2, 12, 0) gtk_widget_set_tooltip_text (button, _("Load images automatically")); - #endif statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button); g_signal_connect (toolbar, "notify::toolbar-style", G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), button); gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); - gtk_widget_show (button); button = katze_property_proxy (settings, "enable-scripts", "toggle"); g_object_set_data (G_OBJECT (button), "feature-label", _("Scripts")); image = gtk_image_new_from_stock (STOCK_SCRIPTS, GTK_ICON_SIZE_MENU); gtk_button_set_image (GTK_BUTTON (button), image); - #if GTK_CHECK_VERSION(2, 12, 0) gtk_widget_set_tooltip_text (button, _("Enable scripts")); - #endif statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button); g_signal_connect (toolbar, "notify::toolbar-style", G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), button); gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); - gtk_widget_show (button); - button = katze_property_proxy (settings, "enable-plugins", "toggle"); - g_object_set_data (G_OBJECT (button), "feature-label", _("Netscape plugins")); + if (midori_web_settings_has_plugin_support ()) + { + button = katze_property_proxy (settings, "enable-plugins", "toggle"); + g_object_set_data (G_OBJECT (button), "feature-label", _("Netscape plugins")); image = gtk_image_new_from_stock (STOCK_PLUGINS, GTK_ICON_SIZE_MENU); gtk_button_set_image (GTK_BUTTON (button), image); - #if GTK_CHECK_VERSION(2, 12, 0) gtk_widget_set_tooltip_text (button, _("Enable Netscape plugins")); - #endif statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button); g_signal_connect (toolbar, "notify::toolbar-style", G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), button); 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_object_unref (settings); + } + button = katze_property_proxy (settings, "identify-as", "custom-user-agent"); + gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); + button = gtk_combo_box_text_new_with_entry (); + gtk_entry_set_width_chars (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (button))), 4); + for (i = 0; i < G_N_ELEMENTS (zoom_levels); i++) + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (button), zoom_levels[i].label); + gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); + g_signal_connect (button, "changed", + G_CALLBACK (statusbar_features_zoom_level_changed_cb), browser); + g_signal_connect (browser, "notify::tab", + G_CALLBACK (statusbar_features_browser_notify_tab_cb), button); + statusbar_features_browser_notify_tab_cb (browser, NULL, button); + gtk_widget_show_all (bbox); + gtk_box_pack_end (GTK_BOX (statusbar), bbox, FALSE, FALSE, 3); g_object_unref (statusbar); g_signal_connect (extension, "deactivate", @@ -146,7 +198,7 @@ MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", _("Statusbar Features"), "description", _("Easily toggle features on web pages on and off"), - "version", "0.1", + "version", "0.1" MIDORI_VERSION_SUFFIX, "authors", "Christian Dywan ", NULL); diff -Nru midori-0.2.8/extensions/tab-panel.c midori-0.4.6/extensions/tab-panel.c --- midori-0.2.8/extensions/tab-panel.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/tab-panel.c 2012-05-14 22:13:42.000000000 +0000 @@ -10,7 +10,6 @@ */ #include -#include #define STOCK_TAB_PANEL "tab-panel" @@ -38,6 +37,13 @@ tab_panel_browser_notify_tab_cb (MidoriBrowser* browser, GParamSpec* pspec, GtkTreeView* treeview); +static void +tab_panel_browser_move_tab_cb (MidoriBrowser* browser, + GtkNotebook* notebook, + gint cur_pos, + gint new_pos, + gpointer user_data); + static void tab_panel_view_notify_minimized_cb (GtkWidget* view, @@ -124,6 +130,8 @@ browser, tab_panel_view_notify_icon_cb, extension); g_signal_handlers_disconnect_by_func ( browser, tab_panel_view_notify_title_cb, extension); + g_signal_handlers_disconnect_by_func ( + browser, tab_panel_browser_move_tab_cb, NULL); gtk_widget_destroy (treeview); } @@ -280,6 +288,20 @@ } static void +tab_panel_toggle_toolbook (GtkWidget* toolbar) +{ + /* Hack to ensure correct toolbar visibility */ + GtkWidget* toolbook = gtk_widget_get_parent (toolbar); + if (gtk_notebook_get_current_page (GTK_NOTEBOOK (toolbook)) + == gtk_notebook_page_num (GTK_NOTEBOOK (toolbook), toolbar)) + { + GList* items = gtk_container_get_children (GTK_CONTAINER (toolbar)); + sokoke_widget_set_visible (toolbook, items != NULL); + g_list_free (items); + } +} + +static void tab_panel_remove_view (MidoriBrowser* browser, GtkWidget* view, gboolean minimized) @@ -287,7 +309,9 @@ if (minimized) { GtkToolItem* toolitem = tab_panel_get_toolitem_for_view (view); + GtkWidget* toolbar = tab_panel_get_toolbar_for_browser (browser); gtk_widget_destroy (GTK_WIDGET (toolitem)); + tab_panel_toggle_toolbook (toolbar); } else { @@ -335,6 +359,7 @@ gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 3, icon, 6, &style->bg[GTK_STATE_NORMAL], + 7, &style->fg[GTK_STATE_NORMAL], -1); } } @@ -380,7 +405,7 @@ GdkEventButton* event, GtkWidget* view) { - if (event->button == 3) + if (MIDORI_EVENT_CONTEXT_MENU (event)) { tab_panel_popup (GTK_WIDGET (toolitem), event, view); return TRUE; @@ -394,9 +419,8 @@ GtkWidget* view, MidoriExtension* extension) { - GtkWidget* notebook = katze_object_get_object (browser, "notebook"); - gint page = gtk_notebook_page_num (GTK_NOTEBOOK (notebook), view); - MidoriWebSettings* settings = katze_object_get_object (browser, "settings"); + gint page = midori_browser_page_num (browser, view); + MidoriWebSettings* settings = midori_browser_get_settings (browser); gboolean minimized = katze_object_get_boolean (view, "minimized"); GdkPixbuf* icon = midori_view_get_icon (MIDORI_VIEW (view)); const gchar* title = midori_view_get_display_title (MIDORI_VIEW (view)); @@ -413,6 +437,7 @@ g_object_set_data (G_OBJECT (view), "tab-panel-ext-toolitem", toolitem); gtk_widget_show (GTK_WIDGET (toolitem)); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + tab_panel_toggle_toolbook (toolbar); g_signal_connect (toolitem, "clicked", G_CALLBACK (tab_panel_toolitem_clicked_cb), view); g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)), "button-press-event", @@ -426,7 +451,7 @@ 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, 6, NULL, -1); + 3, icon, 4, title, 5, ellipsize, 6, NULL, 7, NULL, -1); } if (!g_signal_handler_find (view, G_SIGNAL_MATCH_FUNC, @@ -442,9 +467,6 @@ g_signal_connect (view, "notify::title", G_CALLBACK (tab_panel_view_notify_title_cb), extension); } - - g_object_unref (notebook); - g_object_unref (settings); } static void @@ -462,7 +484,7 @@ { gboolean minimized = katze_object_get_boolean (view, "minimized"); - if (!(GTK_OBJECT_FLAGS (browser) & GTK_IN_DESTRUCTION)) + if (!g_object_get_data (G_OBJECT (browser), "midori-browser-destroyed")) tab_panel_remove_view (browser, view, minimized); } @@ -475,7 +497,7 @@ GtkTreeIter iter; GtkWidget* view; - if (GTK_OBJECT_FLAGS (browser) & GTK_IN_DESTRUCTION) + if (g_object_get_data (G_OBJECT (browser), "midori-browser-destroyed")) return; view = midori_browser_get_current_tab (browser); @@ -505,8 +527,9 @@ panel = katze_object_get_object (browser, "panel"); - 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); + model = gtk_tree_store_new (8, MIDORI_TYPE_VIEW, + G_TYPE_STRING, G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF, G_TYPE_STRING, + G_TYPE_INT, GDK_TYPE_COLOR, 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); @@ -524,7 +547,8 @@ 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, "cell-background-gdk", 6, NULL); + "text", 4, "ellipsize", 5, + "cell-background-gdk", 6, "foreground-gdk", 7, 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 (); @@ -582,6 +606,8 @@ G_CALLBACK (tab_panel_browser_notify_tab_cb), treeview); g_signal_connect (extension, "deactivate", G_CALLBACK (tab_panel_deactivate_cb), treeview); + g_signal_connect (browser, "move-tab", + G_CALLBACK (tab_panel_browser_move_tab_cb), NULL); } static void @@ -599,6 +625,33 @@ G_CALLBACK (tab_panel_app_add_browser_cb), extension); } +static void +tab_panel_browser_move_tab_cb (MidoriBrowser* browser, + GtkNotebook* notebook, + gint cur_pos, + gint new_pos, + gpointer user_data) +{ + GtkTreeIter cur, new; + gint last_page; + GtkTreeModel *model; + + last_page = gtk_notebook_get_n_pages (notebook) - 1; + model = tab_panel_get_model_for_browser (browser); + + gtk_tree_model_iter_nth_child (model, &cur, NULL, cur_pos); + + if (cur_pos == 0 && new_pos == last_page) + gtk_tree_store_move_before (GTK_TREE_STORE (model), &cur, NULL); + else if (cur_pos == last_page && new_pos == 0) + gtk_tree_store_move_after (GTK_TREE_STORE (model), &cur, NULL); + else + { + gtk_tree_model_iter_nth_child (model, &new, NULL, new_pos); + gtk_tree_store_swap (GTK_TREE_STORE (model), &cur, &new); + } +} + MidoriExtension* extension_init (void) { @@ -609,6 +662,7 @@ { { STOCK_TAB_PANEL, N_("T_ab Panel"), 0, 0, NULL }, }; + MidoriExtension* extension; factory = gtk_icon_factory_new (); gtk_stock_add (items, G_N_ELEMENTS (items)); @@ -622,10 +676,10 @@ gtk_icon_factory_add_default (factory); g_object_unref (factory); - MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, + extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", _("Tab Panel"), "description", _("Show tabs in a vertical panel"), - "version", "0.1", + "version", "0.1" MIDORI_VERSION_SUFFIX, "authors", "Christian Dywan ", NULL); diff -Nru midori-0.2.8/extensions/tabs-minimized.c midori-0.4.6/extensions/tabs-minimized.c --- midori-0.2.8/extensions/tabs-minimized.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/tabs-minimized.c 2012-05-14 22:13:42.000000000 +0000 @@ -10,7 +10,6 @@ */ #include -#include static void tabs_minimized_app_add_browser_cb (MidoriApp* app, @@ -76,7 +75,7 @@ MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", _("Only Icons on Tabs by default"), "description", _("New tabs have no label by default"), - "version", "0.1", + "version", "0.1" MIDORI_VERSION_SUFFIX, "authors", "MonkeyOfDoom ", NULL); diff -Nru midori-0.2.8/extensions/toolbar-editor.c midori-0.4.6/extensions/toolbar-editor.c --- midori-0.2.8/extensions/toolbar-editor.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/toolbar-editor.c 2012-05-14 22:13:42.000000000 +0000 @@ -48,6 +48,9 @@ static void tb_editor_browser_populate_tool_menu_cb(MidoriBrowser *browser, GtkWidget *menu, MidoriExtension *ext); +static void tb_editor_browser_populate_toolbar_menu_cb(MidoriBrowser *browser, GtkWidget *menu, + MidoriExtension *ext); + static void tb_editor_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, MidoriExtension *ext); @@ -56,6 +59,7 @@ MidoriApp *app = midori_extension_get_app(extension); g_signal_handlers_disconnect_by_func(browser, tb_editor_browser_populate_tool_menu_cb, extension); + g_signal_handlers_disconnect_by_func(browser, tb_editor_browser_populate_toolbar_menu_cb, extension); g_signal_handlers_disconnect_by_func(extension, tb_editor_deactivate_cb, browser); g_signal_handlers_disconnect_by_func(app, tb_editor_app_add_browser_cb, extension); } @@ -119,9 +123,8 @@ GSList *list = NULL; MidoriWebSettings *settings; - settings = katze_object_get_object(browser, "settings"); + settings = midori_browser_get_settings(browser); g_object_get(settings, "toolbar-items", &items, NULL); - g_object_unref(settings); names = g_strsplit(items ? items : "", ",", 0); list = tb_editor_array_to_list((const gchar **) names); @@ -271,6 +274,7 @@ gint x, gint y, GtkSelectionData *data, guint info, guint ltime, TBEditorWidget *tbw) { +#if !GTK_CHECK_VERSION(3,0,0) /* TODO */ GtkTreeView *tree = GTK_TREE_VIEW(widget); gboolean del = FALSE; @@ -328,6 +332,7 @@ tbw->drag_source = NULL; /* reset the value just to be sure */ tb_editor_free_path(tbw); gtk_drag_finish(context, TRUE, del, ltime); +#endif } @@ -356,9 +361,8 @@ gtk_tree_model_foreach(GTK_TREE_MODEL(tbw->store_used), tb_editor_foreach_used, str); - settings = katze_object_get_object(tbw->browser, "settings"); + settings = midori_browser_get_settings(tbw->browser); g_object_set(settings, "toolbar-items", str->str, NULL); - g_object_unref(settings); g_string_free(str, TRUE); } @@ -390,7 +394,7 @@ GTK_WINDOW(parent), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); - vbox = (GTK_DIALOG(dialog))->vbox; + vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); gtk_box_set_spacing(GTK_BOX(vbox), 6); gtk_widget_set_name(dialog, "GeanyDialog"); gtk_window_set_default_size(GTK_WINDOW(dialog), -1, 400); @@ -402,7 +406,7 @@ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); label = gtk_label_new( - _("Select items to be displayed on the toolbar. Items can be reodered by drag and drop.")); + _("Select items to be displayed on the toolbar. Items can be reordered by drag and drop.")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); tree_available = gtk_tree_view_new(); @@ -581,10 +585,27 @@ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); } +static void tb_editor_browser_populate_toolbar_menu_cb(MidoriBrowser *browser, GtkWidget *menu, + MidoriExtension *ext) +{ + GtkWidget* separator; + GtkWidget* menuitem; + + separator = gtk_separator_menu_item_new (); + gtk_widget_show (separator); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), separator); + menuitem = gtk_menu_item_new_with_mnemonic (_("_Customize...")); + g_signal_connect (menuitem, "activate", + G_CALLBACK (tb_editor_menu_configure_toolbar_activate_cb), browser); + gtk_widget_show (menuitem); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); +} + static void tb_editor_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, MidoriExtension *ext) { - g_signal_connect(browser, "populate-tool-menu", G_CALLBACK(tb_editor_browser_populate_tool_menu_cb), ext); - g_signal_connect(ext, "deactivate", G_CALLBACK(tb_editor_deactivate_cb), browser); + g_signal_connect(browser, "populate-tool-menu", G_CALLBACK(tb_editor_browser_populate_tool_menu_cb), ext); + g_signal_connect(browser, "populate-toolbar-menu", G_CALLBACK(tb_editor_browser_populate_toolbar_menu_cb), ext); + g_signal_connect(ext, "deactivate", G_CALLBACK(tb_editor_deactivate_cb), browser); } @@ -605,7 +626,7 @@ MidoriExtension* extension = g_object_new(MIDORI_TYPE_EXTENSION, "name", _("Toolbar Editor"), "description", _("Easily edit the toolbar layout"), - "version", "0.1", + "version", "0.1" MIDORI_VERSION_SUFFIX, "authors", "Enrico Tröger ", NULL); diff -Nru midori-0.2.8/extensions/web-cache.c midori-0.4.6/extensions/web-cache.c --- midori-0.2.8/extensions/web-cache.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/web-cache.c 2012-05-14 22:13:42.000000000 +0000 @@ -11,23 +11,32 @@ */ #include - -#include -#include "config.h" - #include #include + +#include "config.h" #if HAVE_UNISTD_H #include #endif +#if !WEBKIT_CHECK_VERSION (1, 3, 11) + #define MAXLENGTH 1024 * 1024 static gchar* +web_cache_get_cache_dir (void) +{ + static gchar* cache_dir = NULL; + if (!cache_dir) + cache_dir = g_build_filename (g_get_user_cache_dir (), + PACKAGE_NAME, "web", NULL); + return cache_dir; +} + +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; @@ -36,12 +45,10 @@ 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); - /* FIXME: Wrong place? */ + sub_path = g_build_path (G_DIR_SEPARATOR_S, + web_cache_get_cache_dir (), folder, NULL); katze_mkdir_with_parents (sub_path, 0700); g_free (folder); @@ -82,7 +89,7 @@ return TRUE; } -GHashTable* +static GHashTable* web_cache_get_headers (gchar* filename) { GHashTable* headers; @@ -148,7 +155,6 @@ web_cache_set_content_type (SoupMessage* msg, SoupBuffer* buffer) { - #if WEBKIT_CHECK_VERSION (1, 1, 15) gchar* sniffed_type; SoupContentSniffer* sniffer = soup_content_sniffer_new (); if ((sniffed_type = soup_content_sniffer_sniff (sniffer, msg, buffer, NULL))) @@ -162,7 +168,6 @@ msg->response_headers, "Content-Type"); g_signal_emit_by_name (msg, "content-sniffed", content_type, NULL); } - #endif } static void @@ -323,14 +328,8 @@ if (!web_cache_save_headers (msg, filename)) return; - #if GLIB_CHECK_VERSION (2, 20, 0) ostream = (GOutputStream*)g_file_append_to (file, G_FILE_CREATE_PRIVATE | G_FILE_CREATE_REPLACE_DESTINATION, NULL, NULL); - #else - g_unlink (filename); - ostream = (GOutputStream*)g_file_append_to (file, - G_FILE_CREATE_PRIVATE, NULL, NULL); - #endif g_object_unref (file); if (!ostream) @@ -353,7 +352,7 @@ SoupURI* soup_uri = soup_message_get_uri (msg); gchar* uri = soup_uri_to_string (soup_uri, FALSE); - if (uri && g_str_has_prefix (uri, "http") && !g_strcmp0 (msg->method, "GET")) + if (midori_uri_is_http (uri) && !g_strcmp0 (msg->method, "GET")) { gchar* filename = web_cache_get_cached_path (extension, uri); GHashTable* cache_headers; @@ -381,7 +380,6 @@ g_free (uri); } -#if WEBKIT_CHECK_VERSION (1, 1, 3) static void web_cache_add_download_cb (MidoriBrowser* browser, WebKitDownload* download, @@ -393,7 +391,6 @@ g_object_set_data (G_OBJECT (msg), "midori-web-cache-download", (gpointer)0xdeadbeef); } -#endif static void web_cache_deactivate_cb (MidoriExtension* extension, @@ -404,10 +401,8 @@ MidoriBrowser* browser, MidoriExtension* 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); } @@ -425,22 +420,19 @@ extension, web_cache_deactivate_cb, browser); g_signal_handlers_disconnect_by_func ( app, web_cache_app_add_browser_cb, extension); - #if WEBKIT_CHECK_VERSION (1, 1, 3) g_signal_handlers_disconnect_by_func ( browser, web_cache_add_download_cb, extension); - #endif } static void web_cache_activate_cb (MidoriExtension* extension, MidoriApp* app) { - const gchar* cache_path = midori_extension_get_string (extension, "path"); KatzeArray* browsers; MidoriBrowser* browser; SoupSession* session = webkit_get_default_session (); - katze_mkdir_with_parents (cache_path, 0700); + katze_mkdir_with_parents (web_cache_get_cache_dir (), 0700); g_signal_connect (session, "request-queued", G_CALLBACK (web_cache_session_request_queued_cb), extension); @@ -453,24 +445,32 @@ g_object_unref (browsers); } +static void +web_cache_clear_cache_cb (void) +{ + sokoke_remove_path (web_cache_get_cache_dir (), TRUE); +} +#endif + MidoriExtension* extension_init (void) { - gchar* cache_path = g_build_filename (g_get_user_cache_dir (), - PACKAGE_NAME, "web", NULL); + #if WEBKIT_CHECK_VERSION (1, 3, 11) + return NULL; + #else MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", _("Web Cache"), "description", _("Cache HTTP communication on disk"), - "version", "0.1", + "version", "0.1" MIDORI_VERSION_SUFFIX, "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); + sokoke_register_privacy_item ("web-cache", _("Web Cache"), + G_CALLBACK (web_cache_clear_cache_cb)); + return extension; + #endif } diff -Nru midori-0.2.8/extensions/wscript_build midori-0.4.6/extensions/wscript_build --- midori-0.2.8/extensions/wscript_build 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/extensions/wscript_build 2012-05-14 22:13:42.000000000 +0000 @@ -28,13 +28,20 @@ continue source = extension + if bld.env['platform'] == 'win32' and target in ['external-download-manager']: + continue + obj = bld.new_task_gen ('cc', 'shlib') obj.target = target obj.includes = '..' obj.source = source obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML HILDON' - obj.vapi_dirs = '../midori' - obj.packages = 'glib-2.0 gio-2.0 gtk+-2.0 libsoup-2.4 webkit-1.0 midori' + obj.vapi_dirs = '../midori ../katze' + obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 midori katze' + if bld.env['HAVE_GTK3']: + obj.packages += ' gtk+-3.0 webkitgtk-3.0' + else: + obj.packages += ' gtk+-2.0 webkit-1.0 unique-1.0' obj.install_path = '${LIBDIR}/midori' if bld.env['platform'] == 'win32': obj.uselib_local = 'midori' diff -Nru midori-0.2.8/katze/gtk3-compat.c midori-0.4.6/katze/gtk3-compat.c --- midori-0.2.8/katze/gtk3-compat.c 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/katze/gtk3-compat.c 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,150 @@ +#include "katze/gtk3-compat.h" + +#if !GTK_CHECK_VERSION (3, 2, 0) && !defined (HAVE_HILDON_2_2) +static void +sokoke_widget_set_pango_font_style (GtkWidget* widget, + PangoStyle style) +{ + /* Conveniently change the pango font style + For some reason we need to reset if we actually want the normal style */ + if (style == PANGO_STYLE_NORMAL) + gtk_widget_modify_font (widget, NULL); + else + { + PangoFontDescription* font_description = pango_font_description_new (); + pango_font_description_set_style (font_description, PANGO_STYLE_ITALIC); + gtk_widget_modify_font (widget, font_description); + pango_font_description_free (font_description); + } +} + +static gboolean +sokoke_on_entry_focus_in_event (GtkEntry* entry, + GdkEventFocus* event, + gpointer userdata) +{ + gint has_default = GPOINTER_TO_INT ( + g_object_get_data (G_OBJECT (entry), "sokoke_has_default")); + if (has_default) + { + g_object_set_data (G_OBJECT (entry), "sokoke_has_default", + GINT_TO_POINTER (0)); + gtk_entry_set_text (entry, ""); + sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), + PANGO_STYLE_NORMAL); + } + return FALSE; +} + +static gboolean +sokoke_on_entry_focus_out_event (GtkEntry* entry, + GdkEventFocus* event, + gpointer userdata) +{ + const gchar* text = gtk_entry_get_text (entry); + if (text && !*text) + { + const gchar* default_text = (const gchar*)g_object_get_data ( + G_OBJECT (entry), "sokoke_default_text"); + g_object_set_data (G_OBJECT (entry), + "sokoke_has_default", GINT_TO_POINTER (1)); + gtk_entry_set_text (entry, default_text); + sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), + PANGO_STYLE_ITALIC); + } + return FALSE; +} + +static void +sokoke_on_entry_drag_data_received (GtkEntry* entry, + GdkDragContext* drag_context, + gint x, + gint y, + guint timestamp, + gpointer user_data) +{ + sokoke_on_entry_focus_in_event (entry, NULL, NULL); +} + +void +gtk_entry_set_placeholder_text (GtkEntry* entry, + const gchar* default_text) +{ + /* Note: The default text initially overwrites any previous text */ + gchar* old_value = g_object_get_data (G_OBJECT (entry), + "sokoke_default_text"); + g_object_set_data (G_OBJECT (entry), "sokoke_default_text", + (gpointer)default_text); + + if (!old_value) + { + g_object_set_data (G_OBJECT (entry), "sokoke_has_default", + GINT_TO_POINTER (1)); + sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), + PANGO_STYLE_ITALIC); + gtk_entry_set_text (entry, default_text); + g_signal_connect (entry, "drag-data-received", + G_CALLBACK (sokoke_on_entry_drag_data_received), NULL); + g_signal_connect (entry, "focus-in-event", + G_CALLBACK (sokoke_on_entry_focus_in_event), NULL); + g_signal_connect (entry, "focus-out-event", + G_CALLBACK (sokoke_on_entry_focus_out_event), NULL); + } + else if (!gtk_widget_has_focus (GTK_WIDGET (entry))) + { + gint has_default = GPOINTER_TO_INT ( + g_object_get_data (G_OBJECT (entry), "sokoke_has_default")); + if (has_default) + { + gtk_entry_set_text (entry, default_text); + sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), + PANGO_STYLE_ITALIC); + } + } +} + +const gchar* +gtk_entry_get_placeholder_text (GtkEntry* entry) +{ + return g_object_get_data (G_OBJECT (entry), "sokoke_default_text"); +} +#endif + +#if !GTK_CHECK_VERSION (2, 12, 0) + +void +gtk_widget_set_has_tooltip (GtkWidget* widget, + gboolean has_tooltip) +{ + /* Do nothing */ +} + +void +gtk_widget_set_tooltip_text (GtkWidget* widget, + const gchar* text) +{ + if (text && *text) + { + static GtkTooltips* tooltips = NULL; + if (G_UNLIKELY (!tooltips)) + tooltips = gtk_tooltips_new (); + gtk_tooltips_set_tip (tooltips, widget, text, NULL); + } +} + +void +gtk_tool_item_set_tooltip_text (GtkToolItem* toolitem, + const gchar* text) +{ + if (text && *text) + { + static GtkTooltips* tooltips = NULL; + if (G_UNLIKELY (!tooltips)) + tooltips = gtk_tooltips_new (); + + gtk_tool_item_set_tooltip (toolitem, tooltips, text, NULL); + } +} + +#endif + diff -Nru midori-0.2.8/katze/gtk3-compat.h midori-0.4.6/katze/gtk3-compat.h --- midori-0.2.8/katze/gtk3-compat.h 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/katze/gtk3-compat.h 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,156 @@ +#include +#include + +#ifndef H_GTK3_COMPAT_20110110 +#define H_GTK3_COMPAT_20110110 + +G_BEGIN_DECLS + +#if GTK_CHECK_VERSION (3, 2, 0) && defined (GTK_DISABLE_DEPRECATED) + #define GTK_TYPE_VBOX GTK_TYPE_BOX + #define GtkVBox GtkBox + #define GtkVBoxClass GtkBoxClass + #define gtk_vbox_new(hmg,spc) g_object_new (GTK_TYPE_BOX, \ + "homogeneous", hmg, "spacing", spc, \ + "orientation", GTK_ORIENTATION_VERTICAL, NULL) + #define GTK_TYPE_HBOX GTK_TYPE_BOX + #define GtkHBox GtkBox + #define GtkHBoxClass GtkBoxClass + #define gtk_hbox_new(hmg,spc) g_object_new (GTK_TYPE_BOX, \ + "homogeneous", hmg, "spacing", spc, \ + "orientation", GTK_ORIENTATION_HORIZONTAL, NULL) + #define gtk_hseparator_new() g_object_new (GTK_TYPE_SEPARATOR, NULL) + #define gtk_hpaned_new() g_object_new (GTK_TYPE_PANED, NULL) + #define gtk_vpaned_new() g_object_new (GTK_TYPE_PANED, \ + "orientation", GTK_ORIENTATION_VERTICAL, NULL) + /* FIXME */ + #define gtk_widget_render_icon(wdgt, stk, sz, dtl) \ + gtk_widget_render_icon_pixbuf(wdgt, stk, sz) + #define gtk_widget_size_request(wdgt, req) \ + gtk_widget_get_preferred_size(wdgt, req, NULL) +#endif + +#if !GLIB_CHECK_VERSION (2, 32, 0) + #define G_SOURCE_REMOVE FALSE + #define G_SOURCE_CONTINUE TRUE +#endif + +#if !GLIB_CHECK_VERSION (2, 30, 0) + #define g_format_size(sz) g_format_size_for_display ((goffset)sz) +#endif + +#if !GTK_CHECK_VERSION (2, 14, 0) + #define gtk_dialog_get_content_area(dlg) dlg->vbox + #define gtk_dialog_get_action_area(dlg) dlg->action_area + #define gtk_widget_get_window(wdgt) wdgt->window + #define gtk_adjustment_get_page_size(adj) adj->page_size + #define gtk_adjustment_get_upper(adj) adj->upper + #define gtk_adjustment_get_lower(adj) adj->lower + #define gtk_adjustment_get_value(adj) adj->value +#endif + +#if !GTK_CHECK_VERSION (2, 16, 0) + #define GTK_ACTIVATABLE GTK_WIDGET + #define gtk_activatable_get_related_action gtk_widget_get_action + #define gtk_menu_item_set_label(menuitem, label) \ + gtk_label_set_label (GTK_LABEL (GTK_BIN (menuitem)->child), \ + label ? label : ""); + #define gtk_image_menu_item_set_always_show_image(menuitem, yesno) () +#endif + +#if !GTK_CHECK_VERSION (2, 18, 0) + #define gtk_widget_is_toplevel(widget) GTK_WIDGET_TOPLEVEL (widget) + #define gtk_widget_has_focus(widget) GTK_WIDGET_HAS_FOCUS (widget) + #define gtk_widget_get_visible(widget) GTK_WIDGET_VISIBLE (widget) + #define gtk_widget_get_sensitive(widget) GTK_WIDGET_IS_SENSITIVE (widget) + #define gtk_widget_set_can_focus(widget,flag) \ + GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS) + #define gtk_widget_get_allocation(wdgt, alloc) *alloc = wdgt->allocation + #define gtk_widget_get_has_window(wdgt) !GTK_WIDGET_NO_WINDOW (wdgt) + #define gtk_widget_get_allocation(wdgt, alloc) *alloc = wdgt->allocation + #define gtk_widget_set_window(wdgt, wndw) wdgt->window = wndw + #define gtk_widget_is_drawable GTK_WIDGET_DRAWABLE + #define gtk_widget_get_drawable GTK_WIDGET_VISIBLE + #define gtk_widget_set_has_window(wdgt, wnd) \ + if (wnd) GTK_WIDGET_UNSET_FLAGS (wdgt, GTK_NO_WINDOW); \ + else GTK_WIDGET_SET_FLAGS (wdgt, GTK_NO_WINDOW) +#endif + +#if !GTK_CHECK_VERSION (2, 20, 0) + #define gtk_widget_get_realized(widget) GTK_WIDGET_REALIZED (widget) + #define gtk_widget_set_realized(wdgt, real) \ + if (real) GTK_WIDGET_SET_FLAGS (wdgt, GTK_REALIZED); \ + else GTK_WIDGET_UNSET_FLAGS (wdgt, GTK_REALIZED) +#endif + +#if GTK_CHECK_VERSION (3, 0, 0) + #define GTK_DIALOG_NO_SEPARATOR 0 +#endif + +#if !GTK_CHECK_VERSION (3, 2, 0) && defined (HAVE_HILDON_2_2) + #define gtk_entry_set_placeholder_text hildon_gtk_entry_set_placeholder_text + #define gtk_entry_get_placeholder_text hildon_gtk_entry_get_placeholder_text +#elif !GTK_CHECK_VERSION (3, 2, 0) + void gtk_entry_set_placeholder_text (GtkEntry* entry, const gchar* text); + const gchar* gtk_entry_get_placeholder_text (GtkEntry* entry); +#endif + +#if !GTK_CHECK_VERSION(2, 12, 0) + +void +gtk_widget_set_has_tooltip (GtkWidget* widget, + gboolean has_tooltip); + +void +gtk_widget_set_tooltip_text (GtkWidget* widget, + const gchar* text); + +void +gtk_tool_item_set_tooltip_text (GtkToolItem* toolitem, + const gchar* text); + +#endif + +#if !GTK_CHECK_VERSION (2, 24 ,0) + #define gtk_combo_box_text_append_text gtk_combo_box_append_text + #define gtk_combo_box_text_new gtk_combo_box_new_text + #define gtk_combo_box_text_new_with_entry gtk_combo_box_entry_new_text + #define gtk_combo_box_text_get_active_text gtk_combo_box_get_active_text + #define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX + #define GtkComboBoxText GtkComboBox +#endif + +#ifndef GDK_KEY_Return + #define GDK_KEY_0 GDK_0 + #define GDK_KEY_BackSpace GDK_BackSpace + #define GDK_KEY_space GDK_space + #define GDK_KEY_F5 GDK_F5 + #define GDK_KEY_KP_Equal GDK_KP_Equal + #define GDK_KEY_KP_Enter GDK_KP_Enter + #define GDK_KEY_KP_Left GDK_KP_Left + #define GDK_KEY_KP_Right GDK_KP_Right + #define GDK_KEY_KP_Delete GDK_KP_Delete + #define GDK_KEY_KP_Down GDK_KP_Down + #define GDK_KEY_KP_Up GDK_KP_Up + #define GDK_KEY_KP_Divide GDK_KP_Divide + #define GDK_KEY_Tab GDK_Tab + #define GDK_KEY_ISO_Left_Tab GDK_ISO_Left_Tab + #define GDK_KEY_equal GDK_equal + #define GDK_KEY_ISO_Enter GDK_ISO_Enter + #define GDK_KEY_Left GDK_Left + #define GDK_KEY_Right GDK_Right + #define GDK_KEY_Escape GDK_Escape + #define GDK_KEY_Page_Up GDK_Page_Up + #define GDK_KEY_Page_Down GDK_Page_Down + #define GDK_KEY_Delete GDK_Delete + #define GDK_KEY_Down GDK_Down + #define GDK_KEY_Up GDK_Up + #define GDK_KEY_B GDK_B + #define GDK_KEY_H GDK_H + #define GDK_KEY_J GDK_J + #define GDK_KEY_Return GDK_Return +#endif + +G_END_DECLS + +#endif diff -Nru midori-0.2.8/katze/katze-array.c midori-0.4.6/katze/katze-array.c --- midori-0.2.8/katze/katze-array.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/katze/katze-array.c 2012-05-14 22:13:42.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2008-2010 Christian Dywan + Copyright (C) 2008-2011 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -50,6 +50,9 @@ gint index); void (*clear) (KatzeArray* array); + + void + (*update) (KatzeArray* array); }; G_DEFINE_TYPE (KatzeArray, katze_array, KATZE_TYPE_ITEM); @@ -59,30 +62,36 @@ REMOVE_ITEM, MOVE_ITEM, CLEAR, + UPDATE, LAST_SIGNAL }; static guint signals[LAST_SIGNAL]; +GList* kalistglobal; + static void katze_array_finalize (GObject* object); static void +_katze_array_update (KatzeArray* array) +{ + g_object_set_data (G_OBJECT (array), "last-update", + GINT_TO_POINTER (time (NULL))); +} + +static void _katze_array_add_item (KatzeArray* array, gpointer item) { - if (katze_array_is_a (array, G_TYPE_OBJECT)) - { - GType type = G_OBJECT_TYPE (item); - - /* g_return_if_fail (katze_array_is_a (array, type)); */ - g_object_ref (item); - if (g_type_is_a (type, KATZE_TYPE_ITEM)) - katze_item_set_parent (item, array); - } + GType type = G_OBJECT_TYPE (item); + g_object_ref (item); + if (g_type_is_a (type, KATZE_TYPE_ITEM)) + katze_item_set_parent (item, array); array->items = g_list_append (array->items, item); + _katze_array_update (array); } static void @@ -91,12 +100,10 @@ { array->items = g_list_remove (array->items, item); - if (katze_array_is_a (array, G_TYPE_OBJECT)) - { - if (KATZE_IS_ITEM (item)) - katze_item_set_parent (item, NULL); - g_object_unref (item); - } + if (KATZE_IS_ITEM (item)) + katze_item_set_parent (item, NULL); + g_object_unref (item); + _katze_array_update (array); } static void @@ -106,6 +113,7 @@ { array->items = g_list_remove (array->items, item); array->items = g_list_insert (array->items, item, position); + _katze_array_update (array); } static void @@ -114,9 +122,10 @@ GObject* item; while ((item = g_list_nth_data (array->items, 0))) - katze_array_remove_item (array, item); + g_signal_emit (array, signals[REMOVE_ITEM], 0, item); g_list_free (array->items); array->items = NULL; + _katze_array_update (array); } static void @@ -181,6 +190,25 @@ g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + /** + * KatzeArray::update: + * @array: the object on which the signal is emitted + * + * The array changed and any display widgets should + * be updated. + * + * Since: 0.3.0 + **/ + signals[UPDATE] = g_signal_new ( + "update", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (KatzeArrayClass, update), + 0, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = katze_array_finalize; @@ -188,30 +216,24 @@ class->remove_item = _katze_array_remove_item; class->move_item = _katze_array_move_item; class->clear = _katze_array_clear; + class->update = _katze_array_update; } static void katze_array_init (KatzeArray* array) { - array->type = G_TYPE_NONE; + array->type = G_TYPE_OBJECT; array->items = NULL; } static void katze_array_finalize (GObject* object) { - KatzeArray* array; - guint i; - - array = KATZE_ARRAY (object); - if (katze_array_is_a (array, G_TYPE_OBJECT)) - { - gpointer item; - i = 0; - while ((item = g_list_nth_data (array->items, i++))) - g_object_unref (item); - } + KatzeArray* array = KATZE_ARRAY (object); + GList* items; + for (items = array->items; items; items = g_list_next (items)) + g_object_unref (items->data); g_list_free (array->items); G_OBJECT_CLASS (katze_array_parent_class)->finalize (object); @@ -223,8 +245,6 @@ * * Creates a new #KatzeArray for @type items. * - * You may only add items of the given type or inherited - * from it to this array *if* @type is an #GObject type. * The array will keep a reference on each object until * it is removed from the array. * @@ -233,14 +253,17 @@ KatzeArray* katze_array_new (GType type) { - KatzeArray* array = g_object_new (KATZE_TYPE_ARRAY, NULL); + KatzeArray* array; + + g_return_val_if_fail (g_type_is_a (type, G_TYPE_OBJECT), NULL); + + array = g_object_new (KATZE_TYPE_ARRAY, NULL); array->type = type; return array; } /** - * * katze_array_is_a: * @array: a #KatzeArray * @is_a_type: type to compare with @@ -350,38 +373,39 @@ /** * katze_array_find_token: * @array: a #KatzeArray - * @token: a token string + * @token: a token string, or "token keywords" string * * Looks up an item in the array which has the specified token. * - * This function will silently fail if the type of the list - * is not based on #GObject and only #KatzeItem children - * are checked for their token, any other objects are skipped. + * This function will fail if the type of the list + * is not based on #KatzeItem children. * * Note that @token is by definition unique to one item. * + * Since 0.4.4 @token can be a "token keywords" string. + * * Return value: an item, or %NULL **/ gpointer katze_array_find_token (KatzeArray* array, const gchar* token) { - guint i; - gpointer item; + goffset token_length; + GList* items; + + g_return_val_if_fail (KATZE_IS_ARRAY (array), NULL); + g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_ITEM), NULL); + g_return_val_if_fail (token != NULL, NULL); - if (!katze_array_is_a (array, G_TYPE_OBJECT)) - return NULL; + token_length = strchr (token, ' ') - token; + if (token_length < 1) + token_length = strlen (token); - i = 0; - while ((item = g_list_nth_data (array->items, i++))) + for (items = array->items; items; items = g_list_next (items)) { - const gchar* found_token; - - if (!KATZE_IS_ITEM (item)) - continue; - found_token = ((KatzeItem*)item)->token; - if (!g_strcmp0 (found_token, token)) - return item; + const gchar* found_token = ((KatzeItem*)items->data)->token; + if (found_token != NULL && !strncmp (token, found_token, token_length)) + return items->data; } return NULL; } @@ -393,9 +417,8 @@ * * Looks up an item in the array which has the specified URI. * - * This function will silently fail if the type of the list - * is not based on #GObject and only #KatzeItem children - * are checked for their token, any other objects are skipped. + * This function will fail if the type of the list + * is not based on #KatzeItem children. * * Return value: an item, or %NULL * @@ -405,22 +428,17 @@ katze_array_find_uri (KatzeArray* array, const gchar* uri) { - guint i; - gpointer item; + GList* items; - if (!katze_array_is_a (array, G_TYPE_OBJECT)) - return NULL; + g_return_val_if_fail (KATZE_IS_ARRAY (array), NULL); + g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_ITEM), NULL); + g_return_val_if_fail (uri != NULL, NULL); - i = 0; - while ((item = g_list_nth_data (array->items, i++))) + for (items = array->items; items; items = g_list_next (items)) { - const gchar* found_uri; - - if (!KATZE_IS_ITEM (item)) - continue; - found_uri = ((KatzeItem*)item)->uri; - if (!g_strcmp0 (found_uri, uri)) - return item; + const gchar* found_uri = ((KatzeItem*)items->data)->uri; + if (found_uri != NULL && !strcmp (found_uri, uri)) + return items->data; } return NULL; } @@ -482,6 +500,8 @@ GList* katze_array_peek_items (KatzeArray* array) { + g_return_val_if_fail (KATZE_IS_ARRAY (array), NULL); + return array->items; } @@ -498,3 +518,20 @@ g_signal_emit (array, signals[CLEAR], 0); } + +/** + * katze_array_update: + * @array: a #KatzeArray + * + * Indicates that the array changed and any display + * widgets should be updated. + * + * Since: 0.3.0 + **/ +void +katze_array_update (KatzeArray* array) +{ + g_return_if_fail (KATZE_IS_ARRAY (array)); + + g_signal_emit (array, signals[UPDATE], 0); +} diff -Nru midori-0.2.8/katze/katze-array.h midori-0.4.6/katze/katze-array.h --- midori-0.2.8/katze/katze-array.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/katze/katze-array.h 2012-05-14 22:13:42.000000000 +0000 @@ -83,7 +83,16 @@ GList* katze_array_peek_items (KatzeArray* array); -GList* kalistglobal; +extern GList* kalistglobal; +/* KATZE_ARRAY_FOREACH_ITEM: + * @item: a #KatzeItem variable + * @array: a #KatzeArray to loop through + * + * Loops through all items of the array. The macro can + * be used like a for() loop. + * If the array is modified during the loop, you must + * use KATZE_ARRAY_FOREACH_ITEM_L instead. + * */ #define KATZE_ARRAY_FOREACH_ITEM(kaitem, kaarray) \ for (kalistglobal = katze_array_peek_items (kaarray), \ kaitem = kalistglobal ? kalistglobal->data : NULL; \ @@ -91,9 +100,28 @@ kalistglobal = g_list_next (kalistglobal), \ kaitem = kalistglobal ? kalistglobal->data : NULL) +/* KATZE_ARRAY_FOREACH_ITEM_L: + * @item: a #KatzeItem variable + * @array: a #KatzeArray to loop through + * @list: a #GList variable + * + * Loops through all items of the array. The list must be freed. + * + * Since: 0.3.0 + * */ +#define KATZE_ARRAY_FOREACH_ITEM_L(kaitem, kaarray, kalist) \ + for (kalist = katze_array_get_items (kaarray), \ + kaitem = kalist ? kalist->data : NULL; \ + kalist != NULL; \ + kalist = g_list_next (kalist), \ + kaitem = kalist ? kalist->data : NULL) + void katze_array_clear (KatzeArray* array); +void +katze_array_update (KatzeArray* array); + G_END_DECLS #endif /* __KATZE_ARRAY_H__ */ diff -Nru midori-0.2.8/katze/katze-arrayaction.c midori-0.4.6/katze/katze-arrayaction.c --- midori-0.2.8/katze/katze-arrayaction.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/katze/katze-arrayaction.c 2012-05-14 22:13:42.000000000 +0000 @@ -90,6 +90,10 @@ GtkWidget* proxy); static void +katze_array_action_proxy_clicked_cb (GtkWidget* proxy, + KatzeArrayAction* array_action); + +static void katze_array_action_class_init (KatzeArrayActionClass* class) { GObjectClass* gobject_class; @@ -277,19 +281,6 @@ static void katze_array_action_activate (GtkAction* action) { - GSList* proxies; - - proxies = gtk_action_get_proxies (action); - if (!proxies) - return; - - do - if (GTK_IS_TOOL_ITEM (proxies->data)) - { - - } - while ((proxies = g_slist_next (proxies))); - if (GTK_ACTION_CLASS (katze_array_action_parent_class)->activate) GTK_ACTION_CLASS (katze_array_action_parent_class)->activate (action); } @@ -364,11 +355,16 @@ gint summand; KatzeItem* item; GtkWidget* menuitem; - const gchar* icon_name; - GdkPixbuf* icon; GtkWidget* image; GtkWidget* submenu; + g_return_if_fail (KATZE_IS_ARRAY_ACTION (array_action)); + g_return_if_fail (KATZE_IS_ITEM (array)); + g_return_if_fail (GTK_IS_MENU_SHELL (menu)); + g_return_if_fail (GTK_IS_TOOL_ITEM (proxy) + || GTK_IS_MENU_ITEM (proxy) + || GTK_IS_WINDOW (proxy)); + if (!KATZE_IS_ARRAY (array)) return; @@ -394,31 +390,23 @@ } menuitem = katze_image_menu_item_new_ellipsized ( katze_item_get_name (item)); - if ((icon_name = katze_item_get_icon (item)) && *icon_name) - image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); - else - { - if (KATZE_ITEM_IS_FOLDER (item)) - icon = gtk_widget_render_icon (menuitem, - GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); - else - icon = katze_load_cached_icon (katze_item_get_uri (item), proxy); - image = gtk_image_new_from_pixbuf (icon); - g_object_unref (icon); - } + image = katze_item_get_image (item); 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 ( GTK_IMAGE_MENU_ITEM (menuitem), TRUE); - #endif gtk_menu_shell_append (menu, menuitem); g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); if (KATZE_ITEM_IS_FOLDER (item)) { submenu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu); + /* Make sure menu appears to contain items */ + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), + gtk_separator_menu_item_new ()); g_signal_connect (menuitem, "select", G_CALLBACK (katze_array_action_menu_item_select_cb), array_action); + g_signal_connect (menuitem, "activate", + G_CALLBACK (katze_array_action_menu_item_select_cb), array_action); } else { @@ -432,21 +420,51 @@ } } -static void -katze_array_action_menu_item_select_cb (GtkWidget* proxy, - KatzeArrayAction* array_action) +static gboolean +katze_array_action_menu_item_need_update (KatzeArrayAction* array_action, + GtkWidget* proxy) { GtkWidget* menu; KatzeArray* array; + gint last_array_update, last_proxy_update; gboolean handled; + array = g_object_get_data (G_OBJECT (proxy), "KatzeItem"); + /* last-update is set on all arrays; consider public API */ + last_array_update = GPOINTER_TO_INT ( + g_object_get_data (G_OBJECT (array), "last-update")); + last_proxy_update = GPOINTER_TO_INT ( + g_object_get_data (G_OBJECT (proxy), "last-update")); + if (last_proxy_update > last_array_update) + return FALSE; + menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (proxy)); gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback)(gtk_widget_destroy), NULL); - - array = g_object_get_data (G_OBJECT (proxy), "KatzeItem"); katze_array_action_generate_menu (array_action, array, GTK_MENU_SHELL (menu), proxy); g_signal_emit (array_action, signals[POPULATE_FOLDER], 0, menu, array, &handled); + g_object_set_data (G_OBJECT (proxy), "last-update", + GINT_TO_POINTER (time (NULL))); + return TRUE; +} + +static void +katze_array_action_menu_item_select_cb (GtkWidget* proxy, + KatzeArrayAction* array_action) +{ + katze_array_action_menu_item_need_update (array_action, proxy); +} + +static void +katze_array_action_menu_deactivate_cb (GtkWidget* menu, + GtkWidget* proxy) +{ + void* array_action = g_object_get_data (G_OBJECT (menu), "KatzeArrayAction"); + g_signal_handlers_block_by_func (proxy, + katze_array_action_proxy_clicked_cb, array_action); + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (proxy), FALSE); + g_signal_handlers_unblock_by_func (proxy, + katze_array_action_proxy_clicked_cb, array_action); } static void @@ -457,20 +475,21 @@ KatzeArray* array; gboolean handled = FALSE; + array = (KatzeArray*)g_object_get_data (G_OBJECT (proxy), "KatzeItem"); if (GTK_IS_MENU_ITEM (proxy)) { - g_object_set_data (G_OBJECT (proxy), "KatzeItem", array_action->array); - katze_array_action_menu_item_select_cb (proxy, array_action); - g_signal_emit (array_action, signals[POPULATE_FOLDER], 0, - gtk_menu_item_get_submenu (GTK_MENU_ITEM (proxy)), - array_action->array, &handled); - if (!handled) - g_signal_emit (array_action, signals[POPULATE_POPUP], 0, - gtk_menu_item_get_submenu (GTK_MENU_ITEM (proxy))); + if (katze_array_action_menu_item_need_update (array_action, proxy)) + { + g_signal_emit (array_action, signals[POPULATE_FOLDER], 0, + gtk_menu_item_get_submenu (GTK_MENU_ITEM (proxy)), + array, &handled); + if (!handled) + g_signal_emit (array_action, signals[POPULATE_POPUP], 0, + gtk_menu_item_get_submenu (GTK_MENU_ITEM (proxy))); + } return; } - array = (KatzeArray*)g_object_get_data (G_OBJECT (proxy), "KatzeArray"); if (KATZE_IS_ITEM (array) && katze_item_get_uri ((KatzeItem*)array)) { katze_array_action_activate_item (array_action, KATZE_ITEM (array), 1); @@ -478,6 +497,7 @@ } menu = gtk_menu_new (); + gtk_menu_attach_to_widget (GTK_MENU (menu), proxy, NULL); if (!array) array = array_action->array; @@ -499,6 +519,10 @@ katze_widget_popup (GTK_WIDGET (proxy), GTK_MENU (menu), NULL, KATZE_MENU_POSITION_LEFT); #endif + gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), TRUE); + g_object_set_data (G_OBJECT (menu), "KatzeArrayAction", array_action); + g_signal_connect (menu, "deactivate", + G_CALLBACK (katze_array_action_menu_deactivate_cb), proxy); } static GtkWidget* @@ -515,7 +539,7 @@ { GtkWidget* toolitem; - toolitem = GTK_WIDGET (gtk_tool_button_new (NULL, "")); + toolitem = GTK_WIDGET (gtk_toggle_tool_button_new ()); return toolitem; } @@ -543,18 +567,14 @@ GParamSpec* pspec, GtkToolItem* toolitem) { - KatzeArrayAction* array_action; const gchar* property; const gchar* title; const gchar* desc; - GdkPixbuf* icon; GtkWidget* image; if (!G_IS_PARAM_SPEC_STRING (pspec)) return; - array_action = (KatzeArrayAction*)g_object_get_data ( - G_OBJECT (toolitem), "KatzeArrayAction"); property = g_param_spec_get_name (pspec); if (!strcmp (property, "name")) { @@ -576,16 +596,13 @@ } else if (KATZE_ITEM_IS_BOOKMARK (item) && !strcmp (property, "uri")) { - icon = katze_load_cached_icon (katze_item_get_uri (item), GTK_WIDGET (toolitem)); - image = gtk_image_new_from_pixbuf (icon); - g_object_unref (icon); + image = katze_item_get_image (item); gtk_widget_show (image); gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); } else if (!strcmp (property, "icon")) { - image = gtk_image_new_from_icon_name (katze_item_get_icon (item), - GTK_ICON_SIZE_MENU); + image = katze_item_get_image (item); gtk_widget_show (image); gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); } @@ -597,30 +614,15 @@ { KatzeArrayAction* array_action; GtkWidget* menuitem; - const gchar* icon_name; GtkWidget* image; - GdkPixbuf* icon; array_action = g_object_get_data (G_OBJECT (proxy), "KatzeArrayAction"); menuitem = katze_image_menu_item_new_ellipsized ( katze_item_get_name (item)); - if ((icon_name = katze_item_get_icon (item)) && *icon_name) - image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); - else - { - if (KATZE_ITEM_IS_FOLDER (item)) - icon = gtk_widget_render_icon (menuitem, - GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); - else - icon = katze_load_cached_icon (katze_item_get_uri (item), proxy); - image = gtk_image_new_from_pixbuf (icon); - g_object_unref (icon); - } + image = katze_item_get_image (item); 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 ( GTK_IMAGE_MENU_ITEM (menuitem), TRUE); - #endif g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); if (KATZE_ITEM_IS_FOLDER (item)) { @@ -673,7 +675,6 @@ const gchar* uri; const gchar* desc; GtkToolItem* toolitem; - GdkPixbuf* icon; GtkWidget* image; GtkWidget* label; @@ -684,16 +685,13 @@ if (KATZE_ITEM_IS_SEPARATOR (item)) return gtk_separator_tool_item_new (); - 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_ITEM_IS_FOLDER (item)) - icon = gtk_widget_render_icon (GTK_WIDGET (toolitem), - GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); + toolitem = gtk_toggle_tool_button_new (); else - icon = katze_load_cached_icon (uri, GTK_WIDGET (toolitem)); - image = gtk_image_new_from_pixbuf (icon); - g_object_unref (icon); + toolitem = gtk_tool_button_new (NULL, ""); + g_signal_connect (toolitem, "create-menu-proxy", + G_CALLBACK (katze_array_action_proxy_create_menu_proxy_cb), item); + image = katze_item_get_image (item); gtk_widget_show (image); gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); label = gtk_label_new (NULL); @@ -733,6 +731,9 @@ katze_array_action_connect_proxy (GtkAction* action, GtkWidget* proxy) { + KatzeArrayAction* array_action = KATZE_ARRAY_ACTION (action); + g_object_set_data (G_OBJECT (proxy), "KatzeItem", array_action->array); + GTK_ACTION_CLASS (katze_array_action_parent_class)->connect_proxy ( action, proxy); @@ -744,11 +745,11 @@ else if (GTK_IS_MENU_ITEM (proxy)) { gtk_menu_item_set_submenu (GTK_MENU_ITEM (proxy), gtk_menu_new ()); - /* FIXME: 'select' doesn't cover all ways of selection */ g_signal_connect (proxy, "select", G_CALLBACK (katze_array_action_proxy_clicked_cb), action); + g_signal_connect (proxy, "activate", + G_CALLBACK (katze_array_action_proxy_clicked_cb), action); } - gtk_widget_set_sensitive (proxy, KATZE_ARRAY_ACTION (action)->array != NULL); } static void diff -Nru midori-0.2.8/katze/katze-http-auth.c midori-0.4.6/katze/katze-http-auth.c --- midori-0.2.8/katze/katze-http-auth.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/katze/katze-http-auth.c 2012-05-14 22:13:42.000000000 +0000 @@ -14,16 +14,13 @@ #endif #include "katze-http-auth.h" +#include "gtk3-compat.h" #include #include #include #include -#if !GTK_CHECK_VERSION (2, 14, 0) - #define gtk_dialog_get_content_area(dialog) dialog->vbox -#endif - struct _KatzeHttpAuth { GObject parent_instance; @@ -103,8 +100,7 @@ if (!g_hash_table_lookup (save->http_auth->logins, opaque_info)) { - KatzeHttpAuthLogin* login; - login = g_new (KatzeHttpAuthLogin, 1); + KatzeHttpAuthLogin* login = g_slice_new (KatzeHttpAuthLogin); login->username = save->username; login->password = save->password; g_hash_table_insert (save->http_auth->logins, opaque_info, login); @@ -130,7 +126,7 @@ } /* FIXME g_object_unref (save->auth); */ - /* FIXME g_free (save); */ + /* FIXME g_slice_free (KatzeHttpAuthSave, save); */ g_signal_handlers_disconnect_by_func (msg, authentication_message_got_headers_cb, save); } @@ -164,7 +160,7 @@ else { g_object_unref (save->auth); - g_free (save); + g_slice_free (KatzeHttpAuthSave, save); } } @@ -260,7 +256,6 @@ gtk_size_group_add_widget (sizegroup, align); gtk_box_pack_start (GTK_BOX (hbox), align, TRUE, TRUE, 0); entry = gtk_entry_new (); - gtk_entry_set_max_length (GTK_ENTRY (entry), 32); if (login) gtk_entry_set_text (GTK_ENTRY (entry), login->password); gtk_entry_set_visibility (GTK_ENTRY (entry), FALSE); @@ -280,7 +275,7 @@ g_object_set_data (G_OBJECT (dialog), "session", session); g_object_set_data (G_OBJECT (dialog), "msg", msg); - save = g_new (KatzeHttpAuthSave, 1); + save = g_slice_new0 (KatzeHttpAuthSave); save->http_auth = http_auth; save->auth = g_object_ref (auth); g_signal_connect (dialog, "response", @@ -366,7 +361,7 @@ { g_free (login->username); g_free (login->password); - g_free (login); + g_slice_free (KatzeHttpAuthLogin, login); } static void @@ -389,12 +384,9 @@ gchar** parts = g_strsplit (line, "\t", 3); if (parts && parts[0] && parts[1] && parts[2]) { - KatzeHttpAuthLogin* login; - gint length; - - login = g_new (KatzeHttpAuthLogin, 1); + gint length = strlen (parts[2]); + KatzeHttpAuthLogin* login = g_slice_new (KatzeHttpAuthLogin); login->username = parts[1]; - length = strlen (parts[2]); if (parts[2][length - 1] == '\n') length--; login->password = g_strndup (parts[2], length); diff -Nru midori-0.2.8/katze/katze-http-cookies-sqlite.c midori-0.4.6/katze/katze-http-cookies-sqlite.c --- midori-0.2.8/katze/katze-http-cookies-sqlite.c 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/katze/katze-http-cookies-sqlite.c 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,292 @@ +/* + Copyright (C) 2008-2010 Christian Dywan + Copyright (C) 2011 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. +*/ + +#if HAVE_CONFIG_H + #include +#endif + +#include "katze-http-cookies-sqlite.h" + +#include +#ifdef HAVE_UNISTD_H + #include +#endif +#include +#include +#include +#include +#include + +#define QUERY_ALL "SELECT id, name, value, host, path, expiry, lastAccessed, isSecure, isHttpOnly FROM moz_cookies;" +#define CREATE_TABLE "CREATE TABLE IF NOT EXISTS moz_cookies (id INTEGER PRIMARY KEY, name TEXT, value TEXT, host TEXT, path TEXT,expiry INTEGER, lastAccessed INTEGER, isSecure INTEGER, isHttpOnly INTEGER)" +#define QUERY_INSERT "INSERT INTO moz_cookies VALUES(NULL, %Q, %Q, %Q, %Q, %d, NULL, %d, %d);" +#define QUERY_DELETE "DELETE FROM moz_cookies WHERE name=%Q AND host=%Q;" + +enum { + COL_ID, + COL_NAME, + COL_VALUE, + COL_HOST, + COL_PATH, + COL_EXPIRY, + COL_LAST_ACCESS, + COL_SECURE, + COL_HTTP_ONLY, + N_COL, +}; + +struct _KatzeHttpCookiesSqlite +{ + GObject parent_instance; + gchar* filename; + SoupCookieJar* jar; + sqlite3 *db; + guint counter; +}; + +struct _KatzeHttpCookiesSqliteClass +{ + GObjectClass parent_class; +}; + +static void +katze_http_cookies_sqlite_session_feature_iface_init (SoupSessionFeatureInterface *iface, + gpointer data); + +G_DEFINE_TYPE_WITH_CODE (KatzeHttpCookiesSqlite, katze_http_cookies_sqlite, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE, + katze_http_cookies_sqlite_session_feature_iface_init)); + +/* Cookie jar saving into sqlite database + Copyright (C) 2008 Diego Escalante Urrelo + Copyright (C) 2009 Collabora Ltd. + Mostly copied from libSoup 2.30, coding style retained */ + +/* Follows sqlite3 convention; returns TRUE on error */ +static gboolean +katze_http_cookies_sqlite_open_db (KatzeHttpCookiesSqlite* http_cookies) +{ + char *error = NULL; + + if (sqlite3_open (http_cookies->filename, &http_cookies->db)) { + sqlite3_close (http_cookies->db); + g_warning ("Can't open %s", http_cookies->filename); + return TRUE; + } + + if (sqlite3_exec (http_cookies->db, CREATE_TABLE, NULL, NULL, &error)) { + g_warning ("Failed to execute query: %s", error); + sqlite3_free (error); + } + + if (sqlite3_exec (http_cookies->db, "PRAGMA secure_delete = 1;", + NULL, NULL, &error)) { + g_warning ("Failed to execute query: %s", error); + sqlite3_free (error); + } + + sqlite3_exec (http_cookies->db, + /* Arguably cookies are like a cache, so performance over integrity */ + "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY;" + "PRAGMA count_changes = OFF; PRAGMA journal_mode = TRUNCATE;", + NULL, NULL, &error); + + return FALSE; +} + +static void +katze_http_cookies_sqlite_load (KatzeHttpCookiesSqlite* http_cookies) +{ + const char *name, *value, *host, *path; + sqlite3_stmt* stmt; + SoupCookie *cookie = NULL; + gint64 expire_time; + time_t now; + int max_age; + gboolean http_only = FALSE, secure = FALSE; + char *query; + int result; + + if (http_cookies->db == NULL) { + if (katze_http_cookies_sqlite_open_db (http_cookies)) + return; + } + + sqlite3_prepare_v2 (http_cookies->db, QUERY_ALL, strlen (QUERY_ALL) + 1, &stmt, NULL); + result = sqlite3_step (stmt); + if (result != SQLITE_ROW) + { + if (result == SQLITE_ERROR) + g_print (_("Failed to load cookies\n")); + sqlite3_reset (stmt); + return; + } + + while (result == SQLITE_ROW) + { + now = time (NULL); + name = (const char*)sqlite3_column_text (stmt, COL_NAME); + value = (const char*)sqlite3_column_text (stmt, COL_VALUE); + host = (const char*)sqlite3_column_text (stmt, COL_HOST); + path = (const char*)sqlite3_column_text (stmt, COL_PATH); + expire_time = sqlite3_column_int64 (stmt,COL_EXPIRY); + secure = sqlite3_column_int (stmt, COL_SECURE); + http_only = sqlite3_column_int (stmt, COL_HTTP_ONLY); + + if (now >= expire_time) + { + /* Cookie expired, remove it from database */ + query = sqlite3_mprintf (QUERY_DELETE, name, host); + sqlite3_exec (http_cookies->db, QUERY_DELETE, NULL, NULL, NULL); + sqlite3_free (query); + result = sqlite3_step (stmt); + continue; + } + max_age = (expire_time - now <= G_MAXINT ? expire_time - now : G_MAXINT); + cookie = soup_cookie_new (name, value, host, path, max_age); + + if (secure) + soup_cookie_set_secure (cookie, TRUE); + if (http_only) + soup_cookie_set_http_only (cookie, TRUE); + + soup_cookie_jar_add_cookie (http_cookies->jar, cookie); + result = sqlite3_step (stmt); + } + + if (stmt) + { + sqlite3_reset (stmt); + sqlite3_clear_bindings (stmt); + } +} +static void +katze_http_cookies_sqlite_jar_changed_cb (SoupCookieJar* jar, + SoupCookie* old_cookie, + SoupCookie* new_cookie, + KatzeHttpCookiesSqlite* http_cookies) +{ + GObject* settings; + char *query; + time_t expires = 0; /* Avoid warning */ + + if (http_cookies->db == NULL) { + if (katze_http_cookies_sqlite_open_db (http_cookies)) + return; + } + + if (new_cookie && new_cookie->expires) + { + gint age; + + expires = soup_date_to_time_t (new_cookie->expires); + settings = g_object_get_data (G_OBJECT (jar), "midori-settings"); + age = katze_object_get_int (settings, "maximum-cookie-age"); + if (age > 0) + { + SoupDate* max_date = soup_date_new_from_now ( + age * SOUP_COOKIE_MAX_AGE_ONE_DAY); + if (soup_date_to_time_t (new_cookie->expires) + > soup_date_to_time_t (max_date)) + soup_cookie_set_expires (new_cookie, max_date); + } + else + { + /* An age of 0 to SoupCookie means already-expired + A user choosing 0 days probably expects 1 hour. */ + soup_cookie_set_max_age (new_cookie, SOUP_COOKIE_MAX_AGE_ONE_HOUR); + } + } + + if (g_getenv ("MIDORI_COOKIES_DEBUG") != NULL) + http_cookies->counter++; + + if (old_cookie) { + query = sqlite3_mprintf (QUERY_DELETE, + old_cookie->name, + old_cookie->domain); + sqlite3_exec (http_cookies->db, query, NULL, NULL, NULL); + sqlite3_free (query); + } + + if (new_cookie && new_cookie->expires) { + + query = sqlite3_mprintf (QUERY_INSERT, + new_cookie->name, + new_cookie->value, + new_cookie->domain, + new_cookie->path, + expires, + new_cookie->secure, + new_cookie->http_only); + sqlite3_exec (http_cookies->db, query, NULL, NULL, NULL); + sqlite3_free (query); + } +} + +static void +katze_http_cookies_sqlite_attach (SoupSessionFeature* feature, + SoupSession* session) +{ + KatzeHttpCookiesSqlite* http_cookies = (KatzeHttpCookiesSqlite*)feature; + const gchar* filename = g_object_get_data (G_OBJECT (feature), "filename"); + SoupSessionFeature* jar = soup_session_get_feature (session, SOUP_TYPE_COOKIE_JAR); + g_return_if_fail (jar != NULL); + g_return_if_fail (filename != NULL); + katze_assign (http_cookies->filename, g_strdup (filename)); + http_cookies->jar = g_object_ref (jar); + katze_http_cookies_sqlite_open_db (http_cookies); + katze_http_cookies_sqlite_load (http_cookies); + g_signal_connect (jar, "changed", + G_CALLBACK (katze_http_cookies_sqlite_jar_changed_cb), feature); + +} + +static void +katze_http_cookies_sqlite_detach (SoupSessionFeature* feature, + SoupSession* session) +{ + KatzeHttpCookiesSqlite* http_cookies = (KatzeHttpCookiesSqlite*)feature; + katze_assign (http_cookies->filename, NULL); + katze_object_assign (http_cookies->jar, NULL); + sqlite3_close (http_cookies->db); +} + +static void +katze_http_cookies_sqlite_session_feature_iface_init (SoupSessionFeatureInterface *iface, + gpointer data) +{ + iface->attach = katze_http_cookies_sqlite_attach; + iface->detach = katze_http_cookies_sqlite_detach; +} + +static void +katze_http_cookies_sqlite_finalize (GObject* object) +{ + katze_http_cookies_sqlite_detach ((SoupSessionFeature*)object, NULL); +} + +static void +katze_http_cookies_sqlite_class_init (KatzeHttpCookiesSqliteClass* class) +{ + GObjectClass* gobject_class = (GObjectClass*)class; + gobject_class->finalize = katze_http_cookies_sqlite_finalize; +} + +static void +katze_http_cookies_sqlite_init (KatzeHttpCookiesSqlite* http_cookies) +{ + http_cookies->filename = NULL; + http_cookies->jar = NULL; + http_cookies->db = NULL; + http_cookies->counter = 0; +} diff -Nru midori-0.2.8/katze/katze-http-cookies-sqlite.h midori-0.4.6/katze/katze-http-cookies-sqlite.h --- midori-0.2.8/katze/katze-http-cookies-sqlite.h 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/katze/katze-http-cookies-sqlite.h 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,42 @@ +/* + 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. +*/ + +#ifndef __KATZE_HTTP_COOKIES_SQLITE_H__ +#define __KATZE_HTTP_COOKIES_SQLITE_H__ + +#include "katze-utils.h" + +#include + +G_BEGIN_DECLS + +#define KATZE_TYPE_HTTP_COOKIES_SQLITE \ + (katze_http_cookies_sqlite_get_type ()) +#define KATZE_HTTP_COOKIES_SQLITE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_HTTP_COOKIES_SQLITE, KatzeHttpCookiesSqlite)) +#define KATZE_HTTP_COOKIES_SQLITE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_HTTP_COOKIES_SQLITE, KatzeHttpCookiesSqliteClass)) +#define KATZE_IS_HTTP_COOKIES_SQLITE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_HTTP_COOKIES_SQLITE)) +#define KATZE_IS_HTTP_COOKIES_SQLITE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_HTTP_COOKIES_SQLITE)) +#define KATZE_HTTP_COOKIES_SQLITE_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_HTTP_COOKIES_SQLITE, KatzeHttpCookiesSqliteClass)) + +typedef struct _KatzeHttpCookiesSqlite KatzeHttpCookiesSqlite; +typedef struct _KatzeHttpCookiesSqliteClass KatzeHttpCookiesSqliteClass; + +GType +katze_http_cookies_sqlite_get_type (void) G_GNUC_CONST; + +G_END_DECLS + +#endif /* __KATZE_HTTP_COOKIES_SQLITE_H__ */ diff -Nru midori-0.2.8/katze/katze-http-cookies.c midori-0.4.6/katze/katze-http-cookies.c --- midori-0.2.8/katze/katze-http-cookies.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/katze/katze-http-cookies.c 2012-05-14 22:13:42.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2008-2009 Christian Dywan + Copyright (C) 2008-2010 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,13 +16,21 @@ #include "katze-http-cookies.h" #include +#ifdef HAVE_UNISTD_H + #include +#endif #include #include #include +#include struct _KatzeHttpCookies { GObject parent_instance; + gchar* filename; + SoupCookieJar* jar; + guint timeout; + guint counter; }; struct _KatzeHttpCookiesClass @@ -120,11 +128,12 @@ gchar* line; gchar* p; gsize length = 0; - time_t now = time (NULL); + time_t now; if (!g_file_get_contents (filename, &contents, &length, NULL)) return; + now = time (NULL); line = contents; for (p = contents; *p; p++) { @@ -145,12 +154,10 @@ Copyright (C) 2008 Xan Lopez Copyright (C) 2008 Dan Winship Copied from libSoup 2.24, coding style preserved */ -static void +static gboolean write_cookie (FILE *out, SoupCookie *cookie) { - fseek (out, 0, SEEK_END); - - fprintf (out, "%s%s\t%s\t%s\t%s\t%lu\t%s\t%s\n", + if (fprintf (out, "%s%s\t%s\t%s\t%s\t%lu\t%s\t%s\n", cookie->http_only ? "#HttpOnly_" : "", cookie->domain, *cookie->domain == '.' ? "TRUE" : "FALSE", @@ -158,117 +165,126 @@ cookie->secure ? "TRUE" : "FALSE", (gulong)soup_date_to_time_t (cookie->expires), cookie->name, - cookie->value); + cookie->value) < 0) + return FALSE; + return TRUE; } -/* Cookie jar saving to Mozilla format - Copyright (C) 2008 Xan Lopez - Copyright (C) 2008 Dan Winship - Copied from libSoup 2.24, coding style preserved */ -static void -delete_cookie (const char *filename, SoupCookie *cookie) +static gboolean +katze_http_cookies_update_jar (KatzeHttpCookies* http_cookies) { - char *contents = NULL, *line, *p; - gsize length = 0; - FILE *f; - SoupCookie *c; - time_t now = time (NULL); - - if (!g_file_get_contents (filename, &contents, &length, NULL)) - return; - - f = fopen (filename, "w"); - if (!f) { - g_free (contents); - return; - } - - line = contents; - for (p = contents; *p; p++) { - /* \r\n comes out as an extra empty line and gets ignored */ - if (*p == '\r' || *p == '\n') { - *p = '\0'; - c = parse_cookie (line, now); - if (!c) - continue; - if (!soup_cookie_equal (cookie, c)) - write_cookie (f, c); - line = p + 1; - soup_cookie_free (c); - } - } - c = parse_cookie (line, now); - if (c) { - if (!soup_cookie_equal (cookie, c)) - write_cookie (f, c); - soup_cookie_free (c); - } + gint fn = 0; + FILE* f = NULL; + gchar* temporary_filename = NULL; + GSList* cookies; - g_free (contents); - fclose (f); + if (http_cookies->timeout > 0) + { + g_source_remove (http_cookies->timeout); + http_cookies->timeout = 0; + } + + temporary_filename = g_strconcat (http_cookies->filename, ".XXXXXX", NULL); + if ((fn = g_mkstemp (temporary_filename)) == -1) + goto failed; + if (!((f = fdopen (fn, "wb")))) + goto failed; + + cookies = soup_cookie_jar_all_cookies (http_cookies->jar); + for (; cookies != NULL; cookies = g_slist_next (cookies)) + { + SoupCookie* cookie = cookies->data; + if (cookie->expires && !soup_date_is_past (cookie->expires)) + write_cookie (f, cookie); + soup_cookie_free (cookie); + } + g_slist_free (cookies); + + if (fclose (f) != 0) + { + f = NULL; + goto failed; + } + f = NULL; + + if (g_rename (temporary_filename, http_cookies->filename) == -1) + goto failed; + g_free (temporary_filename); + + if (g_getenv ("MIDORI_COOKIES_DEBUG") != NULL) + { + g_print ("KatzeHttpCookies: %d cookies changed\n", http_cookies->counter); + http_cookies->counter = 0; + } + return FALSE; + +failed: + if (f) + fclose (f); + g_unlink (temporary_filename); + g_free (temporary_filename); + if (g_getenv ("MIDORI_COOKIES_DEBUG") != NULL) + g_print ("KatzeHttpCookies: Failed to write '%s'\n", + http_cookies->filename); + return FALSE; } -/* Cookie jar saving to Mozilla format - Copyright (C) 2008 Xan Lopez - Copyright (C) 2008 Dan Winship - Mostly copied from libSoup 2.24, coding style adjusted */ static void -cookie_jar_changed_cb (SoupCookieJar* jar, - SoupCookie* old_cookie, - SoupCookie* new_cookie, - gchar* filename) +katze_http_cookies_jar_changed_cb (SoupCookieJar* jar, + SoupCookie* old_cookie, + SoupCookie* new_cookie, + KatzeHttpCookies* http_cookies) { GObject* settings; - guint accept_cookies; if (old_cookie) - delete_cookie (filename, old_cookie); + soup_cookie_set_max_age (old_cookie, 0); if (new_cookie) { - FILE *out; - settings = g_object_get_data (G_OBJECT (jar), "midori-settings"); - accept_cookies = katze_object_get_enum (settings, "accept-cookies"); - if (accept_cookies == 2 /* MIDORI_ACCEPT_COOKIES_NONE */) - { - soup_cookie_jar_delete_cookie (jar, new_cookie); - } - else if (accept_cookies == 1 /* MIDORI_ACCEPT_COOKIES_SESSION */ - && new_cookie->expires) - { - soup_cookie_jar_delete_cookie (jar, new_cookie); - } - else if (new_cookie->expires) + if (new_cookie->expires) { gint age = katze_object_get_int (settings, "maximum-cookie-age"); - soup_cookie_set_max_age (new_cookie, - age * SOUP_COOKIE_MAX_AGE_ONE_DAY); - - if (!(out = fopen (filename, "a"))) - return; - write_cookie (out, new_cookie); - if (fclose (out) != 0) - return; + if (age > 0) + { + SoupDate* max_date = soup_date_new_from_now ( + age * SOUP_COOKIE_MAX_AGE_ONE_DAY); + if (soup_date_to_time_t (new_cookie->expires) + > soup_date_to_time_t (max_date)) + soup_cookie_set_expires (new_cookie, max_date); + } + else + { + /* An age of 0 to SoupCookie means already-expired + A user choosing 0 days probably expects 1 hour. */ + soup_cookie_set_max_age (new_cookie, SOUP_COOKIE_MAX_AGE_ONE_HOUR); + } } } + + if (g_getenv ("MIDORI_COOKIES_DEBUG") != NULL) + http_cookies->counter++; + + if (!http_cookies->timeout && (old_cookie || new_cookie->expires)) + http_cookies->timeout = g_timeout_add_seconds (5, + (GSourceFunc)katze_http_cookies_update_jar, http_cookies); } static void katze_http_cookies_attach (SoupSessionFeature* feature, SoupSession* session) { - SoupSessionFeature* cookie_jar; - gchar* filename; - - cookie_jar = soup_session_get_feature (session, SOUP_TYPE_COOKIE_JAR); - g_return_if_fail (cookie_jar != NULL); - filename = g_object_get_data (G_OBJECT (feature), "filename"); + KatzeHttpCookies* http_cookies = (KatzeHttpCookies*)feature; + const gchar* filename = g_object_get_data (G_OBJECT (feature), "filename"); + SoupSessionFeature* jar = soup_session_get_feature (session, SOUP_TYPE_COOKIE_JAR); + g_return_if_fail (jar != NULL); g_return_if_fail (filename != NULL); - cookie_jar_load (SOUP_COOKIE_JAR (cookie_jar), filename); - g_signal_connect_data (cookie_jar, "changed", - G_CALLBACK (cookie_jar_changed_cb), g_strdup (filename), - (GClosureNotify)g_free, 0); + katze_assign (http_cookies->filename, g_strdup (filename)); + http_cookies->jar = g_object_ref (jar); + cookie_jar_load (http_cookies->jar, http_cookies->filename); + g_signal_connect (jar, "changed", + G_CALLBACK (katze_http_cookies_jar_changed_cb), feature); } @@ -276,7 +292,11 @@ katze_http_cookies_detach (SoupSessionFeature* feature, SoupSession* session) { - /* Nothing to do. */ + KatzeHttpCookies* http_cookies = (KatzeHttpCookies*)feature; + if (http_cookies->timeout > 0) + katze_http_cookies_update_jar (http_cookies); + katze_assign (http_cookies->filename, NULL); + katze_object_assign (http_cookies->jar, NULL); } static void @@ -288,13 +308,23 @@ } static void +katze_http_cookies_finalize (GObject* object) +{ + katze_http_cookies_detach ((SoupSessionFeature*)object, NULL); +} + +static void katze_http_cookies_class_init (KatzeHttpCookiesClass* class) { - /* Nothing to do. */ + GObjectClass* gobject_class = (GObjectClass*)class; + gobject_class->finalize = katze_http_cookies_finalize; } static void katze_http_cookies_init (KatzeHttpCookies* http_cookies) { - /* Nothing to do. */ + http_cookies->filename = NULL; + http_cookies->jar = NULL; + http_cookies->timeout = 0; + http_cookies->counter = 0; } diff -Nru midori-0.2.8/katze/katze-item.c midori-0.4.6/katze/katze-item.c --- midori-0.2.8/katze/katze-item.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/katze/katze-item.c 2012-05-14 22:13:42.000000000 +0000 @@ -15,6 +15,8 @@ #include +#include + /** * SECTION:katze-item * @short_description: A useful item @@ -315,6 +317,8 @@ g_return_if_fail (KATZE_IS_ITEM (item)); katze_assign (item->name, g_strdup (name)); + if (item->parent) + katze_array_update ((KatzeArray*)item->parent); g_object_notify (G_OBJECT (item), "name"); } @@ -414,10 +418,87 @@ g_return_if_fail (KATZE_IS_ITEM (item)); katze_item_set_meta_string (item, "icon", icon); + if (item->parent) + katze_array_update ((KatzeArray*)item->parent); g_object_notify (G_OBJECT (item), "icon"); } /** + * katze_item_get_pixbuf: + * @item: a #KatzeItem + * @widget: a #GtkWidget, or %NULL + * + * Retrieves a #GdkPixbuf fit to display @item. + * + * Return value: the icon of the item + * + * Since: 0.4.6 + **/ +GdkPixbuf* +katze_item_get_pixbuf (KatzeItem* item, + GtkWidget* widget) +{ + GdkPixbuf* pixbuf; + + g_return_val_if_fail (KATZE_IS_ITEM (item), NULL); + + if (item->uri == NULL) + return NULL; + + #if WEBKIT_CHECK_VERSION (1, 8, 0) + /* FIXME: Don't hard-code icon size */ + if ((pixbuf = webkit_favicon_database_try_get_favicon_pixbuf ( + webkit_get_favicon_database (), item->uri, 16, 16))) + return pixbuf; + #else + if ((pixbuf = g_object_get_data (G_OBJECT (item), "pixbuf"))) + return pixbuf; + #endif + return NULL; +} + +/** + * katze_item_get_image: + * @item: a #KatzeItem + * + * Retrieves a #GtkImage fit to display @item. + * + * Return value: the icon of the item + * + * Since: 0.4.4 + **/ +GtkWidget* +katze_item_get_image (KatzeItem* item) +{ + GtkWidget* image; + GdkPixbuf* pixbuf; + const gchar* icon; + + g_return_val_if_fail (KATZE_IS_ITEM (item), NULL); + + if (KATZE_ITEM_IS_FOLDER (item)) + image = gtk_image_new_from_stock (GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU); + /* FIXME: Pass widget for icon size */ + else if ((pixbuf = katze_item_get_pixbuf (item, NULL))) + image = gtk_image_new_from_pixbuf (pixbuf); + else if ((icon = katze_item_get_icon (item)) && !strchr (icon, '/')) + image = gtk_image_new_from_icon_name (icon, GTK_ICON_SIZE_MENU); + else + { + if (!(icon && (pixbuf = katze_load_cached_icon (icon, NULL)))) + pixbuf = katze_load_cached_icon (item->uri, NULL); + if (pixbuf) + { + image = gtk_image_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); + } + else + image = gtk_image_new_from_stock (GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); + } + return image; +} + +/** * katze_item_get_token: * @item: a #KatzeItem * @@ -527,17 +608,22 @@ * Return value: a string, or %NULL * * Since: 0.1.8 + * + * Since 0.4.4 "" is treated like %NULL. **/ const gchar* katze_item_get_meta_string (KatzeItem* item, const gchar* key) { + const gchar* value; + g_return_val_if_fail (KATZE_IS_ITEM (item), NULL); g_return_val_if_fail (key != NULL, NULL); if (g_str_has_prefix (key, "midori:")) key = &key[7]; - return g_hash_table_lookup (item->metadata, key); + value = g_hash_table_lookup (item->metadata, key); + return value && *value ? value : NULL; } /** @@ -707,6 +793,8 @@ * Note that subclass specific features will only * be preserved if the class implements it. * + * Since 0.4.3 meta data is copied. + * * Return value: a new #KatzeItem * * Since: 0.1.3 @@ -715,6 +803,9 @@ katze_item_copy (KatzeItem* item) { KatzeItem* copy; + GHashTableIter iter; + const gchar* key; + const gchar* value; KatzeItemClass* class; g_return_val_if_fail (KATZE_IS_ITEM (item), NULL); @@ -727,6 +818,15 @@ "added", item->added, "parent", item->parent, NULL); + + g_hash_table_iter_init (&iter, item->metadata); + while (g_hash_table_iter_next (&iter, (void*)&key, (void*)&value)) + { + if (g_str_has_prefix (key, "midori:")) + key = &key[7]; + g_hash_table_insert (copy->metadata, g_strdup (key), g_strdup (value)); + } + class = KATZE_ITEM_GET_CLASS (item); return class->copy ? class->copy (copy) : copy; } diff -Nru midori-0.2.8/katze/katze-item.h midori-0.4.6/katze/katze-item.h --- midori-0.2.8/katze/katze-item.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/katze/katze-item.h 2012-05-14 22:13:42.000000000 +0000 @@ -12,7 +12,7 @@ #ifndef __KATZE_ITEM_H__ #define __KATZE_ITEM_H__ -#include +#include G_BEGIN_DECLS @@ -91,6 +91,13 @@ katze_item_set_icon (KatzeItem* item, const gchar* icon); +GdkPixbuf* +katze_item_get_pixbuf (KatzeItem* item, + GtkWidget* widget); + +GtkWidget* +katze_item_get_image (KatzeItem* item); + const gchar* katze_item_get_token (KatzeItem* item); diff -Nru midori-0.2.8/katze/katze-net.c midori-0.4.6/katze/katze-net.c --- midori-0.2.8/katze/katze-net.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/katze/katze-net.c 2012-05-14 22:13:42.000000000 +0000 @@ -18,6 +18,7 @@ #endif #include "katze-net.h" +#include "midori-core.h" #include #include @@ -29,8 +30,6 @@ gchar* cache_path; guint cache_size; - - SoupSession* session; }; struct _KatzeNetClass @@ -57,8 +56,6 @@ { net->cache_path = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, NULL); - - net->session = webkit_get_default_session (); } static void @@ -90,7 +87,6 @@ typedef struct { - KatzeNet* net; KatzeNetStatusCb status_cb; KatzeNetTransferCb transfer_cb; gpointer user_data; @@ -100,16 +96,12 @@ static void katze_net_priv_free (KatzeNetPriv* priv) { - KatzeNetRequest* request; - - request = priv->request; - + KatzeNetRequest* request = priv->request; g_free (request->uri); g_free (request->mime_type); g_free (request->data); - - g_free (request); - g_free (priv); + g_slice_free (KatzeNetRequest, request); + g_slice_free (KatzeNetPriv, priv); } gchar* @@ -151,9 +143,7 @@ katze_net_got_headers_cb (SoupMessage* msg, KatzeNetPriv* priv) { - KatzeNetRequest* request; - - request = priv->request; + KatzeNetRequest* request = priv->request; switch (msg->status_code) { @@ -171,7 +161,7 @@ { g_signal_handlers_disconnect_by_func (msg, katze_net_got_headers_cb, priv); g_signal_handlers_disconnect_by_func (msg, katze_net_got_body_cb, priv); - soup_session_cancel_message (priv->net->session, msg, 1); + soup_session_cancel_message (webkit_get_default_session (), msg, 1); } } @@ -179,9 +169,7 @@ katze_net_got_body_cb (SoupMessage* msg, KatzeNetPriv* priv) { - KatzeNetRequest* request; - - request = priv->request; + KatzeNetRequest* request = priv->request; if (msg->response_body->length > 0) { @@ -203,48 +191,35 @@ static gboolean katze_net_local_cb (KatzeNetPriv* priv) { - KatzeNetRequest* request; - gchar* filename; - gchar* contents; - gsize length; - - request = priv->request; - filename = g_filename_from_uri (request->uri, NULL, NULL); + KatzeNetRequest* request = priv->request; + gchar* filename = g_filename_from_uri (request->uri, NULL, NULL); if (!filename || g_access (filename, F_OK) != 0) { request->status = KATZE_NET_NOT_FOUND; if (priv->status_cb) priv->status_cb (request, priv->user_data); - katze_net_priv_free (priv); - return FALSE; } - request->status = KATZE_NET_VERIFIED; - if (priv->status_cb && !priv->status_cb (request, priv->user_data)) + else if (!(priv->status_cb && !priv->status_cb (request, priv->user_data)) + && priv->transfer_cb) { - katze_net_priv_free (priv); - return FALSE; - } - - if (!priv->transfer_cb) - { - katze_net_priv_free (priv); - return FALSE; - } + gchar* contents = NULL; + gsize length; - contents = NULL; - if (!g_file_get_contents (filename, &contents, &length, NULL)) - { - request->status = KATZE_NET_FAILED; + request->status = KATZE_NET_VERIFIED; + if (!g_file_get_contents (filename, &contents, &length, NULL)) + { + request->status = KATZE_NET_FAILED; + } + else + { + request->status = KATZE_NET_DONE; + request->data = contents; + request->length = length; + } priv->transfer_cb (request, priv->user_data); - katze_net_priv_free (priv); - return FALSE; } - - request->status = KATZE_NET_DONE; - request->data = contents; - request->length = length; - priv->transfer_cb (request, priv->user_data); + g_free (filename); katze_net_priv_free (priv); return FALSE; } @@ -298,21 +273,18 @@ if (!status_cb && !transfer_cb) return; - net = katze_net_new (); - - request = g_new0 (KatzeNetRequest, 1); + request = g_slice_new (KatzeNetRequest); request->uri = g_strdup (uri); request->mime_type = NULL; request->data = NULL; - priv = g_new0 (KatzeNetPriv, 1); - priv->net = net; + priv = g_slice_new (KatzeNetPriv); priv->status_cb = status_cb; priv->transfer_cb = transfer_cb; priv->user_data = user_data; priv->request = request; - if (g_str_has_prefix (uri, "http://") || g_str_has_prefix (uri, "https://")) + if (midori_uri_is_http (uri)) { msg = soup_message_new ("GET", uri); if (status_cb) @@ -323,16 +295,13 @@ G_CALLBACK (katze_net_got_body_cb), priv); g_signal_connect (msg, "finished", G_CALLBACK (katze_net_finished_cb), priv); - soup_session_queue_message (net->session, msg, NULL, NULL); + soup_session_queue_message (webkit_get_default_session (), msg, NULL, NULL); return; } if (g_str_has_prefix (uri, "file://")) - { g_idle_add ((GSourceFunc)katze_net_local_cb, priv); - return; - } - - g_idle_add ((GSourceFunc)katze_net_default_cb, priv); + else + g_idle_add ((GSourceFunc)katze_net_default_cb, priv); } diff -Nru midori-0.2.8/katze/katze-preferences.c midori-0.4.6/katze/katze-preferences.c --- midori-0.2.8/katze/katze-preferences.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/katze/katze-preferences.c 2012-05-14 22:13:42.000000000 +0000 @@ -23,10 +23,6 @@ #include #include -#if !GTK_CHECK_VERSION (2, 14, 0) - #define gtk_dialog_get_content_area(dialog) dialog->vbox -#endif - struct _KatzePreferencesPrivate { #if HAVE_HILDON @@ -97,13 +93,23 @@ g_object_set (preferences, "icon-name", GTK_STOCK_PREFERENCES, "title", dialog_title, +#if !GTK_CHECK_VERSION (3, 0, 0) "has-separator", FALSE, +#endif NULL); g_free (dialog_title); #if !HAVE_OSX gtk_dialog_add_buttons (GTK_DIALOG (preferences), GTK_STOCK_HELP, GTK_RESPONSE_HELP, + NULL); + #if GTK_CHECK_VERSION (3, 0, 0) + gtk_style_context_add_class (gtk_widget_get_style_context ( + gtk_dialog_get_widget_for_response (GTK_DIALOG (preferences), + GTK_RESPONSE_HELP)), "help_button"); + #endif + + gtk_dialog_add_buttons (GTK_DIALOG (preferences), #if HAVE_HILDON GTK_STOCK_SAVE, GTK_RESPONSE_APPLY, #else @@ -249,13 +255,21 @@ * Adds a new category with the specified label to the dialog. * * Since: 0.2.1 + * + * Since 0.3.4 a #GtkBox is returned that can be packed into. **/ -void +GtkWidget* katze_preferences_add_category (KatzePreferences* preferences, const gchar* label, const gchar* icon) { - KatzePreferencesPrivate* priv = preferences->priv; + KatzePreferencesPrivate* priv; + + g_return_val_if_fail (KATZE_IS_PREFERENCES (preferences), NULL); + g_return_val_if_fail (label != NULL, NULL); + g_return_val_if_fail (icon != NULL, NULL); + + priv = preferences->priv; #if HAVE_HILDON GtkWidget* widget; @@ -300,6 +314,8 @@ g_object_set_data (G_OBJECT (priv->toolbutton), "notebook", priv->notebook); #endif #endif + + return priv->page; } #if !HAVE_HILDON @@ -325,21 +341,27 @@ /** * katze_preferences_add_group: * @preferences: a #KatzePreferences instance - * @label: a group label + * @label: a group label, or %NULL * * Adds a new group with the specified label to the dialog. * * Since: 0.2.1 + * + * Since 0.3.4 you can pass %NULL to hide the label. **/ void katze_preferences_add_group (KatzePreferences* preferences, const gchar* label) { #if !HAVE_HILDON - KatzePreferencesPrivate* priv = preferences->priv; + KatzePreferencesPrivate* priv; + g_return_if_fail (KATZE_IS_PREFERENCES (preferences)); + + priv = preferences->priv; priv->sizegroup2 = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - priv->frame = katze_hig_frame_new (label); + priv->frame = label ? katze_hig_frame_new (label) : + g_object_new (GTK_TYPE_FRAME, "shadow-type", GTK_SHADOW_NONE, NULL); 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); diff -Nru midori-0.2.8/katze/katze-preferences.h midori-0.4.6/katze/katze-preferences.h --- midori-0.2.8/katze/katze-preferences.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/katze/katze-preferences.h 2012-05-14 22:13:42.000000000 +0000 @@ -51,7 +51,7 @@ GtkWidget* katze_preferences_new (GtkWindow* parent); -void +GtkWidget* katze_preferences_add_category (KatzePreferences* preferences, const gchar* label, const gchar* icon); diff -Nru midori-0.2.8/katze/katze-scrolled.c midori-0.4.6/katze/katze-scrolled.c --- midori-0.2.8/katze/katze-scrolled.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/katze/katze-scrolled.c 2012-05-14 22:13:42.000000000 +0000 @@ -18,26 +18,6 @@ #include "katze-scrolled.h" #include "katze-utils.h" -#if !GTK_CHECK_VERSION (2, 14, 0) - #define gtk_adjustment_get_page_size(adj) adj->page_size - #define gtk_adjustment_get_upper(adj) adj->upper - #define gtk_adjustment_get_lower(adj) adj->lower - #define gtk_adjustment_get_value(adj) adj->value - #define gtk_widget_get_window(wdgt) wdgt->window -#endif -#if !GTK_CHECK_VERSION (2, 18, 0) - #define gtk_widget_set_window(wdgt, wndw) wdgt->window = wndw - #define gtk_widget_get_allocation(wdgt, alloc) *alloc = wdgt->allocation - #define gtk_widget_is_drawable GTK_WIDGET_DRAWABLE - #define gtk_widget_get_drawable GTK_WIDGET_VISIBLE - #define gtk_widget_get_visible(wdgt) GTK_WIDGET_VISIBLE (wdgt) -#endif -#if !GTK_CHECK_VERSION (2, 19, 6) - #define gtk_widget_set_realized(wdgt, real) \ - if (real) GTK_WIDGET_SET_FLAGS (wdgt, GTK_REALIZED); \ - else GTK_WIDGET_UNSET_FLAGS (wdgt, GTK_REALIZED) -#endif - #define DEFAULT_INTERVAL 50 #define DEFAULT_DECELERATION 0.7 #define DEFAULT_DRAGGING_STOPPED_DELAY 100 @@ -137,15 +117,6 @@ gdouble vertical_speed; gdouble horizontal_deceleration; gdouble vertical_deceleration; - - /* Internal scrollbars */ - GdkWindow* vertical_scrollbar_window; - GdkWindow* horizontal_scrollbar_window; - gint vertical_scrollbar_size; - gint horizontal_scrollbar_size; - guint hide_scrollbars_timeout_id; - GdkGC* hilight_gc; - GdkGC* shadow_gc; }; typedef struct _KatzeScrolledState KatzeScrolledState; @@ -212,7 +183,7 @@ EventHandlerData* data; gboolean stop_propagating; - state = g_new0 (KatzeScrolledState, 1); + state = g_slice_new (KatzeScrolledState); state->current_event_handler = g_list_first (event_handlers); if (state->current_event_handler) { @@ -225,7 +196,7 @@ else gtk_main_do_event (event); - g_free (state); + g_slice_free (KatzeScrolledState, state); } static GdkWindow* current_gdk_window; @@ -277,132 +248,6 @@ g_signal_handlers_unblock_matched (priv->hadjustment, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, priv->viewport); } -static gboolean -on_expose_event (GtkWidget* widget, - GdkEventExpose* event, - KatzeScrolled* scrolled) -{ - KatzeScrolledPrivate* priv = scrolled->priv; - gboolean ret = FALSE; - - if (gtk_widget_is_drawable (widget)) - { - if (event->window == priv->horizontal_scrollbar_window) - { - if (priv->horizontal_scrollbar_size) - { - gdk_draw_line (event->window, priv->hilight_gc, 0, 0, priv->horizontal_scrollbar_size - 1, 0); - gdk_draw_line (event->window, priv->hilight_gc, 0, 1, 0, 9); - gdk_draw_line (event->window, priv->shadow_gc, priv->horizontal_scrollbar_size - 1, 1, priv->horizontal_scrollbar_size - 1, 9); - gdk_draw_line (event->window, priv->shadow_gc, 0, 9, priv->horizontal_scrollbar_size - 1, 9); - } - - ret = TRUE; - } - else if (event->window == priv->vertical_scrollbar_window) - { - if (priv->vertical_scrollbar_size) - { - gdk_draw_line (event->window, priv->hilight_gc, 0, 0, 9, 0); - gdk_draw_line (event->window, priv->hilight_gc, 0, 1, 0, priv->vertical_scrollbar_size - 1); - gdk_draw_line (event->window, priv->shadow_gc, 9, 1, 9, priv->vertical_scrollbar_size - 1); - gdk_draw_line (event->window, priv->shadow_gc, 0, priv->vertical_scrollbar_size - 1, 9, priv->vertical_scrollbar_size - 1); - } - - ret = TRUE; - } - } - - return ret; -} - -static gboolean -adjust_scrollbar (KatzeScrolled* scrolled, - GdkWindow* scrollbar_window, - GtkAdjustment* adjustment, - gint* previous_size, - gboolean horizontal) -{ - KatzeScrolledPrivate* priv = scrolled->priv; - GtkWidget* widget = GTK_WIDGET (scrolled); - gdouble page_size, upper, lower, value; - gint x, y; - gint size; - double position; - GtkAllocation allocation; - GtkWidget* window; - - page_size = gtk_adjustment_get_page_size (adjustment); - upper = gtk_adjustment_get_upper (adjustment); - lower = gtk_adjustment_get_lower (adjustment); - value = gtk_adjustment_get_value (adjustment); - - if (page_size >= upper - lower) - { - *previous_size = 0; - return FALSE; - } - - gtk_widget_get_allocation (widget, &allocation); - size = page_size / (upper - lower) - * (horizontal ? allocation.height : allocation.width); - if (size != *previous_size) - { - *previous_size = size; - if (horizontal) - { - gdk_window_resize (scrollbar_window, 10, size); - gdk_window_clear (scrollbar_window); - gdk_draw_line (scrollbar_window, priv->hilight_gc, 0, 0, 9, 0); - gdk_draw_line (scrollbar_window, priv->hilight_gc, 0, 1, 0, size - 1); - gdk_draw_line (scrollbar_window, priv->shadow_gc, 9, 1, 9, size - 1); - gdk_draw_line (scrollbar_window, priv->shadow_gc, 0, size - 1, 9, size - 1); - } - else - { - gdk_window_resize (scrollbar_window, size, 10); - gdk_window_clear (scrollbar_window); - gdk_draw_line (scrollbar_window, priv->hilight_gc, 0, 0, size - 1, 0); - gdk_draw_line (scrollbar_window, priv->hilight_gc, 0, 1, 0, 9); - gdk_draw_line (scrollbar_window, priv->shadow_gc, size - 1, 1, size - 1, 9); - gdk_draw_line (scrollbar_window, priv->shadow_gc, 0, 9, size - 1, 9); - } - } - - position = (value - lower) / (upper - lower); - window = gtk_widget_get_toplevel (widget); - if (horizontal) - { - gtk_widget_translate_coordinates (widget, window, - allocation.width - 20, position * allocation.height, &x, &y); - gdk_window_move (scrollbar_window, x, y); - } - else - { - gtk_widget_translate_coordinates (widget, window, - position * allocation.width, allocation.height - 20, &x, &y); - gdk_window_move (scrollbar_window, x, y); - } - - return TRUE; -} - -static gboolean -hide_scrollbars_timeout (gpointer data) -{ - KatzeScrolled* scrolled = KATZE_SCROLLED (data); - KatzeScrolledPrivate* priv = scrolled->priv; - - gdk_threads_enter (); - gdk_window_hide (priv->vertical_scrollbar_window); - gdk_window_hide (priv->horizontal_scrollbar_window); - - priv->hide_scrollbars_timeout_id = 0; - gdk_threads_leave (); - - return FALSE; -} - static gdouble calculate_timeout_scroll_values (gdouble old_value, gdouble upper_limit, @@ -446,13 +291,12 @@ GtkScrolledWindow* gtk_scrolled = GTK_SCROLLED_WINDOW (scrolled); GtkAdjustment* hadjustment; GtkAdjustment* vadjustment; - gdouble hpage_size, hupper, hlower, hvalue, new_hvalue; - gdouble vpage_size, vupper, vlower, vvalue, new_vvalue; + gdouble hpage_size, hupper, hvalue, new_hvalue; + gdouble vpage_size, vupper, vvalue, new_vvalue; hadjustment = gtk_scrolled_window_get_hadjustment (gtk_scrolled); hpage_size = gtk_adjustment_get_page_size (hadjustment); hupper = gtk_adjustment_get_upper (hadjustment); - hlower = gtk_adjustment_get_lower (hadjustment); hvalue = gtk_adjustment_get_value (hadjustment); new_hvalue = calculate_timeout_scroll_values (hvalue, hupper - hpage_size, @@ -464,7 +308,6 @@ vadjustment = gtk_scrolled_window_get_vadjustment (gtk_scrolled); vpage_size = gtk_adjustment_get_page_size (vadjustment); vupper = gtk_adjustment_get_upper (vadjustment); - vlower = gtk_adjustment_get_lower (vadjustment); vvalue = gtk_adjustment_get_value (vadjustment); new_vvalue = calculate_timeout_scroll_values (vvalue, vupper - vpage_size, @@ -485,13 +328,6 @@ } else if (new_hvalue != hvalue) gtk_adjustment_set_value (hadjustment, new_hvalue); - - adjust_scrollbar (scrolled, priv->horizontal_scrollbar_window, - gtk_scrolled_window_get_hadjustment (gtk_scrolled), - &priv->horizontal_scrollbar_size, FALSE); - adjust_scrollbar (scrolled, priv->vertical_scrollbar_window, - gtk_scrolled_window_get_vadjustment (gtk_scrolled), - &priv->vertical_scrollbar_size, TRUE); } static gboolean @@ -510,10 +346,6 @@ priv->horizontal_speed > -priv->deceleration) { priv->scrolling_timeout_id = 0; - if (!priv->hide_scrollbars_timeout_id) - priv->hide_scrollbars_timeout_id = g_timeout_add (500, - hide_scrollbars_timeout, scrolled); - ret = FALSE; } gdk_threads_leave (); @@ -622,13 +454,6 @@ priv->previous_y = y; priv->previous_x = x; priv->previous_time = timestamp; - - adjust_scrollbar (scrolled, priv->horizontal_scrollbar_window, - gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (scrolled)), - &priv->horizontal_scrollbar_size, FALSE); - adjust_scrollbar (scrolled, priv->vertical_scrollbar_window, - gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled)), - &priv->vertical_scrollbar_size, TRUE); } static gboolean @@ -641,14 +466,12 @@ gint y; GdkModifierType mask; - if (!priv->drag_scrolling) - return FALSE; - - if (event->button != 1) + if (!priv->drag_scrolling || event->button != 1) return FALSE; priv->press_received = TRUE; - + gdk_window_get_pointer (gtk_widget_get_window (GTK_WIDGET (scrolled)), + &x, &y, &mask); if (event->time - priv->previous_time < priv->dragging_stopped_delay && gtk_drag_check_threshold (widget, priv->previous_x, priv->previous_y, x, y)) { @@ -657,8 +480,6 @@ g_source_remove (priv->scrolling_timeout_id); priv->scrolling_timeout_id = 0; } - gdk_window_get_pointer (gtk_widget_get_window (GTK_WIDGET (scrolled)), - &x, &y, &mask); /* do_motion_scroll (scrolled, widget, x, y, event->time); */ } else @@ -674,39 +495,11 @@ priv->dragged = FALSE; priv->previous_time = event->time; } - gdk_window_get_pointer (gtk_widget_get_window (GTK_WIDGET (scrolled)), - &x, &y, &mask); priv->start_x = priv->previous_x = priv->farest_x = x; priv->start_y = priv->previous_y = priv->farest_y = y; priv->start_time = event->time; } - if (priv->scrolling_hints - && !gtk_widget_get_visible (gtk_scrolled_window_get_hscrollbar ( - GTK_SCROLLED_WINDOW (scrolled))) - && adjust_scrollbar (scrolled, priv->horizontal_scrollbar_window, - gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (scrolled)), - &priv->horizontal_scrollbar_size, FALSE)) - { - gdk_window_raise (priv->horizontal_scrollbar_window); - gdk_window_show (priv->horizontal_scrollbar_window); - } - if (priv->scrolling_hints - && !gtk_widget_get_visible (gtk_scrolled_window_get_vscrollbar ( - GTK_SCROLLED_WINDOW (scrolled))) - && adjust_scrollbar (scrolled, priv->vertical_scrollbar_window, - gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled)), - &priv->vertical_scrollbar_size, TRUE)) - { - gdk_window_raise (priv->vertical_scrollbar_window); - gdk_window_show (priv->vertical_scrollbar_window); - } - if (priv->hide_scrollbars_timeout_id) - { - g_source_remove (priv->hide_scrollbars_timeout_id); - priv->hide_scrollbars_timeout_id = 0; - } - return FALSE; } @@ -742,9 +535,6 @@ do_timeout_scroll (scrolled); } - else if (!priv->hide_scrollbars_timeout_id) { - priv->hide_scrollbars_timeout_id = g_timeout_add (500, hide_scrollbars_timeout, scrolled); - } priv->previous_x = x; priv->previous_y = y; priv->previous_time = event->time; @@ -874,12 +664,10 @@ katze_scrolled_realize (GtkWidget* widget) { KatzeScrolled* scrolled = KATZE_SCROLLED (widget); - KatzeScrolledPrivate* priv = scrolled->priv; gboolean drag_scrolling; GtkPolicyType policy; GdkWindow* window; GdkWindowAttr attr; - GdkColor color; (*GTK_WIDGET_CLASS (katze_scrolled_parent_class)->realize) (widget); @@ -896,25 +684,6 @@ attr.wclass = GDK_INPUT_OUTPUT; attr.window_type = GDK_WINDOW_CHILD; attr.override_redirect = TRUE; - priv->vertical_scrollbar_window = gdk_window_new (window, &attr, 0); - priv->horizontal_scrollbar_window = gdk_window_new (window, &attr, 0); - - gdk_window_set_user_data (priv->vertical_scrollbar_window, widget); - gdk_window_set_user_data (priv->horizontal_scrollbar_window, widget); - g_signal_connect (widget, "expose-event", - G_CALLBACK (on_expose_event), scrolled); - - color.red = color.green = color.blue = 0x9999; - gdk_rgb_find_color (gtk_widget_get_colormap (widget), &color); - gdk_window_set_background (priv->vertical_scrollbar_window, &color); - gdk_window_set_background (priv->horizontal_scrollbar_window, &color); - - priv->hilight_gc = gdk_gc_new (window); - color.red = color.green = color.blue = 0xcccc; - gdk_gc_set_rgb_fg_color (priv->hilight_gc, &color); - priv->shadow_gc = gdk_gc_new (window); - color.red = color.green = color.blue = 0x6666; - gdk_gc_set_rgb_fg_color (priv->shadow_gc, &color); gtk_widget_set_realized (widget, TRUE); } @@ -930,11 +699,6 @@ g_source_remove (priv->scrolling_timeout_id); priv->scrolling_timeout_id = 0; } - if (priv->hide_scrollbars_timeout_id) - { - g_source_remove (priv->hide_scrollbars_timeout_id); - priv->hide_scrollbars_timeout_id = 0; - } (*G_OBJECT_CLASS (katze_scrolled_parent_class)->dispose) (object); } @@ -1135,14 +899,6 @@ priv->previous_time = 0; } - gdk_window_hide (priv->vertical_scrollbar_window); - gdk_window_hide (priv->horizontal_scrollbar_window); - if (priv->hide_scrollbars_timeout_id) - { - g_source_remove (priv->hide_scrollbars_timeout_id); - priv->hide_scrollbars_timeout_id = 0; - } - priv->press_received = FALSE; } diff -Nru midori-0.2.8/katze/katze-throbber.c midori-0.4.6/katze/katze-throbber.c --- midori-0.2.8/katze/katze-throbber.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/katze/katze-throbber.c 2012-05-14 22:13:42.000000000 +0000 @@ -18,13 +18,6 @@ #define HAVE_SPINNER GTK_CHECK_VERSION (2, 20, 0) -#if !GTK_CHECK_VERSION (2, 18, 0) - #define gtk_widget_get_allocation(wdgt, alloc) *alloc = wdgt->allocation - #define gtk_widget_set_has_window(wdgt, wnd) \ - if (wnd) GTK_WIDGET_UNSET_FLAGS (wdgt, GTK_NO_WINDOW); \ - else GTK_WIDGET_SET_FLAGS (wdgt, GTK_NO_WINDOW) -#endif - struct _KatzeThrobber { #if HAVE_SPINNER @@ -92,11 +85,25 @@ GParamSpec* pspec); static void +#if GTK_CHECK_VERSION (3, 0, 0) +katze_throbber_destroy (GtkWidget* object); +#else katze_throbber_destroy (GtkObject* object); +#endif static void katze_throbber_realize (GtkWidget* widget); +#if GTK_CHECK_VERSION (3, 0, 0) +static void +katze_throbber_get_preferred_height (GtkWidget *widget, + gint *minimal_height, + gint *natural_height); +static void +katze_throbber_get_preferred_width (GtkWidget *widget, + gint *minimal_width, + gint *natural_width); +#endif static void katze_throbber_unrealize (GtkWidget* widget); @@ -120,7 +127,11 @@ static gboolean katze_throbber_expose_event (GtkWidget* widget, +#if GTK_CHECK_VERSION (3, 0, 0) + cairo_t* cr); +#else GdkEventExpose* event); +#endif static void icon_theme_changed (KatzeThrobber* throbber); @@ -137,7 +148,9 @@ katze_throbber_class_init (KatzeThrobberClass* class) { GObjectClass* gobject_class; +#if !GTK_CHECK_VERSION (3, 0, 0) GtkObjectClass* object_class; +#endif GtkWidgetClass* widget_class; GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; @@ -146,19 +159,30 @@ gobject_class->set_property = katze_throbber_set_property; gobject_class->get_property = katze_throbber_get_property; + widget_class = GTK_WIDGET_CLASS (class); +#if GTK_CHECK_VERSION (3, 0, 0) + widget_class->destroy = katze_throbber_destroy; +#else object_class = GTK_OBJECT_CLASS (class); object_class->destroy = katze_throbber_destroy; - - widget_class = GTK_WIDGET_CLASS (class); +#endif widget_class->realize = katze_throbber_realize; widget_class->unrealize = katze_throbber_unrealize; widget_class->map = katze_throbber_map; widget_class->unmap = katze_throbber_unmap; widget_class->style_set = katze_throbber_style_set; widget_class->screen_changed = katze_throbber_screen_changed; +#if GTK_CHECK_VERSION (3, 0, 0) + widget_class->get_preferred_width= katze_throbber_get_preferred_width; + widget_class->get_preferred_height= katze_throbber_get_preferred_height; +#else widget_class->size_request = katze_throbber_size_request; +#endif +#if GTK_CHECK_VERSION (3, 0, 0) + widget_class->draw = katze_throbber_expose_event; +#else widget_class->expose_event = katze_throbber_expose_event; - +#endif g_object_class_install_property (gobject_class, PROP_ICON_SIZE, g_param_spec_int ( @@ -246,7 +270,11 @@ } static void +#if GTK_CHECK_VERSION (3, 0, 0) +katze_throbber_destroy (GtkWidget* object) +#else katze_throbber_destroy (GtkObject* object) +#endif { KatzeThrobber* throbber = KATZE_THROBBER (object); @@ -255,8 +283,11 @@ katze_assign (throbber->static_icon_name, NULL); katze_object_assign (throbber->static_pixbuf, NULL); katze_assign (throbber->static_stock_id, NULL); - +#if GTK_CHECK_VERSION (3, 0, 0) + GTK_WIDGET_CLASS (katze_throbber_parent_class)->destroy (object); +#else GTK_OBJECT_CLASS (katze_throbber_parent_class)->destroy (object); +#endif } static void @@ -464,8 +495,8 @@ (GSourceFunc)katze_throbber_timeout, throbber, (GDestroyNotify)katze_throbber_timeout_destroy); - gtk_widget_queue_draw (GTK_WIDGET (throbber)); #endif + gtk_widget_queue_draw (GTK_WIDGET (throbber)); g_object_notify (G_OBJECT (throbber), "animated"); } @@ -817,11 +848,38 @@ requisition->width = throbber->width; requisition->height = throbber->height; - +#if !GTK_CHECK_VERSION (3, 0, 0) GTK_WIDGET_CLASS (katze_throbber_parent_class)->size_request (widget, requisition); +#endif } +#if GTK_CHECK_VERSION (3, 0, 0) +static void +katze_throbber_get_preferred_height (GtkWidget *widget, + gint *minimal_height, + gint *natural_height) +{ + GtkRequisition requisition; + + katze_throbber_size_request (widget, &requisition); + + *minimal_height = *natural_height = requisition.height; +} + +static void +katze_throbber_get_preferred_width (GtkWidget *widget, + gint *minimal_width, + gint *natural_width) +{ + GtkRequisition requisition; + + katze_throbber_size_request (widget, &requisition); + + *minimal_width = *natural_width = requisition.width; +} +#endif + static void katze_throbber_aligned_coords (GtkWidget* widget, gint* ax, @@ -843,8 +901,15 @@ gtk_misc_get_padding (GTK_MISC (widget), &xpad, &ypad); #endif + #if GTK_CHECK_VERSION (3, 0, 0) + allocation.x = allocation.y = 0; + allocation.width = gtk_widget_get_allocated_width (widget); + allocation.height = gtk_widget_get_allocated_height (widget); + gtk_widget_get_preferred_size (widget, &requisition, NULL); + #else gtk_widget_get_allocation (widget, &allocation); gtk_widget_size_request (widget, &requisition); + #endif *ax = floor (allocation.x + xpad + ((allocation.width - requisition.width) * xalign)); *ay = floor (allocation.y + ypad @@ -853,15 +918,14 @@ static gboolean katze_throbber_expose_event (GtkWidget* widget, +#if GTK_CHECK_VERSION (3, 0, 0) + cairo_t* cr) +#else GdkEventExpose* event) +#endif { - gint ax, ay; KatzeThrobber* throbber = KATZE_THROBBER (widget); - - #if HAVE_SPINNER - if (throbber->animated) - return GTK_WIDGET_CLASS (katze_throbber_parent_class)->expose_event (widget, event); - #endif + gint ax, ay; if (G_UNLIKELY (!throbber->width || !throbber->height)) return TRUE; @@ -873,6 +937,9 @@ if (!throbber->animated && (throbber->static_pixbuf || throbber->static_icon_name || throbber->static_stock_id)) { +#if !GTK_CHECK_VERSION (3, 0, 0) + cairo_t* cr; +#endif if (G_UNLIKELY (!throbber->static_pixbuf && throbber->static_icon_name)) { icon_theme_changed (KATZE_THROBBER (widget)); @@ -902,13 +969,25 @@ katze_throbber_aligned_coords (widget, &ax, &ay); - gdk_draw_pixbuf (event->window, NULL, throbber->static_pixbuf, - 0, 0, ax, ay, - throbber->width, throbber->height, - GDK_RGB_DITHER_NONE, 0, 0); +#if !GTK_CHECK_VERSION (3, 0, 0) + cr = gdk_cairo_create (gtk_widget_get_window (widget)); +#endif + gdk_cairo_set_source_pixbuf (cr, throbber->static_pixbuf, ax, ay); + cairo_paint (cr); +#if !GTK_CHECK_VERSION (3, 0, 0) + cairo_destroy (cr); +#endif } else { + #if HAVE_SPINNER + if (throbber->animated) +#if GTK_CHECK_VERSION (3, 0, 0) + return GTK_WIDGET_CLASS (katze_throbber_parent_class)->draw (widget, cr); +#else + return GTK_WIDGET_CLASS (katze_throbber_parent_class)->expose_event (widget, event); +#endif + #else gint cols, rows; if (G_UNLIKELY (throbber->icon_name && !throbber->pixbuf)) @@ -969,6 +1048,7 @@ g_object_notify (G_OBJECT (throbber), "pixbuf"); g_object_thaw_notify (G_OBJECT (throbber)); } + #endif } return TRUE; diff -Nru midori-0.2.8/katze/katze-utils.c midori-0.4.6/katze/katze-utils.c --- midori-0.2.8/katze/katze-utils.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/katze/katze-utils.c 2012-05-14 22:13:42.000000000 +0000 @@ -9,8 +9,11 @@ See the file COPYING for the full license text. */ +#include "gtk3-compat.h" + #include "katze-utils.h" #include "katze-array.h" +#include "midori-core.h" #include #include @@ -30,13 +33,7 @@ #include #endif -#if !GTK_CHECK_VERSION (2, 14, 0) - #define gtk_widget_get_window(wdgt) wdgt->window -#endif -#if !GTK_CHECK_VERSION (2, 18, 0) - #define gtk_widget_get_has_window(wdgt) !GTK_WIDGET_NO_WINDOW (wdgt) - #define gtk_widget_get_allocation(wdgt, alloc) *alloc = wdgt->allocation -#endif +#define I_ g_intern_static_string static void proxy_toggle_button_toggled_cb (GtkToggleButton* button, @@ -83,10 +80,10 @@ } static void -proxy_combo_box_text_changed_cb (GtkComboBox* button, - GObject* object) +proxy_combo_box_text_changed_cb (GtkComboBoxText* button, + GObject* object) { - gchar* text = gtk_combo_box_get_active_text (button); + gchar* text = gtk_combo_box_text_get_active_text (button); const gchar* property = g_object_get_data (G_OBJECT (button), "property"); g_object_set (object, property, text, NULL); g_free (text); @@ -97,13 +94,11 @@ { 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); + if (!exe) + exe = g_app_info_get_name (info); return exe; } @@ -186,6 +181,26 @@ } static void +proxy_days_changed_cb (GtkComboBox* combo, + GObject* object) +{ + gint active = gtk_combo_box_get_active (combo); + const gchar* property = g_object_get_data (G_OBJECT (combo), "property"); + gint max_age; + switch (active) + { + case 0: max_age = 0; break; + case 1: max_age = 1; break; + case 2: max_age = 7; break; + case 3: max_age = 30; break; + case 4: max_age = 365; break; + default: + max_age = 30; + } + g_object_set (object, property, max_age, NULL); +} + +static void proxy_spin_button_changed_cb (GtkSpinButton* button, GObject* object) { @@ -316,7 +331,13 @@ static GList* katze_app_info_get_all_for_category (const gchar* category) { + #ifdef _WIN32 + /* FIXME: Real filtering by category would be better */ + const gchar* content_type = g_content_type_from_mime_type (category); + GList* all_apps = g_app_info_get_all_for_type (content_type); + #else GList* all_apps = g_app_info_get_all (); + #endif GList* apps = NULL; guint i = 0; GAppInfo* info; @@ -345,95 +366,6 @@ 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 @@ -470,6 +402,16 @@ * "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. + * Since 0.4.1 mnemonics are automatically stripped. + * Since 0.2.9 the following hints are also supported: + * "languages": the widget will be particularly suitable for choosing + * multiple language codes, ie. "de,en_GB". + * Since 0.3.6 the following hints are also supported: + * "address": the widget will be particularly suitable for typing + * a valid URI or IP address and highlight errors. + * Since 0.4.0 the following hints are also supported: + * "days": the widget will be particularly suitable for choosing + * a period of time in days. * * Any other values for @hint are silently ignored. * @@ -508,7 +450,7 @@ type = G_PARAM_SPEC_TYPE (pspec); nick = g_param_spec_get_nick (pspec); _hint = g_intern_string (hint); - if (_hint == g_intern_string ("blurb")) + if (_hint == I_("blurb")) nick = g_param_spec_get_blurb (pspec); string = NULL; if (type == G_TYPE_PARAM_BOOLEAN) @@ -517,7 +459,7 @@ gboolean toggled = katze_object_get_boolean (object, property); #ifdef HAVE_HILDON_2_2 - if (_hint != g_intern_string ("toggle")) + if (_hint != I_("toggle")) { widget = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH); gtk_button_set_label (GTK_BUTTON (widget), gettext (nick)); @@ -527,7 +469,7 @@ #endif { widget = gtk_check_button_new (); - if (_hint == g_intern_string ("toggle")) + if (_hint == I_("toggle")) gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (widget), FALSE); else gtk_button_set_label (GTK_BUTTON (widget), gettext (nick)); @@ -542,7 +484,7 @@ G_CALLBACK (proxy_widget_boolean_destroy_cb), object); g_free (notify_property); } - else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("file")) + else if (type == G_TYPE_PARAM_STRING && _hint == I_("file")) { string = katze_object_get_string (object, property); @@ -557,7 +499,7 @@ g_signal_connect (widget, "selection-changed", G_CALLBACK (proxy_file_file_set_cb), object); } - else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("folder")) + else if (type == G_TYPE_PARAM_STRING && _hint == I_("folder")) { string = katze_object_get_string (object, property); @@ -571,7 +513,7 @@ g_signal_connect (widget, "selection-changed", G_CALLBACK (proxy_folder_file_set_cb), object); } - else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("uri")) + else if (type == G_TYPE_PARAM_STRING && _hint == I_("uri")) { string = katze_object_get_string (object, property); @@ -590,17 +532,17 @@ G_CALLBACK (proxy_uri_file_set_cb), object); #endif } - else if (type == G_TYPE_PARAM_STRING && (_hint == g_intern_string ("font") - || _hint == g_intern_string ("font-monospace"))) + else if (type == G_TYPE_PARAM_STRING && (_hint == I_("font") + || _hint == I_("font-monospace"))) { GtkComboBox* combo; gint n_families, i; PangoContext* context; PangoFontFamily** families; - gboolean monospace = _hint == g_intern_string ("font-monospace"); + gboolean monospace = _hint == I_("font-monospace"); string = katze_object_get_string (object, property); - widget = gtk_combo_box_new_text (); + widget = gtk_combo_box_text_new (); combo = GTK_COMBO_BOX (widget); context = gtk_widget_get_pango_context (widget); pango_context_list_families (context, &families, &n_families); @@ -617,7 +559,7 @@ const gchar* font = pango_font_family_get_name (families[i]); if (monospace != pango_font_family_is_monospace (families[i])) continue; - gtk_combo_box_append_text (combo, font); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), font); if (!g_ascii_strcasecmp (font, string)) gtk_combo_box_set_active (combo, j); j++; @@ -638,6 +580,8 @@ const gchar* app_type = &hint[12]; GtkSettings* settings; gint icon_width = 16; + GtkTreeIter iter_none; + GAppInfo* info; settings = gtk_settings_get_for_screen (gdk_screen_get_default ()); gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, @@ -662,14 +606,12 @@ if (!g_strcmp0 (string, "")) katze_assign (string, NULL); - if (apps) + gtk_list_store_insert_with_values (model, &iter_none, 0, + 0, NULL, 1, NULL, 2, _("None"), 3, icon_width, -1); + + if (apps != NULL) { - 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++))) { @@ -689,7 +631,10 @@ g_free (icon_name); } + g_list_free (apps); + } + { info = g_app_info_create_from_commandline ("", "", G_APP_INFO_CREATE_NONE, NULL); gtk_list_store_insert_with_values (model, NULL, G_MAXINT, @@ -705,9 +650,6 @@ 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")) @@ -724,7 +666,6 @@ 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); } @@ -732,10 +673,24 @@ { gchar* notify_property; - widget = gtk_entry_new (); + if (_hint == I_("address")) + widget = katze_uri_entry_new (NULL); + else + widget = gtk_entry_new (); g_object_get (object, property, &string, NULL); if (!string) string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); + if (!(string && *string) && _hint == I_("languages")) + { + gchar* lang = g_strjoinv (",", (gchar**)g_get_language_names ()); + if (g_str_has_suffix (lang, ",C")) + { + string = g_strndup (lang, strlen (lang) - 2); + g_free (lang); + } + else + string = lang; + } gtk_entry_set_text (GTK_ENTRY (widget), string ? string : ""); g_signal_connect (widget, "activate", G_CALLBACK (proxy_entry_activate_cb), object); @@ -762,6 +717,30 @@ g_signal_connect (widget, "value-changed", G_CALLBACK (proxy_spin_button_changed_cb), object); } + else if (type == G_TYPE_PARAM_INT && _hint == I_("days")) + { + gint value = katze_object_get_int (object, property); + gint active; + widget = gtk_combo_box_text_new (); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), _("1 hour")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), _("1 day")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), _("1 week")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), _("1 month")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), _("1 year")); + switch (value) + { + case 0: active = 0; break; + case 1: active = 1; break; + case 7: active = 2; break; + case 30: active = 3; break; + case 365: active = 4; break; + default: + active = 3; + } + gtk_combo_box_set_active (GTK_COMBO_BOX (widget), active); + g_signal_connect (widget, "changed", + G_CALLBACK (proxy_days_changed_cb), object); + } else if (type == G_TYPE_PARAM_INT) { gint value = katze_object_get_int (object, property); @@ -801,16 +780,18 @@ hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (widget), HILDON_TOUCH_SELECTOR (selector)); #else - widget = gtk_combo_box_new_text (); + widget = gtk_combo_box_text_new (); #endif for (i = 0; i < enum_class->n_values; i++) { - const gchar* label = gettext (enum_class->values[i].value_nick); + const gchar* raw_label = gettext (enum_class->values[i].value_nick); + gchar* label = katze_strip_mnemonics (raw_label); #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); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), label); #endif + g_free (label); } #ifdef HAVE_HILDON_2_2 hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, value); @@ -935,21 +916,29 @@ GtkRequisition widget_req; KatzePopupInfo* info = user_data; GtkWidget* widget = info->widget; + GdkWindow* window = gtk_widget_get_window (widget); gint widget_height; - gtk_widget_get_allocation (widget, &allocation); + if (!window) + return; + + #if !GTK_CHECK_VERSION (3, 0, 0) + if (GTK_IS_ENTRY (widget)) + window = gdk_window_get_parent (window); + #endif /* Retrieve size and position of both widget and menu */ - if (!gtk_widget_get_has_window (widget)) - { - gdk_window_get_position (gtk_widget_get_window (widget), &wx, &wy); - wx += allocation.x; - wy += allocation.y; - } - else - gdk_window_get_origin (gtk_widget_get_window (widget), &wx, &wy); + gtk_widget_get_allocation (widget, &allocation); + gdk_window_get_origin (window, &wx, &wy); + wx += allocation.x; + wy += allocation.y; + #if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_get_preferred_size (GTK_WIDGET (menu), &menu_req, NULL); + gtk_widget_get_preferred_size (widget, &widget_req, NULL); + #else gtk_widget_size_request (GTK_WIDGET (menu), &menu_req); gtk_widget_size_request (widget, &widget_req); + #endif menu_width = menu_req.width; widget_height = widget_req.height; /* Better than allocation.height */ @@ -1215,6 +1204,16 @@ return result; } +const gchar* +katze_skip_whitespace (const gchar* str) +{ + if (str == NULL) + return NULL; + while (*str == ' ' || *str == '\t' || *str == '\n') + str++; + return str; +} + /** * katze_object_has_property: * @object: a #GObject @@ -1497,7 +1496,7 @@ g_return_val_if_fail (uri != NULL, NULL); - if (g_str_has_prefix (uri, "http://") || g_str_has_prefix (uri,"https://")) + if (midori_uri_is_http (uri)) { guint i; gchar* icon_uri; @@ -1539,3 +1538,76 @@ GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); } +static void +katze_uri_entry_changed_cb (GtkWidget* entry, + GtkWidget* other_widget) +{ + const gchar* uri = gtk_entry_get_text (GTK_ENTRY (entry)); + gboolean valid = midori_uri_is_location (uri); + if (!valid && g_object_get_data (G_OBJECT (entry), "allow_%s")) + valid = uri && g_str_has_prefix (uri, "%s"); + if (*uri && !valid) + { + GdkColor bg_color = { 0 }; + GdkColor fg_color = { 0 }; + gdk_color_parse ("#ef7070", &bg_color); + gdk_color_parse ("#000", &fg_color); + gtk_widget_modify_base (entry, GTK_STATE_NORMAL, &bg_color); + gtk_widget_modify_text (entry, GTK_STATE_NORMAL, &fg_color); + } + else + { + gtk_widget_modify_base (entry, GTK_STATE_NORMAL, NULL); + gtk_widget_modify_text (entry, GTK_STATE_NORMAL, NULL); + } + + if (other_widget != NULL) + gtk_widget_set_sensitive (other_widget, valid); +} + +/** + * katze_uri_entry_new: + * @other_widget: a #GtkWidget, or %NULL + * + * Creates an entry that validates the typed URI. + * + * If @other_widget is given, it will become insensitive if + * the input is not a valid URI. + * + * Returns: a #GtkEntry + * + * Since: 0.3.6 + */ +GtkWidget* +katze_uri_entry_new (GtkWidget* other_widget) +{ + GtkWidget* entry = gtk_entry_new (); + g_signal_connect (entry, "changed", + G_CALLBACK (katze_uri_entry_changed_cb), other_widget); + return entry; +} + +/** + * katze_assert_str_equal: + * @input: a string + * @result: a string + * @expected: a string + * + * Compares the two strings for equality, with verbose errors. + * + * Since: 0.4.3 + */ +void +katze_assert_str_equal (const gchar* input, + const gchar* result, + const gchar* expected) +{ + if (g_strcmp0 (result, expected)) + { + g_error ("Input: %s\nExpected: %s\nResult: %s", + input ? input : "NULL", + expected ? expected : "NULL", + result ? result : "NULL"); + } +} + diff -Nru midori-0.2.8/katze/katze-utils.h midori-0.4.6/katze/katze-utils.h --- midori-0.2.8/katze/katze-utils.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/katze/katze-utils.h 2012-05-14 22:13:42.000000000 +0000 @@ -15,6 +15,7 @@ #include #include "katze-array.h" +#include "gtk3-compat.h" G_BEGIN_DECLS @@ -57,6 +58,20 @@ **/ #define katze_strv_assign(lvalue, rvalue) lvalue = (g_strfreev (lvalue), rvalue) +/** + * katze_str_non_null: + * @str: a string, or %NULL + * + * Returns "" if @str is %NULL. + * + * Since: 0.4.4 + **/ +static inline const gchar* +katze_str_non_null (const gchar* str) +{ + return str ? str : ""; +} + GtkWidget* katze_property_proxy (gpointer object, const gchar* property, @@ -100,6 +115,9 @@ gchar* katze_strip_mnemonics (const gchar* original); +const gchar* +katze_skip_whitespace (const gchar* str); + gboolean katze_object_has_property (gpointer object, const gchar* property); @@ -139,6 +157,14 @@ katze_load_cached_icon (const gchar* uri, GtkWidget* widget); +GtkWidget* +katze_uri_entry_new (GtkWidget* other_widget); + +void +katze_assert_str_equal (const gchar* input, + const gchar* result, + const gchar* expected); + G_END_DECLS #endif /* __KATZE_UTILS_H__ */ diff -Nru midori-0.2.8/katze/katze.h midori-0.4.6/katze/katze.h --- midori-0.2.8/katze/katze.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/katze/katze.h 2012-05-14 22:13:42.000000000 +0000 @@ -14,6 +14,7 @@ #include "katze-http-auth.h" #include "katze-http-cookies.h" +#include "katze-http-cookies-sqlite.h" #include "katze-throbber.h" #include "katze-utils.h" #include "katze-item.h" diff -Nru midori-0.2.8/katze/katze.vapi midori-0.4.6/katze/katze.vapi --- midori-0.2.8/katze/katze.vapi 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/katze/katze.vapi 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,11 @@ +/* Copyright (C) 2012 André Stösel + This file is licensed under the terms of the expat license, see the file EXPAT. */ + +[CCode (cprefix = "Katze", lower_case_cprefix = "katze_")] +namespace Katze { + public class Array : GLib.Object { + public Array (GLib.Type type); + public void add_item (GLib.Object item); + } +} + diff -Nru midori-0.2.8/katze/midori-uri.vala midori-0.4.6/katze/midori-uri.vala --- midori-0.2.8/katze/midori-uri.vala 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/katze/midori-uri.vala 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,172 @@ +/* + Copyright (C) 2011 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. +*/ + +namespace GLib { + extern static string hostname_to_unicode (string hostname); + extern static string hostname_to_ascii (string hostname); +} + +namespace Midori { + public class URI : Object { + public static string? parse_hostname (string? uri, out string path) { + /* path may be null. */ + if (uri == null) + return uri; + unowned string? hostname = uri.chr (-1, '/'); + if (hostname == null || hostname[1] != '/' + || hostname.chr (-1, ' ') != null) + return null; + hostname = hostname.offset (2); + if (&path != null) { + if ((path = hostname.chr (-1, '/')) != null) + return hostname.split ("/")[0]; + } + return hostname; + } + /* Deprecated: 0.4.3 */ + public static string parse (string uri, out string path) { + return parse_hostname (uri, out path) ?? uri; + } + public static string to_ascii (string uri) { + /* Convert hostname to ASCII. */ + string? proto = null; + if (uri.chr (-1, '/') != null && uri.chr (-1, ':') != null) + proto = uri.split ("://")[0]; + string? path = null; + string? hostname = parse_hostname (uri, out path) ?? uri; + string encoded = hostname_to_ascii (hostname); + if (encoded != null) { + return (proto ?? "") + + (proto != null ? "://" : "") + + encoded + path; + } + return uri; + } + public static string unescape (string uri) { + /* Unescape, pass through + and %20 */ + if (uri.chr (-1, '%') != null || uri.chr (-1, ' ') != null) { + /* Preserve %20 for pasting URLs into other windows */ + string? unescaped = GLib.Uri.unescape_string (uri, "+"); + if (unescaped == null) + return uri; + return unescaped.replace (" ", "%20"); + } + return uri; + } + public static string format_for_display (string? uri) { + /* Percent-decode and decode puniycode for user display */ + if (uri != null && uri.has_prefix ("http://")) { + string unescaped = unescape (uri); + if (unescaped == null) + return uri; + else if (!unescaped.validate ()) + return uri; + string path; + string hostname = parse_hostname (unescaped, out path); + string decoded = hostname_to_unicode (hostname); + if (decoded != null) + return "http://" + decoded + path; + return unescaped; + } + return uri; + } + public static string for_search (string? uri, string keywords) { + /* Take a search engine URI and insert specified keywords. + Keywords are percent-encoded. If the uri contains a %s + the keywords are inserted there, otherwise appended. */ + if (uri == null) + return keywords; + string escaped = GLib.Uri.escape_string (keywords, ":/", true); + /* Allow DuckDuckGo to distinguish Midori and in turn share revenue */ + if (uri == "https://duckduckgo.com/?q=%s") + return "https://duckduckgo.com/?q=%s&t=midori".printf (escaped); + if (uri.str ("%s") != null) + return uri.printf (escaped); + return uri + escaped; + } + public static bool is_blank (string? uri) { + return !(uri != null && uri != "" && !uri.has_prefix ("about:")); + } + public static bool is_http (string? uri) { + return uri != null + && (uri.has_prefix ("http://") || uri.has_prefix ("https://")); + } + public static bool is_resource (string? uri) { + return uri != null + && (is_http (uri) + || (uri.has_prefix ("data:") && uri.chr (-1, ';') != null)); + } + public static bool is_location (string? uri) { + /* file:// is not considered a location for security reasons */ + return uri != null + && ((uri.str ("://") != null && uri.chr (-1, ' ') == null) + || is_http (uri) + || uri.has_prefix ("about:") + || (uri.has_prefix ("data:") && uri.chr (-1, ';') != null) + || (uri.has_prefix ("geo:") && uri.chr (-1, ',') != null) + || uri.has_prefix ("javascript:")); + } + public static bool is_email (string? uri) { + return uri != null + && (uri.chr (-1, '@') != null || uri.has_prefix ("mailto:")) + /* :// and @ together would mean login credentials */ + && uri.str ("://") == null; + } + public static bool is_ip_address (string? uri) { + /* Quick check for IPv4 or IPv6, no validation. + FIXME: Schemes are not handled + hostname_is_ip_address () is not used because + we'd have to separate the path from the URI first. */ + if (uri == null) + return false; + /* IPv4 */ + if (uri[0].isdigit () && (uri.chr (4, '.') != null)) + return true; + /* IPv6 */ + if (uri[0].isalnum () && uri[1].isalnum () + && uri[2].isalnum () && uri[3].isalnum () && uri[4] == ':' + && (uri[5] == ':' || uri[5].isalnum ())) + return true; + return false; + } + public static bool is_valid (string? uri) { + return uri != null + && uri.chr (-1, ' ') == null + && (URI.is_location (uri) || uri.chr (-1, '.') != null); + } + public static GLib.ChecksumType get_fingerprint (string uri, + out string checksum, out string label) { + + /* http://foo.bar/baz/spam.eggs#!algo!123456 */ + unowned string delimiter = "#!md5!"; + unowned string display = _("MD5-Checksum:"); + GLib.ChecksumType type = GLib.ChecksumType.MD5; + unowned string? fragment = uri.str (delimiter); + if (fragment == null) { + delimiter = "#!sha1!"; + display = _("SHA1-Checksum:"); + type = GLib.ChecksumType.SHA1; + fragment = uri.str (delimiter); + } + if (fragment == null) { + type = (GLib.ChecksumType)int.MAX; + display = null; + } + + if (&checksum != null) + checksum = fragment != null + ? fragment.offset (delimiter.length) : null; + if (&label != null) + label = display; + return type; + } + } +} diff -Nru midori-0.2.8/midori/gtkiconentry.c midori-0.4.6/midori/gtkiconentry.c --- midori-0.2.8/midori/gtkiconentry.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/gtkiconentry.c 2012-05-14 22:13:42.000000000 +0000 @@ -1419,8 +1419,6 @@ gtk_icon_entry_set_icon_from_icon_name (entry, i, priv->icons[i].icon_name); } - - #if GLIB_CHECK_VERSION (2, 16, 0) else if (priv->icons[i].storage_type == _GTK_IMAGE_GICON) { g_object_unref (priv->icons[i].pixbuf); @@ -1428,7 +1426,6 @@ gtk_icon_entry_set_icon_from_gicon (entry, i, priv->icons[i].gicon); } - #endif } gtk_widget_queue_draw (GTK_WIDGET (entry)); diff -Nru midori-0.2.8/midori/gtkiconentry.h midori-0.4.6/midori/gtkiconentry.h --- midori-0.2.8/midori/gtkiconentry.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/gtkiconentry.h 2012-05-14 22:13:42.000000000 +0000 @@ -21,10 +21,6 @@ #ifndef __GTK_ICON_ENTRY_H__ #define __GTK_ICON_ENTRY_H__ -#if HAVE_CONFIG_H - #include -#endif - #include #include @@ -45,6 +41,7 @@ gtk_icon_entry_set_icon_from_pixbuf (GtkEntry* entry, GtkEntryIconPosition position, GdkPixbuf* pixbuf); + #define gtk_icon_entry_set_tooltip gtk_entry_set_icon_tooltip_text #define gtk_icon_entry_set_icon_highlight gtk_entry_set_icon_activatable #define gtk_icon_entry_set_progress_fraction gtk_entry_set_progress_fraction #else diff -Nru midori-0.2.8/midori/main.c midori-0.4.6/midori/main.c --- midori-0.2.8/midori/main.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/main.c 2012-05-14 22:13:42.000000000 +0000 @@ -10,20 +10,20 @@ See the file COPYING for the full license text. */ -#if HAVE_CONFIG_H - #include -#endif - -#include "midori.h" +#include "midori-app.h" #include "midori-array.h" #include "midori-bookmarks.h" -#include "midori-console.h" +#include "panels/midori-bookmarks.h" +#include "midori-extension.h" #include "midori-extensions.h" #include "midori-history.h" #include "midori-transfers.h" +#include "midori-panel.h" +#include "midori-platform.h" +#include "midori-preferences.h" +#include -#include "sokoke.h" - +#include #if HAVE_UNISTD_H #include #endif @@ -32,12 +32,13 @@ #include #include #include +#include #include #include -#if ENABLE_NLS - #include - #include +#if WEBKIT_CHECK_VERSION (1, 3, 11) + #define LIBSOUP_USE_UNSTABLE_REQUEST_API + #include #endif #ifdef HAVE_SIGNAL_H @@ -60,19 +61,15 @@ static gchar* build_config_filename (const gchar* filename) { - 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); + return g_build_filename (sokoke_set_config_dir (NULL), filename, NULL); } static MidoriWebSettings* -settings_new_from_file (const gchar* filename, - gchar*** extensions) +settings_and_accels_new (const gchar* config, + gchar*** extensions) { MidoriWebSettings* settings = midori_web_settings_new (); + gchar* config_file = g_build_filename (config, "config", NULL); GKeyFile* key_file = g_key_file_new (); GError* error = NULL; GObjectClass* class; @@ -86,14 +83,21 @@ gfloat number; gboolean boolean; - if (!g_key_file_load_from_file (key_file, filename, - G_KEY_FILE_KEEP_COMMENTS, &error)) + if (!g_key_file_load_from_file (key_file, config_file, + G_KEY_FILE_KEEP_COMMENTS, &error)) { if (error->code == G_FILE_ERROR_NOENT) { - gchar* config_file = sokoke_find_config_filename (NULL, "config"); + GError* inner_error = NULL; + katze_assign (config_file, sokoke_find_config_filename (NULL, "config")); g_key_file_load_from_file (key_file, config_file, - G_KEY_FILE_KEEP_COMMENTS, NULL); + G_KEY_FILE_KEEP_COMMENTS, &inner_error); + if (inner_error != NULL) + { + printf (_("The configuration couldn't be loaded: %s\n"), + inner_error->message); + g_error_free (inner_error); + } } else printf (_("The configuration couldn't be loaded: %s\n"), @@ -139,7 +143,6 @@ GEnumClass* enum_class = G_ENUM_CLASS ( g_type_class_peek (pspec->value_type)); GEnumValue* enum_value; - str = g_key_file_get_string (key_file, "settings", property, NULL); enum_value = g_enum_get_value_by_name (enum_class, str); if (enum_value) @@ -147,9 +150,7 @@ else g_warning (_("Value '%s' is invalid for %s"), str, property); - g_free (str); - g_type_class_unref (enum_class); } else g_warning (_("Invalid configuration value '%s'"), property); @@ -160,6 +161,13 @@ g_key_file_free (key_file); + /* Load accelerators */ + katze_assign (config_file, g_build_filename (config, "accels", NULL)); + if (g_access (config_file, F_OK) != 0) + katze_assign (config_file, sokoke_find_config_filename (NULL, "accels")); + gtk_accel_map_load (config_file); + g_free (config_file); + return settings; } @@ -195,13 +203,24 @@ { gchar* string; const gchar* def_string = G_PARAM_SPEC_STRING (pspec)->default_value; + if (!strcmp (property, "user-stylesheet-uri")) + { + const gchar* user_stylesheet_uri = g_object_get_data (G_OBJECT (settings), property); + if (user_stylesheet_uri) + { + g_key_file_set_string (key_file, "settings", property, + user_stylesheet_uri); + } + else + g_key_file_remove_key (key_file, "settings", property, NULL); + continue; + } + g_object_get (settings, property, &string, NULL); - 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); + if (strcmp (string ? string : "", def_string)) + g_key_file_set_string (key_file, "settings", property, string ? string : ""); g_free (string); } else if (type == G_TYPE_PARAM_INT) @@ -228,7 +247,7 @@ else if (type == G_TYPE_PARAM_ENUM) { GEnumClass* enum_class = G_ENUM_CLASS ( - g_type_class_ref (pspec->value_type)); + g_type_class_peek (pspec->value_type)); gint integer; GEnumValue* enum_value; g_object_get (settings, property, &integer, NULL); @@ -246,8 +265,24 @@ { KATZE_ARRAY_FOREACH_ITEM (extension, extensions) if (midori_extension_is_active (extension)) - g_key_file_set_boolean (key_file, "extensions", - g_object_get_data (G_OBJECT (extension), "filename"), TRUE); + { + const gchar* filename = g_object_get_data ( + G_OBJECT (extension), "filename"); + + gchar* key; + gchar* term; + + key = katze_object_get_string (extension, "key"); + if (key && *key) + term = g_strdup_printf ("%s/%s", filename, key); + else + term = g_strdup (filename); + + g_key_file_set_boolean (key_file, "extensions", term, TRUE); + + g_free (key); + g_free (term); + } g_object_unref (extensions); } else if ((_extensions = g_object_get_data (G_OBJECT (app), "extensions"))) @@ -308,6 +343,49 @@ return search_engines; } +static KatzeArray* +search_engines_new_from_folder (const gchar* config, + GString* error_messages) +{ + gchar* config_file = g_build_filename (config, "search", NULL); + GError* error = NULL; + KatzeArray* search_engines; + + search_engines = search_engines_new_from_file (config_file, &error); + /* We ignore for instance empty files */ + if (error && (error->code == G_KEY_FILE_ERROR_PARSE + || error->code == G_FILE_ERROR_NOENT)) + { + g_error_free (error); + error = NULL; + } + if (!error && katze_array_is_empty (search_engines)) + { + g_object_unref (search_engines); + #ifdef G_OS_WIN32 + gchar* dir = g_win32_get_package_installation_directory_of_module (NULL); + katze_assign (config_file, + g_build_filename (dir, "etc", "xdg", PACKAGE_NAME, "search", NULL)); + g_free (dir); + search_engines = search_engines_new_from_file (config_file, NULL); + #else + katze_assign (config_file, + sokoke_find_config_filename (NULL, "search")); + search_engines = search_engines_new_from_file (config_file, NULL); + #endif + } + else if (error) + { + if (error->code != G_FILE_ERROR_NOENT && error_messages) + g_string_append_printf (error_messages, + _("The search engines couldn't be loaded. %s\n"), + error->message); + g_error_free (error); + } + g_free (config_file); + return search_engines; +} + static gboolean search_engines_save_to_file (KatzeArray* search_engines, const gchar* filename, @@ -346,36 +424,59 @@ return saved; } -static sqlite3* +static void +midori_history_clear_cb (KatzeArray* array, + sqlite3* db) +{ + char* errmsg = NULL; + if (sqlite3_exec (db, "DELETE FROM history; DELETE FROM search", + NULL, NULL, &errmsg) != SQLITE_OK) + { + g_printerr (_("Failed to clear history: %s\n"), errmsg); + sqlite3_free (errmsg); + } +} + +static gboolean midori_history_initialize (KatzeArray* array, const gchar* filename, const gchar* bookmarks_filename, char** errmsg) { sqlite3* db; - gboolean has_day; + gboolean has_day = FALSE; sqlite3_stmt* stmt; gint result; gchar* sql; - has_day = FALSE; - if (sqlite3_open (filename, &db) != SQLITE_OK) { if (errmsg) *errmsg = g_strdup_printf (_("Failed to open database: %s\n"), sqlite3_errmsg (db)); sqlite3_close (db); - return NULL; + return FALSE; } if (sqlite3_exec (db, + "PRAGMA journal_mode = WAL; PRAGMA cache_size = 32100;", + NULL, NULL, errmsg) != SQLITE_OK) + sqlite3_exec (db, "PRAGMA journal_mode = TRUNCATE;", NULL, NULL, errmsg); + sqlite3_exec (db, + "PRAGMA synchronous = NORMAL; PRAGMA temp_store = MEMORY;", + NULL, NULL, errmsg); + if (*errmsg) + { + g_warning ("Failed to set journal mode: %s", *errmsg); + sqlite3_free (*errmsg); + } + if (sqlite3_exec (db, "CREATE TABLE IF NOT EXISTS " "history (uri text, title text, date integer, day integer);" "CREATE TABLE IF NOT EXISTS " "search (keywords text, uri text, day integer);", NULL, NULL, errmsg) != SQLITE_OK) - return NULL; + return FALSE; sqlite3_prepare_v2 (db, "SELECT day FROM history LIMIT 1", -1, &stmt, NULL); result = sqlite3_step (stmt); @@ -401,18 +502,20 @@ sql = g_strdup_printf ("ATTACH DATABASE '%s' AS bookmarks", bookmarks_filename); sqlite3_exec (db, sql, NULL, NULL, errmsg); g_free (sql); + g_object_set_data (G_OBJECT (array), "db", db); + g_signal_connect (array, "clear", + G_CALLBACK (midori_history_clear_cb), db); - return db; + return TRUE; } static void -midori_history_terminate (sqlite3* db, - gint max_history_age) +midori_history_terminate (KatzeArray* array, + gint max_history_age) { - gchar* sqlcmd; + sqlite3* db = g_object_get_data (G_OBJECT (array), "db"); char* errmsg = NULL; - - sqlcmd = g_strdup_printf ( + gchar* sqlcmd = g_strdup_printf ( "DELETE FROM history WHERE " "(julianday(date('now')) - julianday(date(date,'unixepoch')))" " >= %d", max_history_age); @@ -427,99 +530,18 @@ } static void -midori_bookmarks_remove_item_cb (KatzeArray* array, - KatzeItem* item, - sqlite3* db) -{ - gchar* sqlcmd; - char* errmsg = NULL; - - if (KATZE_ITEM_IS_BOOKMARK (item)) - sqlcmd = sqlite3_mprintf ( - "DELETE FROM bookmarks WHERE uri = '%q' " - " AND folder = '%q'", - katze_item_get_uri (item), - katze_item_get_meta_string (item, "folder")); - - else - sqlcmd = sqlite3_mprintf ( - "DELETE FROM bookmarks WHERE title = '%q'" - " AND folder = '%q'", - katze_item_get_name (item), - katze_item_get_meta_string (item, "folder")); - - if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK) - { - g_printerr (_("Failed to remove history item: %s\n"), errmsg); - sqlite3_free (errmsg); - } - - sqlite3_free (sqlcmd); -} - -static sqlite3* -midori_bookmarks_initialize (KatzeArray* array, - const gchar* filename, - char** errmsg) -{ - sqlite3* db; - - if (sqlite3_open (filename, &db) != SQLITE_OK) - { - if (errmsg) - *errmsg = g_strdup_printf (_("Failed to open database: %s\n"), - sqlite3_errmsg (db)); - sqlite3_close (db); - return NULL; - } - - if (sqlite3_exec (db, - "CREATE TABLE IF NOT EXISTS " - "bookmarks (uri text, title text, folder text, " - "desc text, app integer, toolbar integer);", - NULL, NULL, errmsg) != SQLITE_OK) - return NULL; - g_signal_connect (array, "remove-item", - G_CALLBACK (midori_bookmarks_remove_item_cb), db); - return db; -} - -static void -midori_bookmarks_import (const gchar* filename, - sqlite3* db) -{ - KatzeArray* bookmarks; - GError* error = NULL; - - bookmarks = katze_array_new (KATZE_TYPE_ARRAY); - - if (!midori_array_from_file (bookmarks, filename, "xbel", &error)) - { - g_warning (_("The bookmarks couldn't be saved. %s"), error->message); - g_error_free (error); - return; - } - midori_bookmarks_import_array_db (db, bookmarks, ""); -} - -static void -midori_session_add_delay (KatzeArray* session) -{ - KatzeItem* item; - KATZE_ARRAY_FOREACH_ITEM (item, session) - katze_item_set_meta_integer (item, "delay", 1); -} - -static void settings_notify_cb (MidoriWebSettings* settings, GParamSpec* pspec, MidoriApp* app) { + GError* error = NULL; gchar* config_file; - GError* error; + + /* Skip state related properties to avoid disk IO */ + if (pspec && pspec->flags & MIDORI_PARAM_DELAY_SAVING) + return; config_file = build_config_filename ("config"); - error = NULL; if (!settings_save_to_file (settings, app, config_file, &error)) { g_warning (_("The configuration couldn't be saved. %s"), error->message); @@ -553,11 +575,8 @@ gpointer item, KatzeArray* search_engines) { - gchar* config_file; - GError* error; - - config_file = build_config_filename ("search"); - error = NULL; + gchar* config_file = build_config_filename ("search"); + GError* error = NULL; if (!search_engines_save_to_file (search_engines, config_file, &error)) { g_warning (_("The search engines couldn't be saved. %s"), @@ -568,26 +587,21 @@ } static void -midori_trash_add_item_cb (KatzeArray* trash, - GObject* item) +midori_search_engines_move_item_cb (KatzeArray* array, + gpointer item, + gint position, + KatzeArray* search_engines) { - gchar* config_file; - GError* error; - GObject* obsolete_item; - - config_file = build_config_filename ("tabtrash.xbel"); - error = NULL; - if (!midori_array_to_file (trash, config_file, "xbel", &error)) - { - /* i18n: Trash, or wastebin, containing closed tabs */ - g_warning (_("The trash couldn't be saved. %s"), error->message); - g_error_free (error); - } - g_free (config_file); + midori_search_engines_modify_cb (array, item, search_engines); +} +static void +midori_trash_add_item_no_save_cb (KatzeArray* trash, + GObject* item) +{ if (katze_array_get_nth_item (trash, 10)) { - obsolete_item = katze_array_get_nth_item (trash, 0); + KatzeItem* obsolete_item = katze_array_get_nth_item (trash, 0); katze_array_remove_item (trash, obsolete_item); } } @@ -596,13 +610,12 @@ midori_trash_remove_item_cb (KatzeArray* trash, GObject* item) { - gchar* config_file; - GError* error; - - config_file = build_config_filename ("tabtrash.xbel"); - error = NULL; + gchar* config_file = build_config_filename ("tabtrash.xbel"); + GError* error = NULL; + midori_trash_add_item_no_save_cb (trash, item); if (!midori_array_to_file (trash, config_file, "xbel", &error)) { + /* i18n: Trash, or wastebin, containing closed tabs */ g_warning (_("The trash couldn't be saved. %s"), error->message); g_error_free (error); } @@ -610,6 +623,86 @@ } static void +midori_trash_add_item_cb (KatzeArray* trash, + GObject* item) +{ + midori_trash_remove_item_cb (trash, item); +} + +static void +midori_browser_show_preferences_cb (MidoriBrowser* browser, + KatzePreferences* preferences, + MidoriApp* app) +{ + KatzeArray* array; + GtkWidget* scrolled; + GtkWidget* addon; + GList* children; + GtkWidget* page; + + /* Hide if there are no extensions at all */ + array = katze_object_get_object (app, "extensions"); + if (!katze_array_get_nth_item (array, 0)) + { + g_object_unref (array); + return; + } + g_object_unref (array); + + scrolled = g_object_new (KATZE_TYPE_SCROLLED, "visible", TRUE, NULL); + /* For lack of a better way of keeping descriptions visible */ + g_object_set (scrolled, "hscrollbar-policy", GTK_POLICY_NEVER, NULL); + addon = g_object_new (MIDORI_TYPE_EXTENSIONS, "app", app, NULL); + children = gtk_container_get_children (GTK_CONTAINER (addon)); + gtk_widget_reparent (g_list_nth_data (children, 0), scrolled); + g_list_free (children); + page = katze_preferences_add_category (preferences, + _("Extensions"), STOCK_EXTENSIONS); + gtk_box_pack_start (GTK_BOX (page), scrolled, TRUE, TRUE, 4); +} + +static void +midori_browser_privacy_preferences_cb (MidoriBrowser* browser, + KatzePreferences* preferences, + MidoriApp* app) +{ + MidoriWebSettings* settings = midori_browser_get_settings (browser); + GtkWidget* button; + GtkWidget* label; + gchar* markup; + + katze_preferences_add_category (preferences, _("Privacy"), GTK_STOCK_INDEX); + katze_preferences_add_group (preferences, NULL); + button = katze_property_label (settings, "maximum-cookie-age"); + katze_preferences_add_widget (preferences, button, "indented"); + button = katze_property_proxy (settings, "maximum-cookie-age", "days"); + katze_preferences_add_widget (preferences, button, "spanned"); + #ifdef HAVE_LIBSOUP_2_29_91 + button = katze_property_proxy (settings, "first-party-cookies-only", NULL); + katze_preferences_add_widget (preferences, button, "filled"); + #endif + + markup = g_strdup_printf ("%s", + _("Cookies store login data, saved games, " + "or user profiles for advertisement purposes.")); + label = gtk_label_new (NULL); + gtk_label_set_markup (GTK_LABEL (label), markup); + g_free (markup); + katze_preferences_add_widget (preferences, label, "filled"); + button = katze_property_proxy (settings, "enable-offline-web-application-cache", NULL); + katze_preferences_add_widget (preferences, button, "indented"); + button = katze_property_proxy (settings, "enable-html5-local-storage", NULL); + katze_preferences_add_widget (preferences, button, "spanned"); + button = katze_property_proxy (settings, "strip-referer", NULL); + katze_preferences_add_widget (preferences, button, "indented"); + katze_preferences_add_widget (preferences, gtk_label_new (NULL), "indented"); + button = katze_property_label (settings, "maximum-history-age"); + katze_preferences_add_widget (preferences, button, "indented"); + button = katze_property_proxy (settings, "maximum-history-age", "days"); + katze_preferences_add_widget (preferences, button, "spanned"); +} + +static void midori_app_add_browser_cb (MidoriApp* app, MidoriBrowser* browser, KatzeNet* net) @@ -619,33 +712,20 @@ panel = katze_object_get_object (browser, "panel"); - /* Bookmarks */ - addon = g_object_new (MIDORI_TYPE_BOOKMARKS, "app", app, NULL); - gtk_widget_show (addon); - midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon)); - - /* History */ - addon = g_object_new (MIDORI_TYPE_HISTORY, "app", app, NULL); - gtk_widget_show (addon); + addon = g_object_new (MIDORI_TYPE_BOOKMARKS, "app", app, "visible", TRUE, NULL); midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon)); - /* Transfers */ - #if WEBKIT_CHECK_VERSION (1, 1, 3) - addon = g_object_new (MIDORI_TYPE_TRANSFERS, "app", app, NULL); - gtk_widget_show (addon); + addon = g_object_new (MIDORI_TYPE_HISTORY, "app", app, "visible", TRUE, NULL); midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon)); - #endif - /* Console */ - addon = g_object_new (MIDORI_TYPE_CONSOLE, "app", app, NULL); - gtk_widget_show (addon); + addon = g_object_new (MIDORI_TYPE_TRANSFERS, "app", app, "visible", TRUE, NULL); midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon)); /* Extensions */ - 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_signal_connect (browser, "show-preferences", + G_CALLBACK (midori_browser_privacy_preferences_cb), app); + g_signal_connect (browser, "show-preferences", + G_CALLBACK (midori_browser_show_preferences_cb), app); g_object_unref (panel); } @@ -655,11 +735,8 @@ static gboolean midori_session_save_timeout_cb (KatzeArray* session) { - gchar* config_file; - GError* error; - - config_file = build_config_filename ("session.xbel"); - error = NULL; + gchar* config_file = build_config_filename ("session.xbel"); + GError* error = NULL; if (!midori_array_to_file (session, config_file, "xbel", &error)) { g_warning (_("The session couldn't be saved. %s"), error->message); @@ -681,8 +758,8 @@ if (!save_timeout) { g_object_ref (session); - save_timeout = g_timeout_add_full (G_PRIORITY_LOW, 5000, - (GSourceFunc)midori_session_save_timeout_cb, session, NULL); + save_timeout = g_timeout_add_seconds (5, + (GSourceFunc)midori_session_save_timeout_cb, session); } } @@ -694,7 +771,7 @@ g_unlink (config_file); g_free (config_file); - if (save_timeout && session) + if (session) midori_session_save_timeout_cb (session); } @@ -714,7 +791,7 @@ SoupURI* proxy_uri; /* soup_uri_new expects a non-NULL string with a protocol */ - if (uri && g_str_has_prefix (uri, "http://")) + if (midori_uri_is_http (uri)) proxy_uri = soup_uri_new (uri); else if (uri && *uri) { @@ -757,23 +834,28 @@ } else if (proxy_type == MIDORI_PROXY_HTTP) { - gchar* http_proxy = katze_object_get_string (settings, "http-proxy"); - midori_soup_session_set_proxy_uri (session, http_proxy); - g_free (http_proxy); + gchar* proxy = katze_object_get_string (settings, "http-proxy"); + GString *http_proxy = g_string_new (proxy); + g_string_append_printf (http_proxy, ":%d", katze_object_get_int (settings, "http-proxy-port")); + midori_soup_session_set_proxy_uri (session, http_proxy->str); + g_string_free (http_proxy, TRUE); + g_free (proxy); } else midori_soup_session_set_proxy_uri (session, NULL); } -#if !WEBKIT_CHECK_VERSION (1, 1, 11) +#ifdef HAVE_LIBSOUP_2_29_91 static void -soup_session_settings_notify_ident_string_cb (MidoriWebSettings* settings, - GParamSpec* pspec, - SoupSession* session) -{ - gchar* ident_string = katze_object_get_string (settings, "user-agent"); - g_object_set (session, "user-agent", ident_string, NULL); - g_free (ident_string); +soup_session_settings_notify_first_party_cb (MidoriWebSettings* settings, + GParamSpec* pspec, + SoupSession* session) +{ + void* jar = soup_session_get_feature (session, SOUP_TYPE_COOKIE_JAR); + gboolean yes = katze_object_get_boolean (settings, "first-party-cookies-only"); + g_object_set (jar, "accept-policy", + yes ? SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY + : SOUP_COOKIE_JAR_ACCEPT_ALWAYS, NULL); } #endif @@ -803,6 +885,30 @@ g_free (languages); soup_message_headers_append (msg->request_headers, "Accept-Language", accpt); g_free (accpt); + + if (katze_object_get_boolean (settings, "strip-referer")) + { + const gchar* referer + = soup_message_headers_get_one (msg->request_headers, "Referer"); + SoupURI* destination = soup_message_get_uri (msg); + if (referer && destination && !strstr (referer, destination->host)) + { + SoupURI* stripped_uri = soup_uri_new (referer); + if (stripped_uri != NULL) + { + gchar* stripped_referer; + soup_uri_set_path (stripped_uri, ""); + soup_uri_set_query (stripped_uri, NULL); + stripped_referer = soup_uri_to_string (stripped_uri, FALSE); + soup_uri_free (stripped_uri); + if (g_getenv ("MIDORI_SOUP_DEBUG")) + g_message ("Referer %s stripped to %s", referer, stripped_referer); + soup_message_headers_replace (msg->request_headers, "Referer", + stripped_referer); + g_free (stripped_referer); + } + } + } } static void @@ -819,19 +925,24 @@ } } -static void -midori_soup_session_prepare (SoupSession* session, - SoupCookieJar* cookie_jar, - MidoriWebSettings* settings) +static gboolean +midori_load_soup_session (gpointer settings) { - SoupSessionFeature* feature; - gchar* config_file; + SoupSession* session = webkit_get_default_session (); - #if WEBKIT_CHECK_VERSION (1, 1, 14) && defined (HAVE_LIBSOUP_2_29_91) + #if defined (HAVE_LIBSOUP_2_37_1) + g_object_set (session, + "ssl-use-system-ca-file", TRUE, + "ssl-strict", FALSE, + NULL); + #elif defined (HAVE_LIBSOUP_2_29_91) const gchar* certificate_files[] = { "/etc/pki/tls/certs/ca-bundle.crt", "/etc/ssl/certs/ca-certificates.crt", + "/etc/ssl/certs/ca-bundle.crt", + "/usr/local/share/certs/ca-root-nss.crt", /* FreeBSD */ + "/var/lib/ca-certificates/ca-bundle.pem", /* openSUSE */ NULL }; guint i; @@ -850,35 +961,41 @@ "SSL certificates cannot be verified.")); #endif + #if !WEBKIT_CHECK_VERSION (1, 3, 5) + /* See http://stevesouders.com/ua/index.php */ + g_object_set (session, "max-conns", 60, + "max-conns-per-host", 6, + NULL); + #endif + + g_object_set_data (G_OBJECT (session), "midori-settings", settings); soup_session_settings_notify_http_proxy_cb (settings, NULL, session); g_signal_connect (settings, "notify::http-proxy", G_CALLBACK (soup_session_settings_notify_http_proxy_cb), session); g_signal_connect (settings, "notify::proxy-type", G_CALLBACK (soup_session_settings_notify_http_proxy_cb), session); + #ifdef HAVE_LIBSOUP_2_29_91 + if (g_object_class_find_property (G_OBJECT_GET_CLASS (settings), + "enable-file-access-from-file-uris")) /* WebKitGTK+ >= 1.1.21 */ + g_signal_connect (settings, "notify::first-party-cookies-only", + G_CALLBACK (soup_session_settings_notify_first_party_cb), session); + #endif - #if !WEBKIT_CHECK_VERSION (1, 1, 11) - soup_session_settings_notify_ident_string_cb (settings, NULL, session); - g_signal_connect (settings, "notify::user-agent", - G_CALLBACK (soup_session_settings_notify_ident_string_cb), session); + #if WEBKIT_CHECK_VERSION (1, 8, 0) + gchar* cache = g_build_filename (g_get_user_data_dir (), + "webkit", "icondatabase", NULL); + webkit_favicon_database_set_path (webkit_get_favicon_database (), cache); + g_free (cache); #endif g_signal_connect (session, "request-queued", G_CALLBACK (midori_soup_session_settings_accept_language_cb), settings); - config_file = build_config_filename ("logins"); - feature = g_object_new (KATZE_TYPE_HTTP_AUTH, "filename", config_file, NULL); - g_free (config_file); - soup_session_add_feature (session, feature); - g_object_unref (feature); midori_soup_session_debug (session); - feature = g_object_new (KATZE_TYPE_HTTP_COOKIES, NULL); - config_file = build_config_filename ("cookies.txt"); - g_object_set_data_full (G_OBJECT (feature), "filename", - config_file, (GDestroyNotify)g_free); - soup_session_add_feature (session, SOUP_SESSION_FEATURE (cookie_jar)); - soup_session_add_feature (session, feature); - g_object_unref (feature); + g_object_set_data (G_OBJECT (session), "midori-session-initialized", (void*)1); + + return FALSE; } static void @@ -892,25 +1009,6 @@ } static void -button_reset_session_clicked_cb (GtkWidget* button, - KatzeArray* session) -{ - gchar* config_file; - GError* error; - - config_file = build_config_filename ("session.old.xbel"); - error = NULL; - if (!midori_array_to_file (session, config_file, "xbel", &error)) - { - g_warning (_("The session couldn't be saved. %s"), error->message); - g_error_free (error); - } - g_free (config_file); - katze_array_clear (session); - gtk_widget_set_sensitive (button, FALSE); -} - -static void button_disable_extensions_clicked_cb (GtkWidget* button, MidoriApp* app) { @@ -918,29 +1016,29 @@ gtk_widget_set_sensitive (button, FALSE); } -static GtkWidget* -midori_create_diagnostic_dialog (MidoriWebSettings* settings, - KatzeArray* _session) +static MidoriStartup +midori_show_diagnostic_dialog (MidoriWebSettings* settings, + KatzeArray* _session) { GtkWidget* dialog; + GtkWidget* content_area; GdkScreen* screen; GtkIconTheme* icon_theme; + GtkWidget* align; GtkWidget* box; GtkWidget* button; MidoriApp* app = katze_item_get_parent (KATZE_ITEM (_session)); + MidoriStartup load_on_startup = katze_object_get_enum (settings, "load-on-startup"); + gint response; dialog = gtk_message_dialog_new ( - NULL, 0, GTK_MESSAGE_WARNING, - #ifdef HAVE_HILDON_2_2 - GTK_BUTTONS_NONE, - #else - GTK_BUTTONS_OK, - #endif + NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, _("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.")); gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); gtk_window_set_title (GTK_WINDOW (dialog), g_get_application_name ()); + content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); screen = gtk_widget_get_screen (dialog); if (screen) { @@ -950,16 +1048,14 @@ else gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); } + align = gtk_alignment_new (0.5, 0.5, 0.5, 0.5); + gtk_container_add (GTK_CONTAINER (content_area), align); box = gtk_hbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (align), box); button = gtk_button_new_with_mnemonic (_("Modify _preferences")); g_signal_connect (button, "clicked", G_CALLBACK (button_modify_preferences_clicked_cb), settings); gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 4); - button = gtk_button_new_with_mnemonic (_("Reset the last _session")); - g_signal_connect (button, "clicked", - G_CALLBACK (button_reset_session_clicked_cb), _session); - gtk_widget_set_sensitive (button, !katze_array_is_empty (_session)); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 4); button = gtk_button_new_with_mnemonic (_("Disable all _extensions")); if (g_object_get_data (G_OBJECT (app), "extensions")) g_signal_connect (button, "clicked", @@ -967,31 +1063,29 @@ else gtk_widget_set_sensitive (button, FALSE); gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 4); - gtk_widget_show_all (box); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), box); - #ifdef HAVE_HILDON_2_2 - box = gtk_hbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), box, TRUE, FALSE, 4); - button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_HALFSCREEN_WIDTH); - gtk_button_set_label (GTK_BUTTON (button), GTK_STOCK_OK); - gtk_button_set_use_stock (GTK_BUTTON (button), TRUE); - g_signal_connect_swapped (button, "clicked", - G_CALLBACK (gtk_widget_destroy), dialog); - gtk_box_pack_start (GTK_BOX (box), button, TRUE, FALSE, 4); - gtk_widget_show_all (box); - #endif + gtk_widget_show_all (align); + button = katze_property_proxy (settings, "show-crash-dialog", NULL); + gtk_widget_show (button); + gtk_container_add (GTK_CONTAINER (content_area), button); + gtk_container_set_focus_child (GTK_CONTAINER (dialog), gtk_dialog_get_action_area (GTK_DIALOG (dialog))); + gtk_dialog_add_buttons (GTK_DIALOG (dialog), + _("Discard old tabs"), MIDORI_STARTUP_BLANK_PAGE, + _("Show last tabs without loading"), MIDORI_STARTUP_DELAYED_PAGES, + _("Show last open tabs"), MIDORI_STARTUP_LAST_OPEN_PAGES, + NULL); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), + load_on_startup == MIDORI_STARTUP_HOMEPAGE + ? MIDORI_STARTUP_BLANK_PAGE : load_on_startup); if (1) { /* GtkLabel can't wrap the text properly. Until some day this works, we implement this hack to do it ourselves. */ - GtkWidget* content_area; GtkWidget* hbox; GtkWidget* vbox; GtkWidget* label; GList* ch; GtkRequisition req; - content_area = GTK_DIALOG (dialog)->vbox; ch = gtk_container_get_children (GTK_CONTAINER (content_area)); hbox = (GtkWidget*)g_list_nth_data (ch, 0); g_list_free (ch); @@ -1004,72 +1098,114 @@ gtk_widget_size_request (content_area, &req); gtk_widget_set_size_request (label, req.width * 0.9, -1); } - return dialog; + + response = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + if (response == GTK_RESPONSE_DELETE_EVENT) + response = G_MAXINT; + else if (response == MIDORI_STARTUP_BLANK_PAGE) + katze_array_clear (_session); + return response; } static gboolean -midori_load_cookie_jar (gpointer data) +midori_load_soup_session_full (gpointer settings) { - MidoriWebSettings* settings = MIDORI_WEB_SETTINGS (data); - SoupSession* webkit_session; + SoupSession* session = webkit_get_default_session (); SoupCookieJar* jar; + gchar* config_file; + SoupSessionFeature* feature; + gboolean have_new_cookies; + SoupSessionFeature* feature_import; + + midori_load_soup_session (settings); + + config_file = build_config_filename ("logins"); + feature = g_object_new (KATZE_TYPE_HTTP_AUTH, "filename", config_file, NULL); + soup_session_add_feature (session, feature); + g_object_unref (feature); - webkit_session = webkit_get_default_session (); jar = soup_cookie_jar_new (); g_object_set_data (G_OBJECT (jar), "midori-settings", settings); - midori_soup_session_prepare (webkit_session, jar, settings); + soup_session_add_feature (session, SOUP_SESSION_FEATURE (jar)); g_object_unref (jar); - return FALSE; -} + katze_assign (config_file, build_config_filename ("cookies.db")); + have_new_cookies = g_access (config_file, F_OK) == 0; + feature = g_object_new (KATZE_TYPE_HTTP_COOKIES_SQLITE, NULL); + g_object_set_data_full (G_OBJECT (feature), "filename", + config_file, (GDestroyNotify)g_free); + soup_session_add_feature (session, feature); + g_object_unref (feature); -static gboolean -midori_load_netscape_plugins (gpointer data) -{ - MidoriApp* app = MIDORI_APP (data); - KatzeArray* extensions = katze_object_get_object (app, "extensions"); - /* FIXME: WebKit should have API to obtain the list of plugins. */ - /* FIXME: Monitor folders for newly added and removes files */ - GtkWidget* web_view = webkit_web_view_new (); - WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view)); - JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); - /* This snippet joins the available plugins into a string like this: - URI1|title1,URI2|title2 - 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 p = l[i].name + '|' + l[i].filename; " - "if (f.indexOf (p) == -1) f.push (p); } return f; }" - "plugins (navigator.plugins)", NULL); - gchar** items = g_strsplit (value, ",", 0); - guint i = 0; - - if (items != NULL) - while (items[i] != NULL) + if (!have_new_cookies) { - gchar** parts = g_strsplit (items[i], "|", 2); - if (parts && *parts && !g_str_equal (parts[1], "undefined")) + katze_assign (config_file, build_config_filename ("cookies.txt")); + if (g_access (config_file, F_OK) == 0) { - MidoriExtension* extension; - gchar* desc = parts[1]; - gsize j = 0; - while (desc[j++]) - if (desc[j-1] == ';') - desc[j-1] = '\n'; - extension = g_object_new (MIDORI_TYPE_EXTENSION, - "name", parts[0], "description", desc, NULL); - g_object_set_data (G_OBJECT (extension), "static", (void*)0xdeadbeef); - katze_array_add_item (extensions, extension); + g_message ("Importing cookies from txt to sqlite3"); + feature_import = g_object_new (KATZE_TYPE_HTTP_COOKIES, NULL); + g_object_set_data_full (G_OBJECT (feature_import), "filename", + config_file, (GDestroyNotify)g_free); + soup_session_add_feature (session, SOUP_SESSION_FEATURE (feature_import)); + soup_session_remove_feature (session, SOUP_SESSION_FEATURE (feature_import)); } - g_strfreev (parts); - i++; } - g_strfreev (items); - g_object_unref (extensions); + + #if WEBKIT_CHECK_VERSION (1, 3, 11) + katze_assign (config_file, g_build_filename (g_get_user_cache_dir (), + PACKAGE_NAME, "web", NULL)); + feature = SOUP_SESSION_FEATURE (soup_cache_new (config_file, 0)); + soup_session_add_feature (session, feature); + soup_cache_set_max_size (SOUP_CACHE (feature), + katze_object_get_int (settings, "maximum-cache-size") * 1024 * 1024); + soup_cache_load (SOUP_CACHE (feature)); + #endif + g_free (config_file); return FALSE; } +static void +midori_load_extension (MidoriApp* app, + KatzeArray* extensions, + gchar** active_extensions, + MidoriExtension* extension, + const gchar* filename) +{ + /* Signal that we want the extension to load and save */ + g_object_set_data_full (G_OBJECT (extension), "filename", + g_strdup (filename), g_free); + if (midori_extension_is_prepared (extension)) + midori_extension_get_config_dir (extension); + + katze_array_add_item (extensions, extension); + if (active_extensions) + { + guint i = 0; + gchar* key; + gchar* name; + gchar* term; + + key = katze_object_get_string (extension, "key"); + if (key && *key) + term = g_strdup_printf ("%s/%s", filename, key); + else + term = g_strdup (filename); + + while ((name = active_extensions[i++])) + if (!g_strcmp0 (term, name)) + g_signal_emit_by_name (extension, "activate", app); + + g_free (key); + g_free (term); + } + g_signal_connect_after (extension, "activate", + G_CALLBACK (extension_activate_cb), app); + g_signal_connect_after (extension, "deactivate", + G_CALLBACK (extension_activate_cb), app); +} + static gboolean midori_load_extensions (gpointer data) { @@ -1078,9 +1214,7 @@ KatzeArray* extensions; #ifdef G_ENABLE_DEBUG gboolean startup_timer = g_getenv ("MIDORI_STARTTIME") != NULL; - GTimer* timer; - if (startup_timer) - timer = g_timer_new (); + GTimer* timer = startup_timer ? g_timer_new () : NULL; #endif /* Load extensions */ @@ -1088,28 +1222,13 @@ g_object_set (app, "extensions", extensions, NULL); if (g_module_supported ()) { - /* FIXME: Read extensions from system data dirs */ gchar* extension_path; - GDir* extension_dir; + GDir* extension_dir = NULL; if (!(extension_path = g_strdup (g_getenv ("MIDORI_EXTENSION_PATH")))) - { - #ifdef G_OS_WIN32 - { - gchar *path = g_win32_get_package_installation_directory_of_module (NULL); - extension_path = g_build_filename (path, "lib", PACKAGE_NAME, NULL); - g_free (path); - if (g_access (extension_path, F_OK) != 0) - { - g_free (extension_path); - extension_path = g_build_filename (LIBDIR, PACKAGE_NAME, NULL); - } - } - #else - extension_path = g_build_filename (LIBDIR, PACKAGE_NAME, NULL); - #endif - } - extension_dir = g_dir_open (extension_path, 0, NULL); + extension_path = sokoke_find_lib_path (PACKAGE_NAME); + if (extension_path != NULL) + extension_dir = g_dir_open (extension_path, 0, NULL); if (extension_dir != NULL) { const gchar* filename; @@ -1118,9 +1237,9 @@ { gchar* fullname; GModule* module; - typedef MidoriExtension* (*extension_init_func)(void); + typedef GObject* (*extension_init_func)(void); extension_init_func extension_init; - MidoriExtension* extension = NULL; + GObject* extension = NULL; /* Ignore files which don't have the correct suffix */ if (!g_str_has_suffix (filename, G_MODULE_SUFFIX)) @@ -1136,35 +1255,38 @@ extension = extension_init (); if (extension != NULL) { - /* Signal that we want the extension to load and save */ - g_object_set_data_full (G_OBJECT (extension), "filename", - g_strdup (filename), g_free); - if (midori_extension_is_prepared (extension)) - midori_extension_get_config_dir (extension); + if (MIDORI_IS_EXTENSION (extension)) + midori_load_extension (app, extensions, + active_extensions, + MIDORI_EXTENSION (extension), filename); + else if (KATZE_IS_ARRAY (extension)) + { + MidoriExtension* extension_item; + KATZE_ARRAY_FOREACH_ITEM (extension_item, KATZE_ARRAY (extension)) + { + if (MIDORI_IS_EXTENSION (extension_item)) + midori_load_extension (app, extensions, + active_extensions, extension_item, + filename); + } + } + } } if (!extension) { + /* No extension, no error: not available, not shown */ + if (g_module_error () == NULL) + continue; + extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", filename, "description", g_module_error (), NULL); g_warning ("%s", g_module_error ()); + katze_array_add_item (extensions, extension); } - katze_array_add_item (extensions, extension); - if (active_extensions) - { - guint i = 0; - gchar* name; - while ((name = active_extensions[i++])) - if (!g_strcmp0 (filename, name)) - g_signal_emit_by_name (extension, "activate", 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); @@ -1173,12 +1295,9 @@ } g_strfreev (active_extensions); - if (g_getenv ("MIDORI_UNARMED") == NULL) - g_idle_add (midori_load_netscape_plugins, app); - #ifdef G_ENABLE_DEBUG if (startup_timer) - g_debug ("Extensions:\t%f", g_test_timer_elapsed ()); + g_debug ("Extensions:\t%f", g_timer_elapsed (timer, NULL)); #endif return FALSE; @@ -1216,17 +1335,15 @@ MidoriBrowser* browser; MidoriApp* app = katze_item_get_parent (KATZE_ITEM (_session)); MidoriWebSettings* settings = katze_object_get_object (app, "settings"); + MidoriStartup load_on_startup; gchar* config_file; KatzeArray* session; KatzeItem* item; gint64 current; - MidoriStartup load_on_startup; gchar** command = g_object_get_data (G_OBJECT (app), "execute-command"); #ifdef G_ENABLE_DEBUG gboolean startup_timer = g_getenv ("MIDORI_STARTTIME") != NULL; - GTimer* timer; - if (startup_timer) - timer = g_timer_new (); + GTimer* timer = startup_timer ? g_timer_new () : NULL; #endif browser = midori_app_create_browser (app); @@ -1249,8 +1366,7 @@ g_signal_connect_after (gtk_accel_map_get (), "changed", G_CALLBACK (accel_map_changed_cb), NULL); - g_object_get (settings, "load-on-startup", &load_on_startup, NULL); - + load_on_startup = (MidoriStartup)g_object_get_data (G_OBJECT (settings), "load-on-startup"); if (katze_array_is_empty (_session)) { gchar* homepage; @@ -1268,22 +1384,23 @@ g_object_unref (item); } - if (load_on_startup == MIDORI_STARTUP_DELAYED_PAGES) - midori_session_add_delay (_session); - session = midori_browser_get_proxy_array (browser); KATZE_ARRAY_FOREACH_ITEM (item, _session) { - g_object_set_data (G_OBJECT (item), "midori-view-append", (void*)1); + katze_item_set_meta_integer (item, "append", 1); + katze_item_set_meta_integer (item, "dont-write-history", 1); + if (load_on_startup == MIDORI_STARTUP_DELAYED_PAGES) + katze_item_set_meta_integer (item, "delay", 1); midori_browser_add_item (browser, item); } current = katze_item_get_meta_integer (KATZE_ITEM (_session), "current"); - if (current < 0) - current = 0; - midori_browser_set_current_page (browser, current); if (!(item = katze_array_get_nth_item (_session, current))) + { + current = 0; item = katze_array_get_nth_item (_session, 0); - if (!g_strcmp0 (katze_item_get_uri (item), "")) + } + midori_browser_set_current_page (browser, current); + if (midori_uri_is_blank (katze_item_get_uri (item))) midori_browser_activate_action (browser, "Location"); g_object_unref (settings); @@ -1304,63 +1421,32 @@ #ifdef G_ENABLE_DEBUG if (startup_timer) - g_debug ("Session setup:\t%f", g_test_timer_elapsed ()); + g_debug ("Session setup:\t%f", g_timer_elapsed (timer, NULL)); #endif return FALSE; } -static gint -midori_run_script (const gchar* filename) -{ - gchar* exception; - gchar* script; - GError* error; - - if (!(filename)) - { - g_print ("%s - %s\n", _("Midori"), _("No filename specified")); - return 1; - } - - error = NULL; - if (g_file_get_contents (filename, &script, NULL, &error)) - { - JSGlobalContextRef js_context = JSGlobalContextCreateInGroup (NULL, NULL); - if (sokoke_js_script_eval (js_context, script, &exception)) - exception = NULL; - g_free (script); - JSGlobalContextRelease (js_context); - } - else if (error) - { - exception = g_strdup (error->message); - g_error_free (error); - } - else - exception = g_strdup (_("An unknown error occured.")); - - if (!exception) - return 0; +#define HAVE_OFFSCREEN GTK_CHECK_VERSION (2, 20, 0) - g_print ("%s - Exception: %s\n", filename, exception); - return 1; -} - -#if WEBKIT_CHECK_VERSION (1, 1, 6) static void snapshot_load_finished_cb (GtkWidget* web_view, WebKitWebFrame* web_frame, gchar* filename) { + #if HAVE_OFFSCREEN + GdkPixbuf* pixbuf = gtk_offscreen_window_get_pixbuf (GTK_OFFSCREEN_WINDOW ( + gtk_widget_get_parent (web_view))); + gdk_pixbuf_save (pixbuf, filename, "png", NULL, "compression", "7", NULL); + g_object_unref (pixbuf); + #else GError* error; GtkPrintOperation* operation = gtk_print_operation_new (); - GtkPrintOperationAction action = GTK_PRINT_OPERATION_ACTION_EXPORT; - GtkPrintOperationResult result; gtk_print_operation_set_export_filename (operation, filename); error = NULL; - result = webkit_web_frame_print_full (web_frame, operation, action, &error); + webkit_web_frame_print_full (web_frame, operation, + GTK_PRINT_OPERATION_ACTION_EXPORT, &error); if (error != NULL) { @@ -1369,22 +1455,23 @@ } g_object_unref (operation); + #endif g_print (_("Snapshot saved to: %s\n"), filename); gtk_main_quit (); } -#endif -static void -midori_web_app_browser_notify_load_status_cb (MidoriBrowser* browser, - GParamSpec* pspec, - gpointer data) -{ - if (katze_object_get_enum (browser, "load-status") != MIDORI_LOAD_PROVISIONAL) - { - GtkWidget* view = midori_browser_get_current_tab (browser); - GdkPixbuf* icon = midori_view_get_icon (MIDORI_VIEW (view)); - gtk_window_set_icon (GTK_WINDOW (browser), icon); - } +static MidoriBrowser* +midori_web_app_browser_new_window_cb (MidoriBrowser* browser, + MidoriBrowser* new_browser, + gpointer user_data) +{ + if (new_browser == NULL) + new_browser = midori_browser_new (); + g_object_set (new_browser, + "settings", midori_browser_get_settings (browser), + NULL); + gtk_widget_show (GTK_WIDGET (new_browser)); + return new_browser; } static void @@ -1405,9 +1492,10 @@ { gchar* uri_ready; - if (g_path_is_absolute (uri)) - return g_filename_to_uri (uri, NULL, NULL); - else if (g_file_test (uri, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) + if (g_str_has_prefix(uri, "javascript:")) + return NULL; + else if (g_file_test (uri, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR) + && !g_path_is_absolute (uri)) { gchar* current_dir = g_get_current_dir (); uri_ready = g_strconcat ("file://", current_dir, @@ -1416,11 +1504,7 @@ return uri_ready; } - uri_ready = sokoke_magic_uri (uri); - if (uri_ready) - return sokoke_uri_to_ascii (uri_ready); - - return sokoke_uri_to_ascii (uri); + return sokoke_magic_uri (uri); } #ifdef HAVE_SIGNAL_H @@ -1434,6 +1518,93 @@ } #endif +static GKeyFile* +speeddial_new_from_file (const gchar* config, + GError** error) +{ + + GKeyFile* key_file = g_key_file_new (); + gchar* config_file = g_build_filename (config, "speeddial", NULL); + guint i = 0; + gchar* json_content; + gsize json_length; + GString* script; + JSGlobalContextRef js_context; + gchar* keyfile; + gchar* thumb_dir; + gchar** tiles; + + if (g_key_file_load_from_file (key_file, config_file, G_KEY_FILE_NONE, error)) + { + g_free (config_file); + return key_file; + } + + katze_assign (config_file, g_build_filename (config, "speeddial.json", NULL)); + if (!g_file_get_contents (config_file, &json_content, &json_length, NULL)) + { + katze_assign (json_content, g_strdup ("'{}'")); + json_length = strlen ("'{}'"); + } + + script = g_string_sized_new (json_length); + g_string_append (script, "var json = JSON.parse ("); + g_string_append_len (script, json_content, json_length); + g_string_append (script, "); " + "var keyfile = '';" + "for (var i in json['shortcuts']) {" + "var tile = json['shortcuts'][i];" + "keyfile += '[Dial ' + tile['id'].substring (1) + ']\\n'" + " + 'uri=' + tile['href'] + '\\n'" + " + 'img=' + tile['img'] + '\\n'" + " + 'title=' + tile['title'] + '\\n\\n';" + "} " + "var columns = json['width'] ? json['width'] : 3;" + "var rows = json['shortcuts'] ? json['shortcuts'].length / columns : 0;" + "keyfile += '[settings]\\n'" + " + 'columns=' + columns + '\\n'" + " + 'rows=' + (rows > 3 ? rows : 3) + '\\n\\n';" + "keyfile;"); + g_free (json_content); + js_context = JSGlobalContextCreateInGroup (NULL, NULL); + keyfile = sokoke_js_script_eval (js_context, script->str, NULL); + JSGlobalContextRelease (js_context); + g_string_free (script, TRUE); + g_key_file_load_from_data (key_file, keyfile, -1, 0, NULL); + g_free (keyfile); + tiles = g_key_file_get_groups (key_file, NULL); + thumb_dir = g_build_path (G_DIR_SEPARATOR_S, g_get_user_cache_dir (), + PACKAGE_NAME, "thumbnails", NULL); + if (!g_file_test (thumb_dir, G_FILE_TEST_EXISTS)) + katze_mkdir_with_parents (thumb_dir, 0700); + g_free (thumb_dir); + + while (tiles[i] != NULL) + { + gsize sz; + gchar* uri = g_key_file_get_string (key_file, tiles[i], "uri", NULL); + gchar* img = g_key_file_get_string (key_file, tiles[i], "img", NULL); + if (img != NULL && (uri && *uri && *uri != '#')) + { + guchar* decoded = g_base64_decode (img, &sz); + gchar* thumb_path = sokoke_build_thumbnail_path (uri); + g_file_set_contents (thumb_path, (gchar*)decoded, sz, NULL); + g_free (thumb_path); + g_free (decoded); + } + g_free (img); + g_free (uri); + g_key_file_remove_key (key_file, tiles[i], "img", NULL); + i++; + } + g_strfreev (tiles); + + katze_assign (config_file, g_build_filename (config, "speeddial", NULL)); + sokoke_key_file_save_to_file (key_file, config_file, NULL); + g_free (config_file); + return key_file; +} + static void midori_soup_session_block_uris_cb (SoupSession* session, SoupMessage* msg, @@ -1489,12 +1660,20 @@ { guint i = 0; GtkWidget* view; + KatzeArray* history = katze_object_get_object (mit->browser, "history"); + KatzeArray* trash = katze_object_get_object (mit->browser, "trash"); + GList* data_items = sokoke_register_privacy_item (NULL, NULL, NULL); while ((view = midori_browser_get_nth_tab (mit->browser, i++))) gtk_widget_destroy (view); midori_browser_set_current_uri (mit->browser, mit->uri); - /* TODO: Re-run initial commands */ - + /* Clear all private data */ + if (history != NULL) + katze_array_clear (history); + if (trash != NULL) + katze_array_clear (trash); + for (; data_items != NULL; data_items = g_list_next (data_items)) + ((SokokePrivacyItem*)(data_items->data))->clear (); } } #else @@ -1520,17 +1699,169 @@ } } +static void +midori_clear_web_cookies_cb (void) +{ + SoupSession* session = webkit_get_default_session (); + MidoriWebSettings* settings = g_object_get_data (G_OBJECT (session), "midori-settings"); + SoupSessionFeature* jar = soup_session_get_feature (session, SOUP_TYPE_COOKIE_JAR); + GSList* cookies = soup_cookie_jar_all_cookies (SOUP_COOKIE_JAR (jar)); + SoupSessionFeature* feature; + gchar* cache; + + /* HTTP Cookies/ Web Cookies */ + for (; cookies != NULL; cookies = g_slist_next (cookies)) + { + const gchar* domain = ((SoupCookie*)cookies->data)->domain; + if (midori_web_settings_get_site_data_policy (settings, domain) + == MIDORI_SITE_DATA_PRESERVE) + continue; + soup_cookie_jar_delete_cookie ((SoupCookieJar*)jar, cookies->data); + } + soup_cookies_free (cookies); + /* Removing KatzeHttpCookies makes it save outstanding changes */ + if ((feature = soup_session_get_feature (session, KATZE_TYPE_HTTP_COOKIES))) + { + g_object_ref (feature); + soup_session_remove_feature (session, feature); + soup_session_add_feature (session, feature); + g_object_unref (feature); + } + + /* Local shared objects/ Flash cookies */ + if (midori_web_settings_has_plugin_support ()) + { + #ifdef GDK_WINDOWING_X11 + cache = g_build_filename (g_get_home_dir (), ".macromedia", "Flash_Player", NULL); + sokoke_remove_path (cache, TRUE); + g_free (cache); + #elif defined(GDK_WINDOWING_WIN32) + cache = g_build_filename (g_get_user_data_dir (), "Macromedia", "Flash Player", NULL); + sokoke_remove_path (cache, TRUE); + g_free (cache); + #elif defined(GDK_WINDOWING_QUARTZ) + cache = g_build_filename (g_get_home_dir (), "Library", "Preferences", + "Macromedia", "Flash Player", NULL); + sokoke_remove_path (cache, TRUE); + g_free (cache); + #endif + } + + /* HTML5 databases */ + webkit_remove_all_web_databases (); + + /* HTML5 offline application caches */ + #if WEBKIT_CHECK_VERSION (1, 3, 13) + /* Changing the size implies clearing the cache */ + webkit_application_cache_set_maximum_size ( + webkit_application_cache_get_maximum_size () - 1); + #endif +} + +static void +midori_clear_saved_logins_cb (void) +{ + sqlite3* db; + gchar* path = g_build_filename (sokoke_set_config_dir (NULL), "logins", NULL); + g_unlink (path); + /* Form History database, written by the extension */ + katze_assign (path, g_build_filename (sokoke_set_config_dir (NULL), + "extensions", MIDORI_MODULE_PREFIX "formhistory." G_MODULE_SUFFIX, "forms.db", NULL)); + if (sqlite3_open (path, &db) == SQLITE_OK) + { + sqlite3_exec (db, "DELETE FROM forms", NULL, NULL, NULL); + sqlite3_close (db); + } + g_free (path); +} + +#if WEBKIT_CHECK_VERSION (1, 3, 11) +static void +midori_clear_web_cache_cb (void) +{ + SoupSession* session = webkit_get_default_session (); + SoupSessionFeature* feature = soup_session_get_feature (session, SOUP_TYPE_CACHE); + gchar* cache = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, "web", NULL); + soup_cache_clear (SOUP_CACHE (feature)); + soup_cache_flush (SOUP_CACHE (feature)); + sokoke_remove_path (cache, TRUE); + g_free (cache); +} +#endif + +static void +midori_clear_page_icons_cb (void) +{ + gchar* cache = g_build_filename (g_get_user_cache_dir (), + PACKAGE_NAME, "icons", NULL); + /* FIXME: Exclude search engine icons */ + sokoke_remove_path (cache, TRUE); + g_free (cache); + cache = g_build_filename (g_get_user_data_dir (), + "webkit", "icondatabase", NULL); + sokoke_remove_path (cache, TRUE); + g_free (cache); + #if WEBKIT_CHECK_VERSION (1, 8, 0) + webkit_favicon_database_clear (webkit_get_favicon_database ()); + #endif +} + +static void +midori_log_to_file (const gchar* log_domain, + GLogLevelFlags log_level, + const gchar* message, + gpointer user_data) +{ + FILE* logfile = fopen ((const char*)user_data, "a"); + gchar* level_name = ""; + time_t timestamp = time (NULL); + + switch (log_level) + { + /* skip irrelevant flags */ + case G_LOG_LEVEL_MASK: + case G_LOG_FLAG_FATAL: + case G_LOG_FLAG_RECURSION: + + case G_LOG_LEVEL_ERROR: + level_name = "ERROR"; + break; + case G_LOG_LEVEL_CRITICAL: + level_name = "CRITICAL"; + break; + case G_LOG_LEVEL_WARNING: + level_name = "WARNING"; + break; + case G_LOG_LEVEL_MESSAGE: + level_name = "MESSAGE"; + break; + case G_LOG_LEVEL_INFO: + level_name = "INFO"; + break; + case G_LOG_LEVEL_DEBUG: + level_name = "DEBUG"; + break; + } + + fprintf (logfile, "%s%s-%s **: %s\n", asctime (localtime (×tamp)), + log_domain ? log_domain : "Midori", level_name, message); + fclose (logfile); +} + int main (int argc, char** argv) { gchar* webapp; gchar* config; + gboolean private; gboolean diagnostic_dialog; gboolean back_from_crash; gboolean run; gchar* snapshot; + gchar* logfile; gboolean execute; + gboolean help_execute; gboolean version; gchar** uris; gchar* block_uris; @@ -1546,16 +1877,18 @@ { "config", 'c', 0, G_OPTION_ARG_FILENAME, &config, N_("Use FOLDER as configuration folder"), N_("FOLDER") }, #endif + { "private", 'p', 0, G_OPTION_ARG_NONE, &private, + N_("Private browsing, no changes are saved"), NULL }, { "diagnostic-dialog", 'd', 0, G_OPTION_ARG_NONE, &diagnostic_dialog, N_("Show a diagnostic dialog"), NULL }, { "run", 'r', 0, G_OPTION_ARG_NONE, &run, N_("Run the specified filename as javascript"), NULL }, - #if WEBKIT_CHECK_VERSION (1, 1, 6) { "snapshot", 's', 0, G_OPTION_ARG_STRING, &snapshot, N_("Take a snapshot of the specified URI"), NULL }, - #endif { "execute", 'e', 0, G_OPTION_ARG_NONE, &execute, N_("Execute the specified command"), NULL }, + { "help-execute", 0, 0, G_OPTION_ARG_NONE, &help_execute, + N_("List available commands to execute with -e/ --execute"), NULL }, { "version", 'V', 0, G_OPTION_ARG_NONE, &version, N_("Display program version"), NULL }, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &uris, @@ -1567,6 +1900,8 @@ /* i18n: CLI: Close tabs, clear private data, open starting page */ N_("Reset Midori after SECONDS seconds of inactivity"), N_("SECONDS") }, #endif + { "log-file", 'l', 0, G_OPTION_ARG_FILENAME, &logfile, + N_("Redirects console warnings to the specified FILENAME"), N_("FILENAME")}, { NULL } }; GString* error_messages; @@ -1574,6 +1909,8 @@ MidoriWebSettings* settings; gchar* config_file; gchar* bookmarks_file; + GKeyFile* speeddial; + gboolean bookmarks_exist; MidoriStartup load_on_startup; KatzeArray* search_engines; KatzeArray* bookmarks; @@ -1596,24 +1933,6 @@ #define midori_startup_timer(tmrmsg) #endif - #if ENABLE_NLS - setlocale (LC_ALL, ""); - if (g_getenv ("MIDORI_NLSPATH")) - bindtextdomain (GETTEXT_PACKAGE, g_getenv ("MIDORI_NLSPATH")); - else - #ifdef G_OS_WIN32 - { - gchar* path = sokoke_find_data_filename ("locale"); - bindtextdomain (GETTEXT_PACKAGE, path); - g_free (path); - } - #else - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); - #endif - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); - #endif - #ifdef HAVE_SIGNAL_H #ifdef SIGHUP signal (SIGHUP, &signal_handler); @@ -1629,17 +1948,19 @@ #endif #endif - /* Preserve argument vector */ - sokoke_get_argv (argv); + midori_app_setup (argv); /* Parse cli options */ webapp = NULL; config = NULL; + private = FALSE; back_from_crash = FALSE; diagnostic_dialog = FALSE; run = FALSE; snapshot = NULL; + logfile = NULL; execute = FALSE; + help_execute = FALSE; version = FALSE; uris = NULL; block_uris = NULL; @@ -1653,21 +1974,35 @@ return 1; } - /* libSoup uses threads, so we need to initialize threads. */ - if (!g_thread_supported ()) g_thread_init (NULL); - sokoke_register_stock_items (); - g_set_application_name (_("Midori")); + /* Relative config path */ + if (config && !g_path_is_absolute (config)) + { + gchar* old_config = config; + gchar* current_dir = g_get_current_dir (); + config = g_build_filename (current_dir, old_config, NULL); + g_free (current_dir); + g_free (old_config); + } - #ifdef G_ENABLE_DEBUG - if (startup_timer) - g_test_timer_start (); - #endif + /* Private browsing, window title, default config folder */ + if (private) + { + if (!config && !webapp) + config = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL); + /* Mask the timezone, which can be read by Javascript */ + g_setenv ("TZ", "UTC", TRUE); + } + else + g_set_application_name (_("Midori")); + + /* Versioned prgname to override menuproxy blacklist */ + g_set_prgname (PACKAGE_NAME "4"); if (version) { g_print ( "%s %s\n\n" - "Copyright (c) 2007-2010 Christian Dywan\n\n" + "Copyright (c) 2007-2011 Christian Dywan\n\n" "%s\n" "\t%s\n\n" "%s\n" @@ -1680,14 +2015,56 @@ return 0; } - #if WEBKIT_CHECK_VERSION (1, 1, 6) + if (help_execute) + { + MidoriBrowser* browser = midori_browser_new (); + GtkActionGroup* action_group = midori_browser_get_action_group (browser); + GList* actions = gtk_action_group_list_actions (action_group); + GList* temp = actions; + guint length = 1; + gchar* space; + + for (; temp; temp = g_list_next (temp)) + { + GtkAction* action = temp->data; + length = MAX (length, 1 + strlen (gtk_action_get_name (action))); + } + + space = g_strnfill (length, ' '); + for (; actions; actions = g_list_next (actions)) + { + GtkAction* action = actions->data; + const gchar* name = gtk_action_get_name (action); + gchar* padding = g_strndup (space, strlen (space) - strlen (name)); + gchar* label = katze_object_get_string (action, "label"); + gchar* stripped = katze_strip_mnemonics (label); + gchar* tooltip = katze_object_get_string (action, "tooltip"); + g_print ("%s%s%s%s%s\n", name, padding, stripped, + tooltip ? ": " : "", tooltip ? tooltip : ""); + g_free (tooltip); + g_free (padding); + g_free (label); + g_free (stripped); + } + g_free (space); + g_list_free (actions); + gtk_widget_destroy (GTK_WIDGET (browser)); + return 0; + } + if (snapshot) { gchar* filename; gint fd; GtkWidget* web_view; + #if HAVE_OFFSCREEN + GtkWidget* offscreen; + GdkScreen* screen; + fd = g_file_open_tmp ("snapshot-XXXXXX.png", &filename, &error); + #else fd = g_file_open_tmp ("snapshot-XXXXXX.pdf", &filename, &error); + #endif close (fd); error = NULL; @@ -1704,6 +2081,16 @@ } web_view = webkit_web_view_new (); + #if HAVE_OFFSCREEN + offscreen = gtk_offscreen_window_new (); + gtk_container_add (GTK_CONTAINER (offscreen), web_view); + if ((screen = gdk_screen_get_default ())) + gtk_widget_set_size_request (web_view, + gdk_screen_get_width (screen), gdk_screen_get_height (screen)); + else + gtk_widget_set_size_request (web_view, 800, 600); + gtk_widget_show_all (offscreen); + #endif g_signal_connect (web_view, "load-finished", G_CALLBACK (snapshot_load_finished_cb), filename); webkit_web_view_open (WEBKIT_WEB_VIEW (web_view), snapshot); @@ -1711,71 +2098,189 @@ g_free (filename); return 0; } + + if (logfile) + { + g_log_set_default_handler (midori_log_to_file, (gpointer)logfile); + } + + /* i18n: Logins and passwords in websites and web forms */ + sokoke_register_privacy_item ("formhistory", _("Saved logins and _passwords"), + G_CALLBACK (midori_clear_saved_logins_cb)); + sokoke_register_privacy_item ("web-cookies", _("Cookies and Website data"), + G_CALLBACK (midori_clear_web_cookies_cb)); + #if WEBKIT_CHECK_VERSION (1, 3, 11) + /* TODO: Preserve page icons of search engines and merge privacy items */ + sokoke_register_privacy_item ("web-cache", _("Web Cache"), + G_CALLBACK (midori_clear_web_cache_cb)); #endif + sokoke_register_privacy_item ("page-icons", _("Website icons"), + G_CALLBACK (midori_clear_page_icons_cb)); - /* Web Application support */ - if (webapp) + /* Web Application or Private Browsing support */ + if (webapp || private || run) { + SoupSession* session = webkit_get_default_session (); MidoriBrowser* browser = midori_browser_new (); - gchar* tmp_uri = midori_prepare_uri (webapp); - katze_assign (webapp, tmp_uri); + g_signal_connect (browser, "new-window", + G_CALLBACK (midori_web_app_browser_new_window_cb), NULL); + g_object_set_data (G_OBJECT (webkit_get_default_session ()), + "pass-through-console", (void*)1); + midori_startup_timer ("Browser: \t%f"); + if (config) { - SoupSession* session; - SoupCookieJar* jar; - - config_file = g_build_filename (config, "config", NULL); - settings = settings_new_from_file (config_file, &extensions); - g_free (config_file); + settings = settings_and_accels_new (config, &extensions); g_strfreev (extensions); + search_engines = search_engines_new_from_folder (config, NULL); + g_object_set (browser, "search-engines", search_engines, NULL); + g_object_unref (search_engines); + speeddial = speeddial_new_from_file (config, &error); + g_object_set (browser, "speed-dial", speeddial, NULL); + } + else + settings = g_object_ref (midori_browser_get_settings (browser)); + + if (private) + { + /* In-memory trash for re-opening closed tabs */ + trash = katze_array_new (KATZE_TYPE_ITEM); + g_signal_connect_after (trash, "add-item", + G_CALLBACK (midori_trash_add_item_no_save_cb), NULL); + g_object_set (browser, "trash", trash, NULL); + + g_object_set (settings, + "preferred-languages", "en", + "enable-private-browsing", TRUE, + #ifdef HAVE_LIBSOUP_2_29_91 + "first-party-cookies-only", TRUE, + #endif + "enable-html5-database", FALSE, + "enable-html5-local-storage", FALSE, + "enable-offline-web-application-cache", FALSE, + /* Arguably DNS prefetching is or isn't a privacy concern. For the + * lack of more fine-grained control we'll go the safe route. */ + #if WEBKIT_CHECK_VERSION (1, 3, 11) + "enable-dns-prefetching", FALSE, + #endif + "strip-referer", TRUE, NULL); + midori_browser_set_action_visible (browser, "Tools", FALSE); + midori_browser_set_action_visible (browser, "ClearPrivateData", FALSE); + #if GTK_CHECK_VERSION (3, 0, 0) + g_object_set (gtk_widget_get_settings (GTK_WIDGET (browser)), + "gtk-application-prefer-dark-theme", TRUE, + NULL); + #endif + } + + if (private || !config) + { + /* Disable saving by setting an unwritable folder */ + sokoke_set_config_dir ("/"); + } + + midori_load_soup_session (settings); + if (block_uris) + g_signal_connect (session, "request-queued", + G_CALLBACK (midori_soup_session_block_uris_cb), + g_strdup (block_uris)); - session = webkit_get_default_session (); - config_file = g_build_filename (config, "cookies.txt", NULL); - jar = soup_cookie_jar_text_new (config_file, TRUE); - g_free (config_file); - soup_session_add_feature (session, SOUP_SESSION_FEATURE (jar)); - g_object_unref (jar); + if (run) + { + gchar* script = NULL; + error = NULL; + + if (g_file_get_contents (uris ? *uris : NULL, &script, NULL, &error)) + { + #if 0 /* HAVE_OFFSCREEN */ + GtkWidget* offscreen = gtk_offscreen_window_new (); + #endif + gchar* msg = NULL; + GtkWidget* view = midori_view_new_with_item (NULL, settings); + g_object_set (settings, "open-new-pages-in", MIDORI_NEW_PAGE_WINDOW, NULL); + midori_browser_add_tab (browser, view); + #if 0 /* HAVE_OFFSCREEN */ + gtk_container_add (GTK_CONTAINER (offscreen), GTK_WIDGET (browser)); + gtk_widget_show_all (offscreen); + #else + gtk_widget_show_all (GTK_WIDGET (browser)); + gtk_widget_hide (GTK_WIDGET (browser)); + #endif + midori_view_execute_script (MIDORI_VIEW (view), script, &msg); + if (msg != NULL) + { + g_error ("%s\n", msg); + g_free (msg); + } + } + else if (error != NULL) + { + g_error ("%s\n", error->message); + g_error_free (error); + } + else + g_error ("%s\n", _("An unknown error occured")); + g_free (script); + } + if (webapp) + { + gchar* tmp_uri = midori_prepare_uri (webapp); + midori_browser_set_action_visible (browser, "Menubar", FALSE); + midori_browser_set_action_visible (browser, "CompactMenu", FALSE); + midori_browser_add_uri (browser, tmp_uri ? tmp_uri : webapp); + g_object_set (settings, "homepage", tmp_uri, NULL); + g_free (tmp_uri); + + g_object_set (settings, + "show-menubar", FALSE, + "show-navigationbar", FALSE, + "always-show-tabbar", FALSE, + "toolbar-items", "Back,Forward,ReloadStop,Location,Homepage", + "show-statusbar", FALSE, + "enable-developer-extras", FALSE, + NULL); } - else - settings = katze_object_get_object (browser, "settings"); - g_object_set (settings, - "show-menubar", FALSE, - "show-navigationbar", TRUE, - "show-panel", FALSE, - "toolbar-items", "Back,Forward,ReloadStop,Location", - "homepage", NULL, - "show-statusbar", FALSE, - "enable-developer-extras", FALSE, + + g_object_set (settings, "show-panel", FALSE, + "last-window-state", MIDORI_WINDOW_NORMAL, NULL); + midori_browser_set_action_visible (browser, "Panel", FALSE); g_object_set (browser, "settings", settings, NULL); midori_startup_timer ("Setup config: \t%f"); g_object_unref (settings); - 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 (!run) + { + gtk_widget_show (GTK_WIDGET (browser)); + midori_browser_activate_action (browser, "Location"); + } if (execute) { - i = 0; - while (uris[i] != NULL) - { + for (i = 0; uris[i] != NULL; i++) midori_browser_activate_action (browser, uris[i]); - i++; + } + else if (uris != NULL) + { + for (i = 0; uris[i] != NULL; i++) + { + gchar* new_uri = midori_prepare_uri (uris[i]); + midori_browser_add_uri (browser, new_uri); + g_free (new_uri); } } - if (block_uris) - g_signal_connect (webkit_get_default_session (), "request-queued", - G_CALLBACK (midori_soup_session_block_uris_cb), - g_strdup (block_uris)); + + /* Informative text for private browsing unless we have a URI */ + if (private && webapp == NULL && uris == NULL) + midori_browser_add_uri (browser, "about:private"); + + if (midori_browser_get_current_uri (browser) == NULL) + midori_browser_add_uri (browser, "about:blank"); + midori_setup_inactivity_reset (browser, inactivity_reset, webapp); midori_startup_timer ("App created: \t%f"); gtk_main (); @@ -1786,29 +2291,9 @@ if (inactivity_reset > 0) g_error ("--inactivity-reset is currently only supported with --app."); - /* Standalone javascript support */ - if (run) - return midori_run_script (uris ? *uris : NULL); - - if (config && !g_path_is_absolute (config)) - { - g_critical (_("The specified configuration folder is invalid.")); - return 1; - } sokoke_set_config_dir (config); - if (config) - { - gchar* name_hash; - gchar* app_name; - name_hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, config, -1); - app_name = g_strconcat ("midori", "_", name_hash, NULL); - g_free (name_hash); - app = g_object_new (MIDORI_TYPE_APP, "name", app_name, NULL); - g_free (app_name); - } - else app = midori_app_new (); - g_free (config); + katze_assign (config, (gchar*)sokoke_set_config_dir (NULL)); midori_startup_timer ("App created: \t%f"); /* FIXME: The app might be 'running' but actually showing a dialog @@ -1821,13 +2306,15 @@ result = midori_app_send_command (app, uris); else if (uris) { - /* TODO: Open a tab per URI, seperated by pipes */ /* Encode any IDN addresses because libUnique doesn't like them */ i = 0; while (uris[i] != NULL) { gchar* new_uri = midori_prepare_uri (uris[i]); - katze_assign (uris[i], new_uri); + gchar* escaped_uri = g_uri_escape_string ( + new_uri ? new_uri : uris[i], NULL, FALSE); + g_free (new_uri); + katze_assign (uris[i], escaped_uri); i++; } result = midori_app_instance_send_uris (app, uris); @@ -1847,58 +2334,17 @@ return 1; } - katze_mkdir_with_parents (sokoke_set_config_dir (NULL), 0700); - + katze_mkdir_with_parents (config, 0700); /* Load configuration file */ error_messages = g_string_new (NULL); - config_file = build_config_filename ("config"); error = NULL; - settings = settings_new_from_file (config_file, &extensions); + settings = settings_and_accels_new (config, &extensions); g_object_set (settings, "enable-developer-extras", TRUE, NULL); - midori_startup_timer ("Config read: \t%f"); - - /* Load accelerators */ - katze_assign (config_file, build_config_filename ("accels")); - if (g_access (config_file, F_OK) != 0) - katze_assign (config_file, sokoke_find_config_filename (NULL, "accels")); - gtk_accel_map_load (config_file); - midori_startup_timer ("Accels read: \t%f"); + g_object_set (settings, "enable-html5-database", TRUE, NULL); + midori_startup_timer ("Config and accels read: \t%f"); /* Load search engines */ - katze_assign (config_file, build_config_filename ("search")); - error = NULL; - search_engines = search_engines_new_from_file (config_file, &error); - /* We ignore for instance empty files */ - if (error && (error->code == G_KEY_FILE_ERROR_PARSE - || error->code == G_FILE_ERROR_NOENT)) - { - g_error_free (error); - error = NULL; - } - if (!error && katze_array_is_empty (search_engines)) - { - #ifdef G_OS_WIN32 - gchar* dir; - - dir = g_win32_get_package_installation_directory_of_module (NULL); - katze_assign (config_file, - g_build_filename (dir, "etc", "xdg", PACKAGE_NAME, "search", NULL)); - g_free (dir); - search_engines = search_engines_new_from_file (config_file, NULL); - #else - katze_assign (config_file, - sokoke_find_config_filename (NULL, "search")); - search_engines = search_engines_new_from_file (config_file, NULL); - #endif - } - else if (error) - { - if (error->code != G_FILE_ERROR_NOENT) - g_string_append_printf (error_messages, - _("The search engines couldn't be loaded. %s\n"), - error->message); - g_error_free (error); - } + search_engines = search_engines_new_from_folder (config, error_messages); /* Pick first search engine as default if not set */ g_object_get (settings, "location-entry-search", &uri, NULL); if (!(uri && *uri) && !katze_array_is_empty (search_engines)) @@ -1911,30 +2357,37 @@ midori_startup_timer ("Search read: \t%f"); bookmarks = katze_array_new (KATZE_TYPE_ARRAY); - bookmarks_file = build_config_filename ("bookmarks.db"); + bookmarks_file = g_build_filename (config, "bookmarks.db", NULL); + bookmarks_exist = g_access (bookmarks_file, F_OK) == 0; errmsg = NULL; if ((db = midori_bookmarks_initialize (bookmarks, bookmarks_file, &errmsg)) == NULL) { g_string_append_printf (error_messages, _("Bookmarks couldn't be loaded: %s\n"), errmsg); - g_free (errmsg); + errmsg = NULL; } - else + else if (!bookmarks_exist) { - gchar* old_bookmarks = build_config_filename (BOOKMARK_FILE); + /* Initial creation, import old bookmarks */ + gchar* old_bookmarks; + if (g_path_is_absolute (BOOKMARK_FILE)) + old_bookmarks = g_strdup (BOOKMARK_FILE); + else + old_bookmarks = g_build_filename (config, BOOKMARK_FILE, NULL); if (g_access (old_bookmarks, F_OK) == 0) { midori_bookmarks_import (old_bookmarks, db); - g_unlink(old_bookmarks); + /* Leave old bookmarks around */ } g_free (old_bookmarks); - g_object_set_data (G_OBJECT (bookmarks), "db", db); } + g_object_set_data (G_OBJECT (bookmarks), "db", db); midori_startup_timer ("Bookmarks read: \t%f"); + config_file = NULL; _session = katze_array_new (KATZE_TYPE_ITEM); + load_on_startup = katze_object_get_enum (settings, "load-on-startup"); #if HAVE_LIBXML - g_object_get (settings, "load-on-startup", &load_on_startup, NULL); if (load_on_startup >= MIDORI_STARTUP_LAST_OPEN_PAGES) { katze_assign (config_file, build_config_filename ("session.xbel")); @@ -1952,7 +2405,7 @@ trash = katze_array_new (KATZE_TYPE_ITEM); #if HAVE_LIBXML - katze_assign (config_file, build_config_filename ("tabtrash.xbel")); + katze_assign (config_file, g_build_filename (config, "tabtrash.xbel", NULL)); error = NULL; if (!midori_array_from_file (trash, config_file, "xbel", &error)) { @@ -1965,19 +2418,21 @@ midori_startup_timer ("Trash read: \t%f"); history = katze_array_new (KATZE_TYPE_ARRAY); - katze_assign (config_file, build_config_filename ("history.db")); + katze_assign (config_file, g_build_filename (config, "history.db", NULL)); errmsg = NULL; - if ((db = midori_history_initialize (history, config_file, bookmarks_file ,&errmsg)) == NULL) + if (!midori_history_initialize (history, config_file, bookmarks_file, &errmsg)) { g_string_append_printf (error_messages, _("The history couldn't be loaded: %s\n"), errmsg); - g_free (errmsg); + errmsg = NULL; } g_free (bookmarks_file); - g_object_set_data (G_OBJECT (history), "db", db); midori_startup_timer ("History read: \t%f"); + error = NULL; + speeddial = speeddial_new_from_file (config, &error); + /* In case of errors */ if (error_messages->len) { @@ -2032,8 +2487,10 @@ { item = katze_item_new (); uri_ready = midori_prepare_uri (uri); - katze_item_set_uri (item, uri_ready); + katze_item_set_uri (item, uri_ready ? uri_ready : uri); g_free (uri_ready); + /* Never delay command line arguments */ + katze_item_set_meta_integer (item, "delay", 0); katze_array_add_item (_session, item); uri = strtok (NULL, "|"); } @@ -2053,6 +2510,8 @@ KATZE_ARRAY_FOREACH_ITEM (item, search_engines) g_signal_connect_after (item, "notify", G_CALLBACK (midori_search_engines_modify_cb), search_engines); + g_signal_connect_after (search_engines, "move-item", + G_CALLBACK (midori_search_engines_move_item_cb), search_engines); } } g_signal_connect_after (trash, "add-item", @@ -2064,28 +2523,24 @@ g_object_set_data (G_OBJECT (app), "extensions", extensions); /* We test for the presence of a dummy file which is created once and deleted during normal runtime, but persists in case of a crash. */ - katze_assign (config_file, build_config_filename ("running")); + katze_assign (config_file, g_build_filename (config, "running", NULL)); if (g_access (config_file, F_OK) == 0) back_from_crash = TRUE; else g_file_set_contents (config_file, "RUNNING", -1, NULL); - if (back_from_crash) - { - if (katze_object_get_int (settings, "load-on-startup") - >= MIDORI_STARTUP_LAST_OPEN_PAGES) - midori_session_add_delay (_session); - - if (katze_object_get_boolean (settings, "show-crash-dialog")) - diagnostic_dialog = TRUE; - } + if (back_from_crash + && katze_object_get_boolean (settings, "show-crash-dialog") + && !katze_array_is_empty (_session)) + diagnostic_dialog = TRUE; if (diagnostic_dialog) { - GtkWidget* dialog = midori_create_diagnostic_dialog (settings, _session); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); + load_on_startup = midori_show_diagnostic_dialog (settings, _session); + if (load_on_startup == G_MAXINT) + return 0; } + g_object_set_data (G_OBJECT (settings), "load-on-startup", GINT_TO_POINTER (load_on_startup)); midori_startup_timer ("Signal setup: \t%f"); g_object_set (app, "settings", settings, @@ -2093,6 +2548,7 @@ "trash", trash, "search-engines", search_engines, "history", history, + "speed-dial", speeddial, NULL); g_object_unref (history); g_object_unref (search_engines); @@ -2103,7 +2559,7 @@ G_CALLBACK (midori_app_add_browser_cb), NULL); midori_startup_timer ("App prepared: \t%f"); - g_idle_add (midori_load_cookie_jar, settings); + g_idle_add (midori_load_soup_session_full, settings); g_idle_add (midori_load_extensions, app); g_idle_add (midori_load_session, _session); @@ -2118,47 +2574,44 @@ gtk_main (); settings = katze_object_get_object (app, "settings"); + settings_notify_cb (settings, NULL, app); + g_object_get (settings, "maximum-history-age", &max_history_age, NULL); - midori_history_terminate (db, max_history_age); + midori_history_terminate (history, max_history_age); /* Clear data on quit, according to the Clear private data dialog */ g_object_get (settings, "clear-private-data", &clear_prefs, NULL); if (clear_prefs & MIDORI_CLEAR_ON_QUIT) { + GList* data_items = sokoke_register_privacy_item (NULL, NULL, NULL); + gchar* clear_data = katze_object_get_string (settings, "clear-data"); + + midori_remove_config_file (clear_prefs, MIDORI_CLEAR_SESSION, "session.xbel"); midori_remove_config_file (clear_prefs, MIDORI_CLEAR_HISTORY, "history.db"); - midori_remove_config_file (clear_prefs, MIDORI_CLEAR_COOKIES, "cookies.txt"); - if ((clear_prefs & MIDORI_CLEAR_FLASH_COOKIES) == MIDORI_CLEAR_FLASH_COOKIES) - { - gchar* cache = g_build_filename (g_get_home_dir (), ".macromedia", - "Flash_Player", NULL); - sokoke_remove_path (cache, TRUE); - g_free (cache); - } - if ((clear_prefs & MIDORI_CLEAR_WEBSITE_ICONS) == MIDORI_CLEAR_WEBSITE_ICONS) - { - gchar* cache = g_build_filename (g_get_user_cache_dir (), - PACKAGE_NAME, "icons", NULL); - sokoke_remove_path (cache, TRUE); - 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) + midori_remove_config_file (clear_prefs, MIDORI_CLEAR_HISTORY, "tabtrash.xbel"); + + for (; data_items != NULL; data_items = g_list_next (data_items)) { - gchar* cache = g_build_filename (g_get_user_cache_dir (), - PACKAGE_NAME, "web", NULL); - sokoke_remove_path (cache, TRUE); - g_free (cache); + SokokePrivacyItem* privacy = data_items->data; + if (clear_data && strstr (clear_data, privacy->name)) + privacy->clear (); } + g_free (clear_data); } - if (katze_object_get_int (settings, "load-on-startup") - < MIDORI_STARTUP_LAST_OPEN_PAGES) + /* Removing KatzeHttpCookies makes it save outstanding changes */ + soup_session_remove_feature_by_type (webkit_get_default_session (), + KATZE_TYPE_HTTP_COOKIES); + + load_on_startup = katze_object_get_int (settings, "load-on-startup"); + if (load_on_startup < MIDORI_STARTUP_LAST_OPEN_PAGES) { - katze_assign (config_file, build_config_filename ("session.xbel")); + katze_assign (config_file, g_build_filename (config, "session.xbel", NULL)); g_unlink (config_file); } g_object_unref (settings); + g_key_file_free (speeddial); g_object_unref (app); g_free (config_file); return 0; diff -Nru midori-0.2.8/midori/marshal.list midori-0.4.6/midori/marshal.list --- midori-0.2.8/midori/marshal.list 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/marshal.list 2012-05-14 22:13:42.000000000 +0000 @@ -4,7 +4,8 @@ BOOLEAN:VOID OBJECT:OBJECT VOID:BOOLEAN,STRING -VOID:OBJECT,ENUM +VOID:OBJECT,ENUM,BOOLEAN +VOID:OBJECT,INT,INT VOID:POINTER,INT VOID:STRING,BOOLEAN VOID:STRING,INT,STRING diff -Nru midori-0.2.8/midori/midori-app.c midori-0.4.6/midori/midori-app.c --- midori-0.2.8/midori/midori-app.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/midori-app.c 2012-05-14 22:13:42.000000000 +0000 @@ -9,17 +9,28 @@ See the file COPYING for the full license text. */ +/* When cross-compiling assume at least WinXP */ +#ifdef _WIN32 + #define _WIN32_WINNT 0x0501 + #include +#endif + #if HAVE_CONFIG_H #include #endif #include "midori-app.h" -#include "sokoke.h" +#include "midori-platform.h" #include #include #include +#if ENABLE_NLS + #include + #include +#endif + #if HAVE_HILDON #include #ifdef HAVE_HILDON_2_2 @@ -32,7 +43,13 @@ #elif HAVE_UNIQUE typedef gpointer MidoriAppInstance; #define MidoriAppInstanceNull NULL + #if defined(G_DISABLE_DEPRECATED) && !defined(G_CONST_RETURN) + #define G_CONST_RETURN + #endif #include + #ifdef G_DISABLE_DEPRECATED + #undef G_CONST_RETUTN + #endif #define MIDORI_UNIQUE_COMMAND 1 #else typedef gint MidoriAppInstance; @@ -42,24 +59,25 @@ #if HAVE_LIBNOTIFY #include + #ifndef NOTIFY_CHECK_VERSION + #define NOTIFY_CHECK_VERSION(x,y,z) 0 + #endif #endif struct _MidoriApp { GObject parent_instance; - MidoriBrowser* browser; - GtkAccelGroup* accel_group; - - gchar* name; MidoriWebSettings* settings; KatzeArray* bookmarks; KatzeArray* trash; KatzeArray* search_engines; KatzeArray* history; + GKeyFile* speeddial; KatzeArray* extensions; KatzeArray* browsers; + MidoriBrowser* browser; MidoriAppInstance instance; #if !HAVE_HILDON || !HAVE_LIBNOTIFY @@ -67,6 +85,8 @@ #endif }; +static gchar* app_name = NULL; + struct _MidoriAppClass { GObjectClass parent_class; @@ -94,6 +114,7 @@ PROP_TRASH, PROP_SEARCH_ENGINES, PROP_HISTORY, + PROP_SPEED_DIAL, PROP_EXTENSIONS, PROP_BROWSERS, PROP_BROWSER @@ -146,6 +167,7 @@ "trash", app->trash, "search-engines", app->search_engines, "history", app->history, + "speed-dial", app->speeddial, NULL); else new_browser = midori_app_create_browser (app); @@ -193,7 +215,6 @@ g_return_if_fail (MIDORI_IS_APP (app)); g_return_if_fail (MIDORI_IS_BROWSER (browser)); - gtk_window_add_accel_group (GTK_WINDOW (browser), app->accel_group); g_object_connect (browser, "signal::focus-in-event", midori_browser_focus_in_event_cb, app, "signal::new-window", midori_browser_new_window_cb, app, @@ -304,7 +325,7 @@ "name", "Name", "The name of the instance", - "midori", + NULL, G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); @@ -362,6 +383,23 @@ KATZE_TYPE_ARRAY, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + + /** + * MidoriApp:speed-dial: + * + * The speed dial configuration file. + * + * Since: 0.3.4 + */ + g_object_class_install_property (gobject_class, + PROP_SPEED_DIAL, + g_param_spec_pointer ( + "speed-dial", + "Speeddial", + "Pointer to key-value object with speed dial items", + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + /** * MidoriApp:browsers: * @@ -450,7 +488,7 @@ MidoriNewPage open_external_pages_in; gboolean first; - g_object_get (app->settings, "open-external-pages-in", + g_object_get (app->settings, "open-new-pages-in", &open_external_pages_in, NULL); if (open_external_pages_in == MIDORI_NEW_PAGE_WINDOW) { @@ -466,9 +504,7 @@ first = (open_external_pages_in == MIDORI_NEW_PAGE_CURRENT); while (*uris) { - gchar* fixed_uri = sokoke_magic_uri (*uris); - if (!fixed_uri) - fixed_uri = g_strdup (*uris); + gchar* fixed_uri = g_uri_unescape_string (*uris, NULL); if (sokoke_recursive_fork_protection (fixed_uri, FALSE)) { if (first) @@ -477,8 +513,25 @@ first = FALSE; } else - midori_browser_set_current_page (browser, - midori_browser_add_uri (browser, fixed_uri)); + { + /* Switch to already open tab if possible */ + guint i = 0; + GtkWidget* tab; + gboolean found = FALSE; + while ((tab = midori_browser_get_nth_tab (browser, i++))) + if (g_str_equal ( + midori_view_get_display_uri (MIDORI_VIEW (tab)), + fixed_uri)) + { + found = TRUE; + break; + } + if (found) + midori_browser_set_current_tab (browser, tab); + else + midori_browser_set_current_page (browser, + midori_browser_add_uri (browser, fixed_uri)); + } } g_free (fixed_uri); uris++; @@ -535,7 +588,7 @@ #elif HAVE_UNIQUE static UniqueResponse midori_browser_message_received_cb (UniqueApp* instance, - UniqueCommand command, + gint command, UniqueMessageData* message, guint timestamp, MidoriApp* app) @@ -629,8 +682,7 @@ #endif static MidoriAppInstance -midori_app_create_instance (MidoriApp* app, - const gchar* name) +midori_app_create_instance (MidoriApp* app) { MidoriAppInstance instance; @@ -666,19 +718,35 @@ GIOChannel* channel; #endif - if (!name) - name = "midori"; - if (!(display = gdk_display_get_default ())) return MidoriAppInstanceNull; + { + #if HAVE_UNIQUE + const gchar* config = sokoke_set_config_dir (NULL); + gchar* name_hash; + name_hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, config, -1); + katze_assign (app_name, g_strconcat ("midori", "_", name_hash, NULL)); + g_free (name_hash); + g_object_notify (G_OBJECT (app), "name"); + #else + katze_assign (app_name, g_strdup (PACKAGE_NAME)); + #endif + } + + #ifdef GDK_WINDOWING_X11 + /* On X11: :0 or :0.0 which is equivalent */ + display_name = g_strndup (gdk_display_get_name (display), 2); + #else display_name = g_strdup (gdk_display_get_name (display)); + #endif n = strlen (display_name); for (i = 0; i < n; i++) - if (display_name[i] == ':' || display_name[i] == '.' - || display_name[i] == '\\') + if (strchr (":.\\/", display_name[i])) display_name[i] = '_'; - instance_name = g_strdup_printf ("de.twotoasts.%s_%s", name, display_name); + instance_name = g_strdup_printf ("de.twotoasts.%s_%s", app_name, display_name); + g_free (display_name); + katze_assign (app_name, instance_name); #if HAVE_UNIQUE instance = unique_app_new (instance_name, NULL); @@ -696,24 +764,25 @@ (GIOFunc)midori_app_io_channel_watch_cb, app); } #endif - - g_free (instance_name); - g_free (display_name); - #endif return instance; } +const gchar* +midori_app_get_name (MidoriApp* app) +{ + return app_name; +} + static void midori_app_init (MidoriApp* app) { - app->accel_group = gtk_accel_group_new (); - app->settings = NULL; app->bookmarks = NULL; app->trash = NULL; app->search_engines = NULL; app->history = NULL; + app->speeddial = NULL; app->extensions = NULL; app->browsers = katze_array_new (MIDORI_TYPE_BROWSER); @@ -732,14 +801,13 @@ { MidoriApp* app = MIDORI_APP (object); - g_object_unref (app->accel_group); - - katze_assign (app->name, NULL); + katze_assign (app_name, NULL); katze_object_assign (app->settings, NULL); katze_object_assign (app->bookmarks, NULL); katze_object_assign (app->trash, NULL); katze_object_assign (app->search_engines, NULL); katze_object_assign (app->history, NULL); + app->speeddial = NULL; katze_object_assign (app->extensions, NULL); katze_object_assign (app->browsers, NULL); @@ -773,7 +841,7 @@ switch (prop_id) { case PROP_NAME: - katze_assign (app->name, g_value_dup_string (value)); + katze_assign (app_name, g_value_dup_string (value)); break; case PROP_SETTINGS: katze_object_assign (app->settings, g_value_dup_object (value)); @@ -790,6 +858,9 @@ case PROP_HISTORY: katze_object_assign (app->history, g_value_dup_object (value)); break; + case PROP_SPEED_DIAL: + app->speeddial = g_value_get_pointer (value); + break; case PROP_EXTENSIONS: katze_object_assign (app->extensions, g_value_dup_object (value)); break; @@ -810,7 +881,7 @@ switch (prop_id) { case PROP_NAME: - g_value_set_string (value, app->name); + g_value_set_string (value, app_name); break; case PROP_SETTINGS: g_value_set_object (value, app->settings); @@ -827,6 +898,9 @@ case PROP_HISTORY: g_value_set_object (value, app->history); break; + case PROP_SPEED_DIAL: + g_value_set_pointer (value, app->speeddial); + break; case PROP_EXTENSIONS: g_value_set_object (value, app->extensions); break; @@ -847,8 +921,6 @@ * * Instantiates a new #MidoriApp singleton. * - * Subsequent calls will ref the initial instance. - * * Return value: a new #MidoriApp **/ MidoriApp* @@ -878,7 +950,7 @@ g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); if (app->instance == MidoriAppInstanceNull) - app->instance = midori_app_create_instance (app, app->name); + app->instance = midori_app_create_instance (app); #if HAVE_HILDON /* FIXME: Determine if application is running already */ @@ -1119,6 +1191,7 @@ "trash", app->trash, "search-engines", app->search_engines, "history", app->history, + "speed-dial", app->speeddial, NULL); } @@ -1199,21 +1272,21 @@ #if HAVE_HILDON hildon_banner_show_information_with_markup (GTK_WIDGET (app->browser), "midori", message); - #else - gboolean sent = FALSE; - - #if HAVE_LIBNOTIFY + #elif HAVE_LIBNOTIFY if (notify_is_initted ()) { NotifyNotification* note; - + #if NOTIFY_CHECK_VERSION (0, 7, 0) + note = notify_notification_new (title, message, "midori"); + #else note = notify_notification_new (title, message, "midori", NULL); - sent = notify_notification_show (note, NULL); + #endif + notify_notification_show (note, NULL); g_object_unref (note); } #else /* Fall back to the command line program "notify-send" */ - if (!sent && app->program_notify_send) + if (app->program_notify_send) { gchar* msgq = g_shell_quote (message); gchar* titleq = g_shell_quote (title); @@ -1227,5 +1300,177 @@ g_free (command); } #endif +} + +/** + * midori_app_setup: + * + * Saves the argument vector, initializes threading and registers + * several custom stock items and prepares localization. + * + * Since: 0.4.2 + **/ +void +midori_app_setup (gchar** argument_vector) +{ + GtkIconSource* icon_source; + GtkIconSet* icon_set; + GtkIconFactory* factory; + gsize i; + + typedef struct + { + const gchar* stock_id; + const gchar* label; + GdkModifierType modifier; + guint keyval; + const gchar* fallback; + } FatStockItem; + static FatStockItem items[] = + { + { STOCK_EXTENSION, NULL, 0, 0, GTK_STOCK_CONVERT }, + { STOCK_IMAGE, NULL, 0, 0, GTK_STOCK_ORIENTATION_PORTRAIT }, + { STOCK_WEB_BROWSER, NULL, 0, 0, "gnome-web-browser" }, + { STOCK_NEWS_FEED, NULL, 0, 0, GTK_STOCK_INDEX }, + { STOCK_SCRIPT, NULL, 0, 0, GTK_STOCK_EXECUTE }, + { STOCK_STYLE, NULL, 0, 0, GTK_STOCK_SELECT_COLOR }, + { STOCK_TRANSFER, NULL, 0, 0, GTK_STOCK_SAVE }, + + { STOCK_BOOKMARK, N_("_Bookmark"), 0, 0, GTK_STOCK_FILE }, + { STOCK_BOOKMARKS, N_("_Bookmarks"), GDK_CONTROL_MASK | GDK_SHIFT_MASK, GDK_KEY_B, GTK_STOCK_DIRECTORY }, + { STOCK_BOOKMARK_ADD, N_("Add Boo_kmark"), 0, 0, "stock_add-bookmark" }, + { STOCK_CONSOLE, N_("_Console"), 0, 0, GTK_STOCK_DIALOG_WARNING }, + { STOCK_EXTENSIONS, N_("_Extensions"), 0, 0, GTK_STOCK_CONVERT }, + { STOCK_HISTORY, N_("_History"), GDK_CONTROL_MASK | GDK_SHIFT_MASK, GDK_KEY_H, GTK_STOCK_SORT_ASCENDING }, + { STOCK_HOMEPAGE, N_("_Homepage"), 0, 0, GTK_STOCK_HOME }, + { STOCK_SCRIPTS, N_("_Userscripts"), 0, 0, GTK_STOCK_EXECUTE }, + { STOCK_TAB_NEW, N_("New _Tab"), 0, 0, GTK_STOCK_ADD }, + { STOCK_TRANSFERS, N_("_Transfers"), GDK_CONTROL_MASK | GDK_SHIFT_MASK, GDK_KEY_J, GTK_STOCK_SAVE }, + { STOCK_PLUGINS, N_("Netscape p_lugins"), 0, 0, GTK_STOCK_CONVERT }, + { STOCK_USER_TRASH, N_("_Closed Tabs"), 0, 0, "gtk-undo-ltr" }, + { STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, GTK_STOCK_ADD }, + { GTK_STOCK_DIRECTORY, N_("New _Folder"), 0, 0, NULL }, + }; + + /* Preserve argument vector */ + sokoke_get_argv (argument_vector); + + /* libSoup uses threads, therefore if WebKit is built with libSoup + * or Midori is using it, we need to initialize threads. */ + #if !GLIB_CHECK_VERSION (2, 32, 0) + if (!g_thread_supported ()) g_thread_init (NULL); + #endif + + #if ENABLE_NLS + setlocale (LC_ALL, ""); + if (g_getenv ("MIDORI_NLSPATH")) + bindtextdomain (GETTEXT_PACKAGE, g_getenv ("MIDORI_NLSPATH")); + else + #ifdef G_OS_WIN32 + { + gchar* path = sokoke_find_data_filename ("locale", FALSE); + bindtextdomain (GETTEXT_PACKAGE, path); + g_free (path); + } + #else + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + #endif + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); + #endif + + g_type_init (); + factory = gtk_icon_factory_new (); + for (i = 0; i < G_N_ELEMENTS (items); i++) + { + icon_set = gtk_icon_set_new (); + icon_source = gtk_icon_source_new (); + if (items[i].fallback) + { + gtk_icon_source_set_icon_name (icon_source, items[i].fallback); + items[i].fallback = NULL; + gtk_icon_set_add_source (icon_set, icon_source); + } + gtk_icon_source_set_icon_name (icon_source, items[i].stock_id); + gtk_icon_set_add_source (icon_set, icon_source); + gtk_icon_source_free (icon_source); + gtk_icon_factory_add (factory, items[i].stock_id, icon_set); + gtk_icon_set_unref (icon_set); + } + gtk_stock_add_static ((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 + + /* Print messages to stdout on Win32 console, cf. AbiWord + * http://svn.abisource.com/abiword/trunk/src/wp/main/win/Win32Main.cpp */ + #ifdef _WIN32 + if (fileno (stdout) != -1 + && _get_osfhandle (fileno (stdout)) != -1) + { + /* stdout is already being redirected to a file */ + } + else + { + typedef BOOL (WINAPI *AttachConsole_t) (DWORD); + AttachConsole_t p_AttachConsole = + (AttachConsole_t) GetProcAddress (GetModuleHandle ("kernel32.dll"), "AttachConsole"); + if (p_AttachConsole != NULL && p_AttachConsole (ATTACH_PARENT_PROCESS)) + { + freopen ("CONOUT$", "w", stdout); + dup2 (fileno (stdout), 1); + freopen ("CONOUT$", "w", stderr); + dup2 (fileno (stderr), 2); + } + } #endif } + diff -Nru midori-0.2.8/midori/midori-app.h midori-0.4.6/midori/midori-app.h --- midori-0.2.8/midori/midori-app.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/midori-app.h 2012-05-14 22:13:42.000000000 +0000 @@ -41,6 +41,9 @@ MidoriApp* midori_app_new (void); +const gchar* +midori_app_get_name (MidoriApp* app); + gboolean midori_app_instance_is_running (MidoriApp* app); @@ -79,6 +82,9 @@ const gchar* title, const gchar* message); +void +midori_app_setup (gchar** argument_vector); + G_END_DECLS #endif /* __MIDORI_APP_H__ */ diff -Nru midori-0.2.8/midori/midori-array.c midori-0.4.6/midori/midori-array.c --- midori-0.2.8/midori/midori-array.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/midori-array.c 2012-05-14 22:13:42.000000000 +0000 @@ -293,19 +293,133 @@ return TRUE; } +static gchar* +katze_unescape_html (const gchar* text) +{ + gchar* amp = g_strstr_len (text, -1, "&"); + + if (amp && *amp) + { + if (!strncmp (amp, """, 6) || !strncmp (amp, "&", 5) + || !strncmp (amp, "<", 4) || !strncmp (amp, ">", 4) + || !strncmp (amp, "'", 6)) + { + guint i = 0; + gchar** parts = g_strsplit_set (text, "&;", -1); + GString *unescaped = g_string_new (NULL); + + while (parts[i]) + { + if (katze_str_equal ("quot", parts[i])) + g_string_append (unescaped, "\""); + else if (katze_str_equal ("amp", parts[i])) + g_string_append (unescaped, "&"); + else if (katze_str_equal ("lt", parts[i])) + g_string_append (unescaped, "<"); + else if (katze_str_equal ("gt", parts[i])) + g_string_append (unescaped, ">"); + else if (katze_str_equal ("apos", parts[i])) + g_string_append (unescaped, "'"); + else + g_string_append (unescaped, parts[i]); + i++; + } + g_strfreev (parts); + + return g_string_free (unescaped, FALSE); + } + } + return g_strdup (text); +} + +static gboolean +katze_array_from_netscape_file (KatzeArray* array, + const gchar* filename) +{ + gchar* line = NULL; + GIOChannel* channel = g_io_channel_new_file (filename, "r", 0); + KatzeArray* folder = array; + KatzeItem* item = NULL; + + if (!channel) + return FALSE; + + while (g_io_channel_read_line (channel, &line, NULL, NULL, NULL) + == G_IO_STATUS_NORMAL) + { + g_strstrip (line); + /* parse lines with bookmarks data only, skip the rest */ + if (!strncmp (line, "", -1); + /* current item */ + if (katze_str_equal (element[1], "DT")) + { + /* item is bookmark */ + if (!strncmp (element[3], "A HREF", 6)) + { + gchar** parts = g_strsplit (line, "\"", -1); + item = katze_item_new (); + katze_array_add_item (folder, item); + item->name = katze_unescape_html (element[4]); + item->uri = katze_unescape_html (parts[1]); + g_strfreev (parts); + } + /* item is folder */ + if (!strncmp (element[3], "H3", 2)) + { + item = (KatzeItem*)katze_array_new (KATZE_TYPE_ARRAY); + katze_array_add_item (folder, item); + folder = (KatzeArray*)item; + item->name = katze_unescape_html (element[4]); + } + } + /* item description */ + if (item && katze_str_equal (element[1], "DD")) + { + if (element[2]) + item->text = katze_unescape_html (element[2]); + item = NULL; + } + /* end of current folder, level-up */ + if (katze_str_equal (element[1], "/DL")) + { + if (folder != array) + folder = katze_item_get_parent ((KatzeItem*)folder); + continue; + } + g_strfreev (element); + } + continue; + } + g_io_channel_shutdown (channel, FALSE, 0); + g_io_channel_unref (channel); + return TRUE; +} + static gboolean katze_array_from_opera_file (KatzeArray* array, - FILE* file) + const gchar* filename) { - gchar line[200]; - gchar* partial_line = NULL; + gchar* line = NULL; + GIOChannel* channel = g_io_channel_new_file (filename, "r", 0); KatzeArray* folder = array; KatzeItem* item = NULL; - while (fgets (line, 200, file)) + if (!channel) + return FALSE; + + while (g_io_channel_read_line (channel, &line, NULL, NULL, NULL) + == G_IO_STATUS_NORMAL) { - gboolean incomplete_line = (strlen (line) == 199); g_strstrip (line); + /* skip file header */ + if (katze_str_equal (line, "Options: encoding = utf8, version=3") + || katze_str_equal (line, "Opera Hotlist version 2.0")) + { + item = NULL; + continue; + } if (line[0] == '\0') { item = NULL; @@ -340,30 +454,7 @@ } 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); + gchar** parts = g_strsplit (line, "=", 2); if (parts && parts[0] && parts[1]) { @@ -392,6 +483,8 @@ else g_warning ("Unexpected property outside of element: %s", line); } + g_io_channel_shutdown (channel, FALSE, 0); + g_io_channel_unref (channel); return TRUE; } @@ -433,6 +526,36 @@ if (!format) format = ""; + /* netscape html */ + if (!*format && g_str_has_suffix (filename, ".html")) + { + FILE* file; + if ((file = g_fopen (filename, "r"))) + { + gchar line[50]; + while (fgets (line, 50, file)) + { + g_strstrip (line); + if (katze_str_equal (line, "")) + { + if (!katze_array_from_netscape_file (array, filename)) + { + /* 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); + } + } + /* Opera6 */ if (katze_str_equal (format, "opera") || (!*format && g_str_has_suffix (filename, ".adr"))) @@ -454,7 +577,7 @@ verify++; else if (verify == 2) { - if (!katze_array_from_opera_file (array, file)) + if (!katze_array_from_opera_file (array, filename)) { /* Parsing failed */ fclose (file); @@ -580,26 +703,26 @@ string_append_item (GString* string, KatzeItem* item) { - gchar* markup; gchar* metadata; g_return_if_fail (KATZE_IS_ITEM (item)); - markup = NULL; metadata = katze_item_metadata_to_xbel (item); if (KATZE_IS_ARRAY (item)) { KatzeItem* _item; KatzeArray* array = KATZE_ARRAY (item); + GList* list; 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)); - KATZE_ARRAY_FOREACH_ITEM (_item, array) + KATZE_ARRAY_FOREACH_ITEM_L (_item, array, list) string_append_item (string, _item); g_string_append (string, metadata); g_string_append (string, "\n"); + g_list_free (list); } else if (katze_item_get_uri (item)) { @@ -616,6 +739,48 @@ g_free (metadata); } +static void +string_append_netscape_item (GString* string, + KatzeItem* item) +{ + g_return_if_fail (KATZE_IS_ITEM (item)); + + if (KATZE_IS_ARRAY (item)) + { + KatzeItem* _item; + KatzeArray* array = KATZE_ARRAY (item); + GList* list; + + g_string_append (string, "\t

"); + string_append_escaped (string, katze_item_get_name (item)); + g_string_append (string, "

\n"); + g_string_append (string, "\t

\n"); + KATZE_ARRAY_FOREACH_ITEM_L (_item, array, list) + { + g_string_append (string, "\t"); + string_append_netscape_item (string, _item); + } + g_string_append (string, "\t

\n"); + + g_list_free (list); + } + else if (katze_item_get_uri (item)) + { + g_string_append (string, "\t

"); + string_append_escaped (string, katze_item_get_name (item)); + g_string_append (string, "\n"); + + if (item->text && g_strcmp0 (item->text, "")) + { + g_string_append (string, "\t
"); + string_append_escaped (string, katze_item_get_text (item)); + g_string_append (string, "\n"); + } + } +} + static gchar* katze_item_metadata_to_xbel (KatzeItem* item) { @@ -631,7 +796,7 @@ const gchar* value; if (!keys) - return g_strdup (""); + return NULL; markup = g_string_new ("\n\n" @@ -690,25 +856,58 @@ ">\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); - KATZE_ARRAY_FOREACH_ITEM (item, array) + g_string_append (markup, metadata ? metadata : ""); + KATZE_ARRAY_FOREACH_ITEM_L (item, array, list) string_append_item (markup, item); g_string_append (markup, "\n"); g_free (metadata); + g_list_free (list); return g_string_free (markup, FALSE); } +static gchar* +katze_array_to_netscape_html (KatzeArray* array, + GError** error) +{ + KatzeItem* item; + GList* list; + + /* The header, including the text, is the same as used in other browsers, + see http://msdn.microsoft.com/en-us/library/aa753582(v=vs.85).aspx */ + GString* markup = g_string_new ( + "\n" + "\n" + "\n" + "Bookmarks\n" + "

Bookmarks

\n" + "\n"); + g_string_append (markup, "

\n"); + KATZE_ARRAY_FOREACH_ITEM_L (item, array, list) + string_append_netscape_item (markup, item); + g_string_append (markup, "

\n"); + + g_list_free (list); + return g_string_free (markup, FALSE); +} + static gboolean -midori_array_to_file_xbel (KatzeArray* array, - const gchar* filename, - GError** error) +midori_array_to_file_format (KatzeArray* array, + const gchar* filename, + const gchar* format, + GError** error) { gchar* data; FILE* fp; - if (!(data = katze_array_to_xbel (array, error))) + if (!g_strcmp0 (format, "xbel")) + data = katze_array_to_xbel (array, error); + else if (!g_strcmp0 (format, "netscape")) + data = katze_array_to_netscape_html (array, error); + else return FALSE; if (!(fp = fopen (filename, "w"))) { @@ -745,8 +944,10 @@ g_return_val_if_fail (filename, FALSE); g_return_val_if_fail (!error || !*error, FALSE); - if (!g_strcmp0 (format, "xbel")) - return midori_array_to_file_xbel (array, filename, error); + if (!g_strcmp0 (format, "xbel") + || !g_strcmp0 (format, "netscape")) + return midori_array_to_file_format (array, filename, format, error); + g_critical ("Cannot write KatzeArray to unknown format '%s'.", format); return FALSE; } @@ -766,19 +967,19 @@ const unsigned char* uri; uri = sqlite3_column_text (stmt, column); if (uri && uri[0] && uri[0] != '(') - katze_item_set_uri (item, (gchar*)uri); + item->uri = g_strdup ((gchar*)uri); } else if (g_str_equal (name, "title") || g_str_equal (name, "name")) { const unsigned char* title; title = sqlite3_column_text (stmt, column); - katze_item_set_name (item, (gchar*)title); + item->name = g_strdup ((gchar*)title); } else if (g_str_equal (name, "date")) { gint date; date = sqlite3_column_int64 (stmt, column); - katze_item_set_added (item, date); + item->added = date; } else if (g_str_equal (name, "day") || g_str_equal (name, "app") || g_str_equal (name, "toolbar")) @@ -797,7 +998,7 @@ { const unsigned char* text; text = sqlite3_column_text (stmt, column); - katze_item_set_text (item, (gchar*)text); + item->text = g_strdup ((gchar*)text); } else g_warn_if_reached (); @@ -864,3 +1065,92 @@ return katze_array_from_statement (stmt); } + +/** + * midori_array_query_recursive: + * @array: the main bookmark array + * @fields: comma separated list of fields + * @condition: condition, like "folder = '%q'" + * @value: a value to be inserted if @condition contains %q + * @recursive: if %TRUE include children + * + * Stores the result in a #KatzeArray. + * + * Return value: a #KatzeArray on success, %NULL otherwise + * + * Since: 0.4.4 + **/ +KatzeArray* +midori_array_query_recursive (KatzeArray* bookmarks, + const gchar* fields, + const gchar* condition, + const gchar* value, + gboolean recursive) +{ + sqlite3* db; + gchar* sqlcmd; + char* sqlcmd_value; + KatzeArray* array; + KatzeItem* item; + GList* list; + + g_return_val_if_fail (KATZE_IS_ARRAY (bookmarks), NULL); + g_return_val_if_fail (fields, NULL); + g_return_val_if_fail (condition, NULL); + db = g_object_get_data (G_OBJECT (bookmarks), "db"); + if (db == NULL) + return NULL; + + sqlcmd = g_strdup_printf ("SELECT %s FROM bookmarks WHERE %s " + "ORDER BY title DESC", fields, condition); + if (strstr (condition, "%q")) + { + sqlcmd_value = sqlite3_mprintf (sqlcmd, value ? value : ""); + array = katze_array_from_sqlite (db, sqlcmd_value); + sqlite3_free (sqlcmd_value); + } + else + array = katze_array_from_sqlite (db, sqlcmd); + g_free (sqlcmd); + + if (!recursive) + return array; + + KATZE_ARRAY_FOREACH_ITEM_L (item, array, list) + { + if (KATZE_ITEM_IS_FOLDER (item)) + { + KatzeArray* subarray = midori_array_query_recursive (bookmarks, + fields, "folder='%q'", item->name, TRUE); + katze_item_set_name (KATZE_ITEM (subarray), item->name); + katze_array_add_item (array, subarray); + } + } + g_list_free (list); + return array; +} + +/** + * midori_array_query: + * @array: the main bookmark array + * @fields: comma separated list of fields + * @condition: condition, like "folder = '%q'" + * @value: a value to be inserted if @condition contains %q + * + * Stores the result in a #KatzeArray. + * + * Return value: a #KatzeArray on success, %NULL otherwise + * + * Since: 0.4.3 + * + * Deprecated: 0.4.4: Use midori_array_query_recursive() instead. + **/ +KatzeArray* +midori_array_query (KatzeArray* bookmarks, + const gchar* fields, + const gchar* condition, + const gchar* value) +{ + return midori_array_query_recursive (bookmarks, fields, condition, value, FALSE); +} + diff -Nru midori-0.2.8/midori/midori-array.h midori-0.4.6/midori/midori-array.h --- midori-0.2.8/midori/midori-array.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/midori-array.h 2012-05-14 22:13:42.000000000 +0000 @@ -31,6 +31,19 @@ katze_array_from_statement (sqlite3_stmt* stmt); KatzeArray* +midori_array_query (KatzeArray* array, + const gchar* fields, + const gchar* condition, + const gchar* value); + +KatzeArray* +midori_array_query_recursive (KatzeArray* array, + const gchar* fields, + const gchar* condition, + const gchar* value, + gboolean recursive); + +KatzeArray* katze_array_from_sqlite (sqlite3* db, const gchar* sqlcmd); diff -Nru midori-0.2.8/midori/midori-bookmarks.c midori-0.4.6/midori/midori-bookmarks.c --- midori-0.2.8/midori/midori-bookmarks.c 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/midori/midori-bookmarks.c 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,116 @@ +/* + Copyright (C) 2010 Christian Dywan + Copyright (C) 2010 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 "midori-bookmarks.h" +#include "panels/midori-bookmarks.h" +#include "midori-array.h" + +#include + +#ifdef G_ENABLE_DEBUG +void midori_bookmarks_dbtracer(void* dummy, const char* query) +{ + g_printerr ("%s\n", query); +} +#endif + +void +midori_bookmarks_add_item_cb (KatzeArray* array, + KatzeItem* item, + sqlite3* db) +{ + midori_bookmarks_insert_item_db (db, item, + katze_item_get_meta_string (item, "folder")); +} + +void +midori_bookmarks_remove_item_cb (KatzeArray* array, + KatzeItem* item, + sqlite3* db) +{ + gchar* sqlcmd; + char* errmsg = NULL; + + if (KATZE_ITEM_IS_BOOKMARK (item)) + sqlcmd = sqlite3_mprintf ( + "DELETE FROM bookmarks WHERE uri = '%q' " + " AND folder = '%q'", + katze_item_get_uri (item), + katze_str_non_null (katze_item_get_meta_string (item, "folder"))); + + else + sqlcmd = sqlite3_mprintf ( + "DELETE FROM bookmarks WHERE title = '%q'" + " AND folder = '%q'", + katze_item_get_name (item), + katze_str_non_null (katze_item_get_meta_string (item, "folder"))); + + if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK) + { + g_printerr (_("Failed to remove history item: %s\n"), errmsg); + sqlite3_free (errmsg); + } + + sqlite3_free (sqlcmd); +} + +sqlite3* +midori_bookmarks_initialize (KatzeArray* array, + const gchar* filename, + char** errmsg) +{ + sqlite3* db; + + if (sqlite3_open (filename, &db) != SQLITE_OK) + { + if (errmsg) + *errmsg = g_strdup_printf (_("Failed to open database: %s\n"), + sqlite3_errmsg (db)); + sqlite3_close (db); + return NULL; + } + +#ifdef G_ENABLE_DEBUG + if (g_getenv ("MIDORI_BOOKMARKS_DEBUG")) + sqlite3_trace (db, midori_bookmarks_dbtracer, NULL); +#endif + + if (sqlite3_exec (db, + "CREATE TABLE IF NOT EXISTS " + "bookmarks (uri text, title text, folder text, " + "desc text, app integer, toolbar integer);", + NULL, NULL, errmsg) != SQLITE_OK) + return NULL; + g_signal_connect (array, "add-item", + G_CALLBACK (midori_bookmarks_add_item_cb), db); + g_signal_connect (array, "remove-item", + G_CALLBACK (midori_bookmarks_remove_item_cb), db); + return db; +} + +void +midori_bookmarks_import (const gchar* filename, + sqlite3* db) +{ + KatzeArray* bookmarks; + GError* error = NULL; + + bookmarks = katze_array_new (KATZE_TYPE_ARRAY); + + if (!midori_array_from_file (bookmarks, filename, "xbel", &error)) + { + g_warning (_("The bookmarks couldn't be saved. %s"), error->message); + g_error_free (error); + return; + } + midori_bookmarks_import_array_db (db, bookmarks, ""); +} diff -Nru midori-0.2.8/midori/midori-bookmarks.h midori-0.4.6/midori/midori-bookmarks.h --- midori-0.2.8/midori/midori-bookmarks.h 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/midori/midori-bookmarks.h 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,33 @@ +/* + Copyright (C) 2010 Christian Dywan + Copyright (C) 2010 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 + +void +midori_bookmarks_add_item_cb (KatzeArray* array, + KatzeItem* item, + sqlite3* db); + +void +midori_bookmarks_remove_item_cb (KatzeArray* array, + KatzeItem* item, + sqlite3* db); + +sqlite3* +midori_bookmarks_initialize (KatzeArray* array, + const gchar* filename, + char** errmsg); + +void +midori_bookmarks_import (const gchar* filename, + sqlite3* db); diff -Nru midori-0.2.8/midori/midori-browser.c midori-0.4.6/midori/midori-browser.c --- midori-0.2.8/midori/midori-browser.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/midori-browser.c 2012-05-14 22:13:42.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2007-2010 Christian Dywan + Copyright (C) 2007-2011 Christian Dywan Copyright (C) 2008 Dale Whittaker Copyright (C) 2009 Jérôme Geulfucci @@ -19,19 +19,24 @@ #include "midori-panel.h" #include "midori-locationaction.h" #include "midori-searchaction.h" -#include "midori-stock.h" +#include "midori-panedaction.h" #include "midori-findbar.h" #include "midori-transferbar.h" +#include "midori-platform.h" +#include "midori-core.h" -#include "gtkiconentry.h" #include "marshal.h" -#include "sokoke.h" #include #include #include -#include #include + +#ifdef HAVE_GRANITE + #include +#endif + +#include #ifdef HAVE_UNISTD_H #include #endif @@ -50,10 +55,6 @@ #include -#if HAVE_CONFIG_H - #include -#endif - struct _MidoriBrowser { #if HAVE_HILDON @@ -64,7 +65,6 @@ GtkActionGroup* action_group; GtkWidget* menubar; - GtkWidget* menu_tools; GtkWidget* throbber; GtkWidget* navigationbar; GtkWidget* bookmarkbar; @@ -80,11 +80,11 @@ GtkWidget* statusbar; GtkWidget* statusbar_contents; GtkWidget* transferbar; - GtkWidget* progressbar; gchar* statusbar_text; gint last_window_width, last_window_height; guint alloc_timeout; + gint last_tab_size; guint panel_timeout; gint clear_private_data; @@ -95,14 +95,14 @@ KatzeArray* trash; KatzeArray* search_engines; KatzeArray* history; + GKeyFile* speeddial; gboolean show_tabs; gboolean show_navigationbar; gboolean show_statusbar; - gboolean speed_dial_in_new_tabs; - gboolean progress_in_location; guint maximum_history_age; gchar* location_entry_search; + guint last_web_search; gchar* news_aggregator; }; @@ -130,6 +130,7 @@ PROP_TRASH, PROP_SEARCH_ENGINES, PROP_HISTORY, + PROP_SPEED_DIAL, PROP_SHOW_TABS, }; @@ -138,12 +139,14 @@ NEW_WINDOW, ADD_TAB, REMOVE_TAB, + MOVE_TAB, ACTIVATE_ACTION, - CONTEXT_READY, ADD_DOWNLOAD, SEND_NOTIFICATION, POPULATE_TOOL_MENU, + POPULATE_TOOLBAR_MENU, QUIT, + SHOW_PREFERENCES, LAST_SIGNAL }; @@ -174,16 +177,6 @@ gchar* folder); void -midori_bookmarks_export_array_db (sqlite3* db, - KatzeArray* array, - const gchar* folder); - -void -midori_bookmarks_insert_item_db (sqlite3* db, - KatzeItem* item, - gchar* folder); - -void midori_browser_open_bookmark (MidoriBrowser* browser, KatzeItem* item); @@ -218,22 +211,23 @@ midori_browser_set_bookmarks (MidoriBrowser* browser, KatzeArray* bookmarks); -GdkPixbuf* -midori_search_action_get_icon (KatzeItem* item, - GtkWidget* widget, - const gchar** icon_name); - static void midori_browser_add_speed_dial (MidoriBrowser* browser); gboolean midori_transferbar_confirm_delete (MidoriTransferbar* transferbar); -#if WEBKIT_CHECK_VERSION (1, 1, 3) +static void +midori_browser_notebook_size_allocate_cb (GtkWidget* notebook, + GdkRectangle* allocation, + MidoriBrowser* browser); + void midori_transferbar_add_download_item (MidoriTransferbar* transferbar, WebKitDownload* download); -#endif +void +midori_transferbar_check_size (GtkWidget* statusbar, + MidoriTransferbar* transferbar); #define _action_by_name(brwsr, nme) \ gtk_action_group_get_action (brwsr->action_group, nme) @@ -245,47 +239,71 @@ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION ( \ _action_by_name (brwsr, nme)), actv); -static void -_toggle_tabbar_smartly (MidoriBrowser* browser) +static gboolean +midori_browser_is_fullscreen (MidoriBrowser* browser) { - guint n; - gboolean always_show_tabbar; + GdkWindow* window = gtk_widget_get_window (GTK_WIDGET (browser)); + GdkWindowState state = window ? gdk_window_get_state (window) : 0; + return state & GDK_WINDOW_STATE_FULLSCREEN; +} - if (!browser->show_tabs) - return; +static gboolean +_toggle_tabbar_smartly (MidoriBrowser* browser, + gboolean ignore_fullscreen) +{ +#ifdef HAVE_GRANITE + gboolean has_tabs = !(midori_browser_is_fullscreen (browser) || ignore_fullscreen); + /* FIXME: Toggle tabbar visibility */ +#else + gboolean has_tabs = + gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), 1) != NULL; + gboolean show_tabs = + browser->show_tabs + && (!midori_browser_is_fullscreen (browser) || ignore_fullscreen) + && (has_tabs + || katze_object_get_boolean (browser->settings, "always-show-tabbar")); - n = gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)); - if (n < 2) - { - g_object_get (browser->settings, "always-show-tabbar", - &always_show_tabbar, NULL); - if (always_show_tabbar) - n++; - } - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (browser->notebook), n > 1); - gtk_notebook_set_show_border (GTK_NOTEBOOK (browser->notebook), n > 1); + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (browser->notebook), show_tabs); + gtk_notebook_set_show_border (GTK_NOTEBOOK (browser->notebook), show_tabs); +#endif + return has_tabs; } static void _midori_browser_update_actions (MidoriBrowser* browser) { - guint n; - gboolean trash_empty; - - _toggle_tabbar_smartly (browser); - n = gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)); - _action_set_sensitive (browser, "TabPrevious", n > 1); - _action_set_sensitive (browser, "TabNext", n > 1); + gboolean has_tabs = _toggle_tabbar_smartly (browser, FALSE); + _action_set_sensitive (browser, "TabPrevious", has_tabs); + _action_set_sensitive (browser, "TabNext", has_tabs); if (browser->trash) { - trash_empty = katze_array_is_empty (browser->trash); + gboolean trash_empty = katze_array_is_empty (browser->trash); _action_set_sensitive (browser, "UndoTabClose", !trash_empty); _action_set_sensitive (browser, "Trash", !trash_empty); } } static void +midori_browser_update_secondary_icon (MidoriBrowser* browser, + MidoriView* view, + GtkAction* action) +{ + if (g_object_get_data (G_OBJECT (view), "news-feeds")) + { + midori_location_action_set_secondary_icon ( + MIDORI_LOCATION_ACTION (action), STOCK_NEWS_FEED); + _action_set_sensitive (browser, "AddNewsFeed", TRUE); + } + else + { + midori_location_action_set_secondary_icon ( + MIDORI_LOCATION_ACTION (action), NULL); + _action_set_sensitive (browser, "AddNewsFeed", FALSE); + } +} + +static void _midori_browser_update_interface (MidoriBrowser* browser) { GtkWidget* widget = midori_browser_get_current_tab (browser); @@ -303,20 +321,16 @@ _action_set_sensitive (browser, "Next", midori_view_get_next_page (view) != NULL); - gtk_action_set_visible (_action_by_name (browser, "AddSpeedDial"), - browser->speed_dial_in_new_tabs && !midori_view_is_blank (view)); - /* Currently views that don't support source, don't support - saving either. If that changes, we need to think of something. */ - _action_set_sensitive (browser, "SaveAs", midori_view_can_view_source (view)); + _action_set_sensitive (browser, "AddSpeedDial", !midori_view_is_blank (view)); + _action_set_sensitive (browser, "BookmarkAdd", !midori_view_is_blank (view)); + _action_set_sensitive (browser, "SaveAs", midori_view_can_save (view)); _action_set_sensitive (browser, "Print", midori_view_can_print (view)); _action_set_sensitive (browser, "ZoomIn", midori_view_can_zoom_in (view)); _action_set_sensitive (browser, "ZoomOut", midori_view_can_zoom_out (view)); _action_set_sensitive (browser, "ZoomNormal", midori_view_get_zoom_level (view) != 1.0f); - #if WEBKIT_CHECK_VERSION (1, 1, 2) _action_set_sensitive (browser, "Encoding", midori_view_can_view_source (view)); - #endif _action_set_sensitive (browser, "SourceView", midori_view_can_view_source (view)); _action_set_sensitive (browser, "Find", @@ -335,21 +349,14 @@ "stock-id", GTK_STOCK_REFRESH, "tooltip", _("Reload the current page"), "sensitive", can_reload, NULL); - gtk_widget_hide (browser->progressbar); - if (!browser->show_navigationbar && !browser->show_statusbar) - gtk_widget_hide (browser->navigationbar); + katze_item_set_meta_integer (midori_view_get_proxy_item (view), + "dont-write-history", -1); } else { g_object_set (action, "stock-id", GTK_STOCK_STOP, "tooltip", _("Stop loading the current page"), NULL); - if (!browser->progress_in_location || !gtk_widget_get_visible (browser->navigationbar)) - gtk_widget_show (browser->progressbar); - if (!gtk_widget_get_visible (browser->statusbar) && - !gtk_widget_get_visible (browser->navigationbar) && - browser->progress_in_location) - gtk_widget_show (browser->navigationbar); } #if HAVE_HILDON @@ -362,65 +369,57 @@ #endif action = _action_by_name (browser, "Location"); - if (g_object_get_data (G_OBJECT (view), "news-feeds")) - { - midori_location_action_set_secondary_icon ( - MIDORI_LOCATION_ACTION (action), STOCK_NEWS_FEED); - gtk_action_set_sensitive (_action_by_name (browser, "AddNewsFeed"), TRUE); - } - else - { - midori_location_action_set_secondary_icon ( - MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO); - gtk_action_set_sensitive (_action_by_name (browser, "AddNewsFeed"), FALSE); - } midori_location_action_set_security_hint ( MIDORI_LOCATION_ACTION (action), midori_view_get_security (view)); + midori_browser_update_secondary_icon (browser, MIDORI_VIEW (view), action); } static void _midori_browser_set_statusbar_text (MidoriBrowser* browser, const gchar* text) { + GtkWidget* view = midori_browser_get_current_tab (browser); + #if GTK_CHECK_VERSION (3, 2, 0) + gboolean is_location = FALSE; + #else GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser)); - gboolean is_location = widget ? - GTK_IS_COMBO_BOX (gtk_widget_get_parent (widget)) : FALSE; + gboolean is_location = widget && GTK_IS_ENTRY (widget) + && GTK_IS_ALIGNMENT (gtk_widget_get_parent (widget)); + #endif - katze_assign (browser->statusbar_text, sokoke_format_uri_for_display (text)); + katze_assign (browser->statusbar_text, midori_uri_format_for_display (text)); + if (view == NULL) + return; - if (!browser->show_statusbar && !is_location) + if (!gtk_widget_get_visible (browser->statusbar) && !is_location + && text && *text) { + #if GTK_CHECK_VERSION (3, 2, 0) + midori_view_set_overlay_text (MIDORI_VIEW (view), browser->statusbar_text); + #else GtkAction* action = _action_by_name (browser, "Location"); MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action); - if (text && *text) - { - midori_location_action_set_text (location_action, browser->statusbar_text); - midori_location_action_set_icon (location_action, NULL); - midori_location_action_set_secondary_icon (location_action, NULL); - } - else - { - GtkWidget* view = midori_browser_get_current_tab (browser); - if (G_LIKELY (view)) - { - if (g_object_get_data (G_OBJECT (view), "news-feeds")) - midori_location_action_set_secondary_icon ( - location_action, STOCK_NEWS_FEED); - else - midori_location_action_set_secondary_icon ( - location_action, GTK_STOCK_JUMP_TO); - midori_location_action_set_text (location_action, - midori_view_get_display_uri (MIDORI_VIEW (view))); - midori_location_action_set_icon (location_action, - midori_view_get_icon (MIDORI_VIEW (view))); - } - } + midori_location_action_set_text (location_action, browser->statusbar_text); + midori_location_action_set_secondary_icon (location_action, NULL); + #endif + } + else if (!gtk_widget_get_visible (browser->statusbar) && !is_location) + { + #if GTK_CHECK_VERSION (3, 2, 0) + midori_view_set_overlay_text (MIDORI_VIEW (view), NULL); + #else + GtkAction* action = _action_by_name (browser, "Location"); + MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action); + midori_browser_update_secondary_icon (browser, view, action); + midori_location_action_set_text (location_action, + midori_view_get_display_uri (MIDORI_VIEW (view))); + #endif } else { gtk_statusbar_pop (GTK_STATUSBAR (browser->statusbar), 1); gtk_statusbar_push (GTK_STATUSBAR (browser->statusbar), 1, - browser->statusbar_text ? browser->statusbar_text : ""); + katze_str_non_null (browser->statusbar_text)); } } @@ -439,30 +438,15 @@ { MidoriLocationAction* action; gdouble progress; - gchar* message; action = MIDORI_LOCATION_ACTION (_action_by_name (browser, "Location")); progress = midori_view_get_progress (view); /* When we are finished, we don't want to *see* progress anymore */ if (midori_view_get_load_status (view) == MIDORI_LOAD_FINISHED) progress = 0.0; - if (progress > 0.0) - { - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (browser->progressbar), - progress); - message = g_strdup_printf (_("%d%% loaded"), (gint)(progress * 100)); - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (browser->progressbar), - message); - g_free (message); - if (!browser->progress_in_location) - progress = 0.0; - } + /* When loading we want to see at minimum 10% progress */ else - { - gtk_progress_bar_pulse (GTK_PROGRESS_BAR (browser->progressbar)); - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (browser->progressbar), - NULL); - } + progress = CLAMP (progress, 0.1, 1.0); midori_location_action_set_progress (action, progress); } @@ -476,6 +460,7 @@ g_return_if_fail (katze_item_get_uri (item) != NULL); db = g_object_get_data (G_OBJECT (browser->history), "db"); + g_return_if_fail (db != NULL); if (!stmt) { const gchar* sqlcmd; @@ -509,19 +494,11 @@ GParamSpec* pspec, MidoriBrowser* browser) { - const gchar* uri; - GtkAction* action; - if (midori_browser_get_current_tab (browser) != (GtkWidget*)view) return; - uri = midori_view_get_display_uri (view); - action = _action_by_name (browser, "Location"); - if (browser->maximum_history_age) - midori_location_action_set_icon_for_uri ( - MIDORI_LOCATION_ACTION (action), midori_view_get_icon (view), uri); - midori_location_action_set_icon (MIDORI_LOCATION_ACTION (action), - midori_view_get_icon (view)); + if (sokoke_is_app_or_private ()) + gtk_window_set_icon (GTK_WINDOW (browser), midori_view_get_icon (view)); } static void @@ -537,17 +514,12 @@ uri = midori_view_get_display_uri (view); action = _action_by_name (browser, "Location"); - if (load_status == MIDORI_LOAD_COMMITTED) - midori_location_action_add_uri (MIDORI_LOCATION_ACTION (action), uri); - if (widget == midori_browser_get_current_tab (browser)) { if (load_status == MIDORI_LOAD_COMMITTED) { midori_location_action_set_text ( MIDORI_LOCATION_ACTION (action), uri); - midori_location_action_set_secondary_icon ( - MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO); g_object_notify (G_OBJECT (browser), "uri"); } @@ -557,7 +529,7 @@ /* This is a hack to ensure that the address entry is focussed with speed dial open. */ if (midori_view_is_blank (view)) - gtk_action_activate (_action_by_name (browser, "Location")); + midori_browser_activate_action (browser, "Location"); } g_object_notify (G_OBJECT (browser), "load-status"); @@ -573,24 +545,33 @@ } static void -midori_view_context_ready_cb (GtkWidget* view, - JSContextRef js_context, - MidoriBrowser* browser) -{ - g_signal_emit (browser, signals[CONTEXT_READY], 0, js_context); -} - -static void -midori_view_notify_uri_cb (GtkWidget* view, +midori_view_notify_uri_cb (GtkWidget* widget, GParamSpec* pspec, MidoriBrowser* browser) { - if (view == midori_browser_get_current_tab (browser)) + if (widget == midori_browser_get_current_tab (browser)) { - const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view)); + MidoriView* view = MIDORI_VIEW (widget); + const gchar* uri = midori_view_get_display_uri (view); GtkAction* action = _action_by_name (browser, "Location"); midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), uri); + _action_set_sensitive (browser, "Back", midori_view_can_go_back (view)); + _action_set_sensitive (browser, "Forward", midori_view_can_go_forward (view)); + } +} + +static void +midori_browser_set_title (MidoriBrowser* browser, + const gchar* title) +{ + if (katze_object_get_boolean (browser->settings, "enable-private-browsing")) + { + gchar* window_title = g_strdup_printf (_("%s (Private Browsing)"), title); + gtk_window_set_title (GTK_WINDOW (browser), window_title); + g_free (window_title); } + else + gtk_window_set_title (GTK_WINDOW (browser), title); } static void @@ -599,11 +580,8 @@ MidoriBrowser* browser) { MidoriView* view = MIDORI_VIEW (widget); - const gchar* uri; const gchar* title; - gchar* window_title; - uri = midori_view_get_display_uri (view); title = midori_view_get_display_title (view); if (midori_view_get_load_status (view) == MIDORI_LOAD_COMMITTED) @@ -614,15 +592,17 @@ const gchar* proxy_uri; proxy = midori_view_get_proxy_item (view); proxy_uri = katze_item_get_uri (proxy); - if (proxy_uri && *proxy_uri && proxy_uri[1] && - !g_str_has_prefix (proxy_uri, "about:") && + if (!midori_uri_is_blank (proxy_uri) && (katze_item_get_meta_integer (proxy, "history-step") == -1)) { - midori_browser_new_history_item (browser, proxy); - katze_item_set_meta_integer (proxy, "history-step", 1); + if (!katze_item_get_meta_boolean (proxy, "dont-write-history")) + { + midori_browser_new_history_item (browser, proxy); + katze_item_set_meta_integer (proxy, "history-step", 1); + } } else if (katze_item_get_name (proxy) && - !g_str_has_prefix (proxy_uri, "about:") && + !midori_uri_is_blank (proxy_uri) && (katze_item_get_meta_integer (proxy, "history-step") == 1)) { midori_browser_update_history_title (browser, proxy); @@ -632,12 +612,26 @@ } if (widget == midori_browser_get_current_tab (browser)) + midori_browser_set_title (browser, title); +} + +static void +midori_view_notify_minimized_cb (GtkWidget* widget, + GParamSpec* pspec, + MidoriBrowser* browser) +{ + if (katze_object_get_boolean (widget, "minimized")) { - window_title = g_strconcat (title, " - ", - g_get_application_name (), NULL); - gtk_window_set_title (GTK_WINDOW (browser), window_title); - g_free (window_title); + #ifdef HAVE_GRANITE + /* FIXME */ + #else + GtkNotebook* notebook = GTK_NOTEBOOK (browser->notebook); + GtkWidget* label = gtk_notebook_get_tab_label (notebook, widget); + gtk_widget_set_size_request (label, -1, -1); + #endif } + else + midori_browser_notebook_size_allocate_cb (NULL, NULL, browser); } static void @@ -665,17 +659,65 @@ } } -static void -midori_browser_edit_bookmark_uri_changed_cb (GtkEntry* entry, - GtkDialog* dialog) +static GtkWidget* +midori_bookmark_folder_button_new (KatzeArray* array, + gboolean new_bookmark, + const gchar* selected) { - const gchar* uri = gtk_entry_get_text (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, "data:") - || g_str_has_prefix (uri, "javascript:"))); + GtkListStore* model; + GtkWidget* combo; + GtkCellRenderer* renderer; + guint n; + sqlite3* db; + sqlite3_stmt* statement; + gint result; + const gchar* sqlcmd = "SELECT title from bookmarks where uri=''"; + + model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT); + combo = 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), renderer, TRUE); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, "text", 0); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), 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), 0); + + db = g_object_get_data (G_OBJECT (array), "db"); + g_return_val_if_fail (db != NULL, NULL); + n = 1; + result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); + while ((result = sqlite3_step (statement)) == SQLITE_ROW) + { + const unsigned char* name = sqlite3_column_text (statement, 0); + gtk_list_store_insert_with_values (model, NULL, G_MAXINT, + 0, name, 1, PANGO_ELLIPSIZE_END, -1); + if (!new_bookmark && !g_strcmp0 (selected, (gchar*)name)) + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), n); + n++; + } + if (n < 2) + gtk_widget_set_sensitive (combo, FALSE); + return combo; +} + +static gchar* +midori_bookmark_folder_button_get_active (GtkWidget* combo) +{ + gchar* selected = NULL; + GtkTreeIter iter; + + g_return_val_if_fail (GTK_IS_COMBO_BOX (combo), NULL); + + if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter)) + { + GtkTreeModel* model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo)); + gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 0, &selected, -1); + if (g_str_equal (selected, _("Toplevel folder"))) + katze_assign (selected, g_strdup ("")); + } + + return selected; } static void @@ -701,7 +743,8 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, KatzeItem* bookmark, gboolean new_bookmark, - gboolean is_folder) + gboolean is_folder, + GtkWidget* proxy) { const gchar* title; GtkWidget* dialog; @@ -712,7 +755,6 @@ GtkWidget* label; const gchar* value; GtkWidget* entry_title; - GtkWidget* entry_desc; GtkWidget* entry_uri; GtkWidget* combo_folder; GtkWidget* check_toolbar; @@ -725,16 +767,30 @@ db = g_object_get_data (G_OBJECT (browser->bookmarks), "db"); + if (!db) + return FALSE; + if (is_folder) title = new_bookmark ? _("New folder") : _("Edit folder"); else title = new_bookmark ? _("New bookmark") : _("Edit bookmark"); - dialog = gtk_dialog_new_with_buttons ( - title, GTK_WINDOW (browser), - GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, + #ifdef HAVE_GRANITE + if (proxy != NULL) + { + /* FIXME: granite: should return GtkWidget* like GTK+ */ + dialog = (GtkWidget*)granite_widgets_pop_over_new (); + granite_widgets_pop_over_move_to_widget ( + GRANITE_WIDGETS_POP_OVER (dialog), proxy); + } + else + #endif + { + dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (browser), + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, NULL, NULL); + } + gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, - NULL); + new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); gtk_window_set_icon_name (GTK_WINDOW (dialog), new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_REMOVE); @@ -774,22 +830,6 @@ gtk_container_add (GTK_CONTAINER (content_area), hbox); gtk_widget_show_all (hbox); - hbox = gtk_hbox_new (FALSE, 8); - 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); - entry_desc = gtk_entry_new (); - gtk_entry_set_activates_default (GTK_ENTRY (entry_desc), TRUE); - if (bookmark) - { - value = katze_item_get_text (bookmark); - gtk_entry_set_text (GTK_ENTRY (entry_desc), value ? value : ""); - } - gtk_box_pack_start (GTK_BOX (hbox), entry_desc, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (content_area), hbox); - gtk_widget_show_all (hbox); - entry_uri = NULL; if (!is_folder) { @@ -798,7 +838,12 @@ 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 (); + entry_uri = katze_uri_entry_new ( + #if GTK_CHECK_VERSION (2, 20, 0) + gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT)); + #else + NULL); + #endif #if HAVE_HILDON HildonGtkInputMode mode = hildon_gtk_entry_get_input_mode (GTK_ENTRY (entry_uri)); mode &= ~HILDON_GTK_INPUT_MODE_AUTOCAP; @@ -806,61 +851,21 @@ #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), - GTK_DIALOG (dialog)); - g_signal_connect (entry_uri, "changed", - G_CALLBACK (midori_browser_edit_bookmark_uri_changed_cb), dialog); gtk_box_pack_start (GTK_BOX (hbox), entry_uri, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (content_area), hbox); gtk_widget_show_all (hbox); } - combo_folder = NULL; - if (1) - { - GtkListStore* model; - GtkCellRenderer* renderer; - guint i, n; - sqlite3_stmt* statement; - gint result; - const gchar* sqlcmd; - - hbox = gtk_hbox_new (FALSE, 8); - 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); - 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; - sqlcmd = "SELECT title from bookmarks where uri=''"; - result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); - while ((result = sqlite3_step (statement)) == SQLITE_ROW) - { - const unsigned char* name = sqlite3_column_text (statement, 0); - gtk_list_store_insert_with_values (model, NULL, G_MAXINT, - 0, name, 1, PANGO_ELLIPSIZE_END, -1); - if (!new_bookmark && katze_item_get_meta_string (bookmark, "folder") - && g_str_equal (katze_item_get_meta_string (bookmark, "folder"), name)) - gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), n); - n++; - } - 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 (content_area), hbox); - gtk_widget_show_all (hbox); - } + hbox = gtk_hbox_new (FALSE, 8); + 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 = midori_bookmark_folder_button_new (browser->bookmarks, + new_bookmark, katze_item_get_meta_string (bookmark, "folder")); + gtk_box_pack_start (GTK_BOX (hbox), combo_folder, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (content_area), hbox); + gtk_widget_show_all (hbox); if (new_bookmark && !is_folder) { @@ -909,16 +914,12 @@ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { gchar* selected; - GtkTreeView* treeview; - GtkTreeModel* model; if (!new_bookmark) katze_array_remove_item (browser->bookmarks, bookmark); katze_item_set_name (bookmark, 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))); if (!is_folder) @@ -929,20 +930,9 @@ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_app))); } - selected = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_folder)); - - if (!strcmp (selected, _("Toplevel folder"))) - selected = g_strdup (""); - - midori_bookmarks_insert_item_db (db, bookmark, selected); - - if (new_bookmark) - { - treeview = g_object_get_data (G_OBJECT (browser->bookmarks), "treeview"); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); - gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), - NULL, NULL, G_MAXINT, 0, bookmark, -1); - } + selected = midori_bookmark_folder_button_get_active (combo_folder); + katze_item_set_meta_string (bookmark, "folder", selected); + katze_array_add_item (browser->bookmarks, bookmark); if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar))) if (!gtk_widget_get_visible (browser->bookmarkbar)) @@ -956,7 +946,6 @@ return return_status; } -#if WEBKIT_CHECK_VERSION (1, 1, 3) static gboolean midori_browser_prepare_download (MidoriBrowser* browser, WebKitDownload* download, @@ -971,64 +960,57 @@ G_FILE_ATTRIBUTE_FILESYSTEM_FREE, NULL, &error); guint64 free_space = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_FREE); + gchar* path = g_file_get_path (folder); + gboolean can_write = g_access (path, W_OK) == 0; + g_free (path); g_object_unref (file); g_object_unref (folder); - if (free_space < total_size) + if (free_space < total_size || !can_write) { - gchar* message = g_strdup_printf ( - _("There is not enough free space to download \"%s\"."), &uri[7]); - gchar* total_size_string = g_format_size_for_display (total_size); - gchar* free_space_string = g_format_size_for_display (free_space); - gchar* detailed_message = g_strdup_printf ( - _("The file needs %s but only %s are left."), - total_size_string, free_space_string); - sokoke_message_dialog (GTK_MESSAGE_ERROR, message, detailed_message); + gchar* message; + gchar* detailed_message; + + if (!can_write) + { + message = g_strdup_printf ( + _("The file \"%s\" can't be saved in this folder."), &uri[7]); + detailed_message = g_strdup_printf ( + _("You don't have permission to write in this location.")); + } + else if (free_space < total_size) + { + gchar* total_size_string = g_format_size (total_size); + gchar* free_space_string = g_format_size (free_space); + message = g_strdup_printf ( + _("There is not enough free space to download \"%s\"."), + &uri[7]); + detailed_message = g_strdup_printf ( + _("The file needs %s but only %s are left."), + total_size_string, free_space_string); + g_free (total_size_string); + g_free (free_space_string); + } + else + g_assert_not_reached (); + + sokoke_message_dialog (GTK_MESSAGE_ERROR, message, detailed_message, FALSE); g_free (message); g_free (detailed_message); - g_free (total_size_string); - g_free (free_space_string); g_object_unref (download); return FALSE; } webkit_download_set_destination_uri (download, uri); - if (!browser->show_statusbar && gtk_widget_get_visible (browser->transferbar)) - { - _midori_browser_set_statusbar_text (browser, NULL); - gtk_widget_show (browser->statusbar); - } + g_signal_emit (browser, signals[ADD_DOWNLOAD], 0, download); midori_transferbar_add_download_item (MIDORI_TRANSFERBAR (browser->transferbar), download); + midori_transferbar_check_size (browser->statusbar, + MIDORI_TRANSFERBAR (browser->transferbar)); return TRUE; } -#else -static void -midori_browser_save_transfer_cb (KatzeNetRequest* request, - gchar* filename) -{ - FILE* fp; - size_t ret; - - if (request->data) - { - if ((fp = fopen (filename, "wb"))) - { - ret = fwrite (request->data, 1, request->length, fp); - fclose (fp); - if ((ret - request->length) != 0) - { - /* Once we have a download interface this should be - indicated graphically. */ - g_warning ("Error writing to file %s " - "in midori_browser_save_transfer_cb", filename); - } - } - } - g_free (filename); -} -#endif static void midori_browser_save_uri (MidoriBrowser* browser, + MidoriView* view, const gchar* uri) { static gchar* last_dir = NULL; @@ -1037,7 +1019,6 @@ gchar* filename; gchar* dirname; gchar* last_slash; - gchar* folder; if (!gtk_widget_get_visible (GTK_WIDGET (browser))) return; @@ -1063,17 +1044,10 @@ g_free (filename); } - /* Try to provide a good default filename */ - filename = g_filename_from_uri (uri, NULL, NULL); - if (!filename && (last_slash = g_strrstr (uri, "/"))) - { - if (last_slash[0] == '/') - last_slash++; - filename = g_strdup (last_slash); - } - else - filename = g_strdup (uri); - gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename); + /* Try to provide a good default filename, UTF-8 encoded */ + filename = soup_uri_decode (uri); + last_slash = g_strrstr (filename, "/") + 1; + gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), last_slash); g_free (filename); } @@ -1082,29 +1056,11 @@ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { - #if WEBKIT_CHECK_VERSION (1, 1, 3) - WebKitNetworkRequest* request; - WebKitDownload* download; - gchar* destination; - #endif - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)); - #if WEBKIT_CHECK_VERSION (1, 1, 3) - request = webkit_network_request_new (uri); - download = webkit_download_new (request); - g_object_unref (request); - destination = g_filename_to_uri (filename, NULL, NULL); - if (midori_browser_prepare_download (browser, download, destination)) - webkit_download_start (download); - g_free (destination); - #else - katze_net_load_uri (NULL, uri, NULL, - (KatzeNetTransferCb)midori_browser_save_transfer_cb, filename); - #endif + midori_view_save_source (view, uri, filename); - g_free (last_dir); - last_dir = folder; + katze_assign (last_dir, + gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog))); } gtk_widget_destroy (dialog); } @@ -1114,86 +1070,49 @@ const gchar* uri, GtkWidget* view) { - MidoriBrowser* browser; - - browser = midori_browser_get_for_widget (menuitem); - midori_browser_save_uri (browser, uri); + MidoriBrowser* browser = midori_browser_get_for_widget (view); + midori_browser_save_uri (browser, MIDORI_VIEW (view), uri); } static gchar* -midori_browser_speed_dial_get_next_free_slot (void) +midori_browser_speed_dial_get_next_free_slot (MidoriView* view) { - GRegex* regex; - GMatchInfo* match_info; - gchar* speed_dial_body; - gchar* body_fname; - gchar* slot_id = NULL; + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view)); + GKeyFile* key_file; + guint slot_count = 0, slot = 1, i; + gchar** groups; - body_fname = g_build_filename (sokoke_set_config_dir (NULL), - "speeddial.json", NULL); + g_object_get (browser, "speed-dial", &key_file, NULL); - if (g_access (body_fname, F_OK) != 0) + groups = g_key_file_get_groups (key_file, NULL); + for (i = 0; groups[i]; i++) { - gchar* filename = g_build_filename ("midori", "res", "speeddial.json", NULL); - gchar* filepath = sokoke_find_data_filename (filename); - g_free (filename); - if (g_file_get_contents (filepath, &speed_dial_body, NULL, NULL)) - { - g_file_set_contents (body_fname, speed_dial_body, -1, NULL); - - g_free (speed_dial_body); - } - g_free (filepath); - g_free (body_fname); - return g_strdup ("s1"); + if (g_key_file_has_key (key_file, groups[i], "uri", NULL)) + slot_count++; } - else - g_file_get_contents (body_fname, &speed_dial_body, NULL, NULL); - - regex = g_regex_new ("\"id\":\"(s[0-9]{1,2})\",\"href\":\"#\"", - G_REGEX_MULTILINE, 0, NULL); - if (g_regex_match (regex, speed_dial_body, 0, &match_info)) + while (slot <= slot_count) { - slot_id = g_match_info_fetch (match_info, 1); - g_match_info_free (match_info); + gchar* dial_id = g_strdup_printf ("Dial %d", slot); + if (!g_key_file_has_group (key_file, dial_id)) + { + g_free (dial_id); + return g_strdup_printf ("s%d", slot); + } + g_free (dial_id); + slot++; } - - if (!g_strcmp0 (slot_id, "")) - g_free (slot_id); - - g_free (body_fname); - g_free (speed_dial_body); - g_free (regex); - - return slot_id; + return g_strdup_printf ("s%d", slot_count + 1); } static void midori_browser_add_speed_dial (MidoriBrowser* browser) { GdkPixbuf* img; - gchar* replace_from; - gchar* replace_by; - gsize len; - GtkWidget* view = midori_browser_get_current_tab (browser); - gchar* uri = g_strdup (midori_view_get_display_uri (MIDORI_VIEW (view))); gchar* title = g_strdup (midori_view_get_display_title (MIDORI_VIEW (view))); - gchar* slot_id = midori_browser_speed_dial_get_next_free_slot (); - - GRegex* reg_quotes = g_regex_new ("'", 0, 0, NULL); - GRegex* reg_others = g_regex_new ("[\\\"\\\\]", 0, 0, NULL); - gchar* temp_title = g_regex_replace_literal (reg_others, title, - -1, 0, " ", 0, NULL); - g_free (title); - title = g_regex_replace_literal (reg_quotes, temp_title, -1, 0, - "\\\\'", 0, NULL); - - g_free (temp_title); - g_regex_unref (reg_quotes); - g_regex_unref (reg_others); + gchar* slot_id = midori_browser_speed_dial_get_next_free_slot (MIDORI_VIEW (view)); if (slot_id == NULL) { @@ -1202,81 +1121,33 @@ return; } - if ((len = g_utf8_strlen (title, -1)) > 15) + if ((img = midori_view_get_snapshot (MIDORI_VIEW (view), 240, 160))) { - /** - * The case when a quote was escaped with a backslash and the - * backslash becomes the last character of the ellipsized string. - * This causes JSON parsing to fail. - * For example: "My Foo Bar \'b\..." - **/ - GRegex* reg_unsafe = g_regex_new ("([\\\\]+\\.)", 0, 0, NULL); - - gchar* temp; - gchar* ellipsized = g_malloc0 ( len + 1); + GKeyFile* key_file; + gchar* dial_id = g_strdup_printf ("Dial %s", slot_id + 1); + gchar* file_path = sokoke_build_thumbnail_path (uri); + gchar* thumb_dir = g_build_path (G_DIR_SEPARATOR_S, g_get_user_cache_dir (), + PACKAGE_NAME, "thumbnails", NULL); + g_object_get (browser, "speed-dial", &key_file, NULL); - g_utf8_strncpy (ellipsized, title, 15); - g_free (title); + g_key_file_set_string (key_file, dial_id, "uri", uri); + g_key_file_set_string (key_file, dial_id, "title", title); - temp = g_strdup_printf ("%s...", ellipsized); - g_free (ellipsized); + if (!g_file_test (thumb_dir, G_FILE_TEST_EXISTS)) + katze_mkdir_with_parents (thumb_dir, 0700); - title = g_regex_replace_literal (reg_unsafe, temp, -1, 0, ".", 0, NULL); - g_free (temp); + gdk_pixbuf_save (img, file_path, "png", NULL, "compression", "7", NULL); - g_regex_unref (reg_unsafe); - } + midori_view_save_speed_dial_config (MIDORI_VIEW (view), key_file); - if ((img = midori_view_get_snapshot (MIDORI_VIEW (view), 240, 160))) - { - GRegex* regex; - gchar* replace; - gchar* file_content; - gchar* encoded; - gchar* speed_dial_body; - gchar* body_fname; - gsize sz; - - body_fname = g_build_filename (sokoke_set_config_dir (NULL), - "speeddial.json", NULL); - - if (g_file_get_contents (body_fname, &speed_dial_body, NULL, NULL)) - { - gint i; - - gdk_pixbuf_save_to_buffer (img, &file_content, &sz, "png", NULL, NULL); - encoded = g_base64_encode ((guchar *)file_content, sz); - - replace_from = g_strdup_printf ( - "\\{\"id\":\"%s\",\"href\":\"#\",\"title\":\"\",\"img\":\"\"\\}", - slot_id); - replace_by = g_strdup_printf ( - "{\"id\":\"%s\",\"href\":\"%s\",\"title\":\"%s\",\"img\":\"%s\"}", - slot_id, uri, title, encoded); - - regex = g_regex_new (replace_from, G_REGEX_MULTILINE, 0, NULL); - replace = g_regex_replace (regex, speed_dial_body, -1, - 1, replace_by, 0, NULL); - - g_file_set_contents (body_fname, replace, -1, NULL); - - i = 0; - while ((view = gtk_notebook_get_nth_page (GTK_NOTEBOOK ( - browser->notebook), i++))) - if (midori_view_is_blank (MIDORI_VIEW (view))) - midori_view_reload (MIDORI_VIEW (view), FALSE); - - g_object_unref (img); - g_regex_unref (regex); - g_free (encoded); - g_free (file_content); - g_free (speed_dial_body); - g_free (replace_from); - g_free (replace_by); - g_free (replace); - } - g_free (body_fname); + g_object_unref (img); + g_free (file_path); + g_free (thumb_dir); + g_free (dial_id); } + g_free (uri); + g_free (title); + g_free (slot_id); } @@ -1306,7 +1177,7 @@ const gchar* action, MidoriBrowser* browser) { - _midori_browser_activate_action (browser, action); + midori_browser_activate_action (browser, action); } static void @@ -1328,8 +1199,21 @@ } static void -midori_browser_view_copy_history (GtkWidget* view_to, - GtkWidget* view_from, +midori_view_detach_inspector_cb (GtkWidget* view, + GtkWidget* inspector_view, + MidoriBrowser* browser) +{ + GtkWidget* scrolled = gtk_widget_get_parent (GTK_WIDGET (inspector_view)); + GtkWidget* paned = gtk_widget_get_parent (scrolled); + browser->inspector_view = gtk_viewport_new (NULL, NULL); + gtk_container_remove (GTK_CONTAINER (scrolled), GTK_WIDGET (inspector_view)); + gtk_container_add (GTK_CONTAINER (scrolled), browser->inspector_view); + gtk_widget_hide (paned); +} + +static void +midori_browser_view_copy_history (GtkWidget* view_to, + GtkWidget* view_from, gboolean omit_last) { WebKitWebView* copy_from; @@ -1354,6 +1238,23 @@ } } +static gboolean +midori_browser_notify_new_tab_timeout_cb (MidoriBrowser *browser) +{ + gtk_window_set_opacity (GTK_WINDOW (browser), 1); + return G_SOURCE_REMOVE; +} + +static void +midori_browser_notify_new_tab (MidoriBrowser *browser) +{ + if (katze_object_get_boolean (browser->settings, "flash-window-on-new-bg-tabs")) + { + gtk_window_set_opacity (GTK_WINDOW (browser), 0.8); + g_timeout_add (100, (GSourceFunc) midori_browser_notify_new_tab_timeout_cb, browser); + } +} + static void midori_view_new_tab_cb (GtkWidget* view, const gchar* uri, @@ -1366,6 +1267,8 @@ if (!background) midori_browser_set_current_page (browser, n); + else + midori_browser_notify_new_tab (browser); } static void @@ -1375,13 +1278,17 @@ { MidoriBrowser* new_browser; g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser); - midori_browser_add_uri (new_browser, uri); + if (new_browser) + midori_browser_add_uri (new_browser, uri); + else /* No MidoriApp, so this is app or private mode */ + sokoke_spawn_app (uri, TRUE); } static void midori_view_new_view_cb (GtkWidget* view, GtkWidget* new_view, MidoriNewView where, + gboolean user_initiated, MidoriBrowser* browser) { midori_browser_view_copy_history (new_view, view, TRUE); @@ -1397,10 +1304,26 @@ gint n = midori_browser_add_tab (browser, new_view); if (where != MIDORI_NEW_VIEW_BACKGROUND) midori_browser_set_current_page (browser, n); + else + midori_browser_notify_new_tab (browser); } -} -#if WEBKIT_CHECK_VERSION (1, 1, 3) + if (!user_initiated) + { + GdkWindow* window = gtk_widget_get_window (GTK_WIDGET (browser)); + GdkWindowState state = gdk_window_get_state (window); + if ((state | GDK_WINDOW_STATE_MAXIMIZED) + || (state | GDK_WINDOW_STATE_FULLSCREEN)) + { + if (where == MIDORI_NEW_VIEW_WINDOW) + g_signal_emit (browser, signals[SEND_NOTIFICATION], 0, + _("New Window"), _("A new window has been opened")); + else if (!browser->show_tabs) + g_signal_emit (browser, signals[SEND_NOTIFICATION], 0, + _("New Tab"), _("A new tab has been opened")); + } + } +} static void midori_view_download_save_as_response_cb (GtkWidget* dialog, @@ -1420,21 +1343,152 @@ gtk_widget_hide (dialog); } +static void +midori_browser_download_status_cb (WebKitDownload* download, + GParamSpec* pspec, + GtkWidget* widget) +{ + const gchar* uri = webkit_download_get_destination_uri (download); + switch (webkit_download_get_status (download)) + { + case WEBKIT_DOWNLOAD_STATUS_FINISHED: + if (!sokoke_show_uri (gtk_widget_get_screen (widget), uri, 0, NULL)) + { + sokoke_message_dialog (GTK_MESSAGE_ERROR, + _("Error opening the image!"), + _("Can not open selected image in a default viewer."), FALSE); + } + break; + case WEBKIT_DOWNLOAD_STATUS_ERROR: + webkit_download_cancel (download); + sokoke_message_dialog (GTK_MESSAGE_ERROR, + _("Error downloading the image!"), + _("Can not download selected image."), FALSE); + break; + case WEBKIT_DOWNLOAD_STATUS_CREATED: + case WEBKIT_DOWNLOAD_STATUS_STARTED: + case WEBKIT_DOWNLOAD_STATUS_CANCELLED: + break; + } +} + +static gchar* +midori_browser_download_prepare_filename (gchar* filename) +{ + if (g_file_test (filename, G_FILE_TEST_EXISTS)) + { + int i = 1; + const gchar* dot_pos; + const gchar* last_separator; + gchar* serial; + GString* tmp_filename; + gssize position; + + last_separator = strrchr (filename, G_DIR_SEPARATOR); + dot_pos = strrchr ((last_separator) ? last_separator : filename, '.'); + position = dot_pos ? (dot_pos - filename) : (gssize) strlen (filename); + tmp_filename = g_string_new (NULL); + + do + { + serial = g_strdup_printf ("-%d", i++); + g_string_assign (tmp_filename, filename); + g_string_insert (tmp_filename, position, serial); + g_free (serial); + } while (g_file_test (tmp_filename->str, G_FILE_TEST_EXISTS)); + + g_free (filename); + filename = g_string_free (tmp_filename, FALSE); + } + return filename; +} + +static gchar* +midori_browser_download_prepare_destination_uri (WebKitDownload* download, + const gchar* folder) +{ + gchar* suggested_filename; + GFile* file_source; + gchar* file_basename; + gchar* download_dir = NULL; + gchar* destination_uri; + gchar* destination_filename; + gchar* midori_tmp_dir; + + suggested_filename = sokoke_get_download_filename (download); + file_source = g_file_new_for_uri (suggested_filename); + g_free (suggested_filename); + file_basename = g_file_get_basename (file_source); + if (folder == NULL) + { + midori_tmp_dir = g_strconcat ("midori-", g_get_user_name (), NULL); + download_dir = g_build_filename (g_get_tmp_dir (), midori_tmp_dir, NULL); + g_free (midori_tmp_dir); + } + else + download_dir = (gchar*)folder; + destination_filename = g_build_filename (download_dir, file_basename, NULL); + destination_filename = midori_browser_download_prepare_filename (destination_filename); + destination_uri = g_filename_to_uri (destination_filename, NULL, NULL); + + if (!g_file_test (download_dir, G_FILE_TEST_EXISTS)) + katze_mkdir_with_parents (download_dir, 0700); + + g_free (file_basename); + if (folder == NULL) + g_free (download_dir); + g_free (destination_filename); + g_object_unref (file_source); + + return destination_uri; +} + +static gboolean +midori_browser_remove_tab_idle (gpointer view) +{ + MidoriBrowser* browser; + + g_return_val_if_fail (GTK_IS_WIDGET (view), FALSE); + browser = midori_browser_get_for_widget (GTK_WIDGET (view)); + midori_browser_remove_tab (browser, GTK_WIDGET (view)); + return G_SOURCE_REMOVE; +} + static gboolean midori_view_download_requested_cb (GtkWidget* view, WebKitDownload* download, MidoriBrowser* browser) { - g_signal_emit (browser, signals[ADD_DOWNLOAD], 0, download); - if (!webkit_download_get_destination_uri (download)) + GtkWidget* web_view; + WebKitWebFrame* web_frame; + WebKitWebDataSource* datasource; + gboolean handled; + + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); + handled = TRUE; + if (g_object_get_data (G_OBJECT (download), "cancel-download")) + { + handled = FALSE; + } + else if (g_object_get_data (G_OBJECT (download), "open-in-viewer")) + { + gchar* destination_uri = + midori_browser_download_prepare_destination_uri (download, NULL); + midori_browser_prepare_download (browser, download, destination_uri); + g_signal_connect (download, "notify::status", + G_CALLBACK (midori_browser_download_status_cb), GTK_WIDGET (browser)); + g_free (destination_uri); + } + else if (!webkit_download_get_destination_uri (download)) { - gchar* folder; if (g_object_get_data (G_OBJECT (download), "save-as-download")) { static GtkWidget* dialog = NULL; + gchar* filename; if (!dialog) { + gchar* folder; dialog = sokoke_file_chooser_dialog_new (_("Save file"), GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_SAVE); gtk_file_chooser_set_do_overwrite_confirmation ( @@ -1449,69 +1503,30 @@ G_CALLBACK (midori_view_download_save_as_response_cb), browser); } g_object_set_data (G_OBJECT (dialog), "download", download); - gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), - webkit_download_get_suggested_filename (download)); + filename = sokoke_get_download_filename (download); + gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename); + g_free (filename); gtk_widget_show (dialog); } else { - const gchar* suggested; - gchar* basename; - gchar* filename; - gchar* uri; - - if (g_object_get_data (G_OBJECT (download), "open-download")) - folder = g_strdup (g_get_tmp_dir ()); - else - folder = katze_object_get_string (browser->settings, "download-folder"); - suggested = webkit_download_get_suggested_filename (download); - /* The suggested name may contain a folder name */ - basename = g_path_get_basename (suggested); - filename = g_build_filename (folder, basename, NULL); - g_free (basename); - /* If the filename exists, choose a different name */ - if (g_access (filename, F_OK) == 0) - { - /* Put the number in front of the extension */ - gchar* extension = strrchr (filename, '.'); - gsize length = extension ? (gsize)(extension - filename) : strlen (filename); - do - { - if (g_ascii_isdigit (filename[length - 1])) - filename[length - 1] += 1; /* FIXME: This will increment '9' to ':' */ - else - { - gchar* new_filename; - if (extension) - { - /* Change the '.' to a '\0' to put the 0 in between */ - *extension++ = '\0'; - new_filename= g_strconcat (filename, "0.", extension, NULL); - } - else - new_filename = g_strconcat (filename, "0", NULL); - katze_assign (filename, new_filename); - if (extension) - { - extension = strrchr (filename, '.'); - length = extension - filename; - } - else - length = strlen (filename); - } - } - while (g_access (filename, F_OK) == 0); - } - g_free (folder); - uri = g_filename_to_uri (filename, NULL, NULL); - g_free (filename); - midori_browser_prepare_download (browser, download, uri); - g_free (uri); + gchar* folder = g_object_get_data (G_OBJECT (download), "open-download") + ? NULL : katze_object_get_string (browser->settings, "download-folder"); + gchar* destination_uri = + midori_browser_download_prepare_destination_uri (download, folder); + midori_browser_prepare_download (browser, download, destination_uri); + g_free (destination_uri); } } - return TRUE; + + /* Close empty tabs due to download links with a target */ + web_view = midori_view_get_web_view (MIDORI_VIEW (view)); + web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view)); + datasource = webkit_web_frame_get_data_source (web_frame); + if (midori_view_is_blank (MIDORI_VIEW (view)) && webkit_web_data_source_get_data (datasource) == NULL) + g_idle_add (midori_browser_remove_tab_idle, view); + return handled; } -#endif static void midori_view_search_text_cb (GtkWidget* view, @@ -1527,16 +1542,13 @@ MidoriBrowser* browser) { KatzeItem* item; - const gchar* uri; if (browser->proxy_array && MIDORI_IS_VIEW (widget)) { item = midori_view_get_proxy_item (MIDORI_VIEW (widget)); - uri = katze_item_get_uri (item); if (browser->trash && !midori_view_is_blank (MIDORI_VIEW (widget))) katze_array_add_item (browser->trash, item); katze_array_remove_item (browser->proxy_array, item); - g_object_unref (item); } _midori_browser_update_actions (browser); @@ -1557,21 +1569,78 @@ return FALSE; } +#ifndef HAVE_GRANITE +static void +midori_browser_notebook_resize (MidoriBrowser* browser, + GdkRectangle* allocation) +{ + gint new_size = 0; + gint n = MAX (1, gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook))); + const gint max_size = 150; + gint min_size; + gint icon_size = 16; + GtkAllocation notebook_size; + GList* children; + + if (allocation != NULL) + notebook_size.width = allocation->width; + else + gtk_widget_get_allocation (browser->notebook, ¬ebook_size); + new_size = notebook_size.width / n; + + gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (browser->notebook), + GTK_ICON_SIZE_MENU, &icon_size, NULL); + min_size = icon_size; + if (katze_object_get_boolean (browser->settings, "close-buttons-on-tabs")) + min_size += icon_size; + if (new_size < min_size) new_size = min_size; + if (new_size > max_size) new_size = max_size; + + if (new_size > browser->last_tab_size - 3 + && new_size < browser->last_tab_size + 3) + return; + browser->last_tab_size = new_size; + + children = gtk_container_get_children (GTK_CONTAINER (browser->notebook)); + for (; children; children = g_list_next (children)) + { + GtkWidget* view = children->data; + GtkWidget* label; + label = gtk_notebook_get_tab_label (GTK_NOTEBOOK(browser->notebook), view); + /* Don't resize empty bin, which is used for thumbnail tabs */ + if (GTK_IS_BIN (label) && gtk_bin_get_child (GTK_BIN (label)) + && !katze_object_get_boolean (view, "minimized")) + gtk_widget_set_size_request (label, new_size, -1); + } +} +#endif + +static void +midori_browser_notebook_size_allocate_cb (GtkWidget* widget, + GdkRectangle* allocation, + MidoriBrowser* browser) +{ + #ifndef HAVE_GRANITE + if (!gtk_notebook_get_show_tabs (GTK_NOTEBOOK (browser->notebook))) + return; + + midori_browser_notebook_resize (browser, allocation); + #endif +} + static void _midori_browser_add_tab (MidoriBrowser* browser, GtkWidget* view) { - GtkNotebook* notebook = GTK_NOTEBOOK (browser->notebook); + GtkWidget* notebook = browser->notebook; +#ifndef HAVE_GRANITE GtkWidget* tab_label; +#endif KatzeItem* item; guint n; - GTK_WIDGET_SET_FLAGS (view, GTK_CAN_FOCUS); - - tab_label = midori_view_get_proxy_tab_label (MIDORI_VIEW (view)); - + gtk_widget_set_can_focus (view, TRUE); item = midori_view_get_proxy_item (MIDORI_VIEW (view)); - g_object_ref (item); katze_array_add_item (browser->proxy_array, item); g_object_connect (view, @@ -1581,12 +1650,12 @@ midori_view_notify_load_status_cb, browser, "signal::notify::progress", midori_view_notify_progress_cb, browser, - "signal::context-ready", - midori_view_context_ready_cb, browser, "signal::notify::uri", midori_view_notify_uri_cb, browser, "signal::notify::title", midori_view_notify_title_cb, browser, + "signal::notify::minimized", + midori_view_notify_minimized_cb, browser, "signal::notify::zoom-level", midori_view_notify_zoom_level_cb, browser, "signal::notify::statusbar-text", @@ -1595,16 +1664,16 @@ midori_view_activate_action_cb, browser, "signal::attach-inspector", midori_view_attach_inspector_cb, browser, + "signal::detach-inspector", + midori_view_detach_inspector_cb, browser, "signal::new-tab", midori_view_new_tab_cb, browser, "signal::new-window", midori_view_new_window_cb, browser, "signal::new-view", midori_view_new_view_cb, browser, - #if WEBKIT_CHECK_VERSION (1, 1, 3) - "signal::download-requested", + "signal-after::download-requested", midori_view_download_requested_cb, browser, - #endif "signal::search-text", midori_view_search_text_cb, browser, "signal::save-as", @@ -1615,23 +1684,37 @@ midori_browser_tab_leave_notify_event_cb, browser, NULL); - if (!g_object_get_data (G_OBJECT (view), "midori-view-append") && + if (!katze_item_get_meta_boolean (item, "append") && katze_object_get_boolean (browser->settings, "open-tabs-next-to-current")) { - n = gtk_notebook_get_current_page (notebook); - gtk_notebook_insert_page (notebook, view, tab_label, n + 1); + n = midori_browser_get_current_page (browser) + 1; + katze_array_move_item (browser->proxy_array, item, n); } else - gtk_notebook_append_page (notebook, view, tab_label); - - gtk_notebook_set_tab_reorderable (notebook, view, TRUE); - gtk_notebook_set_tab_detachable (notebook, view, TRUE); + n = -1; +#ifdef HAVE_GRANITE + /* FIXME: Move to desired position */ + granite_widgets_dynamic_notebook_append_page ( + GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (notebook), + view, midori_view_get_display_title (MIDORI_VIEW (view)), "text-plain"); +#else + tab_label = midori_view_get_proxy_tab_label (MIDORI_VIEW (view)); + /* Don't resize empty bin, which is used for thumbnail tabs */ + if (GTK_IS_BIN (tab_label) && gtk_bin_get_child (GTK_BIN (tab_label)) + && !katze_object_get_boolean (view, "minimized")) + gtk_widget_set_size_request (tab_label, browser->last_tab_size, -1); + gtk_notebook_insert_page (GTK_NOTEBOOK (notebook), view, tab_label, n); + gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (notebook), view, TRUE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (notebook), view, TRUE); +#endif + katze_item_set_meta_integer (item, "append", -1); /* We want the tab to be removed if the widget is destroyed */ g_signal_connect (view, "destroy", G_CALLBACK (midori_browser_tab_destroy_cb), browser); _midori_browser_update_actions (browser); + midori_browser_notebook_size_allocate_cb (browser->notebook, NULL, browser); } static void @@ -1639,6 +1722,7 @@ GtkWidget* view) { gtk_widget_destroy (view); + midori_browser_notebook_size_allocate_cb (browser->notebook, NULL, browser); } /** @@ -1674,8 +1758,65 @@ GdkEventKey* event) { GtkWindow* window = GTK_WINDOW (widget); + MidoriBrowser* browser = MIDORI_BROWSER (widget); GtkWidgetClass* widget_class; guint clean_state; + GtkWidget* focus; + + /* Interpret Ctrl(+Shift)+Tab as tab switching for compatibility */ + if (midori_browser_get_nth_tab (browser, 1) != NULL + && event->keyval == GDK_KEY_Tab + && (event->state & GDK_CONTROL_MASK)) + { + midori_browser_activate_action (browser, "TabNext"); + return TRUE; + } + else if (event->keyval == GDK_KEY_ISO_Left_Tab + && (event->state & GDK_CONTROL_MASK) + && (event->state & GDK_SHIFT_MASK)) + { + midori_browser_activate_action (browser, "TabPrevious"); + return TRUE; + } + /* Interpret Ctrl+= as Zoom In for compatibility */ + else if ((event->keyval == GDK_KEY_KP_Equal || event->keyval == GDK_KEY_equal) + && (event->state & GDK_CONTROL_MASK)) + { + midori_browser_activate_action (browser, "ZoomIn"); + return TRUE; + } + /* Interpret F5 as reloading for compatibility */ + else if (event->keyval == GDK_KEY_F5) + { + midori_browser_activate_action (browser, "Reload"); + return TRUE; + } + + focus = gtk_window_get_focus (GTK_WINDOW (widget)); + if (focus == NULL) + gtk_widget_grab_focus (midori_browser_get_current_tab (MIDORI_BROWSER (widget))); + else if (G_OBJECT_TYPE (focus) == WEBKIT_TYPE_WEB_VIEW + && event->keyval == GDK_KEY_space + && !webkit_web_view_can_cut_clipboard (WEBKIT_WEB_VIEW (focus)) + && !webkit_web_view_can_paste_clipboard (WEBKIT_WEB_VIEW (focus))) + { + /* Space at the bottom of the page: Go to next page */ + MidoriView* view = midori_view_get_for_widget (focus); + GtkScrolledWindow* scrolled = GTK_SCROLLED_WINDOW (gtk_widget_get_parent (focus)); + GtkAdjustment* vadjust = gtk_scrolled_window_get_vadjustment (scrolled); + if (gtk_adjustment_get_value (vadjust) + == (gtk_adjustment_get_upper (vadjust) - gtk_adjustment_get_page_size (vadjust))) + { + /* Duplicate here because the URI pointer might change */ + gchar* uri = g_strdup (midori_view_get_next_page (view)); + if (uri != NULL) + { + midori_view_set_uri (view, uri); + g_free (uri); + return TRUE; + } + } + } if (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)) if (sokoke_window_activate_key (window, event)) @@ -1692,6 +1833,19 @@ if (event->state && gtk_window_propagate_key_event (window, event)) return TRUE; + /* Interpret (Shift+)Backspace as going back (forward) for compatibility */ + if ((event->keyval == GDK_KEY_BackSpace) + && (event->state & GDK_SHIFT_MASK)) + { + midori_browser_activate_action (browser, "Forward"); + return TRUE; + } + else if (event->keyval == GDK_KEY_BackSpace) + { + midori_browser_activate_action (browser, "Back"); + return TRUE; + } + widget_class = g_type_class_peek_static (g_type_parent (GTK_TYPE_WINDOW)); return widget_class->key_press_event (widget, event); } @@ -1757,6 +1911,28 @@ G_TYPE_NONE, 1, GTK_TYPE_WIDGET); + /** + * MidoriBrowser::move-tab: + * @browser: the object on which the signal is emitted + * @notebook: the notebook containing the tabs + * @cur_pos: the current position of the tab + * @new_pos: the new position of the tab + * + * Emitted when a tab is moved. + * + * Since: 0.3.3 + */ + signals[MOVE_TAB] = g_signal_new ( + "move-tab", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + 0, + NULL, + midori_cclosure_marshal_VOID__OBJECT_INT_INT, + G_TYPE_NONE, 3, + GTK_TYPE_NOTEBOOK, G_TYPE_INT, G_TYPE_INT); + signals[ACTIVATE_ACTION] = g_signal_new ( "activate-action", G_TYPE_FROM_CLASS (class), @@ -1768,17 +1944,6 @@ G_TYPE_NONE, 1, G_TYPE_STRING); - signals[CONTEXT_READY] = g_signal_new ( - "context-ready", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST), - 0, - 0, - NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, 1, - G_TYPE_POINTER); - /** * MidoriBrowser::add-download: * @browser: the object on which the signal is emitted @@ -1813,7 +1978,7 @@ * @message: the message for the notification * * Emitted when a browser wants to display a notification message, - * e.g. when a download has been completed. + * e.g. when a download has been completed or a new tab was opened. * * Since: 0.1.7 */ @@ -1849,6 +2014,25 @@ g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GTK_TYPE_MENU); + /** + * MidoriBrowser::populate-toolbar-menu: + * @browser: the object on which the signal is emitted + * @menu: the #GtkMenu to populate + * + * Emitted when a toolbar menu is displayed on right-click. + * + * Since: 0.3.4 + */ + signals[POPULATE_TOOLBAR_MENU] = g_signal_new ( + "populate-toolbar-menu", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + GTK_TYPE_MENU); signals[QUIT] = g_signal_new ( "quit", @@ -1860,6 +2044,27 @@ g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + /** + * MidoriBrowser::show-preferences: + * @browser: the object on which the signal is emitted + * @preferences: the #KatzePreferences to populate + * + * Emitted when a preference dialogue displayed, to allow + * adding of a new page, to be used sparingly. + * + * Since: 0.3.4 + */ + signals[SHOW_PREFERENCES] = g_signal_new ( + "show-preferences", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + KATZE_TYPE_PREFERENCES); + class->add_tab = _midori_browser_add_tab; class->remove_tab = _midori_browser_remove_tab; class->activate_action = _midori_browser_activate_action; @@ -1901,7 +2106,11 @@ "notebook", "Notebook", "The notebook containing the views", + #ifdef HAVE_GRANITE + GRANITE_WIDGETS_TYPE_DYNAMIC_NOTEBOOK, + #else GTK_TYPE_NOTEBOOK, + #endif G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, @@ -2066,6 +2275,22 @@ flags)); /** + * MidoriBrowser:speed-dial: + * + * The speed dial configuration file. + * + * Since: 0.3.4 + */ + g_object_class_install_property (gobject_class, + PROP_SPEED_DIAL, + g_param_spec_pointer ( + "speed-dial", + "Speeddial", + "Pointer to key-value object with speed dial items", + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + + /** * MidoriBrowser:show-tabs: * * Whether or not to show tabs. @@ -2084,6 +2309,7 @@ TRUE, flags)); + #if !GTK_CHECK_VERSION (3, 0, 0) /* Add 2px space between tool buttons */ gtk_rc_parse_string ( "style \"tool-button-style\"\n {\n" @@ -2092,6 +2318,7 @@ "style \"tool-button-style\"\n" "widget \"MidoriBrowser.*.MidoriFindbar.Gtk*ToolButton\" " "style \"tool-button-style\"\n"); + #endif } static void @@ -2116,35 +2343,21 @@ } static void -midori_browser_spawn_app (const gchar* uri) -{ - const gchar* executable = sokoke_get_argv (NULL)[0]; - gchar* command = g_strconcat (executable, " -a", NULL); - sokoke_spawn_program (command, uri, FALSE); - g_free (command); -} - -static void _action_private_browsing_activate (GtkAction* action, MidoriBrowser* browser) { - const gchar* uri = midori_browser_get_current_uri (browser); - if (uri != NULL) - { - if (*uri != '\0') - midori_browser_spawn_app (uri); - else - midori_browser_spawn_app ("about:blank"); - } + sokoke_spawn_app ("about:private", TRUE); } static void _action_open_activate (GtkAction* action, MidoriBrowser* browser) { + #if !GTK_CHECK_VERSION (3, 1, 10) static gchar* last_dir = NULL; - gchar* uri = NULL; gboolean folder_set = FALSE; + #endif + gchar* uri = NULL; GtkWidget* dialog; GtkWidget* view; @@ -2165,7 +2378,9 @@ if (dirname && g_file_test (dirname, G_FILE_TEST_IS_DIR)) { gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dirname); + #if !GTK_CHECK_VERSION (3, 1, 10) folder_set = TRUE; + #endif } g_free (dirname); @@ -2173,20 +2388,22 @@ } } + #if !GTK_CHECK_VERSION (3, 1, 10) if (!folder_set && last_dir && *last_dir) gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), last_dir); + #endif if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { + #if !GTK_CHECK_VERSION (3, 1, 10) gchar* folder; - folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)); + katze_assign (last_dir, folder); + #endif uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); midori_browser_set_current_uri (browser, uri); - - g_free (last_dir); - last_dir = folder; g_free (uri); + } gtk_widget_destroy (dialog); } @@ -2195,7 +2412,8 @@ _action_save_as_activate (GtkAction* action, MidoriBrowser* browser) { - midori_browser_save_uri (browser, midori_browser_get_current_uri (browser)); + GtkWidget* view = midori_browser_get_current_tab (browser); + midori_browser_save_uri (browser, MIDORI_VIEW (view), NULL); } static void @@ -2209,14 +2427,46 @@ _action_add_desktop_shortcut_activate (GtkAction* action, MidoriBrowser* browser) { - #if defined (GDK_WINDOWING_X11) + #if HAVE_HILDON /* TODO: Implement */ + #elif defined (GDK_WINDOWING_X11) + GtkWidget* tab = midori_browser_get_current_tab (browser); + KatzeItem* item = midori_view_get_proxy_item (MIDORI_VIEW (tab)); + const gchar* app_name = katze_item_get_name (item); + gchar* app_exec = g_strconcat ("midori -a ", katze_item_get_uri (item), NULL); + const gchar* icon_uri = midori_view_get_icon_uri (MIDORI_VIEW (tab)); + gchar* app_icon; + GKeyFile* keyfile = g_key_file_new (); + gchar* filename = g_strconcat (app_name, ".desktop", NULL); + gchar* app_dir; + int i = 0; + while (filename[i] != '\0') + { + if (filename[i] == '/') + filename[i] = '_'; + i++; + } + app_dir = g_build_filename (g_get_user_data_dir (), + "applications", filename, NULL); + app_icon = katze_net_get_cached_path (NULL, icon_uri, "icons"); + if (!g_file_test (app_icon, G_FILE_TEST_EXISTS)) + katze_assign (app_icon, g_strdup (STOCK_WEB_BROWSER)); + g_key_file_set_string (keyfile, "Desktop Entry", "Version", "1.0"); + g_key_file_set_string (keyfile, "Desktop Entry", "Type", "Application"); + g_key_file_set_string (keyfile, "Desktop Entry", "Name", app_name); + g_key_file_set_string (keyfile, "Desktop Entry", "Exec", app_exec); + g_key_file_set_string (keyfile, "Desktop Entry", "TryExec", "midori"); + g_key_file_set_string (keyfile, "Desktop Entry", "Icon", app_icon); + g_key_file_set_string (keyfile, "Desktop Entry", "Categories", "Network;"); + sokoke_key_file_save_to_file (keyfile, app_dir, NULL); + g_free (app_dir); + g_free (filename); + g_free (app_exec); + g_key_file_free (keyfile); #elif defined(GDK_WINDOWING_QUARTZ) /* TODO: Implement */ #elif defined (GDK_WINDOWING_WIN32) /* TODO: Implement */ - #elif HAVE_HILDON - /* TODO: Implement */ #endif } @@ -2225,7 +2475,24 @@ const gchar* uri) { if (browser->news_aggregator && *browser->news_aggregator) - sokoke_spawn_program (browser->news_aggregator, uri, FALSE); + { + /* Thunderbird only accepts feed://, Liferea doesn't mind */ + gchar* feed = g_strdup (uri); + if (g_str_has_prefix (feed, "http://")) + { + feed[0] = 'f'; + feed[1] = 'e'; + feed[2] = 'e'; + feed[3] = 'd'; + } + /* Special-case Liferea because a helper script may be required */ + if (g_str_equal (browser->news_aggregator, "liferea") + && g_find_program_in_path ("liferea-add-feed")) + sokoke_spawn_program ("liferea-add-feed", feed); + else + sokoke_spawn_program (browser->news_aggregator, feed); + g_free (feed); + } else { gchar* description = g_strdup_printf ("%s\n\n%s", uri, @@ -2235,7 +2502,7 @@ "Alternatively go to Preferences, Applications in Midori, " "and select a News Aggregator. Next time you click the " "news feed icon, it will be added automatically.")); - sokoke_message_dialog (GTK_MESSAGE_INFO, _("New feed"), description); + sokoke_message_dialog (GTK_MESSAGE_INFO, _("New feed"), description, FALSE); g_free (description); } } @@ -2311,6 +2578,15 @@ MidoriBrowser* browser) { GtkWidget* widget = midori_browser_get_current_tab (browser); + gboolean last_tab = + midori_browser_get_nth_tab (browser, 1) == NULL; + if (last_tab && sokoke_is_app_or_private ()) + { + gtk_widget_destroy (GTK_WIDGET (browser)); + return; + } + if (last_tab && midori_view_is_blank (MIDORI_VIEW (widget))) + return; gtk_widget_destroy (widget); } @@ -2346,19 +2622,15 @@ MidoriBrowser* browser) { GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser)); - #if WEBKIT_CHECK_VERSION (1, 1, 14) gboolean can_undo = FALSE, can_redo = FALSE; - #endif gboolean can_cut = FALSE, can_copy = FALSE, can_paste = FALSE; gboolean has_selection, can_select_all = FALSE; if (WEBKIT_IS_WEB_VIEW (widget)) { WebKitWebView* view = WEBKIT_WEB_VIEW (widget); - #if WEBKIT_CHECK_VERSION (1, 1, 14) can_undo = webkit_web_view_can_undo (view); can_redo = webkit_web_view_can_redo (view); - #endif can_cut = webkit_web_view_can_cut_clipboard (view); can_copy = webkit_web_view_can_copy_clipboard (view); can_paste = webkit_web_view_can_paste_clipboard (view); @@ -2384,10 +2656,8 @@ can_select_all = TRUE; } - #if WEBKIT_CHECK_VERSION (1, 1, 14) _action_set_sensitive (browser, "Undo", can_undo); _action_set_sensitive (browser, "Redo", can_redo); - #endif _action_set_sensitive (browser, "Cut", can_cut); _action_set_sensitive (browser, "Copy", can_copy); _action_set_sensitive (browser, "Paste", can_paste); @@ -2395,7 +2665,6 @@ _action_set_sensitive (browser, "SelectAll", can_select_all); } -#if WEBKIT_CHECK_VERSION (1, 1, 14) static void _action_undo_activate (GtkAction* action, MidoriBrowser* browser) @@ -2413,7 +2682,6 @@ if (WEBKIT_IS_WEB_VIEW (widget)) webkit_web_view_redo (WEBKIT_WEB_VIEW (widget)); } -#endif static void _action_cut_activate (GtkAction* action, @@ -2429,6 +2697,17 @@ MidoriBrowser* browser) { GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser)); +#if !WEBKIT_CHECK_VERSION (1, 4, 3) + /* Work around broken clipboard handling for the sake of the user */ + if (WEBKIT_IS_WEB_VIEW (widget)) + { + GtkWidget* scrolled = gtk_widget_get_parent (widget); + GtkWidget* view = gtk_widget_get_parent (scrolled); + const gchar* selected = midori_view_get_selected_text (MIDORI_VIEW (view)); + sokoke_widget_copy_clipboard (widget, selected); + return; + } +#endif if (G_LIKELY (widget) && g_signal_lookup ("copy-clipboard", G_OBJECT_TYPE (widget))) g_signal_emit_by_name (widget, "copy-clipboard"); } @@ -2494,14 +2773,14 @@ _action_find_next_activate (GtkAction* action, MidoriBrowser* browser) { - midori_findbar_find (MIDORI_FINDBAR (browser->find), TRUE); + midori_findbar_find_text (MIDORI_FINDBAR (browser->find), NULL, TRUE); } static void _action_find_previous_activate (GtkAction* action, MidoriBrowser* browser) { - midori_findbar_find (MIDORI_FINDBAR (browser->find), FALSE); + midori_findbar_find_text (MIDORI_FINDBAR (browser->find), NULL, FALSE); } static void @@ -2520,33 +2799,6 @@ GdkEventButton* event, MidoriBrowser* browser); -static void -_midori_browser_save_toolbar_items (MidoriBrowser* browser) -{ - GString* toolbar_items; - GList* children; - gchar* items; - - toolbar_items = g_string_new (NULL); - children = gtk_container_get_children (GTK_CONTAINER (browser->navigationbar)); - for (; children != NULL; children = g_list_next (children)) - { - GtkAction* action; - - action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (children->data)); - /* If a widget has no action that is actually a bug, so warn about it */ - g_warn_if_fail (action != NULL); - if (action) - { - g_string_append (toolbar_items, gtk_action_get_name (action)); - g_string_append (toolbar_items, ","); - } - } - items = g_string_free (toolbar_items, FALSE); - g_object_set (browser->settings, "toolbar-items", items, NULL); - g_free (items); -} - /** * midori_browser_get_toolbar_actions: * @@ -2596,10 +2848,6 @@ GtkWidget* menu; GtkWidget* menuitem; - /* Unsupported trick used for web app mode */ - if (g_object_get_data (G_OBJECT (browser), "locked")) - return FALSE; - menu = gtk_menu_new (); menuitem = sokoke_action_create_popup_menu_item ( _action_by_name (browser, "Menubar")); @@ -2611,62 +2859,31 @@ _action_by_name (browser, "Bookmarkbar")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); menuitem = sokoke_action_create_popup_menu_item ( - _action_by_name (browser, "Transferbar")); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - menuitem = sokoke_action_create_popup_menu_item ( _action_by_name (browser, "Statusbar")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_signal_emit (browser, signals[POPULATE_TOOLBAR_MENU], 0, menu); + katze_widget_popup (widget, GTK_MENU (menu), NULL, button == -1 ? KATZE_MENU_POSITION_LEFT : KATZE_MENU_POSITION_CURSOR); return TRUE; } -static void -midori_browser_menu_item_select_cb (GtkWidget* menuitem, - MidoriBrowser* browser) -{ - GtkAction* action; - gchar* tooltip; - - action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (menuitem)); - tooltip = action ? katze_object_get_string (action, "tooltip") : NULL; - if (!tooltip) - { - /* This is undocumented object data, used by KatzeArrayAction. */ - KatzeItem* item = g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - if (item) - { - tooltip = g_strdup (katze_item_get_uri (item)); - sokoke_prefetch_uri (tooltip, NULL, NULL); - } - } - _midori_browser_set_statusbar_text (browser, tooltip); - g_free (tooltip); -} - -static void -midori_browser_menu_item_deselect_cb (GtkWidget* menuitem, - MidoriBrowser* browser) -{ - _midori_browser_set_statusbar_text (browser, NULL); -} - static gboolean midori_bookmarkbar_activate_item_alt (GtkAction* action, KatzeItem* item, guint button, MidoriBrowser* browser) { - if (button == 1) - { - midori_browser_open_bookmark (browser, item); - } - else if (button == 2) + if (MIDORI_EVENT_NEW_TAB (gtk_get_current_event ())) { gint n = midori_browser_add_uri (browser, katze_item_get_uri (item)); midori_browser_set_current_page_smartly (browser, n); } + else if (button == 1) + { + midori_browser_open_bookmark (browser, item); + } return TRUE; } @@ -2676,19 +2893,8 @@ GtkMenu* menu, MidoriBrowser* browser) { - GList* children = gtk_container_get_children (GTK_CONTAINER (menu)); - guint i = 0; GtkWidget* menuitem; - while ((menuitem = g_list_nth_data (children, i++))) - { - g_signal_connect (menuitem, "select", - G_CALLBACK (midori_browser_menu_item_select_cb), browser); - g_signal_connect (menuitem, "deselect", - G_CALLBACK (midori_browser_menu_item_deselect_cb), browser); - } - g_list_free (children); - menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); @@ -2698,25 +2904,34 @@ gtk_widget_show (menuitem); } +static gint +midori_browser_restore_tab (MidoriBrowser* browser, + KatzeItem* item) +{ + gint n; + + g_object_ref (item); + katze_array_remove_item (browser->trash, item); + n = midori_browser_add_item (browser, item); + g_object_unref (item); + return n; +} + static gboolean _action_trash_activate_item_alt (GtkAction* action, KatzeItem* item, guint button, MidoriBrowser* browser) { - if (button == 1) + if (MIDORI_EVENT_NEW_TAB (gtk_get_current_event ())) { - 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); + midori_browser_set_current_page_smartly (browser, + midori_browser_restore_tab (browser, item)); } - else if (button == 2) + else if (button == 1) { - gint n = midori_browser_add_item (browser, item); - midori_browser_set_current_page_smartly (browser, n); - katze_array_remove_item (browser->trash, item); - _midori_browser_update_actions (browser); + midori_browser_set_current_page (browser, + midori_browser_restore_tab (browser, item)); } return TRUE; @@ -2738,7 +2953,7 @@ uri_fixed = g_strdup (uri); if (katze_item_get_meta_boolean (item, "app")) - midori_browser_spawn_app (uri_fixed); + sokoke_spawn_app (uri_fixed, FALSE); else { midori_browser_set_current_uri (browser, uri_fixed); @@ -2756,9 +2971,7 @@ { { "ManageSearchEngines" }, { "ClearPrivateData" }, - #if WEBKIT_CHECK_VERSION (1, 1, 17) { "InspectPage" }, - #endif { "-" }, { NULL }, { "p" }, @@ -2816,26 +3029,20 @@ KatzeArray* folder, MidoriBrowser* browser) { - const char* sqlcmd = "SELECT uri, title, app, folder " - "FROM bookmarks WHERE folder = '%q' ORDER BY uri ASC"; - sqlite3* db = g_object_get_data (G_OBJECT (browser->bookmarks), "db"); const gchar* folder_name; - char* sqlcmd_folder; KatzeArray* bookmarks; GtkWidget* menuitem; - if (!db) + folder_name = katze_item_get_name (KATZE_ITEM (folder)); + if (!(bookmarks = midori_array_query (browser->bookmarks, + "uri, title, app, folder", "folder = '%q'", folder_name))) return FALSE; /* Clear items from dummy array here */ gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback)(gtk_widget_destroy), NULL); - folder_name = katze_item_get_name (KATZE_ITEM (folder)); - sqlcmd_folder = sqlite3_mprintf (sqlcmd, folder_name ? folder_name : ""); - bookmarks = katze_array_from_sqlite (db, sqlcmd_folder); - sqlite3_free (sqlcmd_folder); - if (!bookmarks || katze_array_is_empty (bookmarks)) + if (katze_array_is_empty (bookmarks)) { menuitem = gtk_image_menu_item_new_with_label (_("Empty")); gtk_widget_set_sensitive (menuitem, FALSE); @@ -2854,19 +3061,8 @@ GtkMenu* menu, MidoriBrowser* browser) { - GList* children = gtk_container_get_children (GTK_CONTAINER (menu)); - guint i = 0; GtkWidget* menuitem; - while ((menuitem = g_list_nth_data (children, i++))) - { - g_signal_connect (menuitem, "select", - G_CALLBACK (midori_browser_menu_item_select_cb), browser); - g_signal_connect (menuitem, "deselect", - G_CALLBACK (midori_browser_menu_item_deselect_cb), browser); - } - g_list_free (children); - menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); @@ -2879,6 +3075,10 @@ gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); menuitem = gtk_action_create_menu_item ( + _action_by_name (browser, "NextView")); + gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + menuitem = gtk_action_create_menu_item ( _action_by_name (browser, "TabNext")); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); @@ -2900,9 +3100,9 @@ for (i = 0; i < n; i++) { GtkWidget* view; - view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), i); + view = midori_browser_get_nth_tab (browser, i); if (midori_view_get_proxy_item (MIDORI_VIEW (view)) == item) - gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), i); + midori_browser_set_current_page (browser, i); } } @@ -2914,29 +3114,44 @@ static const GtkActionEntry actions[] = { { "TabNew" }, { "WindowNew" }, - { "PrivateBrowsing" }, + { NULL }, { "Open" }, - #if HAVE_HILDON { "Find" }, - #else + #if !HAVE_HILDON { "Print" }, + { "InspectPage" }, + #endif { NULL }, - { "Panel" }, - { "-" }, + { "PrivateBrowsing" }, + #if !HAVE_HILDON { "ClearPrivateData" }, - #if WEBKIT_CHECK_VERSION (1, 1, 17) - { "InspectPage" }, + #if defined (GDK_WINDOWING_X11) + { "AddDesktopShortcut" }, #endif + { NULL }, + { "BookmarksImport"}, + { "BookmarksExport"}, + { NULL }, { "Fullscreen" }, + { "Panel" }, + { "Bookmarkbar" }, + { "-" }, + #endif + { NULL }, + #if !HAVE_HILDON + { "HelpFAQ" }, + { "HelpBugs"}, #endif { "About" }, { "Preferences" }, #if HAVE_HILDON + { NULL }, { "auto-load-images" }, { "enable-scripts" }, { "enable-plugins" }, #endif }; + guint i; for (i = 0; i < G_N_ELEMENTS (actions); i++) @@ -2991,7 +3206,7 @@ MidoriBrowser* browser) { if (response == GTK_RESPONSE_HELP) - gtk_action_activate (_action_by_name (browser, "HelpContents")); + midori_browser_activate_action (browser, "HelpFAQ"); } static void @@ -3006,6 +3221,7 @@ if (!dialog) { dialog = midori_preferences_new (GTK_WINDOW (browser), browser->settings); + g_signal_emit (browser, signals[SHOW_PREFERENCES], 0, dialog); g_signal_connect (dialog, "response", G_CALLBACK (midori_preferences_response_help_cb), browser); g_signal_connect (dialog, "destroy", @@ -3016,47 +3232,70 @@ gtk_window_present (GTK_WINDOW (dialog)); } +static gboolean +midori_browser_has_native_menubar (void) +{ + #if HAVE_HILDON + return TRUE; + #else + static const gchar* ubuntu_menuproxy = NULL; + if (ubuntu_menuproxy == NULL) + ubuntu_menuproxy = g_getenv ("UBUNTU_MENUPROXY"); + return ubuntu_menuproxy && strstr (ubuntu_menuproxy, ".so") != NULL; + #endif +} + static void -_action_menubar_activate (GtkToggleAction* action, +_action_menubar_activate (GtkToggleAction* menubar_action, MidoriBrowser* browser) { - gboolean active = gtk_toggle_action_get_active (action); - if (active) + gboolean active = gtk_toggle_action_get_active (menubar_action); + GtkAction* menu_action = _action_by_name (browser, "CompactMenu"); + GString* toolbar_items; + GList* children; + gchar* items; + + if (midori_browser_has_native_menubar ()) + active = FALSE; + + toolbar_items = g_string_new (NULL); + children = gtk_container_get_children (GTK_CONTAINER (browser->navigationbar)); + 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 = gtk_activatable_get_related_action ( + GTK_ACTIVATABLE (children->data)); + if (!action) + continue; + if (action == ((GtkAction*)menu_action)) { - GtkAction* action_; - - action_ = gtk_activatable_get_related_action (GTK_ACTIVATABLE (children->data)); - if (action_ == menu_action) + if (active) { - gtk_container_remove (navigationbar, - GTK_WIDGET (children->data)); - _midori_browser_save_toolbar_items (browser); - break; + gtk_container_remove (GTK_CONTAINER (browser->navigationbar), + GTK_WIDGET (children->data)); } + continue; } + else if (MIDORI_IS_PANED_ACTION (action)) + { + MidoriPanedAction* paned_action = MIDORI_PANED_ACTION (action); + g_string_append_printf (toolbar_items, "%s,%s", + midori_paned_action_get_child1_name (paned_action), + midori_paned_action_get_child2_name (paned_action)); + } + else + g_string_append (toolbar_items, gtk_action_get_name (action)); + g_string_append_c (toolbar_items, ','); } - 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_list_free (children); - 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); + if (katze_object_get_boolean (browser->settings, "show-menubar") != active) + g_object_set (browser->settings, "show-menubar", active, NULL); + + items = g_string_free (toolbar_items, FALSE); + g_object_set (browser->settings, "toolbar-items", items, NULL); + g_free (items); + sokoke_widget_set_visible (browser->menubar, active); g_object_set_data (G_OBJECT (browser), "midori-toolbars-visible", gtk_widget_get_visible (browser->menubar) || gtk_widget_get_visible (browser->navigationbar) @@ -3087,15 +3326,6 @@ } static void -_action_transferbar_activate (GtkToggleAction* action, - MidoriBrowser* browser) -{ - gboolean active = gtk_toggle_action_get_active (action); - g_object_set (browser->settings, "show-transferbar", active, NULL); - sokoke_widget_set_visible (browser->transferbar, active); -} - -static void _action_statusbar_activate (GtkToggleAction* action, MidoriBrowser* browser) { @@ -3110,9 +3340,6 @@ { gchar* stock_id; GtkWidget* view; - GdkModifierType state = (GdkModifierType)0; - gint x, y; - gboolean from_cache; if (!(view = midori_browser_get_current_tab (browser))) return; @@ -3122,9 +3349,20 @@ /* Refresh or stop, depending on the stock id */ if (!strcmp (stock_id, GTK_STOCK_REFRESH)) { - gdk_window_get_pointer (NULL, &x, &y, &state); - from_cache = state & GDK_SHIFT_MASK; - midori_view_reload (MIDORI_VIEW (view), !from_cache); + GdkModifierType state = (GdkModifierType)0; + gint x, y; + GdkWindow* window; + gboolean from_cache = TRUE; + + if (!strcmp (gtk_action_get_name (action), "ReloadUncached")) + from_cache = FALSE; + else if ((window = gtk_widget_get_window (GTK_WIDGET (browser)))) + { + gdk_window_get_pointer (window, &x, &y, &state); + if (state & GDK_SHIFT_MASK) + from_cache = FALSE; + } + midori_view_reload (MIDORI_VIEW (view), from_cache); } else midori_view_stop_loading (MIDORI_VIEW (view)); @@ -3141,10 +3379,10 @@ if (g_str_equal (gtk_action_get_name (action), "ZoomIn")) midori_view_set_zoom_level (MIDORI_VIEW (view), - midori_view_get_zoom_level (MIDORI_VIEW (view)) + 0.25f); + midori_view_get_zoom_level (MIDORI_VIEW (view)) + 0.10f); else if (g_str_equal (gtk_action_get_name (action), "ZoomOut")) midori_view_set_zoom_level (MIDORI_VIEW (view), - midori_view_get_zoom_level (MIDORI_VIEW (view)) - 0.25f); + midori_view_get_zoom_level (MIDORI_VIEW (view)) - 0.10f); else midori_view_set_zoom_level (MIDORI_VIEW (view), 1.0f); } @@ -3154,7 +3392,6 @@ GtkAction* current, MidoriBrowser* browser) { - #if WEBKIT_CHECK_VERSION (1, 1, 2) GtkWidget* view = midori_browser_get_current_tab (browser); if (view) { @@ -3170,6 +3407,8 @@ const gchar* encoding; if (!strcmp (name, "EncodingChinese")) encoding = "BIG5"; + else if (!strcmp (name, "EncodingChineseSimplified")) + encoding = "GB18030"; else if (!strcmp (name, "EncodingJapanese")) encoding = "SHIFT_JIS"; else if (!strcmp (name, "EncodingKorean")) @@ -3185,92 +3424,6 @@ g_object_set (web_view, "custom-encoding", encoding, NULL); } } - #endif -} - -static gchar* -midori_browser_get_uri_extension (const gchar* uri) -{ - gchar* extension; - gchar* slash; - gchar* period; - gchar* ext_end; - gchar* tmp = g_strdup (uri); - - /* Find the last slash in the URI and search for the last period - *after* the last slash. This is not completely accurate - but should cover most (simple) URIs */ - slash = strrchr (tmp, '/'); - /* Huh, URI without slashes? */ - if (!slash) - return g_strdup (""); - - ext_end = period = strrchr (slash, '.'); - if (!period) - return g_strdup (""); - - /* Skip the period */ - ext_end++; - /* If *ext_end is 0 here, the URI ended with a period, so skip */ - if (!*ext_end) - return g_strdup (""); - - /* Find the end of the extension */ - while (*ext_end && g_ascii_isalnum (*ext_end)) - ext_end++; - - *ext_end = 0; - extension = g_strdup (period); - - g_free (tmp); - - return extension; -} - -static void -midori_browser_source_transfer_cb (KatzeNetRequest* request, - MidoriBrowser* browser) -{ - gchar* filename; - gchar* extension; - gchar* unique_filename; - gchar* text_editor; - gint fd; - FILE* fp; - size_t ret; - - if (request->data) - { - extension = midori_browser_get_uri_extension (request->uri); - filename = g_strdup_printf ("%uXXXXXX%s", - g_str_hash (request->uri), extension); - g_free (extension); - if (((fd = g_file_open_tmp (filename, &unique_filename, NULL)) != -1)) - { - if ((fp = fdopen (fd, "w"))) - { - ret = fwrite (request->data, 1, request->length, fp); - fclose (fp); - if ((ret - request->length) != 0) - { - g_warning ("Error writing to file %s " - "in midori_browser_source_transfer_cb()", filename); - } - g_object_get (browser->settings, - "text-editor", &text_editor, NULL); - if (text_editor && *text_editor) - sokoke_spawn_program (text_editor, unique_filename, TRUE); - else - sokoke_show_uri (NULL, unique_filename, - gtk_get_current_event_time (), NULL); - - g_free (unique_filename); - g_free (text_editor); - } - close (fd); - } - g_free (filename); - } } static void @@ -3279,76 +3432,93 @@ { GtkWidget* view; gchar* text_editor; - const gchar* uri; + gchar* filename = NULL; if (!(view = midori_browser_get_current_tab (browser))) return; + filename = midori_view_save_source (MIDORI_VIEW (view), NULL, 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)) { - #if WEBKIT_CHECK_VERSION (1, 1, 14) GtkWidget* source; - GtkWidget* web_view; + GtkWidget* source_view; + gchar* source_uri; - source = midori_view_new (NULL); - midori_view_set_settings (MIDORI_VIEW (source), browser->settings); - midori_view_set_uri (MIDORI_VIEW (source), ""); - web_view = midori_view_get_web_view (MIDORI_VIEW (source)); - webkit_web_view_set_view_source_mode (WEBKIT_WEB_VIEW (web_view), TRUE); - 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 - GError* error = NULL; + source_uri = g_filename_to_uri (filename, NULL, NULL); + g_free (filename); - if (g_str_has_prefix (uri, "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; - } - #endif + source = midori_view_new_with_item (NULL, browser->settings); + source_view = midori_view_get_web_view (MIDORI_VIEW (source)); + webkit_web_view_set_view_source_mode (WEBKIT_WEB_VIEW (source_view), TRUE); + webkit_web_view_load_uri (WEBKIT_WEB_VIEW (source_view), source_uri); + midori_browser_add_tab (browser, source); } - - if (g_str_has_prefix (uri, "file://")) + else { - gchar* filename = g_filename_from_uri (uri, NULL, NULL); - sokoke_spawn_program (text_editor, filename, TRUE); + sokoke_spawn_program (text_editor, filename); g_free (filename); - return; } - katze_net_load_uri (NULL, uri, NULL, - (KatzeNetTransferCb)midori_browser_source_transfer_cb, browser); g_free (text_editor); } static void +_action_caret_browsing_activate (GtkAction* action, + MidoriBrowser* browser) +{ + _("Toggle text cursor navigation"); + g_object_set (browser->settings, "enable-caret-browsing", + !katze_object_get_boolean (browser->settings, "enable-caret-browsing"), NULL); +} + +static void _action_fullscreen_activate (GtkAction* action, MidoriBrowser* browser) { GdkWindowState state; - if (!GTK_WIDGET (browser)->window) + if (!gtk_widget_get_window (GTK_WIDGET (browser))) return; - state = gdk_window_get_state (GTK_WIDGET (browser)->window); + state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (browser))); if (state & GDK_WINDOW_STATE_FULLSCREEN) + { + if (katze_object_get_boolean (G_OBJECT (browser->settings), "show-menubar")) + gtk_widget_show (browser->menubar); + + if (katze_object_get_boolean (G_OBJECT (browser->settings), "show-panel")) + gtk_widget_show (browser->panel); + + if (katze_object_get_boolean (G_OBJECT (browser->settings), "show-bookmarkbar")) + gtk_widget_show (browser->bookmarkbar); + + if (browser->show_navigationbar) + gtk_widget_show (browser->navigationbar); + + if (browser->show_statusbar) + gtk_widget_show (browser->statusbar); + _toggle_tabbar_smartly (browser, TRUE); + gtk_window_unfullscreen (GTK_WINDOW (browser)); + } else + { + gtk_widget_hide (browser->menubar); + gtk_widget_hide (browser->panel); + gtk_widget_hide (browser->bookmarkbar); + gtk_widget_hide (browser->navigationbar); + gtk_widget_hide (browser->statusbar); + #ifndef HAVE_GRANITE + /* FIXME hide tabs */ + #else + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (browser->notebook), FALSE); + gtk_notebook_set_show_border (GTK_NOTEBOOK (browser->notebook), FALSE); + #endif + gtk_window_fullscreen (GTK_WINDOW (browser)); + } } -#if WEBKIT_CHECK_VERSION (1, 1, 4) static void _action_scroll_somewhere_activate (GtkAction* action, MidoriBrowser* browser) @@ -3372,7 +3542,6 @@ else if (g_str_equal (name, "ScrollRight")) webkit_web_view_move_cursor (web_view, GTK_MOVEMENT_VISUAL_POSITIONS, 1); } -#endif static gboolean _action_navigation_activate (GtkAction* action, @@ -3382,14 +3551,20 @@ GtkWidget* tab; gchar* uri; const gchar* name; + gboolean middle_click; g_assert (GTK_IS_ACTION (action)); - if (g_object_get_data (G_OBJECT (action), "midori-middle-click")) + if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (action), + "midori-middle-click"))) { - g_object_set_data (G_OBJECT (action), "midori-middle-click", (void*)0); - return FALSE; + middle_click = TRUE; + g_object_set_data (G_OBJECT (action), + "midori-middle-click", + GINT_TO_POINTER(0)); } + else + middle_click = FALSE; tab = midori_browser_get_current_tab (browser); if (!tab) @@ -3401,19 +3576,69 @@ if (g_str_equal (name, "Back")) { - midori_view_go_back (view); + if (middle_click) + { + GtkWidget* web_view; + WebKitWebBackForwardList* back_forward_list; + WebKitWebHistoryItem* back_item; + const gchar* back_uri; + gint n; + + web_view = midori_view_get_web_view (view); + + back_forward_list = + webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (web_view)); + back_item = webkit_web_back_forward_list_get_back_item (back_forward_list); + back_uri = webkit_web_history_item_get_uri (back_item); + + n = midori_browser_add_uri (browser, back_uri); + midori_browser_set_current_page_smartly (browser, n); + } + else + midori_view_go_back (view); + return TRUE; } else if (g_str_equal (name, "Forward")) { - midori_view_go_forward (view); + if (middle_click) + { + GtkWidget* web_view; + WebKitWebBackForwardList* back_forward_list; + WebKitWebHistoryItem* forward_item; + const gchar* forward_uri; + gint n; + + web_view = midori_view_get_web_view (view); + + back_forward_list = + webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (web_view)); + forward_item = webkit_web_back_forward_list_get_forward_item (back_forward_list); + forward_uri = webkit_web_history_item_get_uri (forward_item); + + n = midori_browser_add_uri (browser, forward_uri); + midori_browser_set_current_page_smartly (browser, n); + } + else + midori_view_go_forward (view); + return TRUE; } else if (g_str_equal (name, "Previous")) { /* Duplicate here because the URI pointer might change */ uri = g_strdup (midori_view_get_previous_page (view)); - midori_view_set_uri (view, uri); + + if (middle_click) + { + gint n; + + n = midori_browser_add_uri (browser, uri); + midori_browser_set_current_page_smartly (browser, n); + } + else + midori_view_set_uri (view, uri); + g_free (uri); return TRUE; } @@ -3421,14 +3646,34 @@ { /* Duplicate here because the URI pointer might change */ uri = g_strdup (midori_view_get_next_page (view)); - midori_view_set_uri (view, uri); + + if (middle_click) + { + gint n; + + n = midori_browser_add_uri (browser, uri); + midori_browser_set_current_page_smartly (browser, n); + } + else + midori_view_set_uri (view, uri); + g_free (uri); return TRUE; } else if (g_str_equal (name, "Homepage")) { g_object_get (browser->settings, "homepage", &uri, NULL); - midori_view_set_uri (view, uri); + + if (middle_click) + { + gint n; + + n = midori_browser_add_uri (browser, uri); + midori_browser_set_current_page_smartly (browser, n); + } + else + midori_view_set_uri (view, uri); + g_free (uri); return TRUE; } @@ -3444,25 +3689,17 @@ } static void -_action_location_active_changed (GtkAction* action, - gint idx, - MidoriBrowser* browser) -{ - const gchar* uri; - - if (idx > -1) - { - uri = midori_location_action_get_uri (MIDORI_LOCATION_ACTION (action)); - midori_browser_set_current_uri (browser, uri); - } -} - -static void _action_location_focus_in (GtkAction* action, MidoriBrowser* browser) { - midori_location_action_set_secondary_icon ( - MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO); + GdkScreen* screen = gtk_widget_get_screen (browser->notebook); + GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen); + if (gtk_icon_theme_has_icon (icon_theme, "go-jump-symbolic")) + midori_location_action_set_secondary_icon ( + MIDORI_LOCATION_ACTION (action), "go-jump-symbolic"); + else + midori_location_action_set_secondary_icon ( + MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO); } static void @@ -3471,99 +3708,86 @@ { GtkWidget* view = midori_browser_get_current_tab (browser); - if (!browser->show_navigationbar) + if (!browser->show_navigationbar || midori_browser_is_fullscreen (browser)) gtk_widget_hide (browser->navigationbar); - if (g_object_get_data (G_OBJECT (view), "news-feeds")) - midori_location_action_set_secondary_icon ( - MIDORI_LOCATION_ACTION (action), STOCK_NEWS_FEED); - else - midori_location_action_set_secondary_icon ( - MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO); + midori_browser_update_secondary_icon (browser, MIDORI_VIEW (view), action); } static void _action_location_reset_uri (GtkAction* action, - MidoriBrowser* browser) -{ - const gchar* uri; - - uri = midori_browser_get_current_uri (browser); - midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), uri); + MidoriBrowser* browser) +{ + GtkWidget* view; + if ((view = midori_browser_get_current_tab (browser))) + { + midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), + midori_view_get_display_uri (MIDORI_VIEW (view))); + } } - static void _action_location_submit_uri (GtkAction* action, const gchar* uri, gboolean new_tab, MidoriBrowser* browser) { - gchar* stripped_uri; gchar* new_uri; gint n; - stripped_uri = g_strdup (uri); - g_strstrip (stripped_uri); - new_uri = sokoke_magic_uri (stripped_uri); + uri = katze_skip_whitespace (uri); + new_uri = sokoke_magic_uri (uri); if (!new_uri) { - gchar** parts; - gchar* keywords = NULL; + const gchar* keywords = NULL; const gchar* search_uri = NULL; - time_t now; - gint64 day; - sqlite3* db; - static sqlite3_stmt* statement = NULL; + KatzeItem* item; /* Do we have a keyword and a string? */ - parts = g_strsplit (stripped_uri, " ", 2); - if (parts[0]) + if (browser->search_engines + && (item = katze_array_find_token (browser->search_engines, uri))) { - KatzeItem* item; - if ((item = katze_array_find_token (browser->search_engines, parts[0]))) - { - keywords = g_strdup (parts[1] ? parts[1] : ""); - search_uri = katze_item_get_uri (item); - } + keywords = strchr (uri, ' '); + if (keywords != NULL) + keywords++; + else + keywords = ""; + search_uri = katze_item_get_uri (item); } - g_strfreev (parts); - if (keywords) - g_free (stripped_uri); - else + if (keywords == NULL) { - keywords = stripped_uri; + keywords = uri; search_uri = browser->location_entry_search; } - new_uri = sokoke_search_uri (search_uri, keywords); + new_uri = midori_uri_for_search (search_uri, keywords); - now = time (NULL); - day = sokoke_time_t_to_julian (&now); - - db = g_object_get_data (G_OBJECT (browser->history), "db"); - if (!statement) + if (browser->history != NULL) { - const gchar* sqlcmd; - sqlcmd = "INSERT INTO search (keywords, uri, day) VALUES (?,?,?)"; - sqlite3_prepare_v2 (db, sqlcmd, strlen (sqlcmd) + 1, &statement, NULL); - } - sqlite3_bind_text (statement, 1, keywords, -1, 0); - sqlite3_bind_text (statement, 2, search_uri, -1, 0); - sqlite3_bind_int64 (statement, 3, day); + time_t now = time (NULL); + gint64 day = sokoke_time_t_to_julian (&now); + sqlite3* db = g_object_get_data (G_OBJECT (browser->history), "db"); + static sqlite3_stmt* statement = NULL; - if (sqlite3_step (statement) != SQLITE_DONE) - g_printerr (_("Failed to insert new history item: %s\n"), - sqlite3_errmsg (db)); - sqlite3_reset (statement); - if (sqlite3_step (statement) == SQLITE_DONE) - sqlite3_clear_bindings (statement); + if (!statement) + { + const gchar* sqlcmd; + sqlcmd = "INSERT INTO search (keywords, uri, day) VALUES (?,?,?)"; + sqlite3_prepare_v2 (db, sqlcmd, strlen (sqlcmd) + 1, &statement, NULL); + } + sqlite3_bind_text (statement, 1, keywords, -1, 0); + sqlite3_bind_text (statement, 2, search_uri, -1, 0); + sqlite3_bind_int64 (statement, 3, day); - g_free (keywords); + if (sqlite3_step (statement) != SQLITE_DONE) + g_printerr (_("Failed to insert new history item: %s\n"), + sqlite3_errmsg (db)); + sqlite3_reset (statement); + if (sqlite3_step (statement) == SQLITE_DONE) + sqlite3_clear_bindings (statement); + } } - else - g_free (stripped_uri); if (new_tab) { @@ -3595,8 +3819,23 @@ { const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view)); const gchar* feed; - if (gtk_window_get_focus (GTK_WINDOW (browser)) == widget) - _action_location_submit_uri (action, uri, FALSE, browser); + /* Clicking icon on blank is equal to Paste and Proceed */ + if (midori_view_is_blank (MIDORI_VIEW (view))) + { + GtkClipboard* clipboard = gtk_clipboard_get_for_display ( + gtk_widget_get_display (view), GDK_SELECTION_CLIPBOARD); + gchar* text = gtk_clipboard_wait_for_text (clipboard); + if (text != NULL) + { + _action_location_submit_uri (action, text, FALSE, browser); + g_free (text); + } + } + else if (gtk_window_get_focus (GTK_WINDOW (browser)) == widget) + { + const gchar* text = gtk_entry_get_text (GTK_ENTRY (widget)); + _action_location_submit_uri (action, text, FALSE, browser); + } else if ((feed = g_object_get_data (G_OBJECT (view), "news-feeds"))) { KatzeArray* news_feeds; @@ -3635,7 +3874,8 @@ 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)); + gtk_container_foreach (GTK_CONTAINER (menu), + (GtkCallback)(gtk_widget_show_all), NULL); katze_widget_popup (widget, GTK_MENU (menu), NULL, KATZE_MENU_POSITION_RIGHT); } @@ -3657,22 +3897,23 @@ gboolean new_tab, MidoriBrowser* browser) { - guint last_web_search; KatzeItem* item; const gchar* url; gchar* search; - g_object_get (browser->settings, "last-web-search", &last_web_search, NULL); - item = katze_array_get_nth_item (browser->search_engines, last_web_search); + item = katze_array_get_nth_item (browser->search_engines, browser->last_web_search); if (item) url = katze_item_get_uri (item); else /* The location entry search is our fallback */ url = browser->location_entry_search; - search = sokoke_search_uri (url, keywords); + search = midori_uri_for_search (url, keywords); if (new_tab) - midori_browser_add_uri (browser, search); + { + int n = midori_browser_add_uri (browser, search); + midori_browser_set_current_page_smartly (browser, n); + } else midori_browser_set_current_uri (browser, search); @@ -3684,13 +3925,11 @@ MidoriBrowser* browser) { GSList* proxies = gtk_action_get_proxies (action); - guint i = 0; - GtkWidget* proxy; const gchar* uri; gchar* search; - while (((proxy = g_slist_nth_data (proxies, i++)))) - if (GTK_IS_TOOL_ITEM (proxy)) + for (; proxies != NULL; proxies = g_slist_next (proxies)) + if (GTK_IS_TOOL_ITEM (proxies->data)) { if (!gtk_widget_get_visible (browser->navigationbar)) gtk_widget_show (browser->navigationbar); @@ -3699,7 +3938,7 @@ /* Load default search engine in current tab */ uri = browser->location_entry_search; - search = sokoke_search_uri (uri ? uri : "", ""); + search = midori_uri_for_search (uri ? uri : "", ""); midori_browser_set_current_uri (browser, search); gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); g_free (search); @@ -3722,6 +3961,7 @@ idx = 0; g_object_set (browser->settings, "last-web-search", idx, NULL); + browser->last_web_search = idx; } static void @@ -3743,8 +3983,12 @@ _action_search_focus_out (GtkAction* action, MidoriBrowser* browser) { - if (gtk_widget_get_visible (browser->statusbar) && !browser->show_navigationbar) + if ((gtk_widget_get_visible (browser->statusbar) + && !browser->show_navigationbar) + || midori_browser_is_fullscreen (browser)) + { gtk_widget_hide (browser->navigationbar); + } } static void @@ -3842,9 +4086,9 @@ item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); if (KATZE_ITEM_IS_BOOKMARK (item)) - midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE); + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE, NULL); else - midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, TRUE); + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, TRUE, NULL); } static void @@ -3898,12 +4142,13 @@ GdkEventButton* event, MidoriBrowser* browser) { + if (event->button != 3) + return FALSE; + /* 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) + if ((GTK_IS_BOX (toolitem) || GTK_IS_MENU_BAR (toolitem))) { midori_browser_toolbar_popup_context_menu_cb ( GTK_IS_BIN (toolitem) && gtk_bin_get_child (GTK_BIN (toolitem)) ? @@ -3911,7 +4156,7 @@ event->x, event->y, event->button, browser); return TRUE; } - else if (GTK_IS_MENU_ITEM (toolitem) && event->button == 3) + else if (GTK_IS_MENU_ITEM (toolitem)) { gboolean handled; g_signal_emit_by_name (toolitem, "button-press-event", event, &handled); @@ -3925,11 +4170,12 @@ GdkEventButton* event, MidoriBrowser* browser) { - if (event->button == 2) + if (MIDORI_EVENT_NEW_TAB (event)) { GtkAction* action; action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (toolitem)); + g_object_set_data (G_OBJECT (action), "midori-middle-click", GINT_TO_POINTER (1)); return _action_navigation_activate (action, browser); } @@ -3940,10 +4186,19 @@ _action_bookmark_add_activate (GtkAction* action, MidoriBrowser* browser) { + GtkWidget* proxy = NULL; + GSList* proxies = gtk_action_get_proxies (action); + for (; proxies != NULL; proxies = g_slist_next (proxies)) + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + proxy = proxies->data; + break; + } + if (g_str_equal (gtk_action_get_name (action), "BookmarkFolderAdd")) - midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, TRUE); + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, TRUE, proxy); else - midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE); + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE, proxy); } static void @@ -3962,6 +4217,7 @@ { ".opera/bookmarks.adr", N_("Opera"), "opera" }, { ".kde/share/apps/konqueror/bookmarks.xml", N_("Konqueror"), "konqueror" }, { ".gnome2/epiphany/bookmarks.rdf", N_("Epiphany"), "epiphany" }, + { ".mozilla/firefox/*/bookmarks.html", N_("Firefox (%s)"), "firefox" }, }; GtkWidget* dialog; @@ -3973,13 +4229,10 @@ GtkComboBox* combobox; GtkListStore* model; GtkCellRenderer* renderer; - GtkComboBox* combobox_folder; + GtkWidget* combobox_folder; gint icon_width = 16; guint i; - KatzeItem* item; - sqlite3* db; - const gchar* sqlcmd; - KatzeArray* bookmarkdirs; + KatzeArray* bookmarks; if (!browser->bookmarks || !gtk_widget_get_visible (GTK_WIDGET (browser))) return; @@ -4017,16 +4270,54 @@ 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); + const gchar* location = bookmark_clients[i].path; + const gchar* client = bookmark_clients[i].name; + gchar* path = NULL; + + /* Interpret * as 'any folder' */ + if (strchr (location, '*') != NULL) + { + gchar** parts = g_strsplit (location, "*", 2); + GDir* dir; + path = g_build_filename (g_get_home_dir (), parts[0], NULL); + if ((dir = g_dir_open (path, 0, NULL))) + { + const gchar* name; + while ((name = g_dir_read_name (dir))) + { + gchar* file = g_build_filename (path, name, parts[1], NULL); + if (g_access (file, F_OK) == 0) + { + /* If name is XYZ.Name, we use Name only */ + gchar* real_name = strchr (name, '.'); + gchar* display = strstr (_(client), "%s") + ? g_strdup_printf (_(client), + real_name ? real_name + 1 : name) + : g_strdup (_(client)); + gtk_list_store_insert_with_values (model, NULL, G_MAXINT, + 0, display, 1, bookmark_clients[i].icon, + 2, file, 3, icon_width, -1); + g_free (display); + } + g_free (file); + } + g_dir_close (dir); + } + g_free (path); + g_strfreev (parts); + continue; + } + + path = g_build_filename (g_get_home_dir (), location, NULL); if (g_access (path, F_OK) == 0) gtk_list_store_insert_with_values (model, NULL, G_MAXINT, - 0, _(bookmark_clients[i].name), 1, bookmark_clients[i].icon, + 0, _(client), 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); + 0, _("Import from XBEL or HTML file"), 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 (content_area), hbox); @@ -4037,45 +4328,31 @@ 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); - - db = g_object_get_data (G_OBJECT (browser->bookmarks), "db"); - sqlcmd = "SELECT title from bookmarks where uri=''"; - bookmarkdirs = katze_array_from_sqlite (db, sqlcmd); - KATZE_ARRAY_FOREACH_ITEM (item, bookmarkdirs) - { - const gchar* name = katze_item_get_name (item); - gtk_combo_box_append_text (combobox_folder, name); - } - gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0); + combobox_folder = midori_bookmark_folder_button_new (browser->bookmarks, + FALSE, NULL); + gtk_box_pack_start (GTK_BOX (hbox), combobox_folder, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (content_area), hbox); gtk_widget_show_all (hbox); - gtk_widget_set_sensitive (combo, TRUE); 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; + gchar* path = NULL; + gchar* selected = NULL; GError* error; + sqlite3* db = g_object_get_data (G_OBJECT (browser->bookmarks), "db"); - 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); - if (g_str_equal (selected, _("Toplevel folder"))) - selected = g_strdup (""); + if (gtk_combo_box_get_active_iter (combobox, &iter)) + gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 2, &path, -1); + selected = midori_bookmark_folder_button_get_active (combobox_folder); gtk_widget_destroy (dialog); if (!path) { GtkWidget* file_dialog; - file_dialog = sokoke_file_chooser_dialog_new (_("Save file as"), + file_dialog = sokoke_file_chooser_dialog_new (_("Import from a file"), 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)); @@ -4083,14 +4360,18 @@ } error = NULL; - if (path && !midori_array_from_file (browser->bookmarks, path, NULL, &error)) + bookmarks = katze_array_new (KATZE_TYPE_ARRAY); + if (path && !midori_array_from_file (bookmarks, path, NULL, &error)) { sokoke_message_dialog (GTK_MESSAGE_ERROR, - _("Failed to import bookmarks"), error ? error->message : ""); + _("Failed to import bookmarks"), + error ? error->message : "", FALSE); if (error) g_error_free (error); } - midori_bookmarks_import_array_db (db, browser->bookmarks, selected); + midori_bookmarks_import_array_db (db, bookmarks, selected); + katze_array_update (browser->bookmarks); + g_object_unref (bookmarks); g_free (selected); g_free (path); } @@ -4103,34 +4384,60 @@ MidoriBrowser* browser) { GtkWidget* file_dialog; + GtkFileFilter* filter; + const gchar* format; gchar* path = NULL; GError* error; - sqlite3* db; + KatzeArray* bookmarks; if (!browser->bookmarks || !gtk_widget_get_visible (GTK_WIDGET (browser))) return; +wrong_format: file_dialog = sokoke_file_chooser_dialog_new (_("Save file as"), GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_SAVE); gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (file_dialog), "bookmarks.xbel"); + filter = gtk_file_filter_new (); + gtk_file_filter_set_name (filter, _("XBEL Bookmarks")); + gtk_file_filter_add_mime_type (filter, "application/xml"); + gtk_file_filter_add_pattern (filter, "*.xbel"); + gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (file_dialog), filter); + filter = gtk_file_filter_new (); + gtk_file_filter_set_name (filter, _("Netscape Bookmarks")); + gtk_file_filter_add_mime_type (filter, "text/html"); + gtk_file_filter_add_pattern (filter, "*.html"); + gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (file_dialog), filter); 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); + if (g_str_has_suffix (path, ".xbel")) + format = "xbel"; + else if (g_str_has_suffix (path, ".html")) + format = "netscape"; + else if (path != NULL) + { + sokoke_message_dialog (GTK_MESSAGE_ERROR, + _("Midori can only export to XBEL (*.xbel) and Netscape (*.html)"), + "", TRUE); + katze_assign (path, NULL); + goto wrong_format; + } if (path == NULL) return; error = NULL; - db = g_object_get_data (G_OBJECT (browser->history), "db"); - midori_bookmarks_export_array_db (db, browser->bookmarks, ""); - if (!midori_array_to_file (browser->bookmarks, path, "xbel", &error)) + bookmarks = midori_array_query_recursive (browser->bookmarks, + "*", "folder='%q'", "", TRUE); + if (!midori_array_to_file (bookmarks, path, format, &error)) { sokoke_message_dialog (GTK_MESSAGE_ERROR, - _("Failed to export bookmarks"), error ? error->message : ""); + _("Failed to export bookmarks"), error ? error->message : "", FALSE); if (error) g_error_free (error); } + g_object_unref (bookmarks); g_free (path); } @@ -4165,95 +4472,47 @@ GtkToggleButton* button; gint clear_prefs = MIDORI_CLEAR_NONE; gint saved_prefs = MIDORI_CLEAR_NONE; - + GList* data_items = sokoke_register_privacy_item (NULL, NULL, NULL); + GString* clear_data = g_string_new (NULL); g_object_get (browser->settings, "clear-private-data", &saved_prefs, NULL); - button = g_object_get_data (G_OBJECT (dialog), "history"); - if (gtk_toggle_button_get_active (button)) - { - const gchar* sqlcmd; - sqlite3* db; - char* errmsg = NULL; - - db = g_object_get_data (G_OBJECT (browser->history), "db"); - sqlcmd = "DELETE FROM history"; - - if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK) - { - g_printerr (_("Failed to clear history: %s\n"), errmsg); - sqlite3_free (errmsg); - } - else - { - sqlcmd = "DELETE FROM search"; - if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK) - { - g_printerr (_("Failed to clear search history: %s\n"), errmsg); - sqlite3_free (errmsg); - } - } - clear_prefs |= MIDORI_CLEAR_HISTORY; - } - button = g_object_get_data (G_OBJECT (dialog), "cookies"); + button = g_object_get_data (G_OBJECT (dialog), "session"); if (gtk_toggle_button_get_active (button)) { - SoupSession* session = webkit_get_default_session (); - SoupSessionFeature* jar = soup_session_get_feature (session, - SOUP_TYPE_COOKIE_JAR); - GSList* cookies = soup_cookie_jar_all_cookies (SOUP_COOKIE_JAR (jar)); - SoupCookie* cookie; - gsize i = 0; - while ((cookie = g_slist_nth_data (cookies, i++))) - { - soup_cookie_jar_delete_cookie (SOUP_COOKIE_JAR (jar), cookie); - soup_cookie_free (cookie); - } - g_slist_free (cookies); - clear_prefs |= MIDORI_CLEAR_COOKIES; + GList* tabs = gtk_container_get_children (GTK_CONTAINER (browser->notebook)); + for (; tabs != NULL; tabs = g_list_next (tabs)) + gtk_widget_destroy (tabs->data); + g_list_free (tabs); + clear_prefs |= MIDORI_CLEAR_SESSION; } - button = g_object_get_data (G_OBJECT (dialog), "flash-cookies"); + button = g_object_get_data (G_OBJECT (dialog), "history"); if (gtk_toggle_button_get_active (button)) { - gchar* cache = g_build_filename (g_get_home_dir (), ".macromedia", - "Flash_Player", NULL); - sokoke_remove_path (cache, TRUE); - g_free (cache); - clear_prefs |= MIDORI_CLEAR_FLASH_COOKIES; + katze_array_clear (browser->history); + katze_array_clear (browser->trash); + _midori_browser_update_actions (browser); + clear_prefs |= MIDORI_CLEAR_HISTORY; + clear_prefs |= MIDORI_CLEAR_TRASH; /* For backward-compatibility */ } - button = g_object_get_data (G_OBJECT (dialog), "website-icons"); - if (gtk_toggle_button_get_active (button)) + if (clear_prefs != saved_prefs) { - gchar* cache = g_build_filename (g_get_user_cache_dir (), - PACKAGE_NAME, "icons", NULL); - sokoke_remove_path (cache, TRUE); - g_free (cache); - clear_prefs |= MIDORI_CLEAR_WEBSITE_ICONS; + clear_prefs |= (saved_prefs & MIDORI_CLEAR_ON_QUIT); + g_object_set (browser->settings, "clear-private-data", clear_prefs, NULL); } - button = g_object_get_data (G_OBJECT (dialog), "trash"); - if (gtk_toggle_button_get_active (button)) + for (; data_items != NULL; data_items = g_list_next (data_items)) { - if (browser->trash) + SokokePrivacyItem* privacy = data_items->data; + button = g_object_get_data (G_OBJECT (dialog), privacy->name); + g_return_if_fail (button != NULL && GTK_IS_TOGGLE_BUTTON (button)); + if (gtk_toggle_button_get_active (button)) { - katze_array_clear (browser->trash); - _midori_browser_update_actions (browser); + privacy->clear (); + g_string_append (clear_data, privacy->name); + g_string_append_c (clear_data, ','); } - 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) - { - clear_prefs |= (saved_prefs & MIDORI_CLEAR_ON_QUIT); - g_object_set (browser->settings, "clear-private-data", clear_prefs, NULL); } + g_object_set (browser->settings, "clear-data", clear_data->str, NULL); + g_string_free (clear_data, TRUE); } if (response_id != GTK_RESPONSE_DELETE_EVENT) gtk_widget_destroy (dialog); @@ -4282,7 +4541,6 @@ { GtkWidget* content_area; GdkScreen* screen; - GtkIconTheme* icon_theme; GtkSizeGroup* sizegroup; GtkWidget* hbox; GtkWidget* alignment; @@ -4290,6 +4548,8 @@ GtkWidget* icon; GtkWidget* label; GtkWidget* button; + GList* data_items; + gchar* clear_data = katze_object_get_string (browser->settings, "clear-data"); gint clear_prefs = MIDORI_CLEAR_NONE; g_object_get (browser->settings, "clear-private-data", &clear_prefs, NULL); @@ -4297,7 +4557,7 @@ /* i18n: Dialog: Clear Private Data, in the Tools menu */ dialog = gtk_dialog_new_with_buttons (_("Clear Private Data"), GTK_WINDOW (browser), - GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("_Clear private data"), GTK_RESPONSE_ACCEPT, NULL); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); @@ -4305,7 +4565,6 @@ screen = gtk_widget_get_screen (GTK_WIDGET (browser)); if (screen) { - icon_theme = gtk_icon_theme_get_for_screen (screen); gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_CLEAR); } sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); @@ -4323,36 +4582,29 @@ vbox = gtk_vbox_new (TRUE, 4); alignment = gtk_alignment_new (0, 0, 1, 1); gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 6, 12, 0); - button = gtk_check_button_new_with_mnemonic (_("History")); - if ((clear_prefs & MIDORI_CLEAR_HISTORY) == MIDORI_CLEAR_HISTORY) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); - g_object_set_data (G_OBJECT (dialog), "history", button); - gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0); - button = gtk_check_button_new_with_mnemonic (_("Cookies")); - if ((clear_prefs & MIDORI_CLEAR_COOKIES) == MIDORI_CLEAR_COOKIES) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); - g_object_set_data (G_OBJECT (dialog), "cookies", button); - gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0); - button = gtk_check_button_new_with_mnemonic (_("'Flash' Cookies")); - if ((clear_prefs & MIDORI_CLEAR_FLASH_COOKIES) == MIDORI_CLEAR_FLASH_COOKIES) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); - g_object_set_data (G_OBJECT (dialog), "flash-cookies", button); - gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0); - button = gtk_check_button_new_with_mnemonic (_("Website icons")); - if ((clear_prefs & MIDORI_CLEAR_WEBSITE_ICONS) == MIDORI_CLEAR_WEBSITE_ICONS) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); - g_object_set_data (G_OBJECT (dialog), "website-icons", button); - gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0); - button = gtk_check_button_new_with_mnemonic (_("_Closed Tabs")); - if ((clear_prefs & MIDORI_CLEAR_TRASH) == MIDORI_CLEAR_TRASH) + button = gtk_check_button_new_with_mnemonic (_("Last open _tabs")); + if ((clear_prefs & MIDORI_CLEAR_SESSION) == MIDORI_CLEAR_SESSION) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); - g_object_set_data (G_OBJECT (dialog), "trash", button); + g_object_set_data (G_OBJECT (dialog), "session", 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) + /* i18n: Browsing history, visited web pages, closed tabs */ + button = gtk_check_button_new_with_mnemonic (_("_History")); + if ((clear_prefs & MIDORI_CLEAR_HISTORY) == MIDORI_CLEAR_HISTORY) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); - g_object_set_data (G_OBJECT (dialog), "web-cache", button); + g_object_set_data (G_OBJECT (dialog), "history", button); gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0); + + data_items = sokoke_register_privacy_item (NULL, NULL, NULL); + for (; data_items != NULL; data_items = g_list_next (data_items)) + { + SokokePrivacyItem* privacy = data_items->data; + button = gtk_check_button_new_with_mnemonic (privacy->label); + gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0); + g_object_set_data (G_OBJECT (dialog), privacy->name, button); + if (clear_data && strstr (clear_data, privacy->name)) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); + } + g_free (clear_data); gtk_container_add (GTK_CONTAINER (alignment), vbox); gtk_box_pack_start (GTK_BOX (hbox), alignment, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0); @@ -4372,12 +4624,12 @@ g_signal_connect (dialog, "destroy", G_CALLBACK (gtk_widget_destroyed), &dialog); gtk_widget_show (dialog); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); } else gtk_window_present (GTK_WINDOW (dialog)); } -#if WEBKIT_CHECK_VERSION (1, 1, 17) static void _action_inspect_page_activate (GtkAction* action, MidoriBrowser* browser) @@ -4387,14 +4639,62 @@ WebKitWebInspector* inspector = webkit_web_view_get_inspector (web_view); webkit_web_inspector_show (inspector); } -#endif + +static gint +midori_browser_get_n_pages (MidoriBrowser* browser) +{ + #ifdef HAVE_GRANITE + return granite_widgets_dynamic_notebook_get_n_pages ( + GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook)); + #else + return gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)); + #endif +} + +static void +_action_tab_move_backward_activate (GtkAction* action, + MidoriBrowser* browser) +{ + gint new_pos; + gint cur_pos = midori_browser_get_current_page (browser); + GtkWidget* widget = midori_browser_get_nth_tab (browser, cur_pos); + if (cur_pos > 0) + new_pos = cur_pos - 1; + else + new_pos = midori_browser_get_n_pages (browser) - 1; + #ifdef HAVE_GRANITE + /* FIXME */ + #else + gtk_notebook_reorder_child (GTK_NOTEBOOK (browser->notebook), widget, new_pos); + g_signal_emit (browser, signals[MOVE_TAB], 0, browser->notebook, cur_pos, new_pos); + #endif +} + +static void +_action_tab_move_forward_activate (GtkAction* action, + MidoriBrowser* browser) +{ + gint new_pos; + gint cur_pos = midori_browser_get_current_page (browser); + GtkWidget* widget = midori_browser_get_nth_tab (browser, cur_pos); + if (cur_pos == (midori_browser_get_n_pages (browser) - 1)) + new_pos = 0; + else + new_pos = cur_pos + 1; + #ifdef HAVE_GRANITE + /* FIXME */ + #else + gtk_notebook_reorder_child (GTK_NOTEBOOK (browser->notebook), widget, new_pos); + g_signal_emit (browser, signals[MOVE_TAB], 0, browser->notebook, cur_pos, new_pos); + #endif +} static void _action_tab_previous_activate (GtkAction* action, MidoriBrowser* browser) { - gint n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); - gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n - 1); + gint n = midori_browser_get_current_page (browser); + midori_browser_set_current_page (browser, n - 1); } static void @@ -4402,10 +4702,10 @@ MidoriBrowser* browser) { /* Advance one tab or jump to the first one if we are at the last one */ - gint n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); - if (n == gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)) - 1) + gint n = midori_browser_get_current_page (browser); + if (n == midori_browser_get_n_pages (browser) - 1) n = -1; - gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n + 1); + midori_browser_set_current_page (browser, n + 1); } static void @@ -4417,6 +4717,13 @@ } static void +_action_next_view_activate (GtkAction* action, + MidoriBrowser* browser) +{ + gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); +} + +static void _action_tab_minimize_activate (GtkAction* action, MidoriBrowser* browser) { @@ -4431,10 +4738,11 @@ { GtkWidget* view = midori_browser_get_current_tab (browser); MidoriNewView where = MIDORI_NEW_VIEW_TAB; - GtkWidget* new_view = midori_view_new_with_uri ( - midori_view_get_display_uri (MIDORI_VIEW (view)), - NULL, browser->settings); - g_signal_emit_by_name (view, "new-view", new_view, where); + GtkWidget* new_view = midori_view_new_with_item ( + midori_view_get_proxy_item (MIDORI_VIEW (view)), browser->settings); + const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view)); + g_signal_emit_by_name (view, "new-view", new_view, where, TRUE); + midori_view_set_uri (MIDORI_VIEW (new_view), uri); } static void @@ -4461,6 +4769,7 @@ static const gchar* credits_artists[] = { "Nancy Runge ", NULL }; +#if !GTK_CHECK_VERSION (2, 24, 0) static void _action_about_activate_link (GtkAboutDialog* about, const gchar* uri, @@ -4487,29 +4796,31 @@ sokoke_show_uri (NULL, newuri ? newuri : uri, GDK_CURRENT_TIME, NULL); g_free (newuri); } +#endif static void _action_about_activate (GtkAction* action, MidoriBrowser* browser) { - gchar* comments = g_strdup_printf ("GTK+ %d.%d.%d, WebKitGTK+ %d.%d.%d\n%s", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION, - WEBKIT_MAJOR_VERSION, WEBKIT_MINOR_VERSION, WEBKIT_MICRO_VERSION, - _("A lightweight web browser.")); + gchar* comments = g_strdup_printf ("%s\n%s", + _("A lightweight web browser."), + _("See about:version for version info.")); const gchar* license = _("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."); +#if !GTK_CHECK_VERSION (2, 24, 0) gtk_about_dialog_set_email_hook (_action_about_activate_email, NULL, NULL); gtk_about_dialog_set_url_hook (_action_about_activate_link, browser, NULL); +#endif gtk_show_about_dialog (GTK_WINDOW (browser), "logo-icon-name", gtk_window_get_icon_name (GTK_WINDOW (browser)), "name", PACKAGE_NAME, "version", PACKAGE_VERSION, "comments", comments, - "copyright", "Copyright © 2007-2010 Christian Dywan", + "copyright", "Copyright © 2007-2011 Christian Dywan", "website", "http://www.twotoasts.de", "authors", credits_authors, "documenters", credits_documenters, @@ -4526,27 +4837,27 @@ MidoriBrowser* browser) { const gchar* action_name; - const gchar* uri; + const gchar* uri = NULL; gint n; #if defined (G_OS_WIN32) && defined (DOCDIR) gchar* free_uri = NULL; #endif action_name = gtk_action_get_name (action); - if (!strncmp ("HelpContents", action_name, 12)) + if (!strncmp ("HelpFAQ", action_name, 7)) { #ifdef G_OS_WIN32 { #ifdef DOCDIR - gchar* path = sokoke_find_data_filename ("doc/midori/user/midori.html"); + gchar* path = sokoke_find_data_filename ("doc/midori/faq.html", FALSE); uri = free_uri = g_filename_to_uri (path, NULL, NULL); if (g_access (path, F_OK) != 0) { - if (g_access (DOCDIR "/midori/user/midori.html", F_OK) == 0) - uri = "file://" DOCDIR "/midori/user/midori.html"; + if (g_access (DOCDIR "/faq.html", F_OK) == 0) + uri = "file://" DOCDIR "/faq.html"; else #endif - uri = "error:nodocs share/doc/midori/user/midori.html"; + uri = "error:nodocs share/doc/midori/faq.html"; #ifdef DOCDIR } g_free (path); @@ -4554,18 +4865,17 @@ } #else #ifdef DOCDIR - uri = "file://" DOCDIR "/midori/user/midori.html"; - if (g_access (DOCDIR "/midori/user/midori.html", F_OK) != 0) + uri = "file://" DOCDIR "/faq.html"; + if (g_access (DOCDIR "/faq.html", F_OK) != 0) #endif - uri = "error:nodocs " DOCDIR "/midori/user/midori.html"; + uri = "error:nodocs " DOCDIR "/faq.html"; #endif } - else if (!strncmp ("HelpFAQ", action_name, 7)) - uri = "http://wiki.xfce.org/midori/faq"; else if (!strncmp ("HelpBugs", action_name, 8)) - uri = "http://www.twotoasts.de/bugs/"; - else - uri = NULL; + { + if (!g_spawn_command_line_async ("ubuntu-bug " PACKAGE_NAME, NULL)) + uri = PACKAGE_BUGREPORT; + } if (uri) { @@ -4607,12 +4917,32 @@ (GSourceFunc)midori_browser_panel_timeout, hpaned, NULL); } +static gboolean +midori_panel_cycle_child_focus_cb (GtkWidget* hpaned, + gboolean reversed, + MidoriBrowser* browser) +{ + /* Default cycle goes between all GtkPaned widgets. + If focus is in the panel, focus the location as if it's a paned. + If nothing is focussed, simply go to the location. + Be sure to suppress the default because the signal can recurse. */ + GtkWidget* focus = gtk_window_get_focus (GTK_WINDOW (browser)); + if (gtk_widget_get_ancestor (focus, MIDORI_TYPE_PANEL) + || !gtk_widget_get_ancestor (focus, GTK_TYPE_PANED)) + { + g_signal_stop_emission_by_name (hpaned, "cycle-child-focus"); + midori_browser_activate_action (browser, "Location"); + return TRUE; + } + return FALSE; +} + static void midori_panel_notify_page_cb (MidoriPanel* panel, GParamSpec* pspec, MidoriBrowser* browser) { - gint page = katze_object_get_boolean (panel, "page"); + gint page = midori_panel_get_current_page (panel); if (page > -1) g_object_set (browser->settings, "last-panel-page", page, NULL); } @@ -4631,19 +4961,6 @@ } static void -midori_panel_notify_show_controls_cb (MidoriPanel* panel, - GParamSpec* pspec, - MidoriBrowser* browser) -{ - gboolean show_controls = katze_object_get_boolean (panel, "show-controls"); - 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 midori_panel_notify_right_aligned_cb (MidoriPanel* panel, GParamSpec* pspec, MidoriBrowser* browser) @@ -4652,7 +4969,11 @@ GtkWidget* hpaned = gtk_widget_get_parent (browser->panel); GtkWidget* vpaned = gtk_widget_get_parent (browser->notebook); gint paned_position = gtk_paned_get_position (GTK_PANED (hpaned)); - gint paned_size = hpaned->allocation.width; + GtkAllocation allocation; + gint paned_size; + + gtk_widget_get_allocation (hpaned, &allocation); + paned_size = allocation.width; g_object_set (browser->settings, "right-align-sidepanel", right_aligned, NULL); @@ -4684,10 +5005,10 @@ } static void -gtk_notebook_switch_page_cb (GtkWidget* notebook, - GtkNotebookPage* page, - guint page_num, - MidoriBrowser* browser) +midori_browser_notebook_switch_page_cb (GtkWidget* notebook, + gpointer page, + guint page_num, + MidoriBrowser* browser) { GtkWidget* widget; GtkAction* action; @@ -4703,17 +5024,15 @@ } static void -gtk_notebook_switch_page_after_cb (GtkWidget* notebook, - GtkNotebookPage* page, - guint page_num, - MidoriBrowser* browser) +midori_browser_notebook_switch_page_after_cb (GtkWidget* notebook, + gpointer page, + guint page_num, + MidoriBrowser* browser) { GtkWidget* widget; MidoriView* view; const gchar* uri; GtkAction* action; - const gchar* title; - gchar* window_title; if (!(widget = midori_browser_get_current_tab (browser))) return; @@ -4722,29 +5041,36 @@ uri = g_object_get_data (G_OBJECT (widget), "midori-browser-typed-text"); if (!uri) uri = midori_view_get_display_uri (view); + midori_browser_set_title (browser, midori_view_get_display_title (view)); action = _action_by_name (browser, "Location"); midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), uri); - midori_location_action_set_icon (MIDORI_LOCATION_ACTION (action), - midori_view_get_icon (view)); - - title = midori_view_get_display_title (view); - window_title = g_strconcat (title, " - ", g_get_application_name (), NULL); - gtk_window_set_title (GTK_WINDOW (browser), window_title); - g_free (window_title); + if (sokoke_is_app_or_private ()) + gtk_window_set_icon (GTK_WINDOW (browser), midori_view_get_icon (view)); if (browser->proxy_array) katze_item_set_meta_integer (KATZE_ITEM (browser->proxy_array), "current", midori_browser_get_current_page (browser)); - g_object_freeze_notify (G_OBJECT (browser)); - g_object_notify (G_OBJECT (browser), "uri"); g_object_notify (G_OBJECT (browser), "tab"); - g_object_thaw_notify (G_OBJECT (browser)); _midori_browser_set_statusbar_text (browser, NULL); _midori_browser_update_interface (browser); _midori_browser_update_progress (browser, view); } +#ifdef HAVE_GRANITE +static void +midori_browser_notebook_new_tab_created_cb (GtkWidget* notebook, + GraniteWidgetsTab* tab, + MidoriBrowser* browser) +{ + /* FIXME Pack view into tab: How? */ + KatzeItem* item = katze_item_new (); + GtkWidget* view = midori_view_new_with_item (item, browser->settings); + gint n = midori_browser_add_tab (browser, view); + midori_browser_set_current_page (browser, n); +} +#endif + static void midori_browser_notebook_page_reordered_cb (GtkNotebook* notebook, MidoriView* view, @@ -4753,11 +5079,53 @@ { KatzeItem* item = midori_view_get_proxy_item (view); katze_array_move_item (browser->proxy_array, item, page_num); - - g_object_freeze_notify (G_OBJECT (browser)); - g_object_notify (G_OBJECT (browser), "uri"); g_object_notify (G_OBJECT (browser), "tab"); - g_object_thaw_notify (G_OBJECT (browser)); +} + +static void +midori_browser_notebook_page_removed_cb (GtkWidget* notebook, + GtkWidget* view, + guint page_num, + MidoriBrowser* browser) +{ + _midori_browser_remove_tab (browser, view); +} + +static gboolean +midori_browser_notebook_reorder_tab_cb (GtkNotebook* notebook, + GtkDirectionType arg1, + gboolean arg2, + gpointer user_data) +{ + g_signal_stop_emission_by_name (notebook, "reorder-tab"); + return TRUE; +} + +static GtkWidget* +midori_browser_notebook_create_window_cb (GtkNotebook* notebook, + MidoriView* view, + gint x, + gint y, + MidoriBrowser* browser) +{ + MidoriBrowser* new_browser; + g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser); + if (new_browser) + { + GtkWidget* new_notebook = new_browser->notebook; + gtk_window_move (GTK_WINDOW (new_browser), x, y); + return new_notebook; + } + else /* No MidoriApp, so this is app or private mode */ + return NULL; +} + +static void +midori_browser_menu_item_switch_tab_cb (GtkWidget* menuitem, + MidoriBrowser* browser) +{ + gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menuitem), "index")); + midori_browser_set_current_page (browser, page); } static gboolean @@ -4765,23 +5133,52 @@ GdkEventButton* event, MidoriBrowser* browser) { +#if !GTK_CHECK_VERSION(3,0,0) /* TODO */ if (event->window != notebook->event_window) return FALSE; +#endif /* FIXME: Handle double click only when it wasn't handled by GtkNotebook */ /* Open a new tab on double click or middle mouse click */ if (/*(event->type == GDK_2BUTTON_PRESS && event->button == 1) - || */(event->type == GDK_BUTTON_PRESS && event->button == 2)) + || */(event->type == GDK_BUTTON_PRESS && MIDORI_EVENT_NEW_TAB (event))) { - gint n; - GtkWidget* view = midori_view_new_with_uri ("", NULL, browser->settings); - g_object_set_data (G_OBJECT (view), "midori-view-append", (void*)1); - n = midori_browser_add_tab (browser, view); + gint n = midori_browser_add_uri (browser, ""); midori_browser_set_current_page (browser, n); return TRUE; } + else if (event->type == GDK_BUTTON_PRESS && MIDORI_EVENT_CONTEXT_MENU (event)) + { + GtkWidget* menu = gtk_menu_new (); + GList* tabs = gtk_container_get_children (GTK_CONTAINER (notebook)); + GtkWidget* menuitem = sokoke_action_create_popup_menu_item ( + gtk_action_group_get_action (browser->action_group, "TabNew")); + gint i = 0; + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + menuitem = sokoke_action_create_popup_menu_item ( + gtk_action_group_get_action (browser->action_group, "UndoTabClose")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + menuitem = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + for (; tabs != NULL; tabs = g_list_next (tabs)) + { + const gchar* title = midori_view_get_display_title (tabs->data); + menuitem = katze_image_menu_item_new_ellipsized (title); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), + gtk_image_new_from_pixbuf (midori_view_get_icon (tabs->data))); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_object_set_data (G_OBJECT (menuitem), "index", GINT_TO_POINTER (i)); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_browser_menu_item_switch_tab_cb), browser); + i++; + } + g_list_free (tabs); + gtk_widget_show_all (menu); + katze_widget_popup (GTK_WIDGET (notebook), GTK_MENU (menu), NULL, + KATZE_MENU_POSITION_CURSOR); + } return FALSE; } @@ -4792,7 +5189,6 @@ { guint last; KatzeItem* item; - guint n; if (!browser->trash) return; @@ -4800,10 +5196,8 @@ /* Reopen the most recent trash item */ last = katze_array_get_length (browser->trash) - 1; item = katze_array_get_nth_item (browser->trash, last); - 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); + midori_browser_set_current_page (browser, + midori_browser_restore_tab (browser, item)); } static void @@ -4827,24 +5221,27 @@ 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), }, + N_("New P_rivate Browsing Window"), "n", + NULL, G_CALLBACK (_action_private_browsing_activate), }, { "Open", GTK_STOCK_OPEN, NULL, "o", N_("Open a file"), G_CALLBACK (_action_open_activate) }, { "SaveAs", GTK_STOCK_SAVE_AS, - NULL, "s", + N_("_Save Page As..."), "s", N_("Save to a file"), G_CALLBACK (_action_save_as_activate) }, { "AddSpeedDial", NULL, N_("Add to Speed _dial"), "h", - N_("Add shortcut to speed dial"), G_CALLBACK (_action_add_speed_dial_activate) }, + NULL, G_CALLBACK (_action_add_speed_dial_activate) }, { "AddDesktopShortcut", NULL, - N_("Add Shortcut to the _desktop"), "h", - N_("Add shortcut to the desktop"), G_CALLBACK (_action_add_desktop_shortcut_activate) }, + #if HAVE_HILDON + N_("Add Shortcut to the _desktop"), "", + #else + N_("Create _Launcher"), "", + #endif + NULL, G_CALLBACK (_action_add_desktop_shortcut_activate) }, { "AddNewsFeed", NULL, N_("Subscribe to News _feed"), NULL, - N_("Subscribe to this news feed"), G_CALLBACK (_action_add_news_feed_activate) }, + NULL, G_CALLBACK (_action_add_news_feed_activate) }, { "CompactAdd", GTK_STOCK_ADD, NULL, NULL, NULL, G_CALLBACK (_action_compact_add_activate) }, @@ -4853,51 +5250,45 @@ N_("Close the current tab"), G_CALLBACK (_action_tab_close_activate) }, { "WindowClose", NULL, N_("C_lose Window"), "w", - N_("Close this window"), G_CALLBACK (_action_window_close_activate) }, + NULL, G_CALLBACK (_action_window_close_activate) }, { "Print", GTK_STOCK_PRINT, NULL, "p", N_("Print the current page"), G_CALLBACK (_action_print_activate) }, { "Quit", GTK_STOCK_QUIT, - NULL, "q", - N_("Quit the application"), G_CALLBACK (_action_quit_activate) }, + N_("Close a_ll Windows"), "q", + NULL, G_CALLBACK (_action_quit_activate) }, { "Edit", NULL, N_("_Edit"), NULL, NULL, G_CALLBACK (_action_edit_activate) }, - #if WEBKIT_CHECK_VERSION (1, 1, 14) { "Undo", GTK_STOCK_UNDO, NULL, "z", - N_("Undo the last modification"), G_CALLBACK (_action_undo_activate) }, + NULL, G_CALLBACK (_action_undo_activate) }, { "Redo", GTK_STOCK_REDO, NULL, "z", - N_("Redo the last modification"), G_CALLBACK (_action_redo_activate) }, - #endif + NULL, G_CALLBACK (_action_redo_activate) }, { "Cut", GTK_STOCK_CUT, NULL, "x", - N_("Cut the selected text"), G_CALLBACK (_action_cut_activate) }, + NULL, G_CALLBACK (_action_cut_activate) }, { "Copy", GTK_STOCK_COPY, NULL, "c", - N_("Copy the selected text"), G_CALLBACK (_action_copy_activate) }, - { "Copy_", GTK_STOCK_COPY, - NULL, "c", - N_("Copy the selected text"), G_CALLBACK (_action_copy_activate) }, + NULL, G_CALLBACK (_action_copy_activate) }, { "Paste", GTK_STOCK_PASTE, NULL, "v", - N_("Paste text from the clipboard"), G_CALLBACK (_action_paste_activate) }, + NULL, G_CALLBACK (_action_paste_activate) }, { "Delete", GTK_STOCK_DELETE, NULL, NULL, - N_("Delete the selected text"), G_CALLBACK (_action_delete_activate) }, + NULL, G_CALLBACK (_action_delete_activate) }, { "SelectAll", GTK_STOCK_SELECT_ALL, NULL, "a", - N_("Select all text"), G_CALLBACK (_action_select_all_activate) }, + NULL, G_CALLBACK (_action_select_all_activate) }, { "Find", GTK_STOCK_FIND, - NULL, "f", + N_("_Find..."), "f", N_("Find a word or phrase in the page"), G_CALLBACK (_action_find_activate) }, { "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) }, + NULL, G_CALLBACK (_action_find_next_activate) }, { "FindPrevious", GTK_STOCK_GO_BACK, N_("Find _Previous"), "g", - N_("Find the previous occurrence of a word or phrase"), - G_CALLBACK (_action_find_previous_activate) }, + NULL, G_CALLBACK (_action_find_previous_activate) }, { "Preferences", GTK_STOCK_PREFERENCES, NULL, "p", N_("Configure the application preferences"), G_CALLBACK (_action_preferences_activate) }, @@ -4907,6 +5298,9 @@ { "Reload", GTK_STOCK_REFRESH, NULL, "r", N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) }, + { "ReloadUncached", GTK_STOCK_REFRESH, + N_("Reload page without caching"), "r", + NULL, G_CALLBACK (_action_reload_stop_activate) }, { "Stop", GTK_STOCK_STOP, NULL, "Escape", N_("Stop loading the current page"), G_CALLBACK (_action_reload_stop_activate) }, @@ -4921,28 +5315,29 @@ N_("Decrease the zoom level"), G_CALLBACK (_action_zoom_activate) }, { "ZoomNormal", GTK_STOCK_ZOOM_100, NULL, "0", - N_("Reset the zoom level"), G_CALLBACK (_action_zoom_activate) }, + NULL, G_CALLBACK (_action_zoom_activate) }, { "Encoding", NULL, N_("_Encoding") }, { "SourceView", NULL, N_("View So_urce"), "U", - N_("View the source code of the page"), G_CALLBACK (_action_source_view_activate) }, + NULL, G_CALLBACK (_action_source_view_activate) }, + { "CaretBrowsing", NULL, + N_("Ca_ret Browsing"), "F7", + NULL, G_CALLBACK (_action_caret_browsing_activate) }, { "Fullscreen", GTK_STOCK_FULLSCREEN, NULL, "F11", N_("Toggle fullscreen view"), G_CALLBACK (_action_fullscreen_activate) }, - #if WEBKIT_CHECK_VERSION (1, 1, 4) { "ScrollLeft", NULL, N_("Scroll _Left"), "h", - N_("Scroll to the left"), G_CALLBACK (_action_scroll_somewhere_activate) }, + NULL, G_CALLBACK (_action_scroll_somewhere_activate) }, { "ScrollDown", NULL, N_("Scroll _Down"), "j", - N_("Scroll down"), G_CALLBACK (_action_scroll_somewhere_activate) }, + NULL, G_CALLBACK (_action_scroll_somewhere_activate) }, { "ScrollUp", NULL, N_("Scroll _Up"), "k", - N_("Scroll up"), G_CALLBACK (_action_scroll_somewhere_activate) }, + NULL, G_CALLBACK (_action_scroll_somewhere_activate) }, { "ScrollRight", NULL, N_("Scroll _Right"), "l", - N_("Scroll to the right"), G_CALLBACK (_action_scroll_somewhere_activate) }, - #endif + NULL, G_CALLBACK (_action_scroll_somewhere_activate) }, { "Go", NULL, N_("_Go") }, { "Back", GTK_STOCK_GO_BACK, @@ -4964,17 +5359,17 @@ N_("Go to your homepage"), G_CALLBACK (_action_navigation_activate) }, { "TrashEmpty", GTK_STOCK_CLEAR, N_("Empty Trash"), "", - N_("Delete the contents of the trash"), G_CALLBACK (_action_trash_empty_activate) }, + NULL, G_CALLBACK (_action_trash_empty_activate) }, { "UndoTabClose", GTK_STOCK_UNDELETE, N_("Undo _Close Tab"), "t", - N_("Open the last closed tab"), G_CALLBACK (_action_undo_tab_close_activate) }, + NULL, G_CALLBACK (_action_undo_tab_close_activate) }, { "BookmarkAdd", STOCK_BOOKMARK_ADD, NULL, "d", N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_add_activate) }, { "BookmarkFolderAdd", NULL, N_("Add a new _folder"), "", - N_("Add a new bookmark folder"), G_CALLBACK (_action_bookmark_add_activate) }, + NULL, G_CALLBACK (_action_bookmark_add_activate) }, { "BookmarksImport", NULL, N_("_Import bookmarks"), "", NULL, G_CALLBACK (_action_bookmarks_import_activate) }, @@ -4983,54 +5378,53 @@ NULL, G_CALLBACK (_action_bookmarks_export_activate) }, { "ManageSearchEngines", GTK_STOCK_PROPERTIES, N_("_Manage Search Engines"), "s", - N_("Add, edit and remove search engines..."), - G_CALLBACK (_action_manage_search_engines_activate) }, + NULL, G_CALLBACK (_action_manage_search_engines_activate) }, { "ClearPrivateData", NULL, N_("_Clear Private Data"), "Delete", - N_("Clear private data..."), - G_CALLBACK (_action_clear_private_data_activate) }, - #if WEBKIT_CHECK_VERSION (1, 1, 17) + NULL, G_CALLBACK (_action_clear_private_data_activate) }, { "InspectPage", NULL, N_("_Inspect Page"), "i", - N_("Inspect page details and access developer tools..."), - G_CALLBACK (_action_inspect_page_activate) }, - #endif + NULL, G_CALLBACK (_action_inspect_page_activate) }, { "TabPrevious", GTK_STOCK_GO_BACK, N_("_Previous Tab"), "Page_Up", - N_("Switch to the previous tab"), G_CALLBACK (_action_tab_previous_activate) }, + NULL, G_CALLBACK (_action_tab_previous_activate) }, { "TabNext", GTK_STOCK_GO_FORWARD, N_("_Next Tab"), "Page_Down", - N_("Switch to the next tab"), G_CALLBACK (_action_tab_next_activate) }, + NULL, G_CALLBACK (_action_tab_next_activate) }, + { "TabMoveBackward", NULL, N_("Move Tab _Backward"), "Page_Up", + NULL, G_CALLBACK (_action_tab_move_backward_activate) }, + { "TabMoveForward", NULL, N_("_Move Tab Forward"), "Page_Down", + NULL, G_CALLBACK (_action_tab_move_forward_activate) }, { "TabCurrent", NULL, N_("Focus _Current Tab"), "Home", - N_("Focus the current tab"), G_CALLBACK (_action_tab_current_activate) }, + NULL, G_CALLBACK (_action_tab_current_activate) }, + { "NextView", NULL, + N_("Focus _Next view"), "F6", + NULL, G_CALLBACK (_action_next_view_activate) }, { "TabMinimize", NULL, - N_("Minimize _Current Tab"), "", - N_("Minimize the current tab"), G_CALLBACK (_action_tab_minimize_activate) }, + N_("Only show the Icon of the _Current Tab"), "", + NULL, G_CALLBACK (_action_tab_minimize_activate) }, { "TabDuplicate", NULL, N_("_Duplicate Current Tab"), "", - N_("Duplicate the current tab"), G_CALLBACK (_action_tab_duplicate_activate) }, + NULL, G_CALLBACK (_action_tab_duplicate_activate) }, { "TabCloseOther", NULL, N_("Close Ot_her Tabs"), "", - N_("Close all tabs except the current tab"), G_CALLBACK (_action_tab_close_other_activate) }, + NULL, G_CALLBACK (_action_tab_close_other_activate) }, { "LastSession", NULL, N_("Open last _session"), NULL, - N_("Open the tabs saved in the last session"), NULL }, + NULL, NULL }, { "Help", NULL, N_("_Help") }, - { "HelpContents", GTK_STOCK_HELP, - N_("_Contents"), "F1", - N_("Show the documentation"), G_CALLBACK (_action_help_link_activate) }, - { "HelpFAQ", NULL, - N_("_Frequent Questions"), NULL, - N_("Show the Frequently Asked Questions"), G_CALLBACK (_action_help_link_activate) }, + { "HelpFAQ", GTK_STOCK_HELP, + N_("_Frequent Questions"), "F1", + NULL, G_CALLBACK (_action_help_link_activate) }, { "HelpBugs", NULL, - N_("_Report a Bug"), NULL, - N_("Open Midori's bug tracker"), G_CALLBACK (_action_help_link_activate) }, + N_("_Report a Problem..."), NULL, + NULL, G_CALLBACK (_action_help_link_activate) }, { "About", GTK_STOCK_ABOUT, NULL, "", - N_("Show information about the program"), G_CALLBACK (_action_about_activate) }, + NULL, G_CALLBACK (_action_about_activate) }, { "Dummy", NULL, "Dummy" }, }; static const guint entries_n = G_N_ELEMENTS (entries); @@ -5039,27 +5433,23 @@ { { "Menubar", NULL, N_("_Menubar"), "", - N_("Show menubar"), G_CALLBACK (_action_menubar_activate), + NULL, G_CALLBACK (_action_menubar_activate), FALSE }, { "Navigationbar", NULL, N_("_Navigationbar"), "", - N_("Show navigationbar"), G_CALLBACK (_action_navigationbar_activate), + NULL, G_CALLBACK (_action_navigationbar_activate), FALSE }, { "Panel", GTK_STOCK_INDENT, N_("Side_panel"), "F9", - N_("Show sidepanel"), G_CALLBACK (_action_panel_activate), + N_("Sidepanel"), G_CALLBACK (_action_panel_activate), FALSE }, { "Bookmarkbar", NULL, N_("_Bookmarkbar"), "", - N_("Show bookmarkbar"), G_CALLBACK (_action_bookmarkbar_activate), - FALSE }, - { "Transferbar", NULL, - N_("_Transferbar"), "", - N_("Show transferbar"), G_CALLBACK (_action_transferbar_activate), + NULL, G_CALLBACK (_action_bookmarkbar_activate), FALSE }, { "Statusbar", NULL, - N_("_Statusbar"), "", - N_("Show statusbar"), G_CALLBACK (_action_statusbar_activate), + N_("_Statusbar"), "j", + NULL, G_CALLBACK (_action_statusbar_activate), FALSE }, }; static const guint toggle_entries_n = G_N_ELEMENTS (toggle_entries); @@ -5070,7 +5460,10 @@ N_("_Automatic"), "", NULL, 1 }, { "EncodingChinese", NULL, - N_("Chinese (BIG5)"), "", + N_("Chinese Traditional (BIG5)"), "", + NULL, 1 }, + { "EncodingChineseSimplified", NULL, + N_("Chinese Simplified (GB18030)"), "", NULL, 1 }, { "EncodingJapanese", NULL, /* i18n: A double underscore "__" is used to prevent the mnemonic */ @@ -5106,41 +5499,30 @@ else if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) window_state = MIDORI_WINDOW_FULLSCREEN; g_object_set (browser->settings, "last-window-state", window_state, NULL); - - if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) - { - if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) - { - gtk_widget_hide (browser->menubar); - } - else - { - if (katze_object_get_boolean (browser->settings, "show-menubar")) - gtk_widget_show (browser->menubar); - } - } } static gboolean midori_browser_alloc_timeout (MidoriBrowser* browser) { GtkWidget* widget = GTK_WIDGET (browser); - GdkWindowState state = gdk_window_get_state (widget->window); + GdkWindowState state = gdk_window_get_state (gtk_widget_get_window (widget)); if (!(state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN))) { - if (widget->allocation.width != browser->last_window_width) + GtkAllocation allocation; + gtk_widget_get_allocation (widget, &allocation); + if (allocation.width != browser->last_window_width) { - browser->last_window_width = widget->allocation.width; + browser->last_window_width = allocation.width; g_object_set (browser->settings, "last-window-width", browser->last_window_width, NULL); } - if (widget->allocation.height != browser->last_window_height) + if (allocation.height != browser->last_window_height) { - browser->last_window_height = widget->allocation.height; + browser->last_window_height = allocation.height; g_object_set (browser->settings, - "last-window-height", widget->allocation.height, NULL); + "last-window-height", allocation.height, NULL); } } @@ -5154,7 +5536,7 @@ { GtkWidget* widget = GTK_WIDGET (browser); - if (gtk_widget_get_realized (widget) && !browser->alloc_timeout) + if (!browser->alloc_timeout && gtk_widget_get_realized (widget)) { gpointer last_page; @@ -5173,6 +5555,8 @@ static void midori_browser_destroy_cb (MidoriBrowser* browser) { + g_object_set_data (G_OBJECT (browser), "midori-browser-destroyed", (void*)1); + if (G_UNLIKELY (browser->panel_timeout)) g_source_remove (browser->panel_timeout); if (G_UNLIKELY (browser->alloc_timeout)) @@ -5181,6 +5565,12 @@ /* Destroy panel first, so panels don't need special care */ gtk_widget_destroy (browser->panel); /* Destroy tabs second, so child widgets don't need special care */ + g_signal_handlers_disconnect_by_func (browser->notebook, + midori_browser_notebook_reorder_tab_cb, + NULL); + g_signal_handlers_disconnect_by_func (browser->notebook, + midori_browser_notebook_size_allocate_cb, + browser); gtk_container_foreach (GTK_CONTAINER (browser->notebook), (GtkCallback) gtk_widget_destroy, NULL); } @@ -5209,11 +5599,9 @@ "" "" "

" - #if WEBKIT_CHECK_VERSION (1, 1, 14) "" "" "" - #endif "" "" "" @@ -5233,7 +5621,6 @@ "" "" "" - "" "" "" "" @@ -5248,6 +5635,7 @@ "" "" "" + "" "" "" "" @@ -5272,7 +5660,6 @@ "" "" "" - "" "" "" "" @@ -5281,6 +5668,8 @@ /* For accelerators to work all actions need to be used *somewhere* in the UI definition */ "" + "" + "" "" "" "" @@ -5293,6 +5682,7 @@ "" "" "" + "" "" "" "" @@ -5300,6 +5690,9 @@ "" "" "" + "" + "" + "" "" "" "" @@ -5315,7 +5708,7 @@ #ifdef HAVE_HILDON_2_2 /* hildon_gtk_window_enable_zoom_keys */ guint32 set = 1; - gdk_property_change (GTK_WIDGET (browser)->window, + gdk_property_change (gtk_widget_get_window (GTK_WIDGET (browser)), gdk_atom_intern ("_HILDON_ZOOM_KEY_ATOM", FALSE), gdk_x11_xatom_to_atom (XA_INTEGER), 32, GDK_PROP_MODE_REPLACE, @@ -5349,6 +5742,7 @@ day = sokoke_time_t_to_julian (&now); db = g_object_get_data (G_OBJECT (browser->history), "db"); + g_return_if_fail (db != NULL); if (!stmt) { const gchar* sqlcmd; @@ -5373,41 +5767,19 @@ } static void -midori_browser_history_clear_cb (KatzeArray* history, - MidoriBrowser* browser) -{ - GtkAction* location_action = _action_by_name (browser, "Location"); - midori_location_action_clear (MIDORI_LOCATION_ACTION (location_action)); -} - -static void midori_browser_set_history (MidoriBrowser* browser, KatzeArray* history) { - time_t now; - gint64 day; - if (browser->history == history) return; - if (browser->history) - g_signal_handlers_disconnect_by_func (browser->history, - midori_browser_history_clear_cb, - browser); if (history) g_object_ref (history); katze_object_assign (browser->history, history); - midori_browser_history_clear_cb (history, browser); if (!history) return; - g_signal_connect (browser->history, "clear", - G_CALLBACK (midori_browser_history_clear_cb), browser); - - now = time (NULL); - day = sokoke_time_t_to_julian (&now); - g_object_set (_action_by_name (browser, "Location"), "history", browser->history, NULL); } @@ -5426,46 +5798,14 @@ MidoriBrowser* browser; GtkWidget* view; - n = keyval - GDK_0; - if (n == 0) - n = 10; + /* Switch to n-th tab. 9 and 0 go to the last tab. */ + n = keyval - GDK_KEY_0; browser = g_object_get_data (G_OBJECT (accel_group), "midori-browser"); - if ((view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), - n - 1))) + if ((view = midori_browser_get_nth_tab (browser, n < 9 ? n - 1 : -1))) midori_browser_set_current_tab (browser, view); } } -static void -midori_browser_ui_manager_connect_proxy_cb (GtkUIManager* ui_manager, - GtkAction* action, - GtkWidget* proxy, - MidoriBrowser* browser) -{ - if (GTK_IS_MENU_ITEM (proxy)) - { - g_signal_connect (proxy, "select", - G_CALLBACK (midori_browser_menu_item_select_cb), browser); - g_signal_connect (proxy, "deselect", - G_CALLBACK (midori_browser_menu_item_deselect_cb), browser); - } -} - -static void -midori_browser_ui_manager_disconnect_proxy_cb (GtkUIManager* ui_manager, - GtkAction* action, - GtkWidget* proxy, - MidoriBrowser* browser) -{ - if (GTK_IS_MENU_ITEM (proxy)) - { - g_signal_handlers_disconnect_by_func (proxy, - midori_browser_menu_item_select_cb, browser); - g_signal_handlers_disconnect_by_func (proxy, - midori_browser_menu_item_deselect_cb, browser); - } -} - #ifdef HAVE_HILDON_2_2 static void midori_browser_set_portrait_mode (MidoriBrowser* browser, @@ -5519,12 +5859,63 @@ #endif static void +midori_browser_add_actions (MidoriBrowser* browser) +{ + /* 0,053 versus 0,002 compared to gtk_action_group_add_ API */ + guint i; + GSList* group = NULL; + for (i = 0; i < G_N_ELEMENTS (entries); i++) + { + GtkActionEntry entry = entries[i]; + GtkAction* action = gtk_action_new (entry.name, + _(entry.label), _(entry.tooltip), entry.stock_id); + if (entry.callback) + g_signal_connect (action, "activate", entry.callback, browser); + gtk_action_group_add_action_with_accel (browser->action_group, + GTK_ACTION (action), entry.accelerator); + } + for (i = 0; i < G_N_ELEMENTS (toggle_entries); i++) + { + GtkToggleActionEntry entry = toggle_entries[i]; + GtkToggleAction* action = gtk_toggle_action_new (entry.name, + _(entry.label), _(entry.tooltip), entry.stock_id); + if (entry.is_active) + gtk_toggle_action_set_active (action, TRUE); + if (entry.callback) + g_signal_connect (action, "activate", entry.callback, browser); + gtk_action_group_add_action_with_accel (browser->action_group, + GTK_ACTION (action), entry.accelerator); + } + for (i = 0; i < G_N_ELEMENTS (encoding_entries); i++) + { + GtkRadioActionEntry entry = encoding_entries[i]; + GtkRadioAction* action = gtk_radio_action_new (entry.name, + _(entry.label), _(entry.tooltip), entry.stock_id, entry.value); + if (i == 0) + { + group = gtk_radio_action_get_group (action); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE); + g_signal_connect (action, "changed", + G_CALLBACK (_action_view_encoding_activate), browser); + } + else + { + gtk_radio_action_set_group (action, group); + group = gtk_radio_action_get_group (action); + } + gtk_action_group_add_action_with_accel (browser->action_group, + GTK_ACTION (action), entry.accelerator); + } +} + +static void midori_browser_init (MidoriBrowser* browser) { GtkWidget* vbox; GtkUIManager* ui_manager; GtkAccelGroup* accel_group; guint i; + GClosure* accel_closure; GError* error; GtkAction* action; #if !HAVE_HILDON @@ -5536,15 +5927,15 @@ GtkSettings* gtk_settings; GtkWidget* hpaned; GtkWidget* vpaned; - GtkRcStyle* rcstyle; - GtkWidget* label; GtkWidget* scrolled; + KatzeArray* dummy_array; browser->settings = midori_web_settings_new (); browser->proxy_array = katze_array_new (KATZE_TYPE_ARRAY); browser->bookmarks = NULL; browser->trash = NULL; browser->search_engines = NULL; + browser->speeddial = NULL; /* Setup the window metrics */ g_signal_connect (browser, "realize", @@ -5557,7 +5948,9 @@ G_CALLBACK (midori_browser_destroy_cb), NULL); gtk_window_set_role (GTK_WINDOW (browser), "browser"); gtk_window_set_icon_name (GTK_WINDOW (browser), "web-browser"); - gtk_window_set_title (GTK_WINDOW (browser), g_get_application_name ()); + #if GTK_CHECK_VERSION (3, 4, 0) + gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (browser), TRUE); + #endif vbox = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (browser), vbox); gtk_widget_show (vbox); @@ -5565,33 +5958,23 @@ /* Let us see some ui manager magic */ browser->action_group = gtk_action_group_new ("Browser"); gtk_action_group_set_translation_domain (browser->action_group, GETTEXT_PACKAGE); - gtk_action_group_add_actions (browser->action_group, - entries, entries_n, browser); - gtk_action_group_add_toggle_actions (browser->action_group, - toggle_entries, toggle_entries_n, browser); - gtk_action_group_add_radio_actions (browser->action_group, - encoding_entries, encoding_entries_n, 0, - G_CALLBACK (_action_view_encoding_activate), browser); + midori_browser_add_actions (browser); ui_manager = gtk_ui_manager_new (); - g_signal_connect (ui_manager, "connect-proxy", - 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); 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); + accel_closure = g_cclosure_new (G_CALLBACK ( + midori_browser_accel_switch_tab_activate_cb), browser, NULL); for (i = 0; i < 10; i++) { gchar* accel_path = g_strdup_printf ("/Browser/SwitchTab%d", i); - GClosure* closure = g_cclosure_new ( - G_CALLBACK (midori_browser_accel_switch_tab_activate_cb), - browser, NULL); - gtk_accel_map_add_entry (accel_path, GDK_0 + i, GDK_MOD1_MASK); - gtk_accel_group_connect_by_path (accel_group, accel_path, closure); + gtk_accel_map_add_entry (accel_path, GDK_KEY_0 + i, GDK_MOD1_MASK); + gtk_accel_group_connect_by_path (accel_group, accel_path, accel_closure); g_free (accel_path); } + g_closure_unref (accel_closure); error = NULL; if (!gtk_ui_manager_add_ui_from_string (ui_manager, ui_markup, -1, &error)) @@ -5601,7 +5984,7 @@ } /* Hide the 'Dummy' which only holds otherwise unused actions */ - g_object_set (_action_by_name (browser, "Dummy"), "visible", FALSE, NULL); + _action_set_visible (browser, "Dummy", FALSE); action = g_object_new (KATZE_TYPE_SEPARATOR_ACTION, "name", "Separator", @@ -5619,8 +6002,6 @@ g_object_connect (action, "signal::activate", _action_location_activate, browser, - "signal::active-changed", - _action_location_active_changed, browser, "signal::focus-in", _action_location_focus_in, browser, "signal::focus-out", @@ -5658,6 +6039,12 @@ action, "K"); g_object_unref (action); + action = g_object_new (MIDORI_TYPE_PANED_ACTION, + "name", "LocationSearch", + NULL); + gtk_action_group_add_action (browser->action_group, action); + g_object_unref (action); + action = g_object_new (KATZE_TYPE_ARRAY_ACTION, "name", "Trash", "stock-id", STOCK_USER_TRASH, @@ -5672,12 +6059,14 @@ gtk_action_group_add_action_with_accel (browser->action_group, action, ""); g_object_unref (action); + dummy_array = katze_array_new (KATZE_TYPE_ARRAY); + katze_array_update (dummy_array); action = g_object_new (KATZE_TYPE_ARRAY_ACTION, "name", "Bookmarks", "label", _("_Bookmarks"), "stock-id", STOCK_BOOKMARKS, "tooltip", _("Show the saved bookmarks"), - "array", browser->proxy_array, /* Use a non-empty array here */ + "array", dummy_array /* updated, unique */, NULL); g_object_connect (action, "signal::populate-folder", @@ -5687,12 +6076,15 @@ NULL); gtk_action_group_add_action_with_accel (browser->action_group, action, ""); g_object_unref (action); + g_object_unref (dummy_array); + dummy_array = katze_array_new (KATZE_TYPE_ITEM); + katze_array_update (dummy_array); action = g_object_new (KATZE_TYPE_ARRAY_ACTION, "name", "Tools", "label", _("_Tools"), "stock-id", GTK_STOCK_PREFERENCES, - "array", katze_array_new (KATZE_TYPE_ITEM), + "array", dummy_array /* updated, unique */, NULL); g_object_connect (action, "signal::populate-popup", @@ -5702,6 +6094,7 @@ NULL); gtk_action_group_add_action (browser->action_group, action); g_object_unref (action); + g_object_unref (dummy_array); action = g_object_new (KATZE_TYPE_ARRAY_ACTION, "name", "Window", @@ -5722,7 +6115,7 @@ action = g_object_new (KATZE_TYPE_ARRAY_ACTION, "name", "CompactMenu", "label", _("_Menu"), - "stock-id", STOCK_WEB_BROWSER, + "stock-id", GTK_STOCK_PROPERTIES, "tooltip", _("Menu"), "array", katze_array_new (KATZE_TYPE_ITEM), NULL); @@ -5737,6 +6130,7 @@ 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); + _action_set_visible (browser, "Menubar", !midori_browser_has_native_menubar ()); #if HAVE_HILDON #if HILDON_CHECK_VERSION (2, 2, 0) browser->menubar = hildon_app_menu_new (); @@ -5759,10 +6153,15 @@ gtk_widget_show (browser->throbber); gtk_container_add (GTK_CONTAINER (menuitem), browser->throbber); gtk_widget_set_sensitive (menuitem, FALSE); + #if GTK_CHECK_VERSION (3, 2, 0) + /* FIXME: Doesn't work */ + gtk_widget_set_hexpand (menuitem, TRUE); + gtk_widget_set_halign (menuitem, GTK_ALIGN_END); + #else gtk_menu_item_set_right_justified (GTK_MENU_ITEM (menuitem), TRUE); + #endif gtk_menu_shell_append (GTK_MENU_SHELL (browser->menubar), menuitem); #endif - browser->menu_tools = gtk_menu_new (); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM ( gtk_ui_manager_get_widget (ui_manager, "/menubar/File/WindowNew")), NULL); @@ -5785,23 +6184,26 @@ g_signal_connect (forward, "button-press-event", G_CALLBACK (midori_browser_menu_item_middle_click_event_cb), browser); - #if HAVE_HILDON - _action_set_visible (browser, "Menubar", FALSE); - #endif - #if !WEBKIT_CHECK_VERSION (1, 1, 3) - _action_set_visible (browser, "Transferbar", FALSE); - #endif - #if !WEBKIT_CHECK_VERSION (1, 1, 2) - _action_set_sensitive (browser, "Encoding", FALSE); - #endif _action_set_sensitive (browser, "EncodingCustom", FALSE); _action_set_visible (browser, "LastSession", FALSE); - /* FIXME: Show once implemented */ + #if !HAVE_HILDON && !defined (GDK_WINDOWING_X11) _action_set_visible (browser, "AddDesktopShortcut", FALSE); + #endif + + _action_set_visible (browser, "Bookmarks", browser->bookmarks != NULL); + _action_set_visible (browser, "BookmarkAdd", browser->bookmarks != NULL); + _action_set_visible (browser, "BookmarksImport", browser->bookmarks != NULL); + _action_set_visible (browser, "BookmarksExport", browser->bookmarks != NULL); + _action_set_visible (browser, "Bookmarkbar", browser->bookmarks != NULL); + _action_set_visible (browser, "Trash", browser->trash != NULL); + _action_set_visible (browser, "UndoTabClose", browser->trash != NULL); /* Create the navigationbar */ browser->navigationbar = gtk_ui_manager_get_widget ( ui_manager, "/toolbar_navigation"); +#if GTK_CHECK_VERSION(3,0,0) + gtk_style_context_add_class(gtk_widget_get_style_context(browser->navigationbar), "primary-toolbar"); +#endif /* FIXME: Settings should be connected with screen changes */ gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser)); if (gtk_settings) @@ -5833,6 +6235,10 @@ /* Bookmarkbar */ browser->bookmarkbar = gtk_toolbar_new (); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_style_context_add_class ( + gtk_widget_get_style_context (browser->bookmarkbar), "secondary-toolbar"); +#endif gtk_widget_set_name (browser->bookmarkbar, "MidoriBookmarkbar"); gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->bookmarkbar), GTK_ICON_SIZE_MENU); @@ -5852,6 +6258,9 @@ g_signal_connect (hpaned, "notify::position", G_CALLBACK (midori_panel_notify_position_cb), browser); + g_signal_connect (hpaned, "cycle-child-focus", + G_CALLBACK (midori_panel_cycle_child_focus_cb), + browser); gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0); gtk_widget_show (hpaned); browser->panel = g_object_new (MIDORI_TYPE_PANEL, @@ -5862,8 +6271,6 @@ midori_panel_notify_page_cb, browser, "signal::notify::show-titles", midori_panel_notify_show_titles_cb, browser, - "signal::notify::show-controls", - midori_panel_notify_show_controls_cb, browser, "signal::notify::right-aligned", midori_panel_notify_right_aligned_cb, browser, "signal::close", @@ -5875,26 +6282,50 @@ vpaned = gtk_vpaned_new (); gtk_paned_pack2 (GTK_PANED (hpaned), vpaned, TRUE, FALSE); gtk_widget_show (vpaned); + #ifdef HAVE_GRANITE + /* FIXME: granite: should return GtkWidget* like GTK+ */ + browser->notebook = (GtkWidget*)granite_widgets_dynamic_notebook_new (); + #else browser->notebook = gtk_notebook_new (); + gtk_notebook_set_scrollable (GTK_NOTEBOOK (browser->notebook), TRUE); + #endif + #if !GTK_CHECK_VERSION (3, 0, 0) + { /* Remove the inner border between scrollbars and the window border */ - rcstyle = gtk_rc_style_new (); + GtkRcStyle* rcstyle = gtk_rc_style_new (); rcstyle->xthickness = 0; gtk_widget_modify_style (browser->notebook, rcstyle); g_object_unref (rcstyle); - gtk_notebook_set_scrollable (GTK_NOTEBOOK (browser->notebook), TRUE); + } + #endif gtk_paned_pack1 (GTK_PANED (vpaned), browser->notebook, FALSE, FALSE); g_signal_connect (browser->notebook, "switch-page", - G_CALLBACK (gtk_notebook_switch_page_cb), + G_CALLBACK (midori_browser_notebook_switch_page_cb), browser); g_signal_connect_after (browser->notebook, "switch-page", - G_CALLBACK (gtk_notebook_switch_page_after_cb), + G_CALLBACK (midori_browser_notebook_switch_page_after_cb), browser); + #ifdef HAVE_GRANITE + g_signal_connect (browser->notebook, "new-tab-created", + G_CALLBACK (midori_browser_notebook_new_tab_created_cb), + browser); + #endif g_signal_connect (browser->notebook, "page-reordered", G_CALLBACK (midori_browser_notebook_page_reordered_cb), browser); + g_signal_connect (browser->notebook, "page-removed", + G_CALLBACK (midori_browser_notebook_page_removed_cb), + browser); + g_signal_connect (browser->notebook, "size-allocate", + G_CALLBACK (midori_browser_notebook_size_allocate_cb), + browser); g_signal_connect_after (browser->notebook, "button-press-event", G_CALLBACK (midori_browser_notebook_button_press_event_after_cb), browser); + g_signal_connect (browser->notebook, "reorder-tab", + G_CALLBACK (midori_browser_notebook_reorder_tab_cb), NULL); + g_signal_connect (browser->notebook, "create-window", + G_CALLBACK (midori_browser_notebook_create_window_cb), browser); gtk_widget_show (browser->notebook); /* Inspector container */ @@ -5903,7 +6334,7 @@ scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - GTK_WIDGET_SET_FLAGS (scrolled, GTK_CAN_FOCUS); + gtk_widget_set_can_focus (scrolled, TRUE); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled), GTK_SHADOW_ETCHED_IN); gtk_box_pack_start (GTK_BOX (browser->inspector), scrolled, TRUE, TRUE, 0); @@ -5921,32 +6352,38 @@ /* Statusbar */ browser->statusbar = gtk_statusbar_new (); + #if GTK_CHECK_VERSION (2, 20, 0) + browser->statusbar_contents = + gtk_statusbar_get_message_area (GTK_STATUSBAR (browser->statusbar)); + #else /* 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); + forward = GTK_STATUSBAR (browser->statusbar)->label; + if (GTK_IS_BOX (gtk_widget_get_parent (forward))) + browser->statusbar_contents = gtk_widget_get_parent (forward); 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_CONTAINER (GTK_STATUSBAR (browser->statusbar)->frame), forward); gtk_box_pack_start (GTK_BOX (browser->statusbar_contents), - label, TRUE, TRUE, 0); - g_object_unref (label); + forward, TRUE, TRUE, 0); + g_object_unref (forward); gtk_container_add (GTK_CONTAINER (GTK_STATUSBAR (browser->statusbar)->frame), browser->statusbar_contents); } + #endif gtk_box_pack_start (GTK_BOX (vbox), browser->statusbar, FALSE, FALSE, 0); - browser->progressbar = gtk_progress_bar_new (); - gtk_box_pack_start (GTK_BOX (browser->statusbar_contents), - browser->progressbar, FALSE, FALSE, 3); - browser->transferbar = g_object_new (MIDORI_TYPE_TRANSFERBAR, NULL); + #if GTK_CHECK_VERSION (3, 0, 0) + /* FIXME: Transfers should go between text and statusbar features like GTK+2 */ + gtk_box_pack_end (GTK_BOX (browser->statusbar_contents), browser->transferbar, FALSE, FALSE, 3); + #else gtk_box_pack_start (GTK_BOX (browser->statusbar_contents), browser->transferbar, FALSE, FALSE, 3); + #endif gtk_toolbar_set_show_arrow (GTK_TOOLBAR (browser->transferbar), FALSE); gtk_widget_show (browser->transferbar); @@ -5982,6 +6419,7 @@ katze_object_assign (browser->trash, NULL); katze_object_assign (browser->search_engines, NULL); katze_object_assign (browser->history, NULL); + browser->speeddial = NULL; katze_assign (browser->news_aggregator, NULL); @@ -6025,32 +6463,155 @@ gtk_toolbar_style); } +static void +midori_browser_toolbar_popup_context_menu_history_cb (GtkMenuItem* menu_item, + MidoriBrowser* browser) +{ + gint steps = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menu_item), "steps")); + MidoriView* view = MIDORI_VIEW (midori_browser_get_current_tab (browser)); + midori_view_go_back_or_forward (view, steps); +} + +static void +midori_browser_toolbar_popup_context_menu_history (MidoriBrowser* browser, + GtkWidget* widget, + gboolean back, + gint x, + gint y) +{ + const gint step = back ? -1 : 1; + gint steps = step; + GtkWidget* menu; + GtkWidget* menu_item; + WebKitWebBackForwardList* list; + WebKitWebHistoryItem* current_item; + WebKitWebHistoryItem* history_item; + WebKitWebHistoryItem* (*history_next)(WebKitWebBackForwardList*); + void (*history_action)(WebKitWebBackForwardList*); + + list = webkit_web_view_get_back_forward_list ( + WEBKIT_WEB_VIEW (midori_view_get_web_view ( + MIDORI_VIEW (midori_browser_get_current_tab (browser))))); + + if (!list) + return; + + menu = gtk_menu_new (); + + history_action = back ? + webkit_web_back_forward_list_go_back : + webkit_web_back_forward_list_go_forward; + history_next = back ? + webkit_web_back_forward_list_get_back_item : + webkit_web_back_forward_list_get_forward_item; + current_item = webkit_web_back_forward_list_get_current_item (list); + + for (; (history_item = history_next (list)); history_action (list), steps += step) + { + #if WEBKIT_CHECK_VERSION (1, 3, 13) + gchar* icon_uri; + gchar* icon_path; + GdkPixbuf* pixbuf; + GdkPixbuf* pixbuf_scaled = NULL; + #endif + + menu_item = gtk_image_menu_item_new_with_label ( + webkit_web_history_item_get_title (history_item)); + #if WEBKIT_CHECK_VERSION (1, 3, 13) + icon_uri = webkit_icon_database_get_icon_uri (webkit_get_icon_database (), + webkit_web_history_item_get_uri (history_item)); + icon_path = katze_net_get_cached_path (NULL, icon_uri, "icons"); + if ((pixbuf = gdk_pixbuf_new_from_file (icon_path, NULL))) + { + gint w = 16, h = 16; + gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (widget), + GTK_ICON_SIZE_MENU, &w, &h); + pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, + w, h, GDK_INTERP_BILINEAR); + } + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (menu_item), + pixbuf_scaled ? gtk_image_new_from_pixbuf (pixbuf_scaled) : + gtk_image_new_from_stock (GTK_STOCK_FILE, GTK_ICON_SIZE_MENU)); + g_free (icon_uri); + g_free (icon_path); + #endif + g_object_set_data (G_OBJECT (menu_item), "uri", + (gpointer) webkit_web_history_item_get_uri (history_item)); + g_object_set_data (G_OBJECT (menu_item), "steps", GINT_TO_POINTER (steps)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + g_signal_connect (G_OBJECT (menu_item), "activate", + G_CALLBACK (midori_browser_toolbar_popup_context_menu_history_cb), + browser); + if (steps == (10 - 1)) + break; + } + + webkit_web_back_forward_list_go_to_item (list, current_item); + gtk_widget_show_all (menu); + + katze_widget_popup (widget, GTK_MENU (menu), NULL, + KATZE_MENU_POSITION_LEFT); +} + static gboolean midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, GdkEventButton* event, MidoriBrowser* browser) { - if (event->button == 2) + if (MIDORI_EVENT_NEW_TAB (event)) { GtkWidget* parent = gtk_widget_get_parent (toolitem); GtkAction* action = gtk_activatable_get_related_action ( GTK_ACTIVATABLE (parent)); + g_object_set_data (G_OBJECT (action), + "midori-middle-click", + GINT_TO_POINTER (1)); + return _action_navigation_activate (action, browser); } - else if (event->button == 3) + else if (MIDORI_EVENT_CONTEXT_MENU (event)) { - midori_browser_toolbar_popup_context_menu_cb ( - GTK_IS_BIN (toolitem) && gtk_bin_get_child (GTK_BIN (toolitem)) ? + if (g_object_get_data (G_OBJECT (toolitem), "history-back")) + { + midori_browser_toolbar_popup_context_menu_history ( + browser, + GTK_IS_BIN (toolitem) && gtk_bin_get_child (GTK_BIN (toolitem)) ? gtk_widget_get_parent (toolitem) : toolitem, - event->x, event->y, event->button, browser); - + TRUE, event->x, event->y); + } + else if (g_object_get_data (G_OBJECT (toolitem), "history-forward")) + { + midori_browser_toolbar_popup_context_menu_history ( + browser, + GTK_IS_BIN (toolitem) && gtk_bin_get_child (GTK_BIN (toolitem)) ? + gtk_widget_get_parent (toolitem) : toolitem, + FALSE, event->x, event->y); + } + else + { + 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; } return FALSE; } static void +_midori_browser_search_item_allocate_cb (GtkWidget* widget, + GdkRectangle* allocation, + gpointer user_data) +{ + MidoriBrowser* browser = MIDORI_BROWSER (user_data); + MidoriWebSettings* settings = browser->settings; + g_object_set (settings, "search-width", allocation->width, NULL); +} + +static void _midori_browser_set_toolbar_items (MidoriBrowser* browser, const gchar* items) { @@ -6058,23 +6619,94 @@ gchar** name; GtkAction* action; GtkWidget* toolitem; + const char* token_location = g_intern_static_string ("Location"); + const char* token_search = g_intern_static_string ("Search"); + const char* token_dontcare = g_intern_static_string ("Dontcare"); + const char* token_current = token_dontcare; + const char* token_last = token_dontcare; gtk_container_foreach (GTK_CONTAINER (browser->navigationbar), (GtkCallback)gtk_widget_destroy, NULL); names = g_strsplit (items ? items : "", ",", 0); name = names; - while (*name) + for (; *name; ++name) { action = _action_by_name (browser, *name); - if (action) + if (action && strstr (*name, "CompactMenu") == NULL) { - toolitem = gtk_action_create_tool_item (action); + token_last = token_current; + + /* Decide, what kind of token (item) we got now */ + if (name && !g_strcmp0 (*name, "Location")) + token_current = token_location; + else if (name && !g_strcmp0 (*name, "Search")) + token_current = token_search; + else + token_current = token_dontcare; + + if ((token_current == token_location || token_current == token_search) && + (token_last == token_location || token_last == token_search)) + { + GtkWidget* toolitem_first = gtk_action_create_tool_item ( + _action_by_name (browser, token_last)); + GtkWidget* toolitem_second = gtk_action_create_tool_item ( + _action_by_name (browser, token_current)); + MidoriPanedAction* paned_action = MIDORI_PANED_ACTION ( + _action_by_name (browser, "LocationSearch")); + MidoriWebSettings* midori_settings = browser->settings; + midori_paned_action_set_child1 (paned_action, toolitem_first, token_last, + token_last == token_search ? FALSE : TRUE, TRUE); + midori_paned_action_set_child2 (paned_action, toolitem_second, token_current, + token_current == token_search ? FALSE : TRUE, TRUE); + g_signal_connect (G_OBJECT (token_current == token_search ? toolitem_second : toolitem_first), + "size-allocate", G_CALLBACK (_midori_browser_search_item_allocate_cb), (gpointer) browser); + + gtk_widget_set_size_request ( + token_last == token_search ? toolitem_first : toolitem_second, + katze_object_get_int ((gpointer) midori_settings, + "search-width"), + -1); + + toolitem = gtk_action_create_tool_item (GTK_ACTION (paned_action)); + token_current = token_dontcare; + token_last = token_dontcare; + } + else if (token_current == token_dontcare && token_last != token_dontcare) + { + /* There was a location or search item, but was not followed by + the other one, that form a couple */ + gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), + GTK_TOOL_ITEM (gtk_action_create_tool_item ( + _action_by_name (browser, token_last))), + -1); + + toolitem = gtk_action_create_tool_item (action); + } + else if (token_current != token_dontcare && token_last == token_dontcare) + continue; + #ifdef HAVE_GRANITE + /* A "new tab" button is already part of the notebook */ + else if (!strcmp (gtk_action_get_name (action), "TabNew")) + continue; + #endif + else + toolitem = gtk_action_create_tool_item (action); + if (gtk_bin_get_child (GTK_BIN (toolitem))) + { + if (!g_strcmp0 (*name, "Back")) + g_object_set_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (toolitem))), + "history-back", (void*) 0xdeadbeef); + else if (!g_strcmp0 (*name, "Forward")) + g_object_set_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (toolitem))), + "history-forward", (void*) 0xdeadbeef); + g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)), "button-press-event", G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), browser); + } else { gtk_tool_item_set_use_drag_window (GTK_TOOL_ITEM (toolitem), TRUE); @@ -6086,9 +6718,29 @@ gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), GTK_TOOL_ITEM (toolitem), -1); } - name++; } g_strfreev (names); + + /* There was a last item, which could have formed a couple, but + there is no item left, we add that last item to toolbar as is */ + if (token_current != token_dontcare) + { + gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), + GTK_TOOL_ITEM (gtk_action_create_tool_item ( + _action_by_name (browser, token_current))), -1); + } + + if (!katze_object_get_boolean (browser->settings, "show-menubar")) + { + toolitem = gtk_action_create_tool_item ( + GTK_ACTION (_action_by_name (browser, "CompactMenu"))); + 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); + } } static void @@ -6096,17 +6748,17 @@ { gboolean remember_last_window_size; MidoriWindowState last_window_state; - gboolean compact_sidepanel, show_panel_controls; + gboolean compact_sidepanel; 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; + gboolean show_panel; MidoriToolbarStyle toolbar_style; gchar* toolbar_items; - gint last_web_search; gboolean close_buttons_on_tabs; KatzeItem* item; + g_free (browser->location_entry_search); g_free (browser->news_aggregator); g_object_get (browser->settings, @@ -6115,7 +6767,6 @@ "last-window-height", &browser->last_window_height, "last-window-state", &last_window_state, "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, @@ -6124,19 +6775,18 @@ "show-navigationbar", &browser->show_navigationbar, "show-bookmarkbar", &show_bookmarkbar, "show-panel", &show_panel, - "show-transferbar", &show_transferbar, "show-statusbar", &browser->show_statusbar, - "speed-dial-in-new-tabs", &browser->speed_dial_in_new_tabs, "toolbar-style", &toolbar_style, "toolbar-items", &toolbar_items, - "last-web-search", &last_web_search, "location-entry-search", &browser->location_entry_search, "close-buttons-on-tabs", &close_buttons_on_tabs, - "progress-in-location", &browser->progress_in_location, "maximum-history-age", &browser->maximum_history_age, "news-aggregator", &browser->news_aggregator, NULL); + midori_findbar_set_close_button_left (MIDORI_FINDBAR (browser->find), + katze_object_get_boolean (browser->settings, "close-buttons-left")); + if (remember_last_window_size) { if (browser->last_window_width && browser->last_window_height) @@ -6172,13 +6822,13 @@ } _midori_browser_set_toolbar_style (browser, toolbar_style); - _toggle_tabbar_smartly (browser); + _toggle_tabbar_smartly (browser, FALSE); _midori_browser_set_toolbar_items (browser, toolbar_items); if (browser->search_engines) { item = katze_array_get_nth_item (browser->search_engines, - last_web_search); + browser->last_web_search); if (item) midori_search_action_set_current_item (MIDORI_SEARCH_ACTION ( _action_by_name (browser, "Search")), item); @@ -6193,7 +6843,6 @@ } g_object_set (browser->panel, "show-titles", !compact_sidepanel, - "show-controls", show_panel_controls, "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)), @@ -6208,11 +6857,9 @@ _action_set_active (browser, "Menubar", show_menubar); _action_set_active (browser, "Navigationbar", browser->show_navigationbar); - _action_set_active (browser, "Bookmarkbar", show_bookmarkbar); + _action_set_active (browser, "Bookmarkbar", show_bookmarkbar + && browser->bookmarks != NULL); _action_set_active (browser, "Panel", show_panel); - #if WEBKIT_CHECK_VERSION (1, 1, 3) - _action_set_active (browser, "Transferbar", show_transferbar); - #endif _action_set_active (browser, "Statusbar", browser->show_statusbar); g_free (toolbar_items); @@ -6243,49 +6890,44 @@ g_signal_handlers_unblock_by_func (browser->panel, midori_panel_notify_show_titles_cb, browser); } - else if (name == g_intern_string ("show-panel-controls")) - { - g_signal_handlers_block_by_func (browser->panel, - midori_panel_notify_show_controls_cb, browser); - g_object_set (browser->panel, "show-controls", - g_value_get_boolean (&value), NULL); - 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); + _toggle_tabbar_smartly (browser, FALSE); else if (name == g_intern_string ("show-menubar")) - sokoke_widget_set_visible (browser->menubar, g_value_get_boolean (&value)); + { + _action_set_active (browser, "Menubar", g_value_get_boolean (&value)); + } else if (name == g_intern_string ("show-navigationbar")) + { browser->show_navigationbar = g_value_get_boolean (&value); + _action_set_active (browser, "Navigationbar", g_value_get_boolean (&value)); + } + else if (name == g_intern_string ("show-bookmarkbar")) + { + _action_set_active (browser, "Bookmarkbar", g_value_get_boolean (&value)); + } else if (name == g_intern_string ("show-statusbar")) + { browser->show_statusbar = g_value_get_boolean (&value); - else if (name == g_intern_string ("speed-dial-in-new-tabs")) - browser->speed_dial_in_new_tabs = g_value_get_boolean (&value); - else if (name == g_intern_string ("progress-in-location")) - browser->progress_in_location = g_value_get_boolean (&value); - else if (name == g_intern_string ("search-engines-in-completion")) - { - if (g_value_get_boolean (&value)) - 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); + _action_set_active (browser, "Statusbar", g_value_get_boolean (&value)); } else if (name == g_intern_string ("location-entry-search")) { katze_assign (browser->location_entry_search, g_value_dup_string (&value)); } else if (name == g_intern_string ("maximum-history-age")) - browser->maximum_history_age = g_value_get_boolean (&value); + browser->maximum_history_age = g_value_get_int (&value); else if (name == g_intern_string ("news-aggregator")) { katze_assign (browser->news_aggregator, g_value_dup_string (&value)); } + else if (name == g_intern_string ("close-buttons-left")) + { + midori_findbar_set_close_button_left (MIDORI_FINDBAR (browser->find), + g_value_get_boolean (&value)); + } else if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_settings), name)) g_warning (_("Unexpected setting '%s'"), name); @@ -6301,7 +6943,7 @@ gint n; item = (KatzeItem*)g_object_get_data (G_OBJECT (toolitem), "KatzeItem"); - if (event->button == 2) + if (MIDORI_EVENT_NEW_TAB (event)) { if (KATZE_ITEM_IS_BOOKMARK (item)) { @@ -6310,7 +6952,7 @@ return TRUE; } } - else if (event->button == 3) + else if (MIDORI_EVENT_CONTEXT_MENU (event)) { midori_browser_bookmark_popup (toolitem, NULL, item, browser); return TRUE; @@ -6355,8 +6997,6 @@ static void midori_bookmarkbar_populate (MidoriBrowser* browser) { - sqlite3* db; - const gchar* sqlcmd; KatzeArray* array; KatzeItem* item; @@ -6366,14 +7006,8 @@ gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar), gtk_separator_tool_item_new (), -1); - db = g_object_get_data (G_OBJECT (browser->bookmarks), "db"); - if (!db) - return; - - sqlcmd = "SELECT uri, title, desc, app, folder, toolbar FROM bookmarks WHERE " - " toolbar = 1 ORDER BY uri ASC"; - - array = katze_array_from_sqlite (db, sqlcmd); + array = midori_array_query (browser->bookmarks, + "uri, title, desc, app, folder, toolbar", "toolbar = 1", NULL); if (!array) { _action_set_sensitive (browser, "BookmarkAdd", FALSE); @@ -6387,15 +7021,10 @@ midori_bookmarkbar_insert_item (browser->bookmarkbar, item); else { - KatzeArray* subfolder; - gchar* subsqlcmd; - - subsqlcmd = g_strdup_printf ("SELECT uri, title, desc, app FROM bookmarks WHERE " - " folder = '%s' and uri != ''", katze_item_get_name (item)); - subfolder = katze_array_from_sqlite (db, subsqlcmd); + KatzeArray* subfolder = midori_array_query (browser->bookmarks, + "uri, title, desc, app", "folder = '%q' AND uri != ''", katze_item_get_name (item)); katze_item_set_name (KATZE_ITEM (subfolder), katze_item_get_name (item)); midori_bookmarkbar_insert_item (browser->bookmarkbar, KATZE_ITEM (subfolder)); - g_free (subsqlcmd); } } _action_set_sensitive (browser, "BookmarkAdd", TRUE); @@ -6418,12 +7047,7 @@ GParamSpec* pspec, MidoriBrowser* browser) { - gboolean show_bookmarkbar; - - g_object_get (browser->settings, "show-bookmarkbar", - &show_bookmarkbar, NULL); - - if (!show_bookmarkbar) + if (!katze_object_get_boolean (browser->settings, "show-bookmarkbar")) midori_bookmarkbar_clear (browser->bookmarkbar); else midori_bookmarkbar_populate (browser); @@ -6443,9 +7067,25 @@ midori_browser_show_bookmarkbar_notify_value_cb, browser); katze_object_assign (browser->bookmarks, bookmarks); + _action_set_visible (browser, "Bookmarks", bookmarks != NULL); + if (bookmarks != NULL) + { + /* FIXME: Proxies aren't shown propely. Why? */ + GSList* proxies = gtk_action_get_proxies ( + _action_by_name (browser, "Bookmarks")); + for (; proxies; proxies = g_slist_next (proxies)) + gtk_widget_show (proxies->data); + } + _action_set_visible (browser, "BookmarkAdd", bookmarks != NULL); + _action_set_visible (browser, "BookmarksImport", bookmarks != NULL); + _action_set_visible (browser, "BookmarksExport", bookmarks != NULL); + _action_set_visible (browser, "Bookmarkbar", bookmarks != NULL); + if (!bookmarks) return; + if (katze_object_get_boolean (browser->settings, "show-bookmarkbar")) + _action_set_active (browser, "Bookmarkbar", TRUE); g_object_ref (bookmarks); g_signal_connect (settings, "notify::show-bookmarkbar", G_CALLBACK (midori_browser_show_bookmarkbar_notify_value_cb), browser); @@ -6461,7 +7101,6 @@ GParamSpec* pspec) { MidoriBrowser* browser = MIDORI_BROWSER (object); - guint last_web_search; KatzeItem* item; switch (prop_id) @@ -6498,6 +7137,8 @@ g_object_set (_action_by_name (browser, "Trash"), "array", browser->trash, "reversed", TRUE, NULL); + _action_set_visible (browser, "Trash", browser->trash != NULL); + _action_set_visible (browser, "UndoTabClose", browser->trash != NULL); /* FIXME: Connect to updates */ _midori_browser_update_actions (browser); break; @@ -6505,21 +7146,16 @@ { /* FIXME: Disconnect handlers */ katze_object_assign (browser->search_engines, g_value_dup_object (value)); - 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_location_action_set_search_engines (MIDORI_LOCATION_ACTION ( + _action_by_name (browser, "Location")), browser->search_engines); midori_search_action_set_search_engines (MIDORI_SEARCH_ACTION ( _action_by_name (browser, "Search")), browser->search_engines); /* FIXME: Connect to updates */ 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); + g_object_get (browser->settings, "last-web-search", &browser->last_web_search, NULL); + item = katze_array_get_nth_item (browser->search_engines, browser->last_web_search); midori_search_action_set_current_item (MIDORI_SEARCH_ACTION ( _action_by_name (browser, "Search")), item); @@ -6536,15 +7172,12 @@ case PROP_HISTORY: midori_browser_set_history (browser, g_value_get_object (value)); break; + case PROP_SPEED_DIAL: + browser->speeddial = g_value_get_pointer (value); + break; case PROP_SHOW_TABS: browser->show_tabs = g_value_get_boolean (value); - if (browser->show_tabs) - _toggle_tabbar_smartly (browser); - else - { - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (browser->notebook), FALSE); - gtk_notebook_set_show_border (GTK_NOTEBOOK (browser->notebook), FALSE); - } + _toggle_tabbar_smartly (browser, FALSE); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -6611,6 +7244,9 @@ case PROP_HISTORY: g_value_set_object (value, browser->history); break; + case PROP_SPEED_DIAL: + g_value_set_pointer (value, browser->speeddial); + break; case PROP_SHOW_TABS: g_value_set_boolean (value, browser->show_tabs); break; @@ -6656,10 +7292,43 @@ g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1); g_return_val_if_fail (GTK_IS_WIDGET (view), -1); + if (!g_object_get_data (G_OBJECT (webkit_get_default_session ()), + "midori-session-initialized")) + g_critical ("midori_load_soup_session was not called!"); + g_signal_emit (browser, signals[ADD_TAB], 0, view); + return midori_browser_page_num (browser, view); +} + +/** + * midori_browser_page_num: + * @browser: a #MidoriBrowser + * @widget: a widget in the browser + * + * Retrieves the position of @widget in the browser. + * + * If there is no page present at all, -1 is returned. + * + * Return value: the index of the widget, or -1 + * + * Since: 0.4.5 + **/ +gint +midori_browser_page_num (MidoriBrowser* browser, + GtkWidget* view) +{ + g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1); + g_return_val_if_fail (MIDORI_IS_VIEW (view), -1); + +#ifdef HAVE_GRANITE + return granite_widgets_dynamic_notebook_page_num ( + GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), view); +#else return gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), view); +#endif } + /** * midori_browser_remove_tab: * @browser: a #MidoriBrowser @@ -6692,43 +7361,16 @@ KatzeItem* item) { const gchar* uri; - const gchar* title; GtkWidget* view; gint page; - KatzeItem* proxy_item; - GList* keys; g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1); g_return_val_if_fail (KATZE_IS_ITEM (item), -1); uri = katze_item_get_uri (item); - title = katze_item_get_name (item); - /* Blank pages should not be delayed */ - if (katze_item_get_meta_integer (item, "delay") > 0 - && uri != NULL && strcmp (uri, "about:blank") != 0) - { - gchar* new_uri = g_strdup_printf ("pause:%s", uri); - view = midori_view_new_with_uri (new_uri, title, browser->settings); - g_free (new_uri); - } - else - view = midori_view_new_with_uri (uri, title, browser->settings); - - /* FIXME: We should have public API for that */ - if (g_object_get_data (G_OBJECT (item), "midori-view-append")) - g_object_set_data (G_OBJECT (view), "midori-view-append", (void*)1); - + view = midori_view_new_with_item (item, browser->settings); page = midori_browser_add_tab (browser, view); - proxy_item = midori_view_get_proxy_item (MIDORI_VIEW (view)); - if ((keys = katze_item_get_meta_keys (item))) - { - guint i = 0; - const gchar* key; - while ((key = g_list_nth_data (keys, i++))) - katze_item_set_meta_string (proxy_item, key, - katze_item_get_meta_string (item, key)); - g_list_free (keys); - } + midori_view_set_uri (MIDORI_VIEW (view), uri); return page; } @@ -6745,13 +7387,14 @@ midori_browser_add_uri (MidoriBrowser* browser, const gchar* uri) { - GtkWidget* view; + KatzeItem* item; g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1); g_return_val_if_fail (uri != NULL, -1); - view = midori_view_new_with_uri (uri, NULL, browser->settings); - return midori_browser_add_tab (browser, view); + item = katze_item_new (); + item->uri = g_strdup (uri); + return midori_browser_add_item (browser, item); } /** @@ -6771,6 +7414,81 @@ g_signal_emit (browser, signals[ACTIVATE_ACTION], 0, name); } +void +midori_browser_set_action_visible (MidoriBrowser* browser, + const gchar* name, + gboolean visible) +{ + g_return_if_fail (MIDORI_IS_BROWSER (browser)); + g_return_if_fail (name != NULL); + + _action_set_visible (browser, name, visible); + _action_set_sensitive (browser, name, visible); +} + +/** + * midori_browser_block_action: + * @browser: a #MidoriBrowser + * @name: the action to be blocked + * + * Blocks built-in behavior of the specified action without + * disabling it, which gives you a chance to connect your + * own signal handling. + * Call midori_browser_unblock_action() to undo the effect. + * + * Since: 0.3.4 + **/ +void +midori_browser_block_action (MidoriBrowser* browser, + GtkAction* action) +{ + const gchar* name; + guint i; + + g_return_if_fail (MIDORI_IS_BROWSER (browser)); + g_return_if_fail (GTK_IS_ACTION (action)); + + name = gtk_action_get_name (action); + for (i = 0; i < entries_n; i++) + if (g_str_equal (entries[i].name, name)) + { + g_signal_handlers_block_by_func (action, entries[i].callback, browser); + return; + } + g_critical ("%s: Action \"%s\" can't be blocked.", G_STRFUNC, name); +} + +/** + * midori_browser_unblock_action: + * @browser: a #MidoriBrowser + * @name: the action to be unblocked + * + * Restores built-in behavior of the specified action after + * previously blocking it with midori_browser_block_action(). + * + * Since: 0.3.4 + **/ +void +midori_browser_unblock_action (MidoriBrowser* browser, + GtkAction* action) +{ + const gchar* name; + guint i; + + g_return_if_fail (MIDORI_IS_BROWSER (browser)); + g_return_if_fail (GTK_IS_ACTION (action)); + + name = gtk_action_get_name (action); + for (i = 0; i < entries_n; i++) + if (g_str_equal (entries[i].name, name)) + { + g_signal_handlers_unblock_by_func (action, entries[i].callback, browser); + return; + } + g_critical ("%s: Action \"%s\" can't be unblocked.", G_STRFUNC, name); +} + + /** * midori_browser_get_action_group: * @browser: a #MidoriBrowser @@ -6853,12 +7571,26 @@ { GtkWidget* view; + g_return_if_fail (MIDORI_IS_BROWSER (browser)); + + view = midori_browser_get_nth_tab (browser, n); + g_return_if_fail (view != NULL); + + #ifdef HAVE_GRANITE + granite_widgets_dynamic_notebook_set_current_page ( + GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), n); + #else gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n); - view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), n); + #endif if (midori_view_is_blank (MIDORI_VIEW (view))) - gtk_action_activate (_action_by_name (browser, "Location")); + midori_browser_activate_action (browser, "Location"); else gtk_widget_grab_focus (view); + + g_object_freeze_notify (G_OBJECT (browser)); + g_object_notify (G_OBJECT (browser), "uri"); + g_object_notify (G_OBJECT (browser), "tab"); + g_object_thaw_notify (G_OBJECT (browser)); } /** @@ -6876,7 +7608,12 @@ { g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1); + #ifdef HAVE_GRANITE + return granite_widgets_dynamic_notebook_get_current_page ( + GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook)); + #else return gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); + #endif } /** @@ -6896,9 +7633,19 @@ midori_browser_get_nth_tab (MidoriBrowser* browser, gint page) { +#ifdef HAVE_GRANITE + GraniteWidgetsTab* tab; + + g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); + + tab = granite_widgets_dynamic_notebook_get_nth_page ( + GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), page); + return tab != NULL ? tab->widget : NULL; +#else g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); return gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), page); +#endif } /** @@ -6921,12 +7668,8 @@ g_return_if_fail (MIDORI_IS_BROWSER (browser)); g_return_if_fail (GTK_IS_WIDGET (view)); - n = gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), view); - gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n); - if (midori_view_is_blank (MIDORI_VIEW (view))) - gtk_action_activate (_action_by_name (browser, "Location")); - else - gtk_widget_grab_focus (view); + n = midori_browser_page_num (browser, view); + midori_browser_set_current_page (browser, n); } /** @@ -6950,9 +7693,9 @@ g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); - n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); + n = midori_browser_get_current_page (browser); if (n >= 0) - return gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), n); + return midori_browser_get_nth_tab (browser, n); else return NULL; } diff -Nru midori-0.2.8/midori/midori-browser.h midori-0.4.6/midori/midori-browser.h --- midori-0.2.8/midori/midori-browser.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/midori-browser.h 2012-05-14 22:13:42.000000000 +0000 @@ -106,6 +106,19 @@ midori_browser_activate_action (MidoriBrowser* browser, const gchar* name); +void +midori_browser_block_action (MidoriBrowser* browser, + GtkAction* action); + +void +midori_browser_unblock_action (MidoriBrowser* browser, + GtkAction* action); + +void +midori_browser_set_action_visible (MidoriBrowser* browser, + const gchar* name, + gboolean visible); + GtkActionGroup* midori_browser_get_action_group (MidoriBrowser* browser); @@ -139,6 +152,10 @@ midori_browser_get_current_tab (MidoriBrowser* browser); #define midori_browser_get_tab midori_browser_get_current_tab +gint +midori_browser_page_num (MidoriBrowser* browser, + GtkWidget* view); + GList* midori_browser_get_tabs (MidoriBrowser* browser); diff -Nru midori-0.2.8/midori/midori-extension.c midori-0.4.6/midori/midori-extension.c --- midori-0.2.8/midori/midori-extension.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/midori-extension.c 2012-05-14 22:13:42.000000000 +0000 @@ -12,12 +12,8 @@ #include "midori-extension.h" -#if HAVE_CONFIG_H - #include -#endif - #include -#include "sokoke.h" +#include "midori-platform.h" #include G_DEFINE_TYPE (MidoriExtension, midori_extension, G_TYPE_OBJECT); @@ -29,6 +25,7 @@ gchar* version; gchar* authors; gchar* website; + gchar* key; MidoriApp* app; gint active; @@ -131,12 +128,14 @@ PROP_DESCRIPTION, PROP_VERSION, PROP_AUTHORS, - PROP_WEBSITE + PROP_WEBSITE, + PROP_KEY }; enum { ACTIVATE, DEACTIVATE, + OPEN_PREFERENCES, LAST_SIGNAL }; @@ -186,6 +185,24 @@ G_TYPE_NONE, 0, G_TYPE_NONE); + /** + * MidoriExtension::open-preferences: + * + * The preferences of the extension should be opened. + * + * Since: 0.4.0 + */ + signals[OPEN_PREFERENCES] = g_signal_new ( + "open-preferences", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0, + G_TYPE_NONE); + gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = midori_extension_finalize; gobject_class->set_property = midori_extension_set_property; @@ -245,6 +262,23 @@ NULL, flags)); + /** + * MidoriExtension:key: + * + * The extension key. + * Needed if there is more than one extension object in a single module. + * + * Since: 0.4.5 + */ + g_object_class_install_property (gobject_class, + PROP_KEY, + g_param_spec_string ( + "key", + "Key", + "The extension key", + NULL, + flags)); + g_type_class_add_private (class, sizeof (MidoriExtensionPrivate)); } @@ -275,7 +309,16 @@ if (error->code == G_FILE_ERROR_NOENT) { gchar* filename = g_object_get_data (G_OBJECT (extension), "filename"); - gchar* folder = g_strconcat ("extensions/", filename, NULL); + gchar* folder; + if (g_str_has_prefix (filename, MIDORI_MODULE_PREFIX)) + filename = &filename[strlen (MIDORI_MODULE_PREFIX)]; + if (g_str_has_suffix (filename, G_MODULE_SUFFIX)) + filename = g_strndup (filename, + strlen (filename) - strlen ("." G_MODULE_SUFFIX)); + else + filename = g_strdup (filename); + folder = g_strconcat ("extensions/", filename, NULL); + g_free (filename); katze_assign (config_file, sokoke_find_config_filename (folder, "config")); g_free (folder); @@ -376,6 +419,7 @@ katze_assign (extension->priv->version, NULL); katze_assign (extension->priv->authors, NULL); katze_assign (extension->priv->website, NULL); + katze_assign (extension->priv->key, NULL); katze_assign (extension->priv->config_dir, NULL); g_list_free (extension->priv->lsettings); @@ -401,14 +445,30 @@ katze_assign (extension->priv->description, g_value_dup_string (value)); break; case PROP_VERSION: - katze_assign (extension->priv->version, g_value_dup_string (value)); + { + /* Don't show version suffix if it matches the running Midori */ + const gchar* version = g_value_get_string (value); + if (version && g_str_has_suffix (version, MIDORI_VERSION_SUFFIX)) + katze_assign (extension->priv->version, + g_strndup (version, + strlen (version) - strlen (MIDORI_VERSION_SUFFIX))); + /* No version suffix at all, must be 0.4.1 or 0.4.1 git */ + else if (version && !strchr (version, '-') && !strchr (version, '(')) + katze_assign (extension->priv->version, + g_strconcat (version, " (0.4.1)", NULL)); + else + katze_assign (extension->priv->version, g_strdup (version)); break; + } case PROP_AUTHORS: katze_assign (extension->priv->authors, g_value_dup_string (value)); break; case PROP_WEBSITE: katze_assign (extension->priv->website, g_value_dup_string (value)); break; + case PROP_KEY: + katze_assign (extension->priv->key, g_value_dup_string (value)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -440,6 +500,9 @@ case PROP_WEBSITE: g_value_set_string (value, extension->priv->website); break; + case PROP_KEY: + g_value_set_string (value, extension->priv->key); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -469,6 +532,22 @@ } /** + * midori_extension_has_preferences: + * @extension: a #MidoriExtension + * + * Determines if @extension has preferences. + * + * Return value: %TRUE if @extension has preferences + **/ +gboolean +midori_extension_has_preferences (MidoriExtension* extension) +{ + g_return_val_if_fail (MIDORI_IS_EXTENSION (extension), FALSE); + + return g_signal_has_handler_pending (extension, signals[OPEN_PREFERENCES], 0, FALSE); +} + +/** * midori_extension_is_active: * @extension: a #MidoriExtension * @@ -566,7 +645,8 @@ if (!extension->priv->config_dir) { gchar* filename = g_object_get_data (G_OBJECT (extension), "filename"); - g_return_val_if_fail (filename != NULL, NULL); + if (!filename) + return "/"; extension->priv->config_dir = g_build_filename ( sokoke_set_config_dir (NULL), "extensions", filename, NULL); } diff -Nru midori-0.2.8/midori/midori-extension.h midori-0.4.6/midori/midori-extension.h --- midori-0.2.8/midori/midori-extension.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/midori-extension.h 2012-05-14 22:13:42.000000000 +0000 @@ -52,6 +52,9 @@ midori_extension_is_prepared (MidoriExtension* extension); gboolean +midori_extension_has_preferences (MidoriExtension* extension); + +gboolean midori_extension_is_active (MidoriExtension* extension); gboolean diff -Nru midori-0.2.8/midori/midori-extensions-column.vala midori-0.4.6/midori/midori-extensions-column.vala --- midori-0.2.8/midori/midori-extensions-column.vala 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/midori/midori-extensions-column.vala 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,4 @@ + +public class Midori.ExtensionsColumn : Gtk.TreeViewColumn { + public signal void row_clicked (Gtk.TreeView view, Gtk.TreePath path); +} diff -Nru midori-0.2.8/midori/midori-locationaction.c midori-0.4.6/midori/midori-locationaction.c --- midori-0.2.8/midori/midori-locationaction.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/midori-locationaction.c 2012-05-14 22:13:42.000000000 +0000 @@ -12,11 +12,13 @@ #include "midori-locationaction.h" -#include "gtkiconentry.h" #include "marshal.h" -#include "sokoke.h" #include "midori-browser.h" +#include "midori-searchaction.h" +#include "midori-platform.h" +#include +#include "config.h" #include #include #include @@ -134,6 +136,14 @@ GObjectClass* gobject_class; GtkActionClass* action_class; + /** + * MidoriLocationAction:active-changed: + * @row: the active row + * + * The active-changed signal is emitted when the active row changes. + * + * Deprecated: 0.3.4 + */ signals[ACTIVE_CHANGED] = g_signal_new ("active-changed", G_TYPE_FROM_CLASS (class), (GSignalFlags) (G_SIGNAL_RUN_LAST), @@ -254,12 +264,6 @@ "The list of history items", KATZE_TYPE_ARRAY, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - /* We want location entries to have appears-as-list applied */ - gtk_rc_parse_string ("style \"midori-location-entry-style\" {\n" - " GtkComboBox::appears-as-list = 1\n }\n" - "widget \"*MidoriLocationEntry\" " - "style \"midori-location-entry-style\"\n"); } static GtkTreeModel* @@ -273,31 +277,167 @@ } static void -midori_location_action_popup_position (GtkWidget* popup, - GtkWidget* widget) +midori_location_action_popup_position (MidoriLocationAction* action, + gint matches) { - gint wx, wy; + GtkWidget* popup = action->popup; + GtkWidget* widget = action->entry; + GdkWindow* window = gtk_widget_get_window (widget); + gint wx, wy, x_border, y_border, items; GtkRequisition menu_req; GtkRequisition widget_req; GdkScreen* screen; gint monitor_num; GdkRectangle monitor; + GtkAllocation alloc; + gint height, sep, width, toplevel_height; + gboolean above; + GtkWidget* scrolled = gtk_widget_get_parent (action->treeview); + GtkWidget* toplevel; + GtkTreePath* path; - gdk_window_get_origin (widget->window, &wx, &wy); - gtk_widget_size_request (popup, &menu_req); + if (!window) + return; + + gtk_widget_get_allocation (widget, &alloc); + #if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_get_preferred_size (widget, &widget_req, NULL); + #else gtk_widget_size_request (widget, &widget_req); + #endif + gdk_window_get_origin (window, &wx, &wy); + + #if GTK_CHECK_VERSION (3, 0, 0) + wx += alloc.x; + wy += alloc.y + (alloc.height - widget_req.height) / 2; + #endif + /* _gtk_entry_get_borders (GTK_ENTRY (widget), &x_border, &y_border); */ + x_border = y_border = 0; + + gtk_tree_view_column_cell_get_size ( + gtk_tree_view_get_column (GTK_TREE_VIEW (action->treeview), 0), + NULL, NULL, NULL, NULL, &height); + gtk_widget_style_get (action->treeview, "vertical-separator", &sep, NULL); + height += sep; + /* Constrain to screen/ window size */ screen = gtk_widget_get_screen (widget); - monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window); + monitor_num = gdk_screen_get_monitor_at_window (screen, window); gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); + toplevel = gtk_widget_get_toplevel (widget); + gtk_window_get_size (GTK_WINDOW (toplevel), NULL, &toplevel_height); + toplevel_height = MIN (toplevel_height, monitor.height); + if (wy > toplevel_height / 2) + items = MIN (matches, ((monitor.y + wy) / height) - 1); + else + items = MIN (matches, ((toplevel_height - wy) / height) - 1); + width = MIN (alloc.width, monitor.width) - 2 * x_border; + + gtk_tree_view_columns_autosize (GTK_TREE_VIEW (action->treeview)); + #if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_set_size_request (scrolled, width, -1); + gtk_scrolled_window_set_min_content_width (GTK_SCROLLED_WINDOW (scrolled), width); + gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (scrolled), items * height); + gtk_widget_get_preferred_size (popup, &menu_req, NULL); + #else + gtk_widget_set_size_request (scrolled, width, items * height); + gtk_widget_size_request (popup, &menu_req); + #endif + + if (wx < monitor.x) + wx = monitor.x; + else if (wx + menu_req.width > monitor.x + monitor.width) + wx = monitor.x + monitor.width - menu_req.width; - if (wy + widget_req.height + menu_req.height <= monitor.y + monitor.height - || wy - monitor.y < (monitor.y + monitor.height) - (wy + widget_req.height)) + if (wy + widget_req.height + menu_req.height <= monitor.y + monitor.height || + wy - monitor.y < (monitor.y + monitor.height) - (wy + widget_req.height)) + { wy += widget_req.height; + above = FALSE; + } else + { wy -= menu_req.height; - gtk_window_move (GTK_WINDOW (popup), wx, wy); - gtk_window_resize (GTK_WINDOW (popup), widget->allocation.width, 1); + above = TRUE; + } + + path = gtk_tree_path_new_from_indices (above ? matches - 1 : 0, -1); + gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (action->treeview), path, + NULL, FALSE, 0.0, 0.0); + gtk_tree_path_free (path); + + gtk_window_move (GTK_WINDOW (popup), wx, wy); +} + +static int +midori_location_action_add_search_engines (MidoriLocationAction* action, + GtkListStore* store, + gint matches) +{ + KatzeItem* item; + gint i = 0; + GtkStyle* style; + + gtk_widget_realize (action->treeview); + style = gtk_widget_get_style (action->treeview); + + /* FIXME: choose 3 most frequently except for default */ + KATZE_ARRAY_FOREACH_ITEM (item, action->search_engines) + { + gchar* uri; + gchar* title; + const gchar* text; + gchar* desc; + GdkPixbuf* icon; + + uri = midori_uri_for_search (katze_item_get_uri (item), action->key); + title = g_strdup_printf (_("Search with %s"), katze_item_get_name (item)); + text = katze_item_get_text (item); + desc = g_strdup_printf ("%s\n%s", title, text ? text : uri); + icon = midori_search_action_get_icon (item, action->treeview, NULL, FALSE); + gtk_list_store_insert_with_values (store, NULL, matches + i, + URI_COL, uri, TITLE_COL, desc, YALIGN_COL, 0.25, + BACKGROUND_COL, style ? &style->bg[GTK_STATE_NORMAL] : NULL, + STYLE_COL, 1, FAVICON_COL, icon, -1); + g_free (uri); + g_free (title); + g_free (desc); + if (icon != NULL) + g_object_unref (icon); + i++; + + if (i > 2 && matches > 0) + { + gtk_list_store_insert_with_values (store, NULL, matches + i, + URI_COL, "about:search", TITLE_COL, _("Search with..."), + YALIGN_COL, 0.25, + BACKGROUND_COL, style ? &style->bg[GTK_STATE_NORMAL] : NULL, + STYLE_COL, 1, FAVICON_COL, NULL, -1); + i++; + break; + } + } + return i; +} + +static void +midori_location_action_complete (MidoriLocationAction* action, + gboolean new_tab, + const gchar* uri) +{ + if (!strcmp (uri, "about:search")) + { + GtkListStore* store = GTK_LIST_STORE (action->completion_model); + gtk_list_store_clear (store); + midori_location_action_popup_position (action, + midori_location_action_add_search_engines (action, store, 0)); + } + else + { + midori_location_action_popdown_completion (action); + gtk_entry_set_text (GTK_ENTRY (action->entry), uri); + g_signal_emit (action, signals[SUBMIT_URI], 0, uri, new_tab); + } } static gboolean @@ -315,13 +455,9 @@ gtk_tree_model_get_iter (action->completion_model, &iter, path); gtk_tree_path_free (path); - - midori_location_action_popdown_completion (action); - gtk_tree_model_get (action->completion_model, &iter, URI_COL, &uri, -1); - gtk_entry_set_text (GTK_ENTRY (action->entry), uri); - g_signal_emit (action, signals[SUBMIT_URI], 0, uri, - MIDORI_MOD_NEW_TAB (event->state)); + midori_location_action_complete (action, + MIDORI_MOD_NEW_TAB (event->state), uri); g_free (uri); return TRUE; @@ -341,14 +477,21 @@ gint result; static sqlite3_stmt* stmt; const gchar* sqlcmd; - gint matches, searches, height, screen_height, browser_height, sep; - MidoriBrowser* browser; - GtkStyle* style; + gint matches, searches; if (!action->entry || !gtk_widget_has_focus (action->entry) || !action->history) return FALSE; - if (!(action->key && *action->key)) + /* No completion when typing a search token */ + if (action->search_engines + && katze_array_find_token (action->search_engines, action->key)) + { + midori_location_action_popdown_completion (action); + return FALSE; + } + + /* Empty string or starting with a space means: no completion */ + if (!(action->key && *action->key && *action->key != ' ')) { midori_location_action_popdown_completion (action); return FALSE; @@ -358,6 +501,10 @@ { sqlite3* db; db = g_object_get_data (G_OBJECT (action->history), "db"); + + if (!db) + return FALSE; + sqlcmd = "SELECT type, uri, title FROM (" " SELECT 1 AS type, uri, title, count() AS ct FROM history " " WHERE uri LIKE ?1 OR title LIKE ?1 GROUP BY uri " @@ -408,6 +555,8 @@ popup = gtk_window_new (GTK_WINDOW_POPUP); gtk_window_set_type_hint (GTK_WINDOW (popup), GDK_WINDOW_TYPE_HINT_COMBO); + /* Window managers may ignore programmatic resize without this */ + gtk_window_set_resizable (GTK_WINDOW (popup), FALSE); popup_frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (popup_frame), GTK_SHADOW_ETCHED_IN); gtk_container_add (GTK_CONTAINER (popup), popup_frame); @@ -436,6 +585,8 @@ renderer = gtk_cell_renderer_text_new (); g_object_set_data (G_OBJECT (renderer), "location-action", 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 (column), renderer, TRUE); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (column), renderer, "cell-background-gdk", BACKGROUND_COL, @@ -454,7 +605,6 @@ gtk_list_store_clear (store); matches = searches = 0; - style = gtk_widget_get_style (action->treeview); while (result == SQLITE_ROW) { sqlite3_int64 type = sqlite3_column_int64 (stmt, 0); @@ -462,7 +612,7 @@ const unsigned char* title = sqlite3_column_text (stmt, 2); GdkPixbuf* icon = katze_load_cached_icon ((gchar*)uri, NULL); if (!icon) - icon = action->default_icon; + icon = g_object_ref (action->default_icon); if (type == 1 /* history_view */) { gtk_list_store_insert_with_values (store, NULL, matches, @@ -472,62 +622,39 @@ else if (type == 2 /* search_view */) { gchar* search_title = g_strdup_printf (_("Search for %s"), title); + gchar* search_desc = g_strdup_printf ("%s\n%s", search_title, uri); gtk_list_store_insert_with_values (store, NULL, matches, - URI_COL, uri, TITLE_COL, search_title, YALIGN_COL, 0.25, + URI_COL, uri, TITLE_COL, search_desc, YALIGN_COL, 0.25, STYLE_COL, 1, FAVICON_COL, icon, -1); + g_free (search_desc); g_free (search_title); } + if (icon != NULL) + g_object_unref (icon); matches++; result = sqlite3_step (stmt); } - sqlite3_reset (stmt); - sqlite3_clear_bindings (stmt); - if (action->search_engines) + if (stmt) { - KatzeItem* item; - i = 0; - KATZE_ARRAY_FOREACH_ITEM (item, action->search_engines) - { - gchar* uri; - gchar* title; - - uri = sokoke_search_uri (katze_item_get_uri (item), action->key); - title = g_strdup_printf (_("Search with %s"), katze_item_get_name (item)); - gtk_list_store_insert_with_values (store, NULL, matches + i, - URI_COL, uri, TITLE_COL, title, YALIGN_COL, 0.25, - BACKGROUND_COL, style ? &style->bg[GTK_STATE_NORMAL] : NULL, - STYLE_COL, 1, FAVICON_COL, NULL, -1); - g_free (uri); - g_free (title); - i++; - } - searches += i; + sqlite3_reset (stmt); + sqlite3_clear_bindings (stmt); } + if (action->search_engines) + searches += midori_location_action_add_search_engines (action, store, matches); + if (!gtk_widget_get_visible (action->popup)) { GtkWidget* toplevel = gtk_widget_get_toplevel (action->entry); gtk_window_set_screen (GTK_WINDOW (action->popup), gtk_widget_get_screen (action->entry)); gtk_window_set_transient_for (GTK_WINDOW (action->popup), GTK_WINDOW (toplevel)); - gtk_tree_view_columns_autosize (GTK_TREE_VIEW (action->treeview)); + gtk_widget_show_all (action->popup); } - browser = midori_browser_get_for_widget (action->entry); - column = gtk_tree_view_get_column (GTK_TREE_VIEW (action->treeview), 0); - gtk_tree_view_column_cell_get_size (column, NULL, NULL, NULL, NULL, &height); - screen_height = gdk_screen_get_height (gtk_widget_get_screen (action->popup)); - gtk_window_get_size (GTK_WINDOW (browser), NULL, &browser_height); - screen_height = MIN (MIN (browser_height, screen_height / 1.5), screen_height / 1.5); - gtk_widget_style_get (action->treeview, "vertical-separator", &sep, NULL); - /* FIXME: Instead of 1.5 we should relate to the height of one line */ - height = MIN (matches * height + (matches + searches) * sep - + searches * height / 1.5, screen_height); - gtk_widget_set_size_request (action->treeview, -1, height); - midori_location_action_popup_position (action->popup, action->entry); - gtk_widget_show_all (action->popup); + midori_location_action_popup_position (action, matches + searches); return FALSE; } @@ -612,48 +739,6 @@ } static void -midori_location_action_toggle_arrow_cb (GtkWidget* widget, - MidoriLocationAction* location_action) -{ gboolean show = FALSE; - - sqlite3* db; - const gchar* sqlcmd; - sqlite3_stmt* statement; - gint result; - - if (!GTK_IS_BUTTON (widget)) - return; - - db = g_object_get_data (G_OBJECT (location_action->history), "db"); - sqlcmd = "SELECT uri FROM history LIMIT 1"; - sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); - result = sqlite3_step (statement); - if (result == SQLITE_ROW) - show = TRUE; - sqlite3_finalize (statement); - sokoke_widget_set_visible (widget, show); - gtk_widget_set_size_request (widget, show ? -1 : 1, show ? -1 : 1); -} - -static void -midori_location_action_toggle_arrow (MidoriLocationAction* location_action) -{ - GSList* proxies; - - if (!location_action->history) - return; - - proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); - for (; proxies != NULL; proxies = g_slist_next (proxies)) - if (GTK_IS_TOOL_ITEM (proxies->data)) - { - GtkWidget* entry = midori_location_action_entry_for_proxy (proxies->data); - gtk_container_forall (GTK_CONTAINER (entry), - (GtkCallback)midori_location_action_toggle_arrow_cb, location_action); - } -} - -static void midori_location_action_set_property (GObject* object, guint prop_id, const GValue* value, @@ -674,8 +759,6 @@ case PROP_HISTORY: { katze_assign (location_action->history, g_value_dup_object (value)); - - midori_location_action_toggle_arrow (location_action); break; } default: @@ -736,7 +819,6 @@ { GtkWidget* toolitem; GtkWidget* alignment; - GtkWidget* location_entry; GtkWidget* entry; #if HAVE_HILDON HildonGtkInputMode mode; @@ -748,10 +830,6 @@ alignment = gtk_alignment_new (0.0f, 0.5f, 1.0f, 0.1f); gtk_widget_show (alignment); gtk_container_add (GTK_CONTAINER (toolitem), alignment); - location_entry = gtk_combo_box_entry_new (); - gtk_widget_set_name (location_entry, "MidoriLocationEntry"); - gtk_widget_show (location_entry); - gtk_container_add (GTK_CONTAINER (alignment), location_entry); #if HAVE_HILDON entry = gtk_entry_new (); @@ -760,13 +838,38 @@ hildon_gtk_entry_set_input_mode (GTK_ENTRY (entry), mode); #else entry = gtk_icon_entry_new (); - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FILE); + /* Work-around icon being activatable by default */ + gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, FALSE); gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_SECONDARY, TRUE); #endif gtk_widget_show (entry); - gtk_container_add (GTK_CONTAINER (location_entry), entry); + gtk_container_add (GTK_CONTAINER (alignment), entry); + + #if GTK_CHECK_VERSION (3, 0, 0) + { + static const gchar default_style[] = + ".security_unknown {\n" + "background-image: none;\n" + "background-color: #ef7070;\n" + "color: #000;\n" + "}\n" + ".security_trusted {\n" + "background-image: none;\n" + "background-color: #d1eeb9;\n" + "color: #000;\n" + "}\n"; + GtkCssProvider* css_provider; + GtkStyleContext* context; + + css_provider = gtk_css_provider_new (); + context = gtk_widget_get_style_context (entry); + gtk_css_provider_load_from_data (css_provider, default_style, -1, NULL); + gtk_style_context_add_provider (context, GTK_STYLE_PROVIDER (css_provider), + GTK_STYLE_PROVIDER_PRIORITY_FALLBACK); + } + #endif return toolitem; } @@ -838,43 +941,45 @@ switch (event->keyval) { - case GDK_ISO_Enter: - case GDK_KP_Enter: - case GDK_Return: + case GDK_KEY_ISO_Enter: + case GDK_KEY_KP_Enter: + case GDK_KEY_Return: is_enter = TRUE; - case GDK_Left: - case GDK_KP_Left: - case GDK_Right: - case GDK_KP_Right: - + case GDK_KEY_Left: + case GDK_KEY_KP_Left: + case GDK_KEY_Right: + case GDK_KEY_KP_Right: if (location_action->popup && gtk_widget_get_visible (location_action->popup)) { GtkTreeModel* model = location_action->completion_model; GtkTreeIter iter; gint selected = location_action->completion_index; - midori_location_action_popdown_completion (location_action); if (selected > -1 && gtk_tree_model_iter_nth_child (model, &iter, NULL, selected)) { gchar* uri; gtk_tree_model_get (model, &iter, URI_COL, &uri, -1); - gtk_entry_set_text (entry, uri); if (is_enter) - g_signal_emit (action, signals[SUBMIT_URI], 0, uri, - MIDORI_MOD_NEW_TAB (event->state)); + midori_location_action_complete (location_action, + MIDORI_MOD_NEW_TAB (event->state), uri); + else + { + midori_location_action_popdown_completion (location_action); + gtk_entry_set_text (entry, uri); + } g_free (uri); return TRUE; } + midori_location_action_popdown_completion (location_action); } - if (is_enter) - if ((text = gtk_entry_get_text (entry)) && *text) - g_signal_emit (action, signals[SUBMIT_URI], 0, text, - MIDORI_MOD_NEW_TAB (event->state)); + if (is_enter && (text = gtk_entry_get_text (entry)) && *text) + g_signal_emit (action, signals[SUBMIT_URI], 0, text, + MIDORI_MOD_NEW_TAB (event->state)); break; - case GDK_Escape: + case GDK_KEY_Escape: { if (location_action->popup && gtk_widget_get_visible (location_action->popup)) { @@ -888,12 +993,12 @@ /* Return FALSE to allow Escape to stop loading */ return FALSE; } - case GDK_Page_Up: - case GDK_Page_Down: + case GDK_KEY_Page_Up: + case GDK_KEY_Page_Down: if (!(location_action->popup && gtk_widget_get_visible (location_action->popup))) return TRUE; - case GDK_Delete: - case GDK_KP_Delete: + case GDK_KEY_Delete: + case GDK_KEY_KP_Delete: { gint selected = location_action->completion_index; GtkTreeModel* model = location_action->completion_model; @@ -934,13 +1039,13 @@ else break; } - case GDK_Down: - case GDK_KP_Down: - case GDK_Up: - case GDK_KP_Up: + case GDK_KEY_Down: + case GDK_KEY_KP_Down: + case GDK_KEY_Up: + case GDK_KEY_KP_Up: + case GDK_KEY_Tab: + case GDK_KEY_ISO_Left_Tab: { - GtkWidget* parent; - if (location_action->popup && gtk_widget_get_visible (location_action->popup)) { GtkTreeModel* model = location_action->completion_model; @@ -949,19 +1054,22 @@ GtkTreeIter iter; gint selected = location_action->completion_index; - if (event->keyval == GDK_Down || event->keyval == GDK_KP_Down) + if (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_KP_Down + || event->keyval == GDK_KEY_Tab || event->keyval == GDK_KEY_ISO_Left_Tab) selected = MIN (selected + 1, matches -1); - else if (event->keyval == GDK_Up || event->keyval == GDK_KP_Up) + else if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_KP_Up) { if (selected == -1) selected = matches - 1; else selected = MAX (selected - 1, 0); } - else if (event->keyval == GDK_Page_Down) + else if (event->keyval == GDK_KEY_Page_Down) selected = MIN (selected + 14, matches -1); - else if (event->keyval == GDK_Page_Up) + else if (event->keyval == GDK_KEY_Page_Up) selected = MAX (selected - 14, 0); + else if (event->keyval != GDK_KEY_KP_Delete && event->keyval != GDK_KEY_Delete) + g_assert_not_reached (); path = gtk_tree_path_new_from_indices (selected, -1); gtk_tree_view_set_cursor (GTK_TREE_VIEW (location_action->treeview), @@ -980,9 +1088,9 @@ return TRUE; } - parent = gtk_widget_get_parent (widget); - if (!katze_object_get_boolean (parent, "popup-shown")) - gtk_combo_box_popup (GTK_COMBO_BOX (parent)); + /* Allow Tab to handle focus if the popup is closed */ + if (event->keyval == GDK_KEY_Tab || event->keyval == GDK_KEY_ISO_Left_Tab) + return FALSE; return TRUE; } default: @@ -1062,6 +1170,7 @@ { MidoriLocationAction* action = data; gchar* uri_escaped; + gchar* uri_temp; gchar* uri; gchar* title; gboolean style; @@ -1104,13 +1213,26 @@ keys = g_strsplit_set (key, " %", -1); g_free (key); - uri = sokoke_uri_unescape_string (uri_escaped); + uri_temp = midori_uri_unescape (uri_escaped); g_free (uri_escaped); + uri = g_strescape (uri_temp, NULL); + g_free (uri_temp); if (G_LIKELY (uri)) { - temp_iter = temp = g_utf8_strdown (uri, -1); - desc_iter = uri; + /* Strip URI scheme and www. for display to reduce visual noise */ + gchar* stripped_uri = uri; + if (g_str_has_prefix (uri, "http://")) + stripped_uri = &uri[7]; + else if (g_str_has_prefix (uri, "https://")) + stripped_uri = &uri[8]; + else if (g_str_has_prefix (uri, "file://")) + stripped_uri = &uri[7]; + if (g_str_has_prefix (stripped_uri, "www.")) + stripped_uri = &stripped_uri[4]; + + temp_iter = temp = g_utf8_strdown (stripped_uri, -1); + desc_iter = stripped_uri; key_idx = 0; key = keys[key_idx]; offset = 0; @@ -1160,7 +1282,7 @@ katze_assign (desc_uri, temp_concat); } else - desc_uri = g_markup_escape_text (uri, -1); + desc_uri = g_markup_escape_text (stripped_uri, -1); g_free (temp); } @@ -1241,93 +1363,6 @@ } static void -midori_location_action_entry_changed_cb (GtkComboBox* combo_box, - MidoriLocationAction* location_action) -{ - GtkTreeIter iter; - - if (gtk_combo_box_get_active_iter (combo_box, &iter)) - { - GtkIconEntry* entry; - - if ((entry = GTK_ICON_ENTRY (gtk_bin_get_child (GTK_BIN (combo_box))))) - { - GtkTreeModel* model; - gchar* uri; - #if !HAVE_HILDON - GdkPixbuf* pixbuf; - #endif - - model = gtk_combo_box_get_model (combo_box); - gtk_tree_model_get (model, &iter, URI_COL, &uri, -1); - - #if !HAVE_HILDON - gtk_tree_model_get (model, &iter, FAVICON_COL, &pixbuf, -1); - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, pixbuf); - g_object_unref (pixbuf); - #endif - katze_assign (location_action->text, uri); - katze_assign (location_action->uri, g_strdup (uri)); - - g_signal_emit (location_action, signals[ACTIVE_CHANGED], 0, - gtk_combo_box_get_active (combo_box)); - } - } -} - -static void -midori_location_action_entry_popup_cb (GtkComboBox* combo_box, - MidoriLocationAction* location_action) -{ - GtkListStore* store; - gint result; - const gchar* sqlcmd; - static sqlite3_stmt* stmt; - gint matches; - - store = GTK_LIST_STORE (gtk_combo_box_get_model (combo_box)); - gtk_list_store_clear (store); - - if (!stmt) - { - sqlite3* db; - db = g_object_get_data (G_OBJECT (location_action->history), "db"); - sqlcmd = "SELECT uri, title FROM history" - " GROUP BY uri ORDER BY count() DESC LIMIT ?"; - sqlite3_prepare_v2 (db, sqlcmd, -1, &stmt, NULL); - } - - sqlite3_bind_int64 (stmt, 1, MAX_ITEMS); - result = sqlite3_step (stmt); - if (result != SQLITE_ROW) - { - g_print (_("Failed to execute database statement\n")); - sqlite3_reset (stmt); - sqlite3_clear_bindings (stmt); - return; - } - - matches = 0; - do - { - const unsigned char* uri = sqlite3_column_text (stmt, 0); - const unsigned char* title = sqlite3_column_text (stmt, 1); - GdkPixbuf* icon = katze_load_cached_icon ((gchar*)uri, NULL); - if (!icon) - icon = location_action->default_icon; - gtk_list_store_insert_with_values (store, NULL, matches, - URI_COL, uri, TITLE_COL, title, YALIGN_COL, 0.25, - FAVICON_COL, icon, -1); - matches++; - result = sqlite3_step (stmt); - } - while (result == SQLITE_ROW); - sqlite3_reset (stmt); - sqlite3_clear_bindings (stmt); -} - -static void midori_location_action_paste_proceed_cb (GtkWidget* menuitem, GtkWidget* location_action) { @@ -1350,6 +1385,8 @@ MidoriBrowser* browser = midori_browser_get_for_widget (entry); GtkActionGroup* actions = midori_browser_get_action_group (browser); GtkWidget* menuitem; + GtkClipboard* clipboard = gtk_clipboard_get_for_display ( + gtk_widget_get_display (entry),GDK_SELECTION_CLIPBOARD); menuitem = gtk_separator_menu_item_new (); gtk_widget_show (menuitem); @@ -1360,9 +1397,12 @@ /* i18n: Right-click on Location, Open an URL from the clipboard */ menuitem = gtk_menu_item_new_with_mnemonic (_("Paste and p_roceed")); gtk_widget_show (menuitem); - gtk_menu_shell_append (menu, menuitem); + /* Insert menu item after default Paste menu item */ + gtk_menu_shell_insert (menu, menuitem, 3); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_location_action_paste_proceed_cb), location_action); + if (!gtk_clipboard_wait_is_text_available (clipboard)) + gtk_widget_set_sensitive (menuitem, FALSE); } static void @@ -1370,7 +1410,6 @@ GtkWidget* proxy) { MidoriLocationAction* location_action; - GtkCellRenderer* renderer; GTK_ACTION_CLASS (midori_location_action_parent_class)->connect_proxy ( action, proxy); @@ -1383,41 +1422,10 @@ if (GTK_IS_TOOL_ITEM (proxy)) { GtkWidget* entry = midori_location_action_entry_for_proxy (proxy); - GtkWidget* child = gtk_bin_get_child (GTK_BIN (entry)); - GtkTreeModel* model = midori_location_action_create_model (); - - gtk_icon_entry_set_progress_fraction (GTK_ICON_ENTRY (child), + gtk_icon_entry_set_progress_fraction (GTK_ICON_ENTRY (entry), MIDORI_LOCATION_ACTION (action)->progress); - gtk_combo_box_set_model (GTK_COMBO_BOX (entry), model); - #if GTK_CHECK_VERSION (2, 14, 0) - gtk_combo_box_set_button_sensitivity (GTK_COMBO_BOX (entry), - GTK_SENSITIVITY_ON); - #endif - gtk_combo_box_entry_set_text_column ( - GTK_COMBO_BOX_ENTRY (entry), URI_COL); - gtk_cell_layout_clear (GTK_CELL_LAYOUT (entry)); - - /* Setup the renderer for the favicon */ - renderer = gtk_cell_renderer_pixbuf_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (entry), renderer, FALSE); - 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, action, NULL); - - gtk_combo_box_set_active (GTK_COMBO_BOX (entry), -1); - if (location_action->history) - gtk_container_forall (GTK_CONTAINER (entry), - (GtkCallback)midori_location_action_toggle_arrow_cb, action); - g_signal_connect (entry, "changed", - G_CALLBACK (midori_location_action_entry_changed_cb), action); - g_signal_connect (entry, "popup", - G_CALLBACK (midori_location_action_entry_popup_cb), action); - g_object_connect (child, + g_object_connect (entry, "signal::changed", midori_location_action_changed_cb, action, "signal::move-cursor", @@ -1498,7 +1506,7 @@ * @location_action: a #MidoriLocationAction * @text: a string * - * Sets the entry text to @text and, if applicable, updates the icon. + * Sets the entry text to @text. * * Since: 0.2.0 **/ @@ -1507,9 +1515,6 @@ const gchar* text) { GSList* proxies; - GtkWidget* location_entry; - GtkWidget* entry; - GdkPixbuf* icon; g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); g_return_if_fail (text != NULL); @@ -1522,23 +1527,12 @@ if (!(proxies = gtk_action_get_proxies (GTK_ACTION (location_action)))) return; - if (!(icon = katze_load_cached_icon (location_action->uri, NULL))) - icon = g_object_ref (location_action->default_icon); - for (; proxies != NULL; proxies = g_slist_next (proxies)) if (GTK_IS_TOOL_ITEM (proxies->data)) { - location_entry = midori_location_action_entry_for_proxy (proxies->data); - entry = gtk_bin_get_child (GTK_BIN (location_entry)); - + GtkWidget* entry = midori_location_action_entry_for_proxy (proxies->data); gtk_entry_set_text (GTK_ENTRY (entry), text); - #if !HAVE_HILDON - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, icon); - #endif } - - g_object_unref (icon); } /** @@ -1548,37 +1542,12 @@ * * Sets the icon shown on the left hand side. * - * Note: Since 0.1.8 %NULL can be passed to indicate that the - * visible URI refers to a target, not the current location. + * Deprecated: 0.4.6: The left hand icon only shows security status. **/ void midori_location_action_set_icon (MidoriLocationAction* location_action, GdkPixbuf* icon) { - #if !HAVE_HILDON - GSList* proxies; - GtkWidget* location_entry; - GtkWidget* entry; - - g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); - g_return_if_fail (!icon || GDK_IS_PIXBUF (icon)); - - proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); - - for (; proxies != NULL; proxies = g_slist_next (proxies)) - if (GTK_IS_TOOL_ITEM (proxies->data)) - { - location_entry = midori_location_action_entry_for_proxy (proxies->data); - entry = gtk_bin_get_child (GTK_BIN (location_entry)); - - if (icon) - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, icon); - else - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_JUMP_TO); - } - #endif } void @@ -1589,78 +1558,44 @@ g_return_if_fail (uri != NULL); katze_assign (location_action->uri, g_strdup (uri)); - - midori_location_action_toggle_arrow (location_action); } +/** + * midori_location_action_add_item: + * @location_action: a #MidoriLocationAction + * @icon: a #GdkPixbuf or %NULL + * @title: a string + * + * Adds the item to the location, historically this added it to + * completion suggestions and updated the left side icon. + * + * Deprecated: 0.4.6: The left hand icon only shows security status. + **/ + void midori_location_action_add_item (MidoriLocationAction* location_action, const gchar* uri, 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); - g_return_if_fail (title != NULL); - g_return_if_fail (!icon || GDK_IS_PIXBUF (icon)); - - #if !HAVE_HILDON - proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); - - for (; proxies != NULL; proxies = g_slist_next (proxies)) - if (GTK_IS_TOOL_ITEM (proxies->data)) - { - location_entry = midori_location_action_entry_for_proxy (proxies->data); - entry = gtk_bin_get_child (GTK_BIN (location_entry)); - - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, icon); - } - #endif } +/** + * midori_location_action_set_icon_for_uri: + * @location_action: a #MidoriLocationAction + * @icon: a #GdkPixbuf + * @uri: an URI string + * + * Sets the icon for the specified URI. + * + * Deprecated: 0.4.4 + **/ void 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)); - g_return_if_fail (uri != NULL); - - #if !HAVE_HILDON - proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); - - for (; proxies != NULL; proxies = g_slist_next (proxies)) - if (GTK_IS_TOOL_ITEM (proxies->data)) - { - location_entry = midori_location_action_entry_for_proxy (proxies->data); - entry = gtk_bin_get_child (GTK_BIN (location_entry)); - - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, icon); - } - #endif -} - -void -midori_location_action_set_title_for_uri (MidoriLocationAction* location_action, - const gchar* title, - const gchar* uri) -{ - /* Nothing to do */ + midori_location_action_set_icon (location_action, icon); } /** @@ -1698,8 +1633,6 @@ gdouble progress) { GSList* proxies; - GtkWidget* entry; - GtkWidget* child; g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); @@ -1710,27 +1643,31 @@ for (; proxies != NULL; proxies = g_slist_next (proxies)) if (GTK_IS_TOOL_ITEM (proxies->data)) { - entry = midori_location_action_entry_for_proxy (proxies->data); - child = gtk_bin_get_child (GTK_BIN (entry)); - - gtk_icon_entry_set_progress_fraction (GTK_ICON_ENTRY (child), + GtkWidget* entry = midori_location_action_entry_for_proxy (proxies->data); + gtk_icon_entry_set_progress_fraction (GTK_ICON_ENTRY (entry), location_action->progress); } } +/** + * midori_location_action_set_security_hint: + * @location_action: a #MidoriLocationAction + * @icon: a stock ID, or an icon name + * + * Sets the secondary, ie right hand side icon. + * + * Since 0.4.6 @icon can be a stock ID or an icon name. + **/ 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)); - g_return_if_fail (!stock_id || gtk_stock_lookup (stock_id, &stock_item)); katze_assign (location_action->secondary_icon, g_strdup (stock_id)); @@ -1740,39 +1677,18 @@ for (; proxies != NULL; proxies = g_slist_next (proxies)) if (GTK_IS_TOOL_ITEM (proxies->data)) { - entry = midori_location_action_entry_for_proxy (proxies->data); - child = gtk_bin_get_child (GTK_BIN (entry)); - - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (child), - GTK_ICON_ENTRY_SECONDARY, stock_id); + GtkWidget* entry = midori_location_action_entry_for_proxy (proxies->data); + if (stock_id && gtk_stock_lookup (stock_id, &stock_item)) + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_SECONDARY, stock_id); + else + gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_SECONDARY, stock_id); } #endif } /** - * midori_location_action_delete_item_from_uri: - * @location_action: a #MidoriLocationAction - * @uri: a string - * - * Finds the item from the list matching @uri - * and removes it if it is the last instance. - **/ -void -midori_location_action_delete_item_from_uri (MidoriLocationAction* location_action, - const gchar* uri) -{ - /* Nothing to do */ -} - -void -midori_location_action_clear (MidoriLocationAction* location_action) -{ - g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); - - midori_location_action_toggle_arrow (location_action); -} - -/** * midori_location_action_set_security_hint: * @location_action: a #MidoriLocationAction * @hint: a security hint @@ -1787,8 +1703,6 @@ MidoriSecurity hint) { GSList* proxies; - GtkWidget* entry; - GtkWidget* child; g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); @@ -1797,34 +1711,91 @@ for (; proxies != NULL; proxies = g_slist_next (proxies)) if (GTK_IS_TOOL_ITEM (proxies->data)) { - GdkColor bg_color = { 0, 1 }; - GdkColor fg_color = { 0, 1 }; - - entry = midori_location_action_entry_for_proxy (proxies->data); - child = gtk_bin_get_child (GTK_BIN (entry)); + #if !GTK_CHECK_VERSION (3, 0, 0) + const gchar* bg_color = NULL; + const gchar* fg_color = NULL; + #endif + GtkWidget* entry = midori_location_action_entry_for_proxy (proxies->data); + GdkScreen* screen = gtk_widget_get_screen (entry); + GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen); if (hint == MIDORI_SECURITY_UNKNOWN) { - gdk_color_parse ("#ef7070", &bg_color); - gdk_color_parse ("#000", &fg_color); + #if !GTK_CHECK_VERSION (3, 0, 0) + bg_color = "#ef7070"; + fg_color = "#000"; + #endif #if !HAVE_HILDON - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (child), - GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_INFO); + if (gtk_icon_theme_has_icon (icon_theme, "channel-insecure-symbolic")) + gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, "channel-insecure-symbolic"); + else if (gtk_icon_theme_has_icon (icon_theme, "lock-insecure")) + gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, "lock-insecure"); + else + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_INFO); + gtk_icon_entry_set_tooltip (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, _("Not verified")); #endif } else if (hint == MIDORI_SECURITY_TRUSTED) { - gdk_color_parse ("#fcf19a", &bg_color); - gdk_color_parse ("#000", &fg_color); + #if !GTK_CHECK_VERSION (3, 0, 0) + bg_color = "#d1eeb9"; + fg_color = "#000"; + #endif #if !HAVE_HILDON - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (child), - GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_DIALOG_AUTHENTICATION); + if (gtk_icon_theme_has_icon (icon_theme, "channel-secure-symbolic")) + gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, "channel-secure-symbolic"); + else if (gtk_icon_theme_has_icon (icon_theme, "lock-secure")) + gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, "lock-secure"); + else + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_DIALOG_AUTHENTICATION); + gtk_icon_entry_set_tooltip (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, _("Verified and encrypted connection")); #endif } + else if (hint == MIDORI_SECURITY_NONE) + { + if (gtk_icon_theme_has_icon (icon_theme, "text-html-symbolic")) + gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, "text-html-symbolic"); + else + gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, "text-html"); + gtk_icon_entry_set_tooltip (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, _("Open, unencrypted connection")); + } - gtk_widget_modify_base (child, GTK_STATE_NORMAL, - bg_color.red == 1 ? NULL : &bg_color); - gtk_widget_modify_text (child, GTK_STATE_NORMAL, - bg_color.red == 1 ? NULL : &fg_color); + { + #if GTK_CHECK_VERSION (3, 0, 0) + GtkStyleContext* context = gtk_widget_get_style_context (entry); + if (hint == MIDORI_SECURITY_UNKNOWN) + { + gtk_style_context_add_class (context, "security_unknown"); + gtk_style_context_remove_class (context, "security_trusted"); + } + else if (hint == MIDORI_SECURITY_TRUSTED) + { + gtk_style_context_add_class (context, "security_trusted"); + gtk_style_context_remove_class (context, "security_unknown"); + } + else if (hint == MIDORI_SECURITY_NONE) + { + gtk_style_context_remove_class (context, "security_unknown"); + gtk_style_context_remove_class (context, "security_trusted"); + } + #else + GdkColor color = { 0 }; + if (bg_color) gdk_color_parse (bg_color, &color); + gtk_widget_modify_base (entry, GTK_STATE_NORMAL, bg_color ? &color : NULL); + if (fg_color) gdk_color_parse (fg_color, &color); + gtk_widget_modify_text (entry, GTK_STATE_NORMAL, fg_color ? &color : NULL); + #endif + } } } diff -Nru midori-0.2.8/midori/midori-panedaction.c midori-0.4.6/midori/midori-panedaction.c --- midori-0.2.8/midori/midori-panedaction.c 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/midori/midori-panedaction.c 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,227 @@ +/* + Copyright (C) 2011 Peter Hatina + + 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 "midori-panedaction.h" + +struct _MidoriPanedActionChild +{ + GtkWidget* widget; + gchar* name; + gboolean resize; + gboolean shrink; +}; + +struct _MidoriPanedAction +{ + GtkAction parent_instance; + GtkWidget* hpaned; + GtkWidget* toolitem; + struct _MidoriPanedActionChild child1; + struct _MidoriPanedActionChild child2; +}; + +struct _MidoriPanedActionClass +{ + GtkActionClass parent_class; +}; + +G_DEFINE_TYPE (MidoriPanedAction, midori_paned_action, GTK_TYPE_ACTION); + +static GtkWidget* +midori_paned_action_create_tool_item (GtkAction *action); + +static void +midori_paned_action_finalize (GObject* object); + +static void +midori_paned_action_init (MidoriPanedAction* paned_action) +{ + paned_action->hpaned = NULL; + paned_action->toolitem = NULL; + memset ((void*) &paned_action->child1, 0, sizeof (struct _MidoriPanedActionChild)); + memset ((void*) &paned_action->child2, 0, sizeof (struct _MidoriPanedActionChild)); +} + +static void +midori_paned_action_finalize (GObject* object) +{ + MidoriPanedAction* paned_action = MIDORI_PANED_ACTION (object); + + g_object_unref (G_OBJECT (paned_action->toolitem)); + g_object_unref (G_OBJECT (paned_action->hpaned)); + katze_assign (paned_action->child1.name, NULL); + katze_assign (paned_action->child2.name, NULL); + + G_OBJECT_CLASS (midori_paned_action_parent_class)->finalize (object); +} + +static void +midori_paned_action_class_init (MidoriPanedActionClass* class) +{ + GObjectClass* gobject_class; + GtkActionClass* action_class; + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = midori_paned_action_finalize; + + action_class = GTK_ACTION_CLASS (class); + action_class->create_tool_item = midori_paned_action_create_tool_item; +} + +static GtkWidget* +midori_paned_action_create_tool_item (GtkAction* action) +{ + MidoriPanedAction* paned_action = MIDORI_PANED_ACTION (action); + GtkWidget* alignment = gtk_alignment_new (0.0f, 0.5f, 1.0f, 0.1f); + paned_action->hpaned = gtk_hpaned_new (); + paned_action->toolitem = GTK_WIDGET (gtk_tool_item_new ()); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (paned_action->toolitem), TRUE); + gtk_container_add (GTK_CONTAINER (paned_action->toolitem), alignment); + gtk_container_add (GTK_CONTAINER (alignment), GTK_WIDGET (paned_action->hpaned)); + + gtk_paned_pack1 (GTK_PANED (paned_action->hpaned), + paned_action->child1.widget, + paned_action->child1.resize, + paned_action->child1.shrink); + gtk_paned_pack2 (GTK_PANED (paned_action->hpaned), + paned_action->child2.widget, + paned_action->child2.resize, + paned_action->child2.shrink); + + gtk_widget_show_all (GTK_WIDGET (paned_action->toolitem)); + return paned_action->toolitem; +} + +/** + * midori_paned_action_set_child1: + * @paned_action: a #MidoriPanedAction + * @child1: a #GtkWidget to be added into GtkHPaned container + * @name: string name for the child2 + * @resize: should child1 expand when the MidoriPanedAction is resized + * @shrink: can child1 be made smaller than its requisition + **/ +void +midori_paned_action_set_child1 (MidoriPanedAction* paned_action, + GtkWidget* child1, + const gchar* name, + gboolean resize, + gboolean shrink) +{ + g_return_if_fail (MIDORI_IS_PANED_ACTION (paned_action)); + + katze_assign (paned_action->child1.name, g_strdup (name)); + paned_action->child1.widget = child1; + paned_action->child1.resize = resize; + paned_action->child1.shrink = shrink; +} + +/** + * midori_paned_action_set_child1: + * @paned_action: a #MidoriPanedAction + * @child2: a #GtkWidget to be added into GtkHPaned container + * @name: string name for the child2 + * @resize: should child2 expand when the MidoriPanedAction is resized + * @shrink: can child2 be made smaller than its requisition + **/ +void +midori_paned_action_set_child2 (MidoriPanedAction* paned_action, + GtkWidget* child2, + const gchar* name, + gboolean resize, + gboolean shrink) +{ + g_return_if_fail (MIDORI_IS_PANED_ACTION (paned_action)); + + katze_assign (paned_action->child2.name, g_strdup (name)); + paned_action->child2.widget = child2; + paned_action->child2.resize = resize; + paned_action->child2.shrink = shrink; +} + +/** + * midori_paned_action_get_child1: + * @paned_action: a #MidoriPanedAction + * + * returns the first child held in GtkHPaned container + **/ +GtkWidget* +midori_paned_action_get_child1 (MidoriPanedAction* paned_action) +{ + g_return_val_if_fail (MIDORI_IS_PANED_ACTION (paned_action), NULL); + + return paned_action->child1.widget; +} + +/** + * midori_paned_action_get_child1: + * @paned_action: a #MidoriPanedAction + * + * returns the second child held in GtkHPaned container + **/ +GtkWidget* +midori_paned_action_get_child2 (MidoriPanedAction* paned_action) +{ + g_return_val_if_fail (MIDORI_IS_PANED_ACTION (paned_action), NULL); + + return paned_action->child2.widget; +} + +/** + * midori_paned_action_get_child1: + * @paned_action: a #MidoriPanedAction + * @name: string name for one of the children + * + * returns a child specified by its name + **/ +GtkWidget* +midori_paned_action_get_child_by_name (MidoriPanedAction* paned_action, + const gchar* name) +{ + g_return_val_if_fail (MIDORI_IS_PANED_ACTION (paned_action), NULL); + g_return_val_if_fail (name != NULL, NULL); + + if (g_strcmp0 (name, paned_action->child1.name) == 0) + return midori_paned_action_get_child1 (paned_action); + else if (g_strcmp0 (name, paned_action->child2.name) == 0) + return midori_paned_action_get_child2 (paned_action); + + return NULL; +} + +/** + * midori_paned_action_get_child1_name: + * @paned_action a #MidoriPanedAction + * + * Returns: The name of the first child + **/ +const gchar* +midori_paned_action_get_child1_name (MidoriPanedAction* paned_action) +{ + g_return_val_if_fail (MIDORI_IS_PANED_ACTION (paned_action), NULL); + + return paned_action->child1.name; +} + +/** + * midori_paned_action_get_child2_name: + * @paned_action a #MidoriPanedAction + * + * Returns: The name of the second child + **/ +const gchar* +midori_paned_action_get_child2_name (MidoriPanedAction* paned_action) +{ + g_return_val_if_fail (MIDORI_IS_PANED_ACTION (paned_action), NULL); + + return paned_action->child2.name; +} diff -Nru midori-0.2.8/midori/midori-panedaction.h midori-0.4.6/midori/midori-panedaction.h --- midori-0.2.8/midori/midori-panedaction.h 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/midori/midori-panedaction.h 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,70 @@ +/* + Copyright (C) 2011 Peter Hatina + + 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 __MIDORI_PANED_ACTION_H__ +#define __MIDORI_PANED_ACTION_H__ + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_PANED_ACTION \ + (midori_paned_action_get_type ()) +#define MIDORI_PANED_ACTION(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_PANED_ACTION, MidoriPanedAction)) +#define MIDORI_PANED_ACTION_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_PANED_ACTION, MidoriPanedActionClass)) +#define MIDORI_IS_PANED_ACTION(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_PANED_ACTION)) +#define MIDORI_IS_PANED_ACTION_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_PANED_ACTION)) +#define MIDORI_PANED_ACTION_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_PANED_ACTION, MidoriPanedActionClass)) + +typedef struct _MidoriPanedAction MidoriPanedAction; +typedef struct _MidoriPanedActionClass MidoriPanedActionClass; + +GType +midori_paned_action_get_type (void) G_GNUC_CONST; + +void +midori_paned_action_set_child1 (MidoriPanedAction* paned_action, + GtkWidget* child1, + const gchar* name, + gboolean resize, + gboolean shrink); + +void +midori_paned_action_set_child2 (MidoriPanedAction* paned_action, + GtkWidget* child2, + const gchar* name, + gboolean resize, + gboolean shrink); + +GtkWidget* +midori_paned_action_get_child1 (MidoriPanedAction* paned_action); + +GtkWidget* +midori_paned_action_get_child2 (MidoriPanedAction* paned_action); + +GtkWidget* +midori_paned_action_get_child_by_name (MidoriPanedAction* paned_action, + const gchar* name); + +const gchar* +midori_paned_action_get_child1_name (MidoriPanedAction* paned_action); + +const gchar* +midori_paned_action_get_child2_name (MidoriPanedAction* paned_action); + +G_END_DECLS + +#endif // __MIDORI_PANED_ACTION_H__ diff -Nru midori-0.2.8/midori/midori-panel.c midori-0.4.6/midori/midori-panel.c --- midori-0.2.8/midori/midori-panel.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/midori-panel.c 2012-05-14 22:13:42.000000000 +0000 @@ -11,15 +11,15 @@ #include "midori-panel.h" +#include "midori-browser.h" +#include "midori-platform.h" #include "midori-view.h" #include "marshal.h" -#include "sokoke.h" #include #include "config.h" - #ifdef HAVE_HILDON_2_2 #include #endif @@ -31,8 +31,6 @@ GtkWidget* labelbar; GtkWidget* toolbar; GtkToolItem* button_align; - GtkToolItem* button_detach; - GtkToolItem* button_controls; GtkWidget* toolbar_label; GtkWidget* frame; GtkWidget* toolbook; @@ -194,6 +192,8 @@ * Whether to show operating controls. * * Since: 0.1.9 + * + * Deprecated: 0.3.0 */ g_object_class_install_property (gobject_class, PROP_SHOW_CONTROLS, @@ -338,25 +338,12 @@ 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); - if (!gtk_notebook_get_n_pages (GTK_NOTEBOOK (panel->notebook))) - 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) { @@ -405,20 +392,6 @@ gtk_container_add (GTK_CONTAINER (toolitem), panel->toolbar_label); gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6); gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, -1); - toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_FULLSCREEN); - gtk_widget_set_sensitive (GTK_WIDGET (toolitem), FALSE); - panel->button_detach = toolitem; - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), - _("Detach chosen panel from the window")); - gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (toolitem), - _("Detach chosen panel from the window")); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_panel_button_detach_clicked_cb), panel); - #if HAVE_OSX - gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, 0); - #else - gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, -1); - #endif toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD); gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("Align sidepanel to the right")); @@ -450,7 +423,6 @@ gtk_notebook_set_show_border (GTK_NOTEBOOK (panel->toolbook), FALSE); gtk_notebook_set_show_tabs (GTK_NOTEBOOK (panel->toolbook), FALSE); gtk_box_pack_start (GTK_BOX (vbox), panel->toolbook, FALSE, FALSE, 0); - gtk_widget_show (panel->toolbook); /* Create the notebook */ panel->notebook = gtk_notebook_new (); @@ -497,12 +469,6 @@ break; case PROP_SHOW_CONTROLS: panel->show_controls = g_value_get_boolean (value); - sokoke_widget_set_visible (panel->labelbar, panel->show_controls); - sokoke_widget_set_visible (panel->toolbar, panel->show_controls); - if (panel->button_controls) - gtk_toggle_tool_button_set_active ( - GTK_TOGGLE_TOOL_BUTTON (panel->button_controls), - !panel->show_controls); break; case PROP_RIGHT_ALIGNED: midori_panel_set_right_aligned (panel, g_value_get_boolean (value)); @@ -622,12 +588,30 @@ midori_panel_viewable_destroy_cb (GtkWidget* viewable, MidoriPanel* panel) { - gint i = gtk_notebook_page_num (GTK_NOTEBOOK (panel->notebook), + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (panel)); + gint n_pages; + gchar* action_name; + GtkAction* action; + gint i; + + i = gtk_notebook_page_num (GTK_NOTEBOOK (panel->notebook), g_object_get_data (G_OBJECT (viewable), "parent")); if (i > -1) gtk_notebook_remove_page (GTK_NOTEBOOK (panel->notebook), i); g_signal_handlers_disconnect_by_func ( viewable, midori_panel_viewable_destroy_cb, panel); + + n_pages = midori_panel_get_n_pages (panel); + if (n_pages > 0 && browser && !g_object_get_data (G_OBJECT (browser), "midori-browser-destroyed")) + midori_panel_set_current_page (panel, (n_pages-1 > i) ? i : n_pages - 1); + + action_name = g_strconcat ("PanelPage", + midori_viewable_get_stock_id (MIDORI_VIEWABLE (viewable)), NULL); + action = gtk_action_group_get_action (panel->action_group, action_name); + g_free (action_name); + + gtk_action_group_remove_action (panel->action_group, action); + g_object_unref (G_OBJECT (action)); } static GtkToolItem* @@ -644,9 +628,6 @@ 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 GTK_TOOL_ITEM (toolitem); } @@ -677,16 +658,6 @@ } } -#if !HAVE_HILDON -static void -midori_panel_show_controls_toggled_cb (GtkWidget* menuitem, - MidoriPanel* panel) -{ - if (panel->show_controls != !gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (menuitem))) - g_object_set (panel, "show-controls", !panel->show_controls, NULL); -} -#endif - /** * midori_panel_append_page: * @panel: a #MidoriPanel @@ -714,7 +685,9 @@ MidoriViewable* viewable) { GtkWidget* scrolled; + #if !GTK_CHECK_VERSION (3, 0, 0) GObjectClass* gobject_class; + #endif GtkWidget* widget; GtkWidget* toolbar; GtkToolItem* toolitem; @@ -725,6 +698,12 @@ g_return_val_if_fail (MIDORI_IS_PANEL (panel), -1); g_return_val_if_fail (MIDORI_IS_VIEWABLE (viewable), -1); + #if GTK_CHECK_VERSION (3, 2, 0) + if (GTK_IS_ORIENTABLE (viewable)) + gtk_orientable_set_orientation (GTK_ORIENTABLE (viewable), + GTK_ORIENTATION_VERTICAL); + #endif + if (GTK_IS_SCROLLED_WINDOW (viewable)) scrolled = (GtkWidget*)viewable; else @@ -733,10 +712,14 @@ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - GTK_WIDGET_SET_FLAGS (scrolled, GTK_CAN_FOCUS); + gtk_widget_set_can_focus (scrolled, TRUE); gtk_widget_show (scrolled); + #if GTK_CHECK_VERSION (3, 0, 0) + if (GTK_IS_SCROLLABLE (viewable)) + #else gobject_class = G_OBJECT_GET_CLASS (viewable); if (GTK_WIDGET_CLASS (gobject_class)->set_scroll_adjustments_signal) + #endif widget = (GtkWidget*)viewable; else { @@ -749,17 +732,6 @@ gtk_container_add (GTK_CONTAINER (panel->notebook), scrolled); toolbar = midori_viewable_get_toolbar (viewable); - #if !HAVE_HILDON - toolitem = gtk_toggle_tool_button_new_from_stock (GTK_STOCK_PROPERTIES); - gtk_tool_item_set_tooltip_text (toolitem, _("Hide operating controls")); - gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (toolitem), - !panel->show_controls); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_panel_show_controls_toggled_cb), panel); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, 0); - gtk_widget_show (GTK_WIDGET (toolitem)); - panel->button_controls = toolitem; - #endif gtk_widget_show (toolbar); gtk_container_add (GTK_CONTAINER (panel->toolbook), toolbar); g_signal_connect (viewable, "destroy", @@ -954,8 +926,7 @@ gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->toolbook), n); toolbar = gtk_notebook_get_nth_page (GTK_NOTEBOOK (panel->toolbook), n); items = gtk_container_get_children (GTK_CONTAINER (toolbar)); - sokoke_widget_set_visible (panel->toolbook, - g_list_nth_data (items, 1) != NULL); + sokoke_widget_set_visible (panel->toolbook, items != NULL); g_list_free (items); gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->notebook), n); label = midori_viewable_get_label (MIDORI_VIEWABLE (viewable)); diff -Nru midori-0.2.8/midori/midori-platform.h midori-0.4.6/midori/midori-platform.h --- midori-0.2.8/midori/midori-platform.h 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/midori/midori-platform.h 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,48 @@ +/* + Copyright (C) 2010-2011 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 __MIDORI_PLATFORM_H__ +#define __MIDORI_PLATFORM_H__ 1 + +#include "midori/midori-stock.h" +#include "katze/gtk3-compat.h" +#include "midori/gtkiconentry.h" +#include "midori/sokoke.h" + +/* Common behavior modifiers */ +#define MIDORI_MOD_NEW_WINDOW(state) (state & GDK_SHIFT_MASK) +#define MIDORI_MOD_NEW_TAB(state) (state & GDK_CONTROL_MASK) +#define MIDORI_MOD_BACKGROUND(state) (state & GDK_SHIFT_MASK) +#define MIDORI_MOD_SCROLL(state) (state & GDK_CONTROL_MASK) + +#ifdef GDK_WINDOWING_QUARTZ + #define MIDORI_EVENT_CONTEXT_MENU(evt) \ + ((evt->button == 3) \ + || (evt->button == 1 && (evt->state & GDK_CONTROL_MASK))) +#else + #define MIDORI_EVENT_CONTEXT_MENU(evt) \ + (evt->button == 3) +#endif + +#define MIDORI_EVENT_NEW_TAB(evt) \ + (evt != NULL \ + && ((((GdkEventButton*)evt)->button == 1 \ + && MIDORI_MOD_NEW_TAB(((GdkEventButton*)evt)->state)) \ + || (((GdkEventButton*)evt)->button == 2))) + +#ifndef G_OS_WIN32 + #define MIDORI_MODULE_PREFIX "lib" +#else + #define MIDORI_MODULE_PREFIX "" +#endif + + +#endif /* !__MIDORI_PLATFORM_H__ */ diff -Nru midori-0.2.8/midori/midori-preferences.c midori-0.4.6/midori/midori-preferences.c --- midori-0.2.8/midori/midori-preferences.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/midori-preferences.c 2012-05-14 22:13:42.000000000 +0000 @@ -11,16 +11,18 @@ #include "midori-preferences.h" -#if HAVE_CONFIG_H - #include -#endif - -#include "sokoke.h" +#include "midori-platform.h" #include #include #include +#if WEBKIT_CHECK_VERSION (1, 3, 11) + #define LIBSOUP_USE_UNSTABLE_REQUEST_API + #include +#endif + +#include #if HAVE_LIBNOTIFY #include #endif @@ -158,17 +160,9 @@ 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"); @@ -281,8 +275,8 @@ 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); + GtkWidget* vbox = gtk_dialog_get_content_area (GTK_DIALOG (preferences)); + gtk_box_pack_start (GTK_BOX (vbox), header, FALSE, FALSE, 0); gtk_widget_show_all (header); } _preferences = KATZE_PREFERENCES (preferences); @@ -298,61 +292,39 @@ #define SPANNED_ADD(__widget) \ katze_preferences_add_widget (_preferences, __widget, "spanned") /* Page "General" */ - PAGE_NEW (GTK_STOCK_HOME, _("General")); - FRAME_NEW (_("Startup")); + if (!sokoke_is_app_or_private ()) + { + PAGE_NEW (GTK_STOCK_HOME, _("Startup")); + FRAME_NEW (NULL); label = katze_property_label (settings, "load-on-startup"); INDENTED_ADD (label); button = katze_property_proxy (settings, "load-on-startup", NULL); SPANNED_ADD (button); label = katze_property_label (settings, "homepage"); INDENTED_ADD (label); - entry = katze_property_proxy (settings, "homepage", NULL); + entry = katze_property_proxy (settings, "homepage", "address"); 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); + #if 0 + button = gtk_button_new_with_mnemonic (_("Use _current page")); #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")); + label = gtk_label_new (NULL); + INDENTED_ADD (label); + button = gtk_button_new_with_label (_("Use current page as homepage")); + #endif g_signal_connect (button, "clicked", G_CALLBACK (midori_preferences_homepage_current_clicked_cb), settings); SPANNED_ADD (button); - #endif } - button = katze_property_proxy (settings, "show-crash-dialog", NULL); - INDENTED_ADD (button); - button = katze_property_proxy (settings, "speed-dial-in-new-tabs", NULL); - SPANNED_ADD (button); - FRAME_NEW (_("Transfers")); - #if !HAVE_HILDON - label = katze_property_label (settings, "download-folder"); - INDENTED_ADD (label); - button = katze_property_proxy (settings, "download-folder", "folder"); - SPANNED_ADD (button); - label = katze_property_proxy (settings, "ask-for-destination-folder", NULL); - 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")); + PAGE_NEW (GTK_STOCK_SELECT_FONT, _("Fonts")); + FRAME_NEW (NULL); #if !HAVE_HILDON - label = gtk_label_new (_("Default Font Family")); + label = gtk_label_new (_("Proportional Font Family")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); 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")); @@ -361,6 +333,7 @@ gtk_widget_set_tooltip_text (entry, _("The default font size used to display text")); SPANNED_ADD (entry); label = gtk_label_new (_("Fixed-width Font Family")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); 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")); @@ -369,10 +342,13 @@ gtk_widget_set_tooltip_text (entry, _("The font size used to display fixed-width text")); SPANNED_ADD (entry); label = gtk_label_new (_("Minimum Font Size")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); 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")); SPANNED_ADD (entry); + button = katze_property_proxy (settings, "enforce-font-family", NULL); + INDENTED_ADD (button); #endif label = katze_property_label (settings, "preferred-encoding"); INDENTED_ADD (label); @@ -381,102 +357,95 @@ /* Page "Behavior" */ PAGE_NEW (GTK_STOCK_SELECT_COLOR, _("Behavior")); - FRAME_NEW (_("Features")); + FRAME_NEW (NULL); #if !HAVE_HILDON button = katze_property_proxy (settings, "auto-load-images", NULL); 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, "enable-spell-checking", NULL); + SPANNED_ADD (button); + /* Disable spell check option if there are no enchant modules */ { - 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")); + gchar* enchant_path = sokoke_find_lib_path ("enchant"); + if (enchant_path == NULL) + { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), FALSE); + gtk_widget_set_sensitive (button, FALSE); + } + else + g_free (enchant_path); } - #else - button = katze_property_proxy (settings, "middle-click-opens-selection", NULL); - #endif - SPANNED_ADD (button); - #if !HAVE_HILDON button = katze_property_proxy (settings, "enable-scripts", NULL); INDENTED_ADD (button); - button = katze_property_proxy (settings, "open-panels-in-windows", NULL); - SPANNED_ADD (button); button = katze_property_proxy (settings, "enable-plugins", NULL); - INDENTED_ADD (button); - #endif - button = katze_property_proxy (settings, "find-while-typing", NULL); SPANNED_ADD (button); + #endif button = katze_property_proxy (settings, "zoom-text-and-images", NULL); INDENTED_ADD (button); - #if WEBKIT_CHECK_VERSION (1, 1, 11) button = katze_property_proxy (settings, "javascript-can-open-windows-automatically", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Allow scripts to open popups")); gtk_widget_set_tooltip_text (button, _("Whether scripts are allowed to open popup windows automatically")); SPANNED_ADD (button); - #endif - #if WEBKIT_CHECK_VERSION (1, 1, 6) - FRAME_NEW (_("Spell Checking")); - 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")); + 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, "middle-click-opens-selection", NULL); INDENTED_ADD (button); - button = gtk_label_new (_("Spelling dictionaries:")); + button = katze_property_proxy (settings, "flash-window-on-new-bg-tabs", NULL); + SPANNED_ADD (button); + + if (katze_object_has_property (settings, "enable-webgl")) + { + button = katze_property_proxy (settings, "enable-webgl", NULL); + INDENTED_ADD (button); + } + + FRAME_NEW (NULL); + button = katze_property_label (settings, "preferred-languages"); 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\"")); + entry = katze_property_proxy (settings, "preferred-languages", "languages"); SPANNED_ADD (entry); + #if !HAVE_HILDON + label = katze_property_label (settings, "download-folder"); + INDENTED_ADD (label); + button = katze_property_proxy (settings, "download-folder", "folder"); + SPANNED_ADD (button); #endif /* Page "Interface" */ - PAGE_NEW (GTK_STOCK_CONVERT, _("Interface")); - FRAME_NEW (_("Navigationbar")); + PAGE_NEW (GTK_STOCK_CONVERT, _("Browsing")); #if !HAVE_HILDON - INDENTED_ADD (katze_property_label (settings, "toolbar-style")); - button = katze_property_proxy (settings, "toolbar-style", NULL); - SPANNED_ADD (button); - button = katze_property_proxy (settings, "progress-in-location", NULL); - INDENTED_ADD (button); - button = katze_property_proxy (settings, "search-engines-in-completion", NULL); - SPANNED_ADD (button); + if (!g_getenv ("DESKTOP_SESSION")) + { + FRAME_NEW (NULL); + INDENTED_ADD (katze_property_label (settings, "toolbar-style")); + button = katze_property_proxy (settings, "toolbar-style", NULL); + SPANNED_ADD (button); + } #endif - FRAME_NEW (_("Browsing")); + FRAME_NEW (NULL); label = katze_property_label (settings, "open-new-pages-in"); INDENTED_ADD (label); button = katze_property_proxy (settings, "open-new-pages-in", NULL); SPANNED_ADD (button); - label = katze_property_label (settings, "open-external-pages-in"); - INDENTED_ADD (label); - button = katze_property_proxy (settings, "open-external-pages-in", NULL); - SPANNED_ADD (button); #if !HAVE_HILDON - button = katze_property_proxy (settings, "always-show-tabbar", NULL); - INDENTED_ADD (button); button = katze_property_proxy (settings, "close-buttons-on-tabs", NULL); + INDENTED_ADD (button); + #ifndef HAVE_GRANITE + button = katze_property_proxy (settings, "always-show-tabbar", NULL); SPANNED_ADD (button); #endif + #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")); + INDENTED_ADD (gtk_label_new (NULL)); label = katze_property_label (settings, "text-editor"); 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); - entry = katze_property_proxy (settings, "download-manager", "application-FileTransfer"); - SPANNED_ADD (entry); label = katze_property_label (settings, "news-aggregator"); INDENTED_ADD (label); entry = katze_property_proxy (settings, "news-aggregator", "application-News"); @@ -485,57 +454,43 @@ /* Page "Network" */ PAGE_NEW (GTK_STOCK_NETWORK, _("Network")); - FRAME_NEW (_("Network")); + FRAME_NEW (NULL); #if !HAVE_HILDON label = katze_property_label (settings, "proxy-type"); INDENTED_ADD (label); button = katze_property_proxy (settings, "proxy-type", NULL); SPANNED_ADD (button); label = gtk_label_new (_("Hostname")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); INDENTED_ADD (label); entry = katze_property_proxy (settings, "http-proxy", NULL); SPANNED_ADD (entry); g_signal_connect (settings, "notify::proxy-type", G_CALLBACK (midori_preferences_notify_proxy_type_cb), entry); midori_preferences_notify_proxy_type_cb (settings, NULL, entry); - #endif - label = katze_property_label (settings, "identify-as"); - INDENTED_ADD (label); - button = katze_property_proxy (settings, "identify-as", "custom-user-agent"); - SPANNED_ADD (button); - label = katze_property_label (settings, "preferred-languages"); - INDENTED_ADD (label); - entry = katze_property_proxy (settings, "preferred-languages", NULL); - SPANNED_ADD (entry); - - - /* Page "Privacy" */ - PAGE_NEW (GTK_STOCK_INDEX, _("Privacy")); - FRAME_NEW (_("Web Cookies")); - label = katze_property_label (settings, "accept-cookies"); - INDENTED_ADD (label); - button = katze_property_proxy (settings, "accept-cookies", NULL); - SPANNED_ADD (button); - label = katze_property_label (settings, "maximum-cookie-age"); + label = katze_property_label (settings, "http-proxy-port"); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); INDENTED_ADD (label); - entry = katze_property_proxy (settings, "maximum-cookie-age", NULL); + entry = katze_property_proxy (settings, "http-proxy-port", NULL); SPANNED_ADD (entry); - label = gtk_label_new (_("days")); - SPANNED_ADD (label); - #if WEBKIT_CHECK_VERSION (1, 1, 8) - INDENTED_ADD (katze_property_proxy (settings, "enable-html5-database", NULL)); - SPANNED_ADD (katze_property_proxy (settings, "enable-html5-local-storage", NULL)); + g_signal_connect (settings, "notify::proxy-type", + G_CALLBACK (midori_preferences_notify_proxy_type_cb), entry); + midori_preferences_notify_proxy_type_cb (settings, NULL, entry); #endif - #if WEBKIT_CHECK_VERSION (1, 1, 13) - INDENTED_ADD (katze_property_proxy (settings, "enable-offline-web-application-cache", NULL)); + #if WEBKIT_CHECK_VERSION (1, 3, 11) + if (soup_session_get_feature (webkit_get_default_session (), SOUP_TYPE_CACHE)) + { + label = katze_property_label (settings, "maximum-cache-size"); + INDENTED_ADD (label); + button = katze_property_proxy (settings, "maximum-cache-size", NULL); + SPANNED_ADD (button); + label = gtk_label_new (_("MB")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + SPANNED_ADD (label); + } #endif - FRAME_NEW (_("History")); - button = katze_property_label (settings, "maximum-history-age"); - INDENTED_ADD (button); - button = katze_property_proxy (settings, "maximum-history-age", NULL); + label = katze_property_label (settings, "identify-as"); + INDENTED_ADD (label); + button = katze_property_proxy (settings, "identify-as", "custom-user-agent"); SPANNED_ADD (button); - label = gtk_label_new (_("days")); - SPANNED_ADD (label); - button = katze_property_proxy (settings, "remember-last-downloaded-files", NULL); - INDENTED_ADD (button); } diff -Nru midori-0.2.8/midori/midori-searchaction.c midori-0.4.6/midori/midori-searchaction.c --- midori-0.2.8/midori/midori-searchaction.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/midori-searchaction.c 2012-05-14 22:13:42.000000000 +0000 @@ -11,10 +11,11 @@ #include "midori-searchaction.h" -#include "gtkiconentry.h" #include "marshal.h" -#include "sokoke.h" +#include "midori-platform.h" +#include "midori-core.h" +#include "config.h" #include #include #include @@ -311,6 +312,7 @@ toolitem = GTK_WIDGET (gtk_tool_item_new ()); entry = gtk_icon_entry_new (); + sokoke_entry_set_clear_button_visible (GTK_ENTRY (entry), TRUE); gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, TRUE); alignment = gtk_alignment_new (0, 0.5, 1, 0.1); @@ -346,19 +348,19 @@ switch (event->keyval) { - case GDK_ISO_Enter: - case GDK_KP_Enter: - case GDK_Return: + case GDK_KEY_ISO_Enter: + case GDK_KEY_KP_Enter: + case GDK_KEY_Return: text = gtk_entry_get_text (GTK_ENTRY (entry)); g_signal_emit (search_action, signals[SUBMIT], 0, text, MIDORI_MOD_NEW_TAB (event->state)); search_action->last_proxy = entry; return TRUE; - case GDK_Up: + case GDK_KEY_Up: if (MIDORI_MOD_SCROLL (event->state)) _midori_search_action_move_index (search_action, - 1); return TRUE; - case GDK_Down: + case GDK_KEY_Down: if (MIDORI_MOD_SCROLL (event->state)) _midori_search_action_move_index (search_action, + 1); return TRUE; @@ -399,24 +401,26 @@ gtk_widget_show (dialog); } -/* Private function, used by MidoriView */ -/* static */ GdkPixbuf* +GdkPixbuf* midori_search_action_get_icon (KatzeItem* item, GtkWidget* widget, - const gchar** icon_name) + const gchar** icon_name, + gboolean in_entry) { - const gchar* icon; + const gchar* icon = katze_item_get_uri (item); + GdkScreen* screen; + GtkIconTheme* icon_theme; - if ((icon = katze_item_get_uri (item)) && (g_strstr_len (icon, 8, "://"))) + if (midori_uri_is_resource (icon)) return katze_load_cached_icon (icon, widget); + if (icon_name == NULL) + return NULL; + + screen = gtk_widget_get_screen (widget); + icon_theme = gtk_icon_theme_get_for_screen (screen); if ((icon = katze_item_get_icon (item)) && *icon) { - GdkScreen* screen; - GtkIconTheme* icon_theme; - - screen = gtk_widget_get_screen (widget); - icon_theme = gtk_icon_theme_get_for_screen (screen); if (gtk_icon_theme_has_icon (icon_theme, icon)) { *icon_name = icon; @@ -424,7 +428,12 @@ } } - *icon_name = GTK_STOCK_FILE; + if (in_entry && gtk_icon_theme_has_icon (icon_theme, "edit-find-option-symbolic")) + *icon_name = "edit-find-option-symbolic"; + else if (gtk_icon_theme_has_icon (icon_theme, "edit-find-option")) + *icon_name = "edit-find-option"; + else + *icon_name = "edit-find"; return NULL; } @@ -455,7 +464,7 @@ menuitem = gtk_image_menu_item_new_with_label ( katze_item_get_name (item)); image = gtk_image_new (); - icon = midori_search_action_get_icon (item, entry, &icon_name); + icon = midori_search_action_get_icon (item, entry, &icon_name, FALSE); if (icon) { gtk_image_set_from_pixbuf (GTK_IMAGE (image), icon); @@ -465,10 +474,8 @@ 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 ( GTK_IMAGE_MENU_ITEM (menuitem), TRUE); - #endif gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "engine", item); g_signal_connect (menuitem, "activate", @@ -520,7 +527,7 @@ const gchar* icon_name; icon = midori_search_action_get_icon (search_action->current_item, - entry, &icon_name); + entry, &icon_name, TRUE); if (icon) { gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), @@ -530,7 +537,7 @@ 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), + gtk_entry_set_placeholder_text (GTK_ENTRY (entry), katze_item_get_name (search_action->current_item)); } else @@ -538,7 +545,7 @@ gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FIND); - sokoke_entry_set_default_text (GTK_ENTRY (entry), ""); + gtk_entry_set_placeholder_text (GTK_ENTRY (entry), ""); } } @@ -668,8 +675,6 @@ KatzeArray* search_engines) { GSList* proxies; - GtkWidget* alignment; - GtkWidget* entry; g_return_if_fail (MIDORI_IS_SEARCH_ACTION (search_action)); g_return_if_fail (!search_engines || @@ -696,16 +701,6 @@ proxies = gtk_action_get_proxies (GTK_ACTION (search_action)); if (!proxies) return; - - do - if (GTK_IS_TOOL_ITEM (proxies->data)) - { - alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); - entry = gtk_bin_get_child (GTK_BIN (alignment)); - - /* FIXME: Unset the current item if it isn't in the list */ - } - while ((proxies = g_slist_next (proxies))); } KatzeItem* @@ -818,14 +813,12 @@ GtkWidget* treeview) { 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"); - if ((icon = midori_search_action_get_icon (item, treeview, &icon_name))) + if ((icon = midori_search_action_get_icon (item, treeview, &icon_name, FALSE))) { g_object_set (renderer, "pixbuf", icon, "yalign", 0.25, NULL); g_object_unref (icon); @@ -884,18 +877,13 @@ GTK_RESPONSE_ACCEPT, text && *text); } -static inline const gchar* -STR_NON_NULL (const gchar* string) -{ - return string ? string : ""; -} - static void midori_search_action_get_editor (MidoriSearchAction* search_action, gboolean new_engine) { GtkWidget* toplevel; GtkWidget* dialog; + GtkWidget* content_area; GtkSizeGroup* sizegroup; KatzeItem* item; GtkWidget* hbox; @@ -919,8 +907,9 @@ NULL); gtk_window_set_icon_name (GTK_WINDOW (dialog), new_engine ? GTK_STOCK_ADD : GTK_STOCK_REMOVE); + content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); + gtk_container_set_border_width (GTK_CONTAINER (content_area), 5); sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); if (new_engine) @@ -948,9 +937,9 @@ gtk_entry_set_activates_default (GTK_ENTRY (entry_name), TRUE); if (!new_engine) gtk_entry_set_text (GTK_ENTRY (entry_name), - STR_NON_NULL (katze_item_get_name (item))); + katze_str_non_null (katze_item_get_name (item))); gtk_box_pack_start (GTK_BOX (hbox), entry_name, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_container_add (GTK_CONTAINER (content_area), hbox); gtk_widget_show_all (hbox); hbox = gtk_hbox_new (FALSE, 8); @@ -962,9 +951,9 @@ gtk_entry_set_activates_default (GTK_ENTRY (entry_description), TRUE); if (!new_engine) gtk_entry_set_text (GTK_ENTRY (entry_description) - , STR_NON_NULL (katze_item_get_text (item))); + , katze_str_non_null (katze_item_get_text (item))); gtk_box_pack_start (GTK_BOX (hbox), entry_description, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_container_add (GTK_CONTAINER (content_area), hbox); gtk_widget_show_all (hbox); hbox = gtk_hbox_new (FALSE, 8); @@ -972,13 +961,19 @@ 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 (); + entry_uri = katze_uri_entry_new ( + #if GTK_CHECK_VERSION (2, 20, 0) + gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT)); + #else + NULL); + #endif + g_object_set_data (G_OBJECT (entry_uri), "allow_%s", (void*)1); gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE); if (!new_engine) gtk_entry_set_text (GTK_ENTRY (entry_uri) - , STR_NON_NULL (katze_item_get_uri (item))); + , katze_str_non_null (katze_item_get_uri (item))); gtk_box_pack_start (GTK_BOX (hbox), entry_uri, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_container_add (GTK_CONTAINER (content_area), hbox); gtk_widget_show_all (hbox); hbox = gtk_hbox_new (FALSE, 8); @@ -990,9 +985,9 @@ gtk_entry_set_activates_default (GTK_ENTRY (entry_icon), TRUE); if (!new_engine) gtk_entry_set_text (GTK_ENTRY (entry_icon) - , STR_NON_NULL (katze_item_get_icon (item))); + , katze_str_non_null (katze_item_get_icon (item))); gtk_box_pack_start (GTK_BOX (hbox), entry_icon, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_container_add (GTK_CONTAINER (content_area), hbox); gtk_widget_show_all (hbox); hbox = gtk_hbox_new (FALSE, 8); @@ -1004,9 +999,9 @@ gtk_entry_set_activates_default (GTK_ENTRY (entry_token), TRUE); if (!new_engine) gtk_entry_set_text (GTK_ENTRY (entry_token) - , STR_NON_NULL (katze_item_get_token (item))); + , katze_str_non_null (katze_item_get_token (item))); gtk_box_pack_start (GTK_BOX (hbox), entry_token, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_container_add (GTK_CONTAINER (content_area), hbox); gtk_widget_show_all (hbox); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); @@ -1026,6 +1021,7 @@ 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); + g_object_unref (item); } gtk_widget_destroy (dialog); } @@ -1088,21 +1084,87 @@ } static void -midori_search_action_dialog_default_cb (GtkWidget* widget, +midori_search_action_dialog_move_up_cb (GtkWidget* widget, MidoriSearchAction* search_action) { KatzeArray* search_engines; GtkWidget* treeview; GtkTreeSelection* selection; GtkTreeModel* liststore; - GtkTreeIter iter; + GtkTreeIter iter, prev; + GtkTreePath* path; + KatzeItem* item; + gint i; + + search_engines = search_action->search_engines; + treeview = search_action->treeview; + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); + + if (gtk_tree_selection_get_selected (selection, &liststore, &iter)) + { + path = gtk_tree_model_get_path (liststore, &iter); + if(gtk_tree_path_prev(path)) + { + gtk_tree_model_get (liststore, &iter, 0, &item, -1); + gtk_tree_model_get_iter (liststore, &prev, path); + gtk_list_store_swap (GTK_LIST_STORE(liststore), &iter, &prev); + + i = katze_array_get_item_index (search_engines, item); + katze_array_move_item (search_engines, item, i - 1); + g_object_unref (item); + /* If the index of the current item has changed it needs to be reset */ + g_object_notify (G_OBJECT (search_action), "current-item"); + } + gtk_tree_path_free (path); + } +} + +static void +midori_search_action_dialog_move_down_cb (GtkWidget* widget, + MidoriSearchAction* search_action) +{ + KatzeArray* search_engines; + GtkWidget* treeview; + GtkTreeSelection* selection; + GtkTreeModel* liststore; + GtkTreeIter iter, next; KatzeItem* item; + gint i; search_engines = search_action->search_engines; treeview = search_action->treeview; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); if (gtk_tree_selection_get_selected (selection, &liststore, &iter)) { + next = iter; + if (gtk_tree_model_iter_next (liststore, &next)) + { + gtk_tree_model_get (liststore, &iter, 0, &item, -1); + gtk_list_store_swap (GTK_LIST_STORE(liststore), &iter, &next); + + i = katze_array_get_item_index (search_engines, item); + katze_array_move_item (search_engines, item, i + 1); + g_object_unref (item); + /* If the index of the current item has changed it needs to be reset */ + g_object_notify (G_OBJECT (search_action), "current-item"); + } + } +} + +static void +midori_search_action_dialog_default_cb (GtkWidget* widget, + MidoriSearchAction* search_action) +{ + GtkWidget* treeview; + GtkTreeSelection* selection; + GtkTreeModel* liststore; + GtkTreeIter iter; + KatzeItem* item; + + treeview = search_action->treeview; + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); + if (gtk_tree_selection_get_selected (selection, &liststore, &iter)) + { gtk_tree_model_get (liststore, &iter, 0, &item, -1); midori_search_action_set_default_item (search_action, item); g_object_unref (item); @@ -1162,6 +1224,7 @@ } else valid = gtk_tree_model_iter_next (liststore, &iter); + g_object_unref (found_item); } } @@ -1207,6 +1270,7 @@ const gchar* dialog_title; GtkWidget* toplevel; GtkWidget* dialog; + GtkWidget* content_area; gint width, height; GtkWidget* xfce_heading; GtkWidget* hbox; @@ -1244,6 +1308,7 @@ g_signal_connect (dialog, "destroy", G_CALLBACK (gtk_widget_destroyed), &search_action->dialog); gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES); + content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); /* TODO: Implement some kind of help function */ gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_HELP, FALSE); @@ -1255,11 +1320,9 @@ We need mnemonics */ if ((xfce_heading = sokoke_xfce_header_new ( gtk_window_get_icon_name (GTK_WINDOW (dialog)), dialog_title))) - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), - xfce_heading, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (content_area), xfce_heading, FALSE, FALSE, 0); hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, - TRUE, TRUE, 12); + gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 12); liststore = gtk_list_store_new (1, KATZE_TYPE_ITEM); treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (liststore)); search_action->treeview = treeview; @@ -1341,10 +1404,12 @@ button = gtk_label_new (""); /* This is an invisible separator */ gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 12); button = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN); - gtk_widget_set_sensitive (button, FALSE); + g_signal_connect (button, "clicked", + G_CALLBACK (midori_search_action_dialog_move_down_cb), search_action); gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); button = gtk_button_new_from_stock (GTK_STOCK_GO_UP); - gtk_widget_set_sensitive (button, FALSE); + g_signal_connect (button, "clicked", + G_CALLBACK (midori_search_action_dialog_move_up_cb), search_action); gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); #if HAVE_OSX @@ -1357,12 +1422,10 @@ gtk_widget_set_sensitive (button, FALSE); /* g_signal_connect (button, "clicked", G_CALLBACK (midori_search_action_dialog_help_clicked_cb), dialog); */ - gtk_box_pack_end (GTK_BOX (hbox), - button, FALSE, FALSE, 4); - gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->vbox), - hbox, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 4); + gtk_box_pack_end (GTK_BOX (content_area), hbox, FALSE, FALSE, 0); #endif - gtk_widget_show_all (GTK_DIALOG (dialog)->vbox); + gtk_widget_show_all (content_area); if (search_action->search_engines) g_object_connect (search_action->search_engines, diff -Nru midori-0.2.8/midori/midori-searchaction.h midori-0.4.6/midori/midori-searchaction.h --- midori-0.2.8/midori/midori-searchaction.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/midori-searchaction.h 2012-05-14 22:13:42.000000000 +0000 @@ -59,6 +59,12 @@ KatzeItem* midori_search_action_get_default_item (MidoriSearchAction* search_action); +GdkPixbuf* +midori_search_action_get_icon (KatzeItem* item, + GtkWidget* widget, + const gchar** icon_name, + gboolean in_entry); + void midori_search_action_set_default_item (MidoriSearchAction* search_action, KatzeItem* item); diff -Nru midori-0.2.8/midori/midori-stock.h midori-0.4.6/midori/midori-stock.h --- midori-0.2.8/midori/midori-stock.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/midori-stock.h 2012-05-14 22:13:42.000000000 +0000 @@ -12,15 +12,13 @@ #ifndef __MIDORI_STOCK_H__ #define __MIDORI_STOCK_H__ 1 -#include - /* Custom stock items We should distribute these Names should match with epiphany and/ or xdg spec */ #define STOCK_BOOKMARK "stock_bookmark" -#define STOCK_BOOKMARKS "vcard" +#define STOCK_BOOKMARKS "user-bookmarks" #define STOCK_CONSOLE "terminal" #define STOCK_EXTENSION "extension" #define STOCK_EXTENSIONS "extension" @@ -32,8 +30,8 @@ #define STOCK_TRANSFERS "package" #define STOCK_PLUGINS "gnome-mime-application-x-shockwave-flash" -#define STOCK_BOOKMARK_ADD "stock_add-bookmark" -#define STOCK_HOMEPAGE GTK_STOCK_HOME +#define STOCK_BOOKMARK_ADD "bookmark-new" +#define STOCK_HOMEPAGE "go-home" #define STOCK_IMAGE "gnome-mime-image" #define STOCK_NETWORK_OFFLINE "network-offline" #define STOCK_SCRIPT "stock_script" diff -Nru midori-0.2.8/midori/midori-view.c midori-0.4.6/midori/midori-view.c --- midori-0.2.8/midori/midori-view.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/midori-view.c 2012-05-14 22:13:42.000000000 +0000 @@ -10,16 +10,19 @@ See the file COPYING for the full license text. */ -#if HAVE_CONFIG_H - #include -#endif - #include "midori-view.h" -#include "midori-stock.h" #include "midori-browser.h" +#include "midori-searchaction.h" +#include "midori-app.h" +#include "midori-platform.h" +#include "midori-core.h" +#include "midori-findbar.h" #include "marshal.h" -#include "sokoke.h" + +#ifdef HAVE_GRANITE +#include +#endif #include #include @@ -29,28 +32,25 @@ #include #include +#include #if HAVE_UNISTD_H #include #endif +#include +#include +#include + #ifndef G_OS_WIN32 #include #endif +#if !WEBKIT_CHECK_VERSION (1, 4, 3) /* This is unstable API, so we need to declare it */ gchar* webkit_web_view_get_selected_text (WebKitWebView* web_view); -/* This is public API since WebKitGTK+ 1.1.6 */ -#if !WEBKIT_CHECK_VERSION (1, 1, 6) -void -webkit_web_frame_print (WebKitWebFrame* web_frame); #endif -GdkPixbuf* -midori_search_action_get_icon (KatzeItem* item, - GtkWidget* widget, - const gchar** icon_name); - static void midori_view_construct_web_view (MidoriView* view); @@ -59,6 +59,20 @@ const gchar* key, MidoriView* view); +static void +_midori_view_set_settings (MidoriView* view, + MidoriWebSettings* settings); + +static GdkPixbuf* +midori_view_web_view_get_snapshot (GtkWidget* web_view, + gint width, + gint height); + +static void +midori_view_speed_dial_get_thumb (MidoriView* view, + gchar* dial_id, + gchar* url); + struct _MidoriView { GtkVBox parent_instance; @@ -74,26 +88,21 @@ MidoriLoadStatus load_status; gboolean minimized; gchar* statusbar_text; - #if WEBKIT_CHECK_VERSION (1, 1, 15) WebKitHitTestResult* hit_test; - #endif gchar* link_uri; + gboolean button_press_handled; gboolean has_selection; gchar* selected_text; MidoriWebSettings* settings; GtkWidget* web_view; - GtkWidget* thumb_view; KatzeArray* news_feeds; - gboolean speed_dial_in_new_tabs; - gchar* download_manager; - gchar* news_aggregator; - gboolean ask_for_destination_folder; gboolean middle_click_opens_selection; gboolean open_tabs_in_the_background; gboolean close_buttons_on_tabs; MidoriNewPage open_new_pages_in; - gboolean find_while_typing; + gint find_links; + gint alerts; GtkWidget* menu_item; GtkWidget* tab_label; @@ -103,11 +112,14 @@ KatzeItem* item; gint scrollh, scrollv; gboolean back_forward_set; - - KatzeNet* net; GHashTable* memory; - GtkWidget* scrolled_window; + + #if GTK_CHECK_VERSION (3, 2, 0) + GtkWidget* overlay; + GtkWidget* overlay_label; + GtkWidget* overlay_find; + #endif }; struct _MidoriViewClass @@ -118,24 +130,6 @@ G_DEFINE_TYPE (MidoriView, midori_view, GTK_TYPE_VBOX); GType -midori_load_status_get_type (void) -{ - static GType type = 0; - static const GEnumValue values[] = { - { MIDORI_LOAD_PROVISIONAL, "MIDORI_LOAD_PROVISIONAL", "Load Provisional" }, - { MIDORI_LOAD_COMMITTED, "MIDORI_LOAD_COMMITTED", "Load Committed" }, - { MIDORI_LOAD_FINISHED, "MIDORI_LOAD_FINISHED", "Load Finished" }, - { 0, NULL, NULL } - }; - - if (type) - return type; - - type = g_enum_register_static ("MidoriLoadStatus", values); - return type; -} - -GType midori_new_view_get_type (void) { static GType type = 0; @@ -186,15 +180,14 @@ PROP_ZOOM_LEVEL, PROP_NEWS_FEEDS, PROP_STATUSBAR_TEXT, - PROP_SETTINGS, - PROP_NET + PROP_SETTINGS }; enum { ACTIVATE_ACTION, CONSOLE_MESSAGE, - CONTEXT_READY, ATTACH_INSPECTOR, + DETACH_INSPECTOR, NEW_TAB, NEW_WINDOW, NEW_VIEW, @@ -207,8 +200,19 @@ LAST_SIGNAL }; +enum { + DOWNLOAD_SAVE = 1, + DOWNLOAD_SAVE_AS, + DOWNLOAD_CANCEL, + DOWNLOAD_OPEN, +}; + static guint signals[LAST_SIGNAL]; +static gchar* speeddial_markup = NULL; +static GtkWidget* thumb_view = NULL; +static GList* thumb_queue = NULL; + static void midori_view_finalize (GObject* object); @@ -234,12 +238,7 @@ MidoriView* view); static void -midori_view_speed_dial_get_thumb (GtkWidget* web_view, - const gchar* message, - MidoriView* view); - -static void -midori_view_speed_dial_save (GtkWidget* web_view, +midori_view_speed_dial_save (MidoriView* view, const gchar* message); static void @@ -273,19 +272,28 @@ G_TYPE_INT, G_TYPE_STRING); - signals[CONTEXT_READY] = g_signal_new ( - "context-ready", + signals[ATTACH_INSPECTOR] = g_signal_new ( + "attach-inspector", G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), 0, 0, NULL, - g_cclosure_marshal_VOID__POINTER, + g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, - G_TYPE_POINTER); + GTK_TYPE_WIDGET); - signals[ATTACH_INSPECTOR] = g_signal_new ( - "attach-inspector", + /** + * MidoriView::detach-inspector: + * @view: the object on which the signal is emitted + * + * Emitted when an open inspector that was previously + * attached to the window is now detached again. + * + * Since: 0.3.4 + */ + signals[DETACH_INSPECTOR] = g_signal_new ( + "detach-inspector", G_TYPE_FROM_CLASS (class), (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), 0, @@ -323,12 +331,15 @@ * @view: the object on which the signal is emitted * @new_view: a newly created view * @where: where to open the view + * @user_initiated: %TRUE if the user actively opened the new view * * Emitted when a new view is created. The value of * @where determines where to open the view according * to how it was opened and user preferences. * * Since: 0.1.2 + * + * Since 0.3.4 a boolean argument was added. */ signals[NEW_VIEW] = g_signal_new ( "new-view", @@ -337,10 +348,11 @@ 0, 0, NULL, - midori_cclosure_marshal_VOID__OBJECT_ENUM, - G_TYPE_NONE, 2, + midori_cclosure_marshal_VOID__OBJECT_ENUM_BOOLEAN, + G_TYPE_NONE, 3, MIDORI_TYPE_VIEW, - MIDORI_TYPE_NEW_VIEW); + MIDORI_TYPE_NEW_VIEW, + G_TYPE_BOOLEAN); /** * MidoriView::download-requested: @@ -473,7 +485,7 @@ "Title", "The title of the currently loaded page", NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + flags)); /** * MidoriView:security: @@ -505,7 +517,7 @@ "mime-type", "MIME Type", "The MIME type of the currently loaded page", - "text/html", + NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, @@ -600,20 +612,49 @@ "The associated settings", MIDORI_TYPE_WEB_SETTINGS, flags)); +} - g_object_class_install_property (gobject_class, - PROP_NET, - g_param_spec_object ( - "net", - "Net", - "The associated net", - KATZE_TYPE_NET, - flags)); +#ifdef HAVE_GRANITE +static GraniteWidgetsTab* +midori_view_get_tab (MidoriView* view) +{ + GraniteWidgetsDynamicNotebook* notebook; + GraniteWidgetsTab* tab = NULL; + + notebook = (GraniteWidgetsDynamicNotebook*)gtk_widget_get_parent ((GtkWidget*)view); + if (notebook != NULL) + tab = granite_widgets_dynamic_notebook_get_nth_page (notebook, + granite_widgets_dynamic_notebook_page_num (notebook, (GtkWidget*)view)); + + return tab; } +#endif static void -midori_view_update_title (MidoriView* view) +midori_view_set_title (MidoriView* view, const gchar* title) { + const gchar* display_title; + #ifdef HAVE_GRANITE + GraniteWidgetsTab* tab; + #endif + + if (!title) + title = view->uri; + /* Work-around libSoup not setting a proper directory title */ + else if (!strcmp (title, "OMG!") && g_str_has_prefix (view->uri, "file://")) + title = view->uri; + + katze_assign (view->title, g_strdup (title)); + + /* Render filename as title of patches */ + if (title && (g_str_has_suffix (title, ".diff") + || g_str_has_suffix (title, ".patch"))) + { + gchar* prefix = strrchr (title, '/'); + if (prefix != NULL) + katze_assign (view->title, g_strdup (prefix + 1)); + } + #ifndef G_OS_WIN32 /* If left-to-right text is combined with right-to-left text the default behaviour of Pango can result in awkwardly aligned text. For example @@ -621,13 +662,20 @@ "hadess) | An era comes to an end - Midori) بستيان نوصر". So to prevent this we insert an LRE character before the title which indicates that we want left-to-right but retains the direction of right-to-left text. */ - if (view->title && !g_str_has_prefix (view->title, "‪")) + if (title && !g_str_has_prefix (title, "‪")) { gchar* new_title = g_strconcat ("‪", view->title, NULL); katze_assign (view->title, new_title); } #endif - #define title midori_view_get_display_title (view) + + display_title = midori_view_get_display_title (view); + #ifdef HAVE_GRANITE + /* FIXME: granite: GraniteWidgetsTab.text should be a property */ + tab = midori_view_get_tab (view); + if (tab != NULL) + katze_assign (tab->text, g_strdup (display_title)); + #endif if (view->tab_label) { /* If the title starts with the presumed name of the website, we @@ -641,22 +689,21 @@ while (name[i++]) if (name[i] == '.') break; - if (!g_ascii_strncasecmp (title, name, i)) + if (!g_ascii_strncasecmp (display_title, name, i)) gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), PANGO_ELLIPSIZE_START); else gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), PANGO_ELLIPSIZE_END); if (uri) soup_uri_free (uri); } - gtk_label_set_text (GTK_LABEL (view->tab_title), title); - gtk_widget_set_tooltip_text (view->tab_icon, title); - gtk_widget_set_tooltip_text (view->tab_title, title); + gtk_label_set_text (GTK_LABEL (view->tab_title), display_title); + gtk_widget_set_tooltip_text (view->tab_icon, display_title); + gtk_widget_set_tooltip_text (view->tab_title, display_title); } if (view->menu_item) gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN ( - view->menu_item))), title); - katze_item_set_name (view->item, title); - #undef title + view->menu_item))), display_title); + katze_item_set_name (view->item, display_title); } static void @@ -664,13 +711,21 @@ GdkPixbuf* icon, const gchar* icon_name) { + #ifdef HAVE_GRANITE + GraniteWidgetsTab* tab = midori_view_get_tab (view); + g_object_set (tab, "pixbuf", icon, NULL); + #endif + katze_item_set_icon (view->item, icon_name); + /* katze_item_get_image knows about this pixbuf */ + g_object_set_data_full (G_OBJECT (view->item), "pixbuf", g_object_ref (icon), + (GDestroyNotify)g_object_unref); katze_object_assign (view->icon, icon); g_object_notify (G_OBJECT (view), "icon"); if (view->tab_icon) { - if (icon_name) + if (icon_name && !strchr (icon_name, '/')) katze_throbber_set_static_icon_name (KATZE_THROBBER (view->tab_icon), icon_name); else @@ -679,11 +734,7 @@ } if (view->menu_item) { - GtkWidget* image; - if (icon_name) - image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); - else - image = gtk_image_new_from_pixbuf (view->icon); + GtkWidget* image = katze_item_get_image (view->item); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (view->menu_item), image); } } @@ -713,99 +764,68 @@ } static void -midori_view_update_icon (MidoriView* view, - GdkPixbuf* icon) +midori_view_unset_icon (MidoriView* view) { GdkScreen* screen; GtkIconTheme* theme; gchar** parts = NULL; + GdkPixbuf* icon; - if (icon) - { - midori_view_apply_icon (view, icon, NULL); - return; - } - - if (!((screen = gtk_widget_get_screen (GTK_WIDGET (view))) + if (!((screen = gtk_widget_get_screen (view->web_view)) && (theme = gtk_icon_theme_get_for_screen (screen)))) return; - if (!((parts = g_strsplit (view->mime_type, "/", 2)) && (*parts && parts[1]))) + if (!(view->mime_type + && (parts = g_strsplit (view->mime_type, "/", 2)) + && (*parts && parts[1]))) { - g_strfreev (parts); - /* This is a hack to have a Find icon in the location while the - blank page has a File icon. */ - icon = gtk_widget_render_icon (GTK_WIDGET (view), - GTK_STOCK_FIND, GTK_ICON_SIZE_MENU, NULL); + icon = gtk_widget_render_icon (view->web_view, + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); midori_view_apply_icon (view, icon, GTK_STOCK_FILE); - return; + goto free_parts; } if (midori_view_mime_icon (view, theme, "%s-%s", *parts, parts[1])) - return; + goto free_parts; if (midori_view_mime_icon (view, theme, "gnome-mime-%s-%s", *parts, parts[1])) - return; + goto free_parts; if (midori_view_mime_icon (view, theme, "%s-x-generic", *parts, NULL)) - return; + goto free_parts; if (midori_view_mime_icon (view, theme, "gnome-mime-%s-x-generic", *parts, NULL)) - return; + goto free_parts; - icon = gtk_widget_render_icon (GTK_WIDGET (view), + icon = gtk_widget_render_icon (view->web_view, GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); - midori_view_apply_icon (view, icon, NULL); -} - -static void -midori_view_icon_cb (GdkPixbuf* icon, - MidoriView* view) -{ - midori_view_update_icon (view, icon); -} - -typedef void (*KatzeNetIconCb) (GdkPixbuf* icon, - MidoriView* view); - -typedef struct -{ - gchar* icon_file; - gchar* icon_uri; - MidoriView* view; -} KatzeNetIconPriv; + midori_view_apply_icon (view, icon, GTK_STOCK_FILE); -void -katze_net_icon_priv_free (KatzeNetIconPriv* priv) -{ - g_free (priv->icon_file); - g_free (priv->icon_uri); - g_free (priv); +free_parts: + g_strfreev (parts); } -gboolean +#if !WEBKIT_CHECK_VERSION (1, 8, 0) +static gboolean katze_net_icon_status_cb (KatzeNetRequest* request, - KatzeNetIconPriv* priv) + MidoriView* view) { switch (request->status) { - case KATZE_NET_VERIFIED: - if (request->mime_type && strncmp (request->mime_type, "image/", 6)) - { - katze_net_icon_priv_free (priv); + case KATZE_NET_VERIFIED: + if (request->mime_type && strncmp (request->mime_type, "image/", 6)) + { + return FALSE; + } + break; + case KATZE_NET_MOVED: + break; + default: return FALSE; - } - break; - case KATZE_NET_MOVED: - break; - default: - katze_net_icon_priv_free (priv); - return FALSE; } - return TRUE; } -void +static void katze_net_icon_transfer_cb (KatzeNetRequest* request, - KatzeNetIconPriv* priv) + MidoriView* view) { GdkPixbuf* pixbuf; FILE* fp; @@ -820,105 +840,96 @@ pixbuf = NULL; if (request->data) { - if ((fp = fopen (priv->icon_file, "wb"))) + gchar* icon_file = katze_net_get_cached_path (NULL, view->icon_uri, "icons"); + if ((fp = fopen (icon_file, "wb"))) { - ret = fwrite (request->data, 1, request->length, fp); + ret = fwrite (request->data, 1, request->length, fp); fclose (fp); - if ((ret - request->length) != 0) + if ((ret - request->length != 0)) { g_warning ("Error writing to file %s " - "in katze_net_icon_transfer_cb()", priv->icon_file); + "in katze_net_icon_transfer_cb()", icon_file); } - pixbuf = gdk_pixbuf_new_from_file (priv->icon_file, NULL); } - else - pixbuf = katze_pixbuf_new_from_buffer ((guchar*)request->data, - request->length, request->mime_type, NULL); - if (pixbuf) - g_object_ref (pixbuf); - g_hash_table_insert (priv->view->memory, - g_strdup (priv->icon_file), pixbuf); + g_free (icon_file); + + pixbuf = katze_pixbuf_new_from_buffer ((guchar*)request->data, + request->length, request->mime_type, NULL); + } if (!pixbuf) { - midori_view_icon_cb (NULL, priv->view); - katze_net_icon_priv_free (priv); + midori_view_unset_icon (view); return; } - settings = gtk_widget_get_settings (priv->view->web_view); - gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, - &icon_width, &icon_height); - pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, - GDK_INTERP_BILINEAR); - g_object_unref (pixbuf); - - katze_assign (priv->view->icon_uri, g_strdup (priv->icon_uri)); - midori_view_icon_cb (pixbuf_scaled, priv->view); - katze_net_icon_priv_free (priv); + g_hash_table_insert (view->memory, g_strdup (view->icon_uri), pixbuf); + settings = gtk_widget_get_settings (view->web_view); + gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, &icon_width, &icon_height); + pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, GDK_INTERP_BILINEAR); + midori_view_apply_icon (view, pixbuf_scaled, view->icon_uri); } - +#endif static void _midori_web_view_load_icon (MidoriView* view) { - GdkPixbuf* pixbuf; - KatzeNetIconPriv* priv; - gchar* icon_uri; - gchar* icon_file; + GdkPixbuf* pixbuf = NULL; gint icon_width, icon_height; - GdkPixbuf* pixbuf_scaled; GtkSettings* settings; - pixbuf = NULL; - icon_uri = g_strdup (view->icon_uri); + #if WEBKIT_CHECK_VERSION (1, 8, 0) + settings = gtk_widget_get_settings (view->web_view); + gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, + &icon_width, &icon_height); + if ((pixbuf = webkit_web_view_try_get_favicon_pixbuf ( + WEBKIT_WEB_VIEW (view->web_view), 16, 16))) + midori_view_apply_icon (view, pixbuf, view->icon_uri); + #else + GdkPixbuf* pixbuf_scaled; - if ((icon_uri && g_str_has_prefix (icon_uri, "http")) - || g_str_has_prefix (view->uri, "http")) + if (!midori_uri_is_http (view->icon_uri)) + katze_assign (view->icon_uri, NULL); + + if (midori_uri_is_http (view->uri) || g_str_has_prefix (view->uri, "file://")) { - if (!icon_uri) + gchar* icon_file = NULL; + if (!view->icon_uri) { guint i = 8; while (view->uri[i] != '\0' && view->uri[i] != '/') i++; if (view->uri[i] == '/') { - icon_uri = g_strdup (view->uri); - icon_uri[i] = '\0'; - icon_uri = g_strdup_printf ("%s/favicon.ico", icon_uri); + gchar* path = g_strndup (view->uri, i); + view->icon_uri = g_strdup_printf ("%s/favicon.ico", path); + g_free (path); } else - icon_uri = g_strdup_printf ("%s/favicon.ico", view->uri); + view->icon_uri = g_strdup_printf ("%s/favicon.ico", view->uri); } - icon_file = katze_net_get_cached_path (NULL, icon_uri, "icons"); if (g_hash_table_lookup_extended (view->memory, - icon_file, NULL, (gpointer)&pixbuf)) + view->icon_uri, NULL, (gpointer)&pixbuf)) { - g_free (icon_file); - if (pixbuf) - { - g_object_ref (pixbuf); - katze_assign (view->icon_uri, icon_uri); - } + g_warn_if_fail (pixbuf != NULL); + g_object_ref (pixbuf); } - else if ((pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL))) + else if ((icon_file = katze_net_get_cached_path (NULL, view->icon_uri, "icons")) && + (pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL))) { - g_free (icon_file); - katze_assign (view->icon_uri, icon_uri); + g_hash_table_insert (view->memory, + g_strdup (view->icon_uri), g_object_ref (pixbuf)); } - else + else if (!view->special) { - priv = g_new0 (KatzeNetIconPriv, 1); - priv->icon_file = icon_file; - priv->icon_uri = icon_uri; - priv->view = view; - - katze_net_load_uri (NULL, icon_uri, + katze_net_load_uri (NULL, view->icon_uri, (KatzeNetStatusCb)katze_net_icon_status_cb, - (KatzeNetTransferCb)katze_net_icon_transfer_cb, priv); + (KatzeNetTransferCb)katze_net_icon_transfer_cb, view); } + + g_free (icon_file); } if (pixbuf) @@ -930,9 +941,9 @@ icon_height, GDK_INTERP_BILINEAR); g_object_unref (pixbuf); pixbuf = pixbuf_scaled; + midori_view_apply_icon (view, pixbuf, view->icon_uri); } - - midori_view_update_icon (view, pixbuf); + #endif } static void @@ -948,6 +959,10 @@ view->load_status = load_status; g_object_notify (G_OBJECT (view), "load-status"); + #ifdef HAVE_GRANITE + g_object_set (midori_view_get_tab (view), + "loading", view->load_status != MIDORI_LOAD_FINISHED, NULL); + #endif if (view->tab_icon) katze_throbber_set_animated (KATZE_THROBBER (view->tab_icon), view->load_status != MIDORI_LOAD_FINISHED); @@ -961,8 +976,17 @@ WebKitWebPolicyDecision* decision, MidoriView* view) { + JSContextRef js_context; + gchar* result; const gchar* uri = webkit_network_request_get_uri (request); - if (g_str_has_prefix (uri, "mailto:") || g_str_has_prefix (uri, "tel:")) + if (g_str_has_prefix (uri, "geo:") && strstr (uri, ",")) + { + gchar* new_uri = sokoke_magic_uri (uri); + midori_view_set_uri (view, new_uri); + g_free (new_uri); + return TRUE; + } + else if (g_str_has_prefix (uri, "mailto:") || sokoke_external_uri (uri)) { if (sokoke_show_uri (gtk_widget_get_screen (GTK_WIDGET (web_view)), uri, GDK_CURRENT_TIME, NULL)) @@ -972,6 +996,29 @@ } } view->special = FALSE; + + /* Remove link labels */ + js_context = webkit_web_frame_get_global_context (web_frame); + result = sokoke_js_script_eval (js_context, + "(function (links) {" + "if (links != undefined && links.length > 0) {" + " for (var i = links.length - 1; i >= 0; i--) {" + " var parent = links[i].parentNode;" + " parent.removeChild(links[i]); } } }) (" + "document.getElementsByClassName ('midoriHKD87346'));", + NULL); + g_free (result); + result = sokoke_js_script_eval (js_context, + "(function (links) {" + "if (links != undefined && links.length > 0) {" + " for (var i = links.length - 1; i >= 0; i--) {" + " var parent = links[i].parentNode;" + " parent.removeChild(links[i]); } } }) (" + "document.getElementsByClassName ('midori_access_key_fc04de'));", + NULL); + g_free (result); + view->find_links = -1; + return FALSE; } @@ -995,6 +1042,10 @@ MidoriView* view) { const gchar* uri; + GList* children; + + if (web_frame != webkit_web_view_get_main_frame (web_view)) + return; g_object_freeze_notify (G_OBJECT (view)); @@ -1002,9 +1053,16 @@ g_return_if_fail (uri != NULL); katze_assign (view->icon_uri, NULL); + children = gtk_container_get_children (GTK_CONTAINER (view)); + for (; children; children = g_list_next (children)) + if (g_object_get_data (G_OBJECT (children->data), "midori-infobar-cb")) + gtk_widget_destroy (children->data); + g_list_free (children); + view->alerts = 0; + if (g_strcmp0 (uri, katze_item_get_uri (view->item))) { - katze_assign (view->uri, sokoke_format_uri_for_display (uri)); + katze_assign (view->uri, midori_uri_format_for_display (uri)); katze_item_set_uri (view->item, uri); } @@ -1014,11 +1072,11 @@ g_object_notify (G_OBJECT (view), "uri"); g_object_set (view, "title", NULL, NULL); - midori_view_update_icon (view, NULL); + midori_view_unset_icon (view); if (!strncmp (uri, "https", 5)) { -#if WEBKIT_CHECK_VERSION (1, 1, 14) && defined (HAVE_LIBSOUP_2_29_91) + #if defined (HAVE_LIBSOUP_2_29_91) WebKitWebDataSource *source; WebKitNetworkRequest *request; SoupMessage *message; @@ -1031,13 +1089,14 @@ && soup_message_get_flags (message) & SOUP_MESSAGE_CERTIFICATE_TRUSTED) view->security = MIDORI_SECURITY_TRUSTED; else -#endif + #endif view->security = MIDORI_SECURITY_UNKNOWN; } else view->security = MIDORI_SECURITY_NONE; g_object_notify (G_OBJECT (view), "security"); + view->find_links = -1; midori_view_update_load_status (view, MIDORI_LOAD_COMMITTED); g_object_thaw_notify (G_OBJECT (view)); @@ -1053,7 +1112,6 @@ g_object_notify (G_OBJECT (view), "progress"); } -#if WEBKIT_CHECK_VERSION (1, 1, 14) static void midori_view_web_view_resource_request_cb (WebKitWebView* web_view, WebKitWebFrame* web_frame, @@ -1065,17 +1123,13 @@ const gchar* uri = webkit_network_request_get_uri (request); /* Only apply custom URIs to special pages for security purposes */ - if (!view->special) + if (!view->special && !midori_view_is_blank (view)) 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); + gchar* filepath = sokoke_find_data_filename (&uri[6], TRUE); + gchar* file_uri = g_filename_to_uri (filepath, NULL, NULL); g_free (filepath); webkit_network_request_set_uri (request, file_uri); g_free (file_uri); @@ -1085,6 +1139,11 @@ GdkPixbuf* pixbuf; const gchar* icon_name = &uri[8] ? &uri[8] : ""; gint icon_size = GTK_ICON_SIZE_MENU; + GdkScreen* screen = gtk_widget_get_screen (GTK_WIDGET (view)); + GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen); + gint real_icon_size; + GtkIconInfo* icon_info; + const gchar* icon_filename; if (g_ascii_isalpha (icon_name[0])) icon_size = strstr (icon_name, "dialog") ? @@ -1105,6 +1164,30 @@ } } + /* If available, load SVG icon as SVG markup */ + gtk_icon_size_lookup_for_settings ( + gtk_widget_get_settings (GTK_WIDGET (view)), + icon_size, &real_icon_size, &real_icon_size); + icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, + real_icon_size, GTK_ICON_LOOKUP_FORCE_SVG); + icon_filename = icon_info ? gtk_icon_info_get_filename (icon_info) : NULL; + if (icon_filename && g_str_has_suffix (icon_filename, ".svg")) + { + gchar* buffer; + gsize buffer_size; + if (g_file_get_contents (icon_filename, &buffer, &buffer_size, NULL)) + { + gchar* encoded = g_base64_encode ((guchar*)buffer, buffer_size); + gchar* data_uri = g_strconcat ("data:image/svg+xml;base64,", encoded, NULL); + g_free (buffer); + g_free (encoded); + webkit_network_request_set_uri (request, data_uri); + g_free (data_uri); + return; + } + } + + /* Render icon as a PNG at the desired size */ pixbuf = gtk_widget_render_icon (GTK_WIDGET (view), icon_name, icon_size, NULL); if (!pixbuf) pixbuf = gtk_widget_render_icon (GTK_WIDGET (view), @@ -1132,12 +1215,212 @@ } } } + +#define HAVE_GTK_INFO_BAR GTK_CHECK_VERSION (2, 18, 0) +#define HAVE_OFFSCREEN GTK_CHECK_VERSION (2, 20, 0) + +#if HAVE_GTK_INFO_BAR +static void +midori_view_infobar_response_cb (GtkWidget* infobar, + gint response, + gpointer data_object) +{ + void (*response_cb) (GtkWidget*, gint, gpointer); + response_cb = g_object_get_data (G_OBJECT (infobar), "midori-infobar-cb"); + response_cb (infobar, response, data_object); + gtk_widget_destroy (infobar); +} +#else +static void +midori_view_info_bar_button_cb (GtkWidget* button, + gpointer data_object) +{ + GtkWidget* infobar = gtk_widget_get_parent (gtk_widget_get_parent (button)); + gint response = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "midori-infobar-response")); + void (*response_cb) (GtkWidget*, gint, gpointer); + response_cb = g_object_get_data (G_OBJECT (infobar), "midori-infobar-cb"); + response_cb (infobar, response, data_object); + gtk_widget_destroy (infobar); +} +#endif + +/** + * midori_view_add_info_bar + * @view: a #MidoriView + * @message_type: a #GtkMessageType + * @message: a message string + * @response_cb: a response callback + * @user_data: user data passed to the callback + * @first_button_text: button text or stock ID + * @...: first response ID, then more text - response ID pairs + * + * Adds an infobar (or equivalent) to the view. Activation of a + * button invokes the specified callback. The infobar is + * automatically destroyed if the location changes or reloads. + * + * Return value: an infobar widget + * + * Since: 0.2.9 + **/ +GtkWidget* +midori_view_add_info_bar (MidoriView* view, + GtkMessageType message_type, + const gchar* message, + GCallback response_cb, + gpointer data_object, + const gchar* first_button_text, + ...) +{ + GtkWidget* infobar; + GtkWidget* action_area; + GtkWidget* content_area; + GtkWidget* label; + va_list args; + const gchar* button_text; + + g_return_val_if_fail (message != NULL, NULL); + g_return_val_if_fail (response_cb != NULL, NULL); + + va_start (args, first_button_text); + + #if HAVE_GTK_INFO_BAR + infobar = gtk_info_bar_new (); + for (button_text = first_button_text; button_text; + button_text = va_arg (args, const gchar*)) + { + gint response_id = va_arg (args, gint); + gtk_info_bar_add_button (GTK_INFO_BAR (infobar), + button_text, response_id); + } + gtk_info_bar_set_message_type (GTK_INFO_BAR (infobar), message_type); + content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (infobar)); + action_area = gtk_info_bar_get_action_area (GTK_INFO_BAR (infobar)); + gtk_orientable_set_orientation (GTK_ORIENTABLE (action_area), + GTK_ORIENTATION_HORIZONTAL); + g_signal_connect (infobar, "response", + G_CALLBACK (midori_view_infobar_response_cb), data_object); + #else + infobar = gtk_hbox_new (FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (infobar), 4); + + content_area = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (infobar), content_area, TRUE, TRUE, 0); + action_area = gtk_hbutton_box_new (); + for (button_text = first_button_text; button_text; + button_text = va_arg (args, const gchar*)) + { + gint response_id = va_arg (args, gint); + GtkWidget* button = gtk_button_new_with_mnemonic (button_text); + g_object_set_data (G_OBJECT (button), "midori-infobar-response", + GINT_TO_POINTER (response_id)); + g_signal_connect (button, "clicked", + G_CALLBACK (midori_view_info_bar_button_cb), data_object); + gtk_box_pack_start (GTK_BOX (action_area), button, FALSE, FALSE, 0); + if (response_id == GTK_RESPONSE_HELP) + gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (action_area), + button, TRUE); + } + gtk_box_pack_start (GTK_BOX (infobar), action_area, FALSE, FALSE, 0); + #endif + + va_end (args); + label = gtk_label_new (message); + gtk_label_set_selectable (GTK_LABEL (label), TRUE); + gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); + gtk_container_add (GTK_CONTAINER (content_area), label); + gtk_widget_show_all (infobar); + gtk_box_pack_start (GTK_BOX (view), infobar, FALSE, FALSE, 0); + gtk_box_reorder_child (GTK_BOX (view), infobar, 0); + g_object_set_data (G_OBJECT (infobar), "midori-infobar-cb", response_cb); + return infobar; +} + +static void +midori_view_database_response_cb (GtkWidget* infobar, + gint response, + WebKitWebDatabase* database) +{ + if (response != GTK_RESPONSE_ACCEPT) + { + WebKitSecurityOrigin* origin = webkit_web_database_get_security_origin (database); + webkit_security_origin_set_web_database_quota (origin, 0); + webkit_web_database_remove (database); + } + /* TODO: Remember the decision */ +} + +static void +midori_view_web_view_database_quota_exceeded_cb (WebKitWebView* web_view, + WebKitWebFrame* web_frame, + WebKitWebDatabase* database, + MidoriView* view) +{ + const gchar* uri = webkit_web_frame_get_uri (web_frame); + MidoriSiteDataPolicy policy = midori_web_settings_get_site_data_policy (view->settings, uri); + + switch (policy) + { + case MIDORI_SITE_DATA_BLOCK: + { + WebKitSecurityOrigin* origin = webkit_web_database_get_security_origin (database); + webkit_security_origin_set_web_database_quota (origin, 0); + webkit_web_database_remove (database); + } + case MIDORI_SITE_DATA_ACCEPT: + case MIDORI_SITE_DATA_PRESERVE: + return; + case MIDORI_SITE_DATA_UNDETERMINED: + { + gchar* hostname = midori_uri_parse_hostname (uri, NULL); + gchar* message = g_strdup_printf (_("%s wants to save an HTML5 database."), + hostname && *hostname ? hostname : uri); + midori_view_add_info_bar (view, GTK_MESSAGE_QUESTION, message, + G_CALLBACK (midori_view_database_response_cb), database, + _("_Deny"), GTK_RESPONSE_REJECT, _("_Allow"), GTK_RESPONSE_ACCEPT, + NULL); + g_free (hostname); + g_free (message); + } + } +} + +#if WEBKIT_CHECK_VERSION (1, 1, 23) +static void +midori_view_location_response_cb (GtkWidget* infobar, + gint response, + WebKitGeolocationPolicyDecision* decision) +{ + if (response == GTK_RESPONSE_ACCEPT) + webkit_geolocation_policy_allow (decision); + else + webkit_geolocation_policy_deny (decision); + g_object_unref (decision); +} + +static gboolean +midori_view_web_view_geolocation_decision_cb (WebKitWebView* web_view, + WebKitWebFrame* web_frame, + WebKitGeolocationPolicyDecision* decision, + MidoriView* view) +{ + const gchar* uri = webkit_web_frame_get_uri (web_frame); + gchar* hostname = midori_uri_parse_hostname (uri, NULL); + gchar* message = g_strdup_printf (_("%s wants to know your location."), + hostname && *hostname ? hostname : uri); + /* FIXME: decision should be released even if neither buttons's pressed */ + midori_view_add_info_bar (view, GTK_MESSAGE_QUESTION, + message, G_CALLBACK (midori_view_location_response_cb), g_object_ref (decision), + _("_Deny"), GTK_RESPONSE_REJECT, _("_Allow"), GTK_RESPONSE_ACCEPT, + NULL); + g_free (hostname); + g_free (message); + return TRUE; +} #endif static void midori_view_load_alternate_string (MidoriView* view, const gchar* data, - const gchar* res_root, const gchar* uri, WebKitWebFrame* web_frame) { @@ -1145,19 +1428,10 @@ if (!web_frame) web_frame = webkit_web_view_get_main_frame (web_view); view->special = TRUE; - #if WEBKIT_CHECK_VERSION (1, 1, 14) webkit_web_frame_load_alternate_string ( web_frame, data, uri, uri); - #elif WEBKIT_CHECK_VERSION (1, 1, 6) - webkit_web_frame_load_alternate_string ( - web_frame, data, res_root, uri); - #else - webkit_web_view_load_html_string ( - web_view, data, res_root); - #endif } -#if WEBKIT_CHECK_VERSION (1, 1, 6) static gboolean midori_view_display_error (MidoriView* view, const gchar* uri, @@ -1167,46 +1441,31 @@ const gchar* try_again, WebKitWebFrame* web_frame) { - gchar* template_file = g_build_filename ("midori", "res", "error.html", NULL); - gchar* path = sokoke_find_data_filename (template_file); + gchar* path = sokoke_find_data_filename ("error.html", TRUE); gchar* template; - 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_escaped; + const gchar* icon; 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_escaped = g_markup_escape_text (title, -1); + icon = katze_item_get_icon (view->item); result = sokoke_replace_variables (template, - "{title}", title, + "{title}", title_escaped, + "{icon}", icon ? icon : "", "{message}", message, "{description}", description, "{tryagain}", try_again, - "{res}", res_root, - "{stock}", stock_root, + "{uri}", uri, NULL); + g_free (title_escaped); g_free (template); midori_view_load_alternate_string (view, - result, res_root, uri, web_frame); + result, uri, web_frame); - g_free (res_root); - g_free (stock_root); g_free (result); g_free (path); @@ -1224,53 +1483,30 @@ GError* error, MidoriView* view) { - gchar* title = g_strdup_printf (_("Error - %s"), uri); - gchar* message = g_strdup_printf (_("The page '%s' couldn't be loaded."), uri); - gboolean result = midori_view_display_error (view, uri, title, - message, error->message, _("Try again"), web_frame); - g_free (message); - g_free (title); - return result; -} -#else -static void -webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame, - gboolean success, - MidoriView* view) -{ gchar* title; - gchar* data; - gchar* logo_path; - gchar* logo_uri; + gchar* message; + gboolean result; - if (!success) + /* The unholy trinity; also ignored in Webkit's default error handler */ + switch (error->code) { - /* i18n: The title of the 404 - Not found error page */ - title = g_strdup_printf (_("Not found - %s"), view->uri); - katze_assign (view->title, title); - logo_path = sokoke_find_data_filename ("midori/logo-shade.png"); - logo_uri = g_filename_to_uri (logo_path, NULL, NULL); - g_free (logo_path); - data = g_strdup_printf ( - "%s" - "

%s

" - "" - "

The page you were opening doesn't exist." - "

Try to load the page again, " - "or move on to another page." - "", - title, title, logo_uri, view->uri); - webkit_web_view_load_html_string ( - WEBKIT_WEB_VIEW (view->web_view), data, view->uri); - g_free (title); - g_free (data); - g_free (logo_uri); + case WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD: + /* A plugin will take over. That's expected, it's not fatal. */ + case WEBKIT_NETWORK_ERROR_CANCELLED: + /* Mostly initiated by JS redirects. */ + case WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE: + /* A frame load is cancelled because of a download. */ + return FALSE; } - midori_view_update_load_status (view, MIDORI_LOAD_FINISHED); + title = g_strdup_printf (_("Error - %s"), uri); + message = g_strdup_printf (_("The page '%s' couldn't be loaded."), uri); + result = midori_view_display_error (view, uri, title, + message, error->message, _("Try again"), web_frame); + g_free (message); + g_free (title); + return result; } -#endif static void midori_view_apply_scroll_position (MidoriView* view) @@ -1279,9 +1515,9 @@ { if (view->scrollh > 0) { - GtkAdjustment* adjustment = katze_object_get_object (view->scrolled_window, "hadjustment"); + GtkScrolledWindow* scrolled = GTK_SCROLLED_WINDOW (view->scrolled_window); + GtkAdjustment* adjustment = gtk_scrolled_window_get_hadjustment (scrolled); gtk_adjustment_set_value (adjustment, view->scrollh); - g_object_unref (adjustment); } view->scrollh = -3; } @@ -1289,9 +1525,9 @@ { if (view->scrollv > 0) { - GtkAdjustment* adjustment = katze_object_get_object (view->scrolled_window, "vadjustment"); + GtkScrolledWindow* scrolled = GTK_SCROLLED_WINDOW (view->scrolled_window); + GtkAdjustment* adjustment = gtk_scrolled_window_get_vadjustment (scrolled); gtk_adjustment_set_value (adjustment, view->scrollv); - g_object_unref (adjustment); } view->scrollv = -3; } @@ -1304,67 +1540,102 @@ { g_object_freeze_notify (G_OBJECT (view)); - /* TODO: Find a better condition than a finished load. - Apparently WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT is too early. */ midori_view_apply_scroll_position (view); view->progress = 1.0; g_object_notify (G_OBJECT (view), "progress"); midori_view_update_load_status (view, MIDORI_LOAD_FINISHED); - if (1) + if (web_frame == webkit_web_view_get_main_frame (web_view)) { JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); - /* This snippet joins the available news feeds into a string like this: - URI1|title1,URI2|title2 - FIXME: Ensure separators contained in the string can't break it */ + /* Icon: URI, News Feed: $URI|title, Search: :URI|title */ gchar* value = sokoke_js_script_eval (js_context, - "(function (l) { var f = new Array (); for (i in l) " + "(function (l) { var f = new Array (); for (var 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);" + "f.push ('$' + l[i].href + '|' + l[i].title);" + "else if (r == 'search' && t == 'application/opensearchdescription+xml') " + "f.push (':' + l[i].href + '|' + l[i].title); " #if !WEBKIT_CHECK_VERSION (1, 1, 18) "else if (r && r.indexOf ('icon') != -1) f.push (l[i].href); " #endif "} return f; })(" "document.getElementsByTagName ('link'));", NULL); + + /* FIXME: If URI or title contains , parsing will break */ gchar** items = g_strsplit (value, ",", 0); - guint i = 0; + gchar** current_item = items; gchar* default_uri = NULL; - katze_array_clear (view->news_feeds); - if (items != NULL) - while (items[i] != NULL) + if (view->news_feeds != NULL) + katze_array_clear (view->news_feeds); + else + view->news_feeds = katze_array_new (KATZE_TYPE_ITEM); + + while (current_item && *current_item) { - gchar** parts = g_strsplit (items[i], "|", 2); - if (parts == NULL) - ; - else if (*parts && parts[1]) + const gchar* uri_and_title = *current_item; + if (uri_and_title[0] == '$') { - KatzeItem* item = g_object_new (KATZE_TYPE_ITEM, - "uri", parts[0], "name", parts[1], NULL); + const gchar* title; + gchar* uri; + KatzeItem* item; + + uri_and_title++; + if (uri_and_title == NULL) + continue; + title = strchr (uri_and_title, '|'); + if (title == NULL) + goto news_feeds_continue; + title++; + + uri = g_strndup (uri_and_title, title - 1 - uri_and_title); + item = g_object_new (KATZE_TYPE_ITEM, + "uri", uri, "name", title, NULL); katze_array_add_item (view->news_feeds, item); g_object_unref (item); if (!default_uri) - default_uri = g_strdup (parts[0]); + default_uri = uri; + else + g_free (uri); + } + else if (uri_and_title[0] == ':') + { + const gchar* title; + + uri_and_title++; + if (uri_and_title == NULL) + continue; + title = strchr (uri_and_title, '|'); + if (title == NULL) + goto news_feeds_continue; + title++; + /* TODO: Parse search engine XML + midori_view_add_info_bar (view, GTK_MESSAGE_INFO, title, + G_CALLBACK (midori_view_open_search_response_cb), view, + _("_Save Search engine"), GTK_RESPONSE_ACCEPT, NULL); */ } #if !WEBKIT_CHECK_VERSION (1, 1, 18) else - katze_assign (view->icon_uri, g_strdup (*parts)); + katze_assign (view->icon_uri, g_strdup (uri_and_title)); #endif - g_strfreev (parts); - i++; + news_feeds_continue: + current_item++; } g_strfreev (items); + g_object_set_data_full (G_OBJECT (view), "news-feeds", default_uri, g_free); g_free (value); /* Ensure load-status is notified again, whether it changed or not */ g_object_notify (G_OBJECT (view), "load-status"); + + #if !WEBKIT_CHECK_VERSION (1, 4, 3) + _midori_web_view_load_icon (view); + #endif } - _midori_web_view_load_icon (view); - g_object_thaw_notify (G_OBJECT (view)); } @@ -1374,31 +1645,30 @@ GParamSpec* pspec, MidoriView* view) { - katze_assign (view->icon_uri, katze_object_get_string (web_view, "icon-uri")); + const gchar* icon_uri = webkit_web_view_get_icon_uri (web_view); + katze_assign (view->icon_uri, g_strdup (icon_uri)); _midori_web_view_load_icon (view); } #endif -#if WEBKIT_CHECK_VERSION (1, 1, 4) +static void +webkit_web_view_notify_uri_cb (WebKitWebView* web_view, + GParamSpec* pspec, + MidoriView* view) +{ + katze_assign (view->uri, g_strdup (webkit_web_view_get_uri (web_view))); + g_object_notify (G_OBJECT (view), "uri"); +} + static void webkit_web_view_notify_title_cb (WebKitWebView* web_view, GParamSpec* pspec, MidoriView* view) { - g_object_get (web_view, "title", &view->title, NULL); - midori_view_update_title (view); + const gchar* title = webkit_web_view_get_title (web_view); + midori_view_set_title (view, title); g_object_notify (G_OBJECT (view), "title"); } -#else -static void -webkit_web_view_title_changed_cb (WebKitWebView* web_view, - WebKitWebFrame* web_frame, - const gchar* title, - MidoriView* view) -{ - g_object_set (view, "title", title, NULL); -} -#endif static void webkit_web_view_statusbar_text_changed_cb (WebKitWebView* web_view, @@ -1423,8 +1693,8 @@ const gchar* link_uri, MidoriView* view) { - #if !(WEBKIT_CHECK_VERSION (2, 18, 0) && defined (HAVE_LIBSOUP_2_29_3)) - sokoke_prefetch_uri (link_uri, NULL, NULL); + #if !(WEBKIT_CHECK_VERSION (1, 3, 1) && defined (HAVE_LIBSOUP_2_29_3)) + sokoke_prefetch_uri (view->settings, link_uri, NULL, NULL); #endif katze_assign (view->link_uri, g_strdup (link_uri)); @@ -1438,13 +1708,54 @@ g_object_set (view, "statusbar-text", link_uri, NULL); } +static gboolean +midori_view_always_same_tab (const gchar* uri) +{ + /* No opening in tab, window or app for Javascript or mailto links */ + return g_str_has_prefix (uri, "javascript:") || midori_uri_is_email (uri); +} + +static void +midori_view_ensure_link_uri (MidoriView* view, + gint *x, + gint *y, + GdkEventButton* event) +{ + g_return_if_fail (MIDORI_IS_VIEW (view)); + + if (view->web_view && gtk_widget_get_window (view->web_view)) + { + GdkEventButton ev; + + if (!event) { + gint ex, ey; + event = &ev; + gdk_window_get_pointer (gtk_widget_get_window (view->web_view), &ex, &ey, NULL); + event->x = ex; + event->y = ey; + } + + if (x != NULL) + *x = event->x; + if (y != NULL) + *y = event->y; + + katze_object_assign (view->hit_test, + g_object_ref ( + webkit_web_view_get_hit_test_result ( + WEBKIT_WEB_VIEW (view->web_view), event))); + katze_assign (view->link_uri, + katze_object_get_string (view->hit_test, "link-uri")); + } +} + #define MIDORI_KEYS_MODIFIER_MASK (GDK_SHIFT_MASK | GDK_CONTROL_MASK \ | GDK_MOD1_MASK | GDK_META_MASK | GDK_SUPER_MASK | GDK_HYPER_MASK ) static gboolean -gtk_widget_button_press_event_cb (WebKitWebView* web_view, - GdkEventButton* event, - MidoriView* view) +midori_view_web_view_button_press_event_cb (WebKitWebView* web_view, + GdkEventButton* event, + MidoriView* view) { GtkClipboard* clipboard; gchar* uri; @@ -1453,13 +1764,19 @@ gboolean background; event->state = event->state & MIDORI_KEYS_MODIFIER_MASK; + midori_view_ensure_link_uri (view, NULL, NULL, event); link_uri = midori_view_get_link_uri (view); + view->button_press_handled = FALSE; switch (event->button) { case 1: if (!link_uri) return FALSE; + + if (midori_view_always_same_tab (link_uri)) + return FALSE; + if (MIDORI_MOD_NEW_TAB (event->state)) { /* Open link in new tab */ @@ -1467,34 +1784,34 @@ if (MIDORI_MOD_BACKGROUND (event->state)) background = !background; g_signal_emit (view, signals[NEW_TAB], 0, link_uri, background); + view->button_press_handled = TRUE; return TRUE; } else if (MIDORI_MOD_NEW_WINDOW (event->state)) { /* Open link in new window */ g_signal_emit (view, signals[NEW_WINDOW], 0, link_uri); + view->button_press_handled = TRUE; return TRUE; } break; case 2: if (link_uri) { + if (midori_view_always_same_tab (link_uri)) + return FALSE; + /* Open link in new tab */ background = view->open_tabs_in_the_background; if (MIDORI_MOD_BACKGROUND (event->state)) background = !background; g_signal_emit (view, signals[NEW_TAB], 0, link_uri, background); + view->button_press_handled = TRUE; return TRUE; } - else if (MIDORI_MOD_SCROLL (event->state)) - { - midori_view_set_zoom_level (MIDORI_VIEW (view), 1.0); - return FALSE; /* Allow Ctrl + Middle click */ - } - else if (view->middle_click_opens_selection) + if (view->middle_click_opens_selection) { gboolean is_editable; - #if WEBKIT_CHECK_VERSION (1, 1, 15) WebKitHitTestResult* result; WebKitHitTestResultContext context; @@ -1502,60 +1819,64 @@ context = katze_object_get_int (result, "context"); is_editable = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE; g_object_unref (result); - #else - is_editable = webkit_web_view_can_paste_clipboard (WEBKIT_WEB_VIEW (view->web_view)); - #endif - if (is_editable) - return FALSE; - - clipboard = gtk_clipboard_get_for_display ( - gtk_widget_get_display (GTK_WIDGET (view)), - GDK_SELECTION_PRIMARY); - if ((uri = gtk_clipboard_wait_for_text (clipboard))) + if (!is_editable) { - guint i = 0; - while (uri[i++] != '\0') - if (uri[i] == '\n' || uri[i] == '\r') - uri[i] = ' '; - g_strstrip (uri); - - /* Hold Alt to search for the selected word */ - if (event->state & GDK_MOD1_MASK) + clipboard = gtk_clipboard_get_for_display ( + gtk_widget_get_display (GTK_WIDGET (view)), + GDK_SELECTION_PRIMARY); + if ((uri = gtk_clipboard_wait_for_text (clipboard))) { - new_uri = sokoke_magic_uri (uri); - if (!new_uri) + guint i = 0; + while (uri[i++] != '\0') + if (uri[i] == '\n' || uri[i] == '\r') + uri[i] = ' '; + g_strstrip (uri); + + /* Hold Alt to search for the selected word */ + if (event->state & GDK_MOD1_MASK) { - gchar* search; - g_object_get (view->settings, "location-entry-search", - &search, NULL); - new_uri = sokoke_search_uri (search, uri); + new_uri = sokoke_magic_uri (uri); + if (!new_uri) + { + gchar* search = katze_object_get_string ( + view->settings, "location-entry-search"); + new_uri = midori_uri_for_search (search, uri); + g_free (search); + } + katze_assign (uri, new_uri); + } + else if (midori_uri_is_location (uri)) + { + if (MIDORI_MOD_NEW_TAB (event->state)) + { + background = view->open_tabs_in_the_background; + if (MIDORI_MOD_BACKGROUND (event->state)) + background = !background; + g_signal_emit (view, signals[NEW_TAB], 0, uri, background); + } + else + { + midori_view_set_uri (MIDORI_VIEW (view), uri); + gtk_widget_grab_focus (GTK_WIDGET (view)); + } + g_free (uri); + view->button_press_handled = TRUE; + return TRUE; + } + else + { + g_free (uri); } - katze_assign (uri, new_uri); - } - else if (!strstr (uri, "://")) - { - g_free (uri); - return FALSE; - } - - if (MIDORI_MOD_NEW_TAB (event->state)) - { - background = view->open_tabs_in_the_background; - if (MIDORI_MOD_BACKGROUND (event->state)) - background = !background; - g_signal_emit (view, signals[NEW_TAB], 0, uri, background); - } - else - { - midori_view_set_uri (MIDORI_VIEW (view), uri); - gtk_widget_grab_focus (GTK_WIDGET (view)); } - g_free (uri); - return TRUE; } } + if (MIDORI_MOD_SCROLL (event->state)) + { + midori_view_set_zoom_level (MIDORI_VIEW (view), 1.0); + return FALSE; /* Allow Ctrl + Middle click */ + } + return FALSE; break; - #if WEBKIT_CHECK_VERSION (1, 1, 15) case 3: if (event->state & GDK_CONTROL_MASK) { @@ -1564,15 +1885,17 @@ midori_view_populate_popup (view, menu, TRUE); katze_widget_popup (GTK_WIDGET (web_view), GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR); + view->button_press_handled = TRUE; return TRUE; } break; - #endif case 8: midori_view_go_back (view); + view->button_press_handled = TRUE; return TRUE; case 9: midori_view_go_forward (view); + view->button_press_handled = TRUE; return TRUE; /* * On some fancier mice the scroll wheel can be used to scroll horizontally. @@ -1582,8 +1905,8 @@ * accidentally being interpreted as first button clicks. */ case 11: - return TRUE; case 12: + view->button_press_handled = TRUE; return TRUE; } @@ -1594,16 +1917,154 @@ } static gboolean +midori_view_web_view_button_release_event_cb (WebKitWebView* web_view, + GdkEventButton* event, + MidoriView* view) +{ + gboolean button_press_handled = view->button_press_handled; + view->button_press_handled = FALSE; + + return button_press_handled; +} + +static gboolean +midori_view_inspector_window_key_press_event_cb (GtkWidget* window, + GdkEventKey* event, + gpointer user_data) +{ + /* Close window on Ctrl+W */ + if (event->keyval == 'w' && (event->state & GDK_CONTROL_MASK)) + gtk_widget_destroy (window); + + return FALSE; +} + +static gboolean gtk_widget_key_press_event_cb (WebKitWebView* web_view, GdkEventKey* event, MidoriView* view) { guint character; + gint digit = g_ascii_digit_value (event->keyval); + + event->state = event->state & MIDORI_KEYS_MODIFIER_MASK; + + /* Handle oddities in Russian keyboard layouts */ + if (event->hardware_keycode == ';' || event->hardware_keycode == '=') + event->keyval = ','; + else if (event->hardware_keycode == '<') + event->keyval = '.'; + + /* Find links by number: . to show links, type number, Return to go */ + if (event->keyval == '.' + || (view->find_links > -1 + && (digit != -1 || event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_Escape))) + { + WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (web_view); + JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); + gchar* result; + + if (view->find_links == -1) + { + result = sokoke_js_script_eval (js_context, + " var style_func = (function (selector, rule) { " + " var style = document.createElement ('style');" + " style.setAttribute ('type', 'text/css');" + " var heads = document.getElementsByTagName ('head');" + " heads[0].appendChild (style);" + " document.styleSheets[0].insertRule (selector + ' ' + rule);" + " } );" + " style_func ('.midoriHKD87346', '{ " + " font-size:small !important; font-weight:bold !important;" + " z-index:500; border-radius:0.3em; line-height:1 !important;" + " background: white !important; color: black !important;" + " border:1px solid gray; padding:0 0.1em !important;" + " position:absolute; display:inline !important; }');" + " style_func ('.midori_access_key_fc04de', '{ " + " font-size:small !important; font-weight:bold !important;" + " z-index:500; border-radius:0.3em; line-height:1 !important;" + " background: black !important; color: white !important;" + " border:1px solid gray; padding:0 0.1em 0.2em 0.1em !important;" + " position:absolute; display:inline !important; }');" + " var label_count = 0;" + " for (var i in document.links) {" + " if (document.links[i].href && document.links[i].insertBefore) {" + " var child = document.createElement ('span');" + " if (document.links[i].accessKey && isNaN (document.links[i].accessKey)) {" + " child.setAttribute ('class', 'midori_access_key_fc04de');" + " child.appendChild (document.createTextNode (document.links[i].accessKey));" + " } else {" + " child.setAttribute ('class', 'midoriHKD87346');" + " child.appendChild (document.createTextNode (label_count));" + " label_count++;" + " }" + " document.links[i].insertBefore (child); } }", + NULL); + view->find_links = 0; + } + else if (digit != -1 && event->keyval != GDK_KEY_Return && event->keyval != GDK_KEY_Escape) + { + if (view->find_links > -1) + view->find_links *= 10; + view->find_links += digit; + } + else if (event->keyval == GDK_KEY_Escape) + { + view->find_links = 0; + } + else if (event->keyval == GDK_KEY_Return) + { + gchar* script; + script = g_strdup_printf ( + "var links = document.getElementsByClassName ('midoriHKD87346');" + "var i = %d; var return_key = %d;" + "if (return_key) {" + " if (typeof links[i] != 'undefined')" + " links[i].parentNode.href; }", + view->find_links, event->keyval == GDK_KEY_Return + ); + result = sokoke_js_script_eval (js_context, script, NULL); + if (midori_uri_is_location (result)) + { + if (MIDORI_MOD_NEW_TAB (event->state)) + { + gboolean background = view->open_tabs_in_the_background; + if (MIDORI_MOD_BACKGROUND (event->state)) + background = !background; + g_signal_emit (view, signals[NEW_TAB], 0, result, background); + } + else + midori_view_set_uri (view, result); + } + g_free (script); + g_free (result); + view->find_links = 0; + } + else + { + result = sokoke_js_script_eval (js_context, + "var links = document.getElementsByClassName ('midoriHKD87346');" + "for (var i = links.length - 1; i >= 0; i--) {" + " var parent = links[i].parentNode;" + " parent.removeChild(links[i]); }", + NULL); + g_free (result); + result = sokoke_js_script_eval (js_context, + "var links = document.getElementsByClassName ('midori_access_key_fc04de');" + "if (links != undefined && links.length > 0) {" + " for (var i = links.length - 1; i >= 0; i--) {" + " var parent = links[i].parentNode;" + " parent.removeChild(links[i]); } }", + NULL); + g_free (result); + view->find_links = -1; + } + return FALSE; + } - if (event->keyval == '.' || event->keyval == '/' || event->keyval == GDK_KP_Divide) + /* Find inline */ + if (event->keyval == ',' || event->keyval == '/' || event->keyval == GDK_KEY_KP_Divide) character = '\0'; - else if (view->find_while_typing) - character = gdk_unicode_to_keyval (event->keyval); else return FALSE; @@ -1614,8 +2075,13 @@ if (!webkit_web_view_can_cut_clipboard (web_view) && !webkit_web_view_can_paste_clipboard (web_view)) { - gchar* text = character ? g_strdup_printf ("%c", character) : g_strdup (""); - g_signal_emit (view, signals[SEARCH_TEXT], 0, TRUE, text); + gchar* text = character ? g_strdup_printf ("%c", character) : NULL; + #if GTK_CHECK_VERSION(3, 2, 0) + midori_findbar_search_text (MIDORI_FINDBAR (view->overlay_find), + (GtkWidget*)view, TRUE, katze_str_non_null (text)); + #else + g_signal_emit (view, signals[SEARCH_TEXT], 0, TRUE, text ? text : ""); + #endif g_free (text); return TRUE; } @@ -1634,30 +2100,16 @@ { if (event->direction == GDK_SCROLL_DOWN) midori_view_set_zoom_level (view, - midori_view_get_zoom_level (view) - 0.25f); + midori_view_get_zoom_level (view) - 0.10f); else if(event->direction == GDK_SCROLL_UP) midori_view_set_zoom_level (view, - midori_view_get_zoom_level (view) + 0.25f); + midori_view_get_zoom_level (view) + 0.10f); return TRUE; } else return FALSE; } -#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_new_window_activate_cb (GtkWidget* widget, MidoriView* view) @@ -1669,14 +2121,17 @@ midori_web_view_menu_web_app_activate_cb (GtkWidget* widget, MidoriView* view) { - sokoke_spawn_program ("midori -a", view->link_uri, FALSE); + sokoke_spawn_app (view->link_uri, FALSE); } static void midori_web_view_menu_link_copy_activate_cb (GtkWidget* widget, MidoriView* view) { - midori_web_view_set_clipboard (widget, view->link_uri); + if (g_str_has_prefix (view->link_uri, "mailto:")) + sokoke_widget_copy_clipboard (widget, view->link_uri + 7); + else + sokoke_widget_copy_clipboard (widget, view->link_uri); } static void @@ -1687,11 +2142,8 @@ WebKitDownload* download = webkit_download_new (request); gboolean handled; g_object_unref (request); - if (view->ask_for_destination_folder) - g_object_set_data (G_OBJECT (download), "save-as-download", (void*)0xdeadbeef); + g_object_set_data (G_OBJECT (download), "save-as-download", (void*)0xdeadbeef); g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled); - if (!view->ask_for_destination_folder) - webkit_download_start (download); } static void @@ -1709,7 +2161,7 @@ MidoriView* view) { gchar* uri = katze_object_get_string (view->hit_test, "image-uri"); - midori_web_view_set_clipboard (widget, uri); + sokoke_widget_copy_clipboard (widget, uri); g_free (uri); } @@ -1722,11 +2174,22 @@ WebKitDownload* download = webkit_download_new (request); gboolean handled; g_object_unref (request); - if (view->ask_for_destination_folder) - g_object_set_data (G_OBJECT (download), "save-as-download", (void*)0xdeadbeef); + g_object_set_data (G_OBJECT (download), "save-as-download", (void*)0xdeadbeef); + g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled); + g_free (uri); +} + +static void +midori_web_view_open_picture_cb (GtkWidget* widget, + MidoriView* view) +{ + gchar* uri = katze_object_get_string (view->hit_test, "image-uri"); + WebKitNetworkRequest* request = webkit_network_request_new (uri); + WebKitDownload* download = webkit_download_new (request); + gboolean handled; + g_object_unref (request); + g_object_set_data (G_OBJECT (download), "open-in-viewer", (void*)0xdeadbeef); g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled); - if (!view->ask_for_destination_folder) - webkit_download_start (download); g_free (uri); } @@ -1735,7 +2198,7 @@ MidoriView* view) { gchar* uri = katze_object_get_string (view->hit_test, "media-uri"); - midori_web_view_set_clipboard (widget, uri); + sokoke_widget_copy_clipboard (widget, uri); g_free (uri); } @@ -1748,23 +2211,10 @@ WebKitDownload* download = webkit_download_new (request); gboolean handled; g_object_unref (request); - if (view->ask_for_destination_folder) - g_object_set_data (G_OBJECT (download), "save-as-download", (void*)0xdeadbeef); + g_object_set_data (G_OBJECT (download), "save-as-download", (void*)0xdeadbeef); g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled); - if (!view->ask_for_destination_folder) - webkit_download_start (download); - g_free (uri); -} - -static void -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, FALSE); g_free (uri); } -#endif static void midori_web_view_menu_new_tab_activate_cb (GtkWidget* widget, @@ -1795,7 +2245,6 @@ } } -#if WEBKIT_CHECK_VERSION (1, 1, 15) static void midori_web_view_menu_background_tab_activate_cb (GtkWidget* widget, MidoriView* view) @@ -1803,7 +2252,6 @@ 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, @@ -1817,7 +2265,7 @@ else g_object_get (view->settings, "location-entry-search", &search, NULL); - uri = sokoke_search_uri (search, view->selected_text); + uri = midori_uri_for_search (search, view->selected_text); g_free (search); g_signal_emit (view, signals[NEW_TAB], 0, uri, @@ -1826,29 +2274,11 @@ g_free (uri); } -#if WEBKIT_CHECK_VERSION (1, 1, 15) static void midori_web_view_menu_copy_activate_cb (GtkWidget* widget, MidoriView* view) { - midori_web_view_set_clipboard (widget, view->selected_text); -} -#endif - -#if !WEBKIT_CHECK_VERSION (1, 1, 3) -static void -midori_web_view_menu_save_as_activate_cb (GtkWidget* widget, - MidoriView* view) -{ - g_signal_emit (view, signals[SAVE_AS], 0, view->link_uri); -} -#endif - -static void -midori_web_view_menu_download_activate_cb (GtkWidget* widget, - MidoriView* view) -{ - sokoke_spawn_program (view->download_manager, view->link_uri, FALSE); + sokoke_widget_copy_clipboard (widget, view->selected_text); } static void @@ -1859,7 +2289,15 @@ midori_view_get_display_uri (MIDORI_VIEW (view))); } -#if WEBKIT_CHECK_VERSION (1, 1, 17) +static void +midori_web_view_open_frame_in_new_tab_cb (GtkWidget* widget, + MidoriView* view) +{ + WebKitWebFrame* web_frame = webkit_web_view_get_focused_frame (WEBKIT_WEB_VIEW (view->web_view)); + g_signal_emit (view, signals[NEW_TAB], 0, + webkit_web_frame_get_uri (web_frame), view->open_tabs_in_the_background); +} + static void midori_web_view_menu_inspect_element_activate_cb (GtkWidget* widget, MidoriView* view) @@ -1873,7 +2311,6 @@ webkit_web_inspector_inspect_coordinates (inspector, x, y); webkit_web_inspector_show (inspector); } -#endif static GtkWidget* midori_view_insert_menu_item (GtkMenuShell* menu, @@ -1936,6 +2373,7 @@ WebKitWebView* web_view = WEBKIT_WEB_VIEW (view->web_view); GtkWidget* widget = GTK_WIDGET (view); MidoriBrowser* browser = midori_browser_get_for_widget (widget); + GdkWindowState state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (browser))); GtkActionGroup* actions = midori_browser_get_action_group (browser); GtkMenuShell* menu_shell = GTK_MENU_SHELL (menu); GtkWidget* menuitem; @@ -1948,65 +2386,24 @@ GtkWidget* label; guint i; - #if WEBKIT_CHECK_VERSION (1, 1, 15) gint x, y; - GdkEventButton event; WebKitHitTestResultContext context; gboolean is_image; gboolean is_media; - gdk_window_get_pointer (view->web_view->window, &x, &y, NULL); - event.x = x; - event.y = y; - katze_object_assign (view->hit_test, - webkit_web_view_get_hit_test_result (web_view, &event)); + midori_view_ensure_link_uri (view, &x, &y, NULL); context = katze_object_get_int (view->hit_test, "context"); - /* Ensure view->link_uri is correct. */ - katze_assign (view->link_uri, - katze_object_get_string (view->hit_test, "link-uri")); has_selection = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION; /* Ensure view->selected_text */ - midori_view_has_selection (view); + if (!midori_view_has_selection (view)) + has_selection = false; is_editable = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE; is_image = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE; is_media = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_MEDIA; is_document = !view->link_uri && !has_selection && !is_image && !is_media; - #else - /* There is no guarantee view->link_uri is correct in case - gtk-touchscreen-mode is enabled, nothing we can do. */ - has_selection = midori_view_has_selection (view); - is_document = !view->link_uri && !has_selection; - - /* Unfortunately inspecting the menu is the only way to - determine that the mouse is over a text area or selection. */ - items = gtk_container_get_children (GTK_CONTAINER (menu)); - menuitem = (GtkWidget*)g_list_nth_data (items, 0); - if (GTK_IS_IMAGE_MENU_ITEM (menuitem)) - { - icon = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (menuitem)); - gtk_image_get_stock (GTK_IMAGE (icon), &stock_id, NULL); - if (!strcmp (stock_id, GTK_STOCK_FIND)) - { - gtk_widget_hide (menuitem); - gtk_widget_set_no_show_all (menuitem, TRUE); - menuitem = (GtkWidget*)g_list_nth_data (items, 1); - gtk_widget_hide (menuitem); - menuitem = (GtkWidget*)g_list_nth_data (items, 2); - icon = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (menuitem)); - gtk_image_get_stock (GTK_IMAGE (icon), &stock_id, NULL); - } - is_editable = !strcmp (stock_id, GTK_STOCK_CUT); - if (is_document && !strcmp (stock_id, GTK_STOCK_OPEN)) - is_document = FALSE; - } - else - is_editable = FALSE; - g_list_free (items); - #endif if (is_editable) { - #if WEBKIT_CHECK_VERSION (1, 1, 14) menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_prepend (menu_shell, menuitem); gtk_widget_show (menuitem); @@ -2020,7 +2417,6 @@ gtk_widget_set_sensitive (menuitem, webkit_web_view_can_undo (web_view)); gtk_menu_shell_prepend (menu_shell, menuitem); - #endif if (manual) { menuitem = sokoke_action_create_popup_menu_item ( @@ -2050,7 +2446,6 @@ gtk_action_group_get_action (actions, "SelectAll")); gtk_menu_shell_append (menu_shell, menuitem); /* FIXME: We are missing Font, Input Methods and Insert Character */ - #if WEBKIT_CHECK_VERSION (1, 1, 17) if (katze_object_get_boolean (view->settings, "enable-developer-extras")) { menuitem = gtk_separator_menu_item_new (); @@ -2063,8 +2458,7 @@ gtk_widget_show (menuitem); g_object_set_data (G_OBJECT (menuitem), "x", GINT_TO_POINTER (x)); g_object_set_data (G_OBJECT (menuitem), "y", GINT_TO_POINTER (y)); - } - #endif + } } return; } @@ -2097,7 +2491,6 @@ } } - #if WEBKIT_CHECK_VERSION (1, 1, 15) if (!is_document) { items = gtk_container_get_children (GTK_CONTAINER (menu)); @@ -2108,6 +2501,8 @@ } if (view->link_uri) { + if (!midori_view_always_same_tab (view->link_uri)) + { 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); @@ -2122,17 +2517,18 @@ midori_view_insert_menu_item (menu_shell, -1, _("Open Link as Web A_pplication"), NULL, G_CALLBACK (midori_web_view_menu_web_app_activate_cb), widget); + } + midori_view_insert_menu_item (menu_shell, -1, _("Copy Link de_stination"), NULL, G_CALLBACK (midori_web_view_menu_link_copy_activate_cb), widget); + + if (!midori_view_always_same_tab (view->link_uri)) + { midori_view_insert_menu_item (menu_shell, -1, - view->ask_for_destination_folder ? _("_Save Link destination") - : _("_Download Link destination"), NULL, + NULL, GTK_STOCK_SAVE_AS, G_CALLBACK (midori_web_view_menu_save_activate_cb), widget); - if (view->download_manager && *view->download_manager) - midori_view_insert_menu_item (menu_shell, -1, - _("Download with Download _Manager"), STOCK_TRANSFER, - G_CALLBACK (midori_web_view_menu_download_activate_cb), widget); + } } if (is_image) @@ -2146,9 +2542,11 @@ _("Copy Image _Address"), NULL, G_CALLBACK (midori_web_view_menu_image_copy_activate_cb), widget); midori_view_insert_menu_item (menu_shell, -1, - view->ask_for_destination_folder ? _("Save I_mage") - : _("Download I_mage"), GTK_STOCK_SAVE, + _("Save I_mage"), GTK_STOCK_SAVE, G_CALLBACK (midori_web_view_menu_image_save_activate_cb), widget); + midori_view_insert_menu_item (menu_shell, -1, + _("Open in Image _Viewer"), GTK_STOCK_OPEN, + G_CALLBACK (midori_web_view_open_picture_cb), widget); } if (is_media) @@ -2159,10 +2557,6 @@ midori_view_insert_menu_item (menu_shell, -1, FALSE ? _("Save _Video") : _("Download _Video"), GTK_STOCK_SAVE, G_CALLBACK (midori_web_view_menu_video_save_activate_cb), widget); - if (view->download_manager && *view->download_manager) - midori_view_insert_menu_item (menu_shell, -1, - _("Download with Download _Manager"), STOCK_TRANSFER, - G_CALLBACK (midori_web_view_menu_video_download_activate_cb), widget); } if (has_selection) @@ -2171,52 +2565,19 @@ midori_view_insert_menu_item (menu_shell, -1, NULL, GTK_STOCK_COPY, G_CALLBACK (midori_web_view_menu_copy_activate_cb), widget); } - #else - if (view->link_uri) - { - items = gtk_container_get_children (GTK_CONTAINER (menu)); - menuitem = (GtkWidget*)g_list_nth_data (items, 0); - /* hack to hide menu item */ - gtk_widget_hide (menuitem); - 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); - g_list_free (items); - items = gtk_container_get_children (GTK_CONTAINER (menu)); - menuitem = (GtkWidget*)g_list_nth_data (items, 2); - /* hack to localize menu item */ - label = gtk_bin_get_child (GTK_BIN (menuitem)); - gtk_label_set_label (GTK_LABEL (label), _("Open Link in New _Window")); - menuitem = (GtkWidget*)g_list_nth_data (items, 3); - g_list_free (items); - #if WEBKIT_CHECK_VERSION (1, 1, 3) - /* hack to localize menu item */ - label = gtk_bin_get_child (GTK_BIN (menuitem)); - gtk_label_set_label (GTK_LABEL (label), _("_Download Link destination")); - #else - /* hack to disable non-functional Download File */ - gtk_widget_hide (menuitem); - gtk_widget_set_no_show_all (menuitem, TRUE); - midori_view_insert_menu_item (menu_shell, 3, - _("_Save Link destination"), NULL, - G_CALLBACK (midori_web_view_menu_save_as_activate_cb), widget); - #endif - if (view->download_manager && *view->download_manager) - midori_view_insert_menu_item (menu_shell, 4, - _("Download with Download _Manager"), STOCK_TRANSFER, - G_CALLBACK (midori_web_view_menu_download_activate_cb), widget); - } - #endif if (!view->link_uri && has_selection) { GtkWidget* window; + KatzeArray* search_engines = NULL; window = gtk_widget_get_toplevel (GTK_WIDGET (web_view)); i = 0; if (katze_object_has_property (window, "search-engines")) + search_engines = katze_object_get_object (window, "search-engines"); + + if (search_engines != NULL) { - KatzeArray* search_engines; KatzeItem* item; GtkWidget* sub_menu = gtk_menu_new (); @@ -2224,7 +2585,6 @@ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), sub_menu); gtk_menu_shell_insert (menu_shell, menuitem, 1); - search_engines = katze_object_get_object (window, "search-engines"); KATZE_ARRAY_FOREACH_ITEM (item, search_engines) { GdkPixbuf* pixbuf; @@ -2232,7 +2592,7 @@ menuitem = gtk_image_menu_item_new_with_mnemonic (katze_item_get_name (item)); pixbuf = midori_search_action_get_icon (item, - GTK_WIDGET (web_view), &icon_name); + GTK_WIDGET (web_view), &icon_name, FALSE); if (pixbuf) { icon = gtk_image_new_from_pixbuf (pixbuf); @@ -2241,10 +2601,8 @@ 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 ( GTK_IMAGE_MENU_ITEM (menuitem), TRUE); - #endif gtk_menu_shell_insert (GTK_MENU_SHELL (sub_menu), menuitem, i); g_object_set_data (G_OBJECT (menuitem), "search", (gchar*)katze_item_get_uri (item)); @@ -2254,27 +2612,15 @@ } g_object_unref (search_engines); } - #if WEBKIT_CHECK_VERSION (1, 1, 15) midori_view_insert_menu_item (menu_shell, 0, _("_Search the Web"), GTK_STOCK_FIND, G_CALLBACK (midori_web_view_menu_search_web_activate_cb), widget); - #else - items = gtk_container_get_children (GTK_CONTAINER (menu)); - menuitem = (GtkWidget*)g_list_nth_data (items, 0); - /* hack to localize menu item */ - label = gtk_bin_get_child (GTK_BIN (menuitem)); - gtk_label_set_label (GTK_LABEL (label), _("_Search the Web")); - /* hack to implement Search the Web */ - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_web_view_menu_search_web_activate_cb), view); - g_list_free (items); - #endif + /* FIXME: choose 3 most frequently */ g_strstrip (view->selected_text); - if (view->selected_text && !strchr (view->selected_text, ' ') - && (strchr (view->selected_text, '.') || g_strstr_len (view->selected_text, 9, "://"))) + if (midori_uri_is_valid (view->selected_text)) { - if (strchr (view->selected_text, '@')) + if (midori_uri_is_email (view->selected_text)) { gchar* text = g_strdup_printf (_("Send a message to %s"), view->selected_text); menuitem = midori_view_insert_menu_item (menu_shell, -1, @@ -2334,31 +2680,18 @@ menuitem = sokoke_action_create_popup_menu_item ( gtk_action_group_get_action (actions, "UndoTabClose")); gtk_menu_shell_append (menu_shell, menuitem); + + if (webkit_web_view_get_focused_frame (web_view) != webkit_web_view_get_main_frame (web_view)) + menuitem = midori_view_insert_menu_item (menu_shell, -1, + _("Open _Frame in New Tab"), NULL, + G_CALLBACK (midori_web_view_open_frame_in_new_tab_cb), widget); + menuitem = gtk_image_menu_item_new_from_stock (STOCK_WINDOW_NEW, NULL); gtk_menu_item_set_label (GTK_MENU_ITEM (menuitem), _("Open in New _Window")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_view_tab_label_menu_window_new_cb), view); - #if WEBKIT_CHECK_VERSION (1, 1, 15) - /* if (webkit_web_view_get_main_frame (web_view) != frame_under_mouse) - { - midori_view_insert_menu_item (menu_shell, -1, - _("Open _Frame in New Tab"), NULL, - G_CALLBACK (midori_web_view_menu_frame_new_tab_activate_cb), widget); - midori_view_insert_menu_item (menu_shell, -1, - _("Open _Frame in New Window"), NULL, - G_CALLBACK (midori_web_view_menu_frame_new_window_activate_cb), widget); - } */ - #endif - - if (!g_object_get_data (G_OBJECT (browser), "midori-toolbars-visible")) - { - menuitem = sokoke_action_create_popup_menu_item ( - gtk_action_group_get_action (actions, "Menubar")); - gtk_menu_shell_append (menu_shell, menuitem); - } - #if !HAVE_HILDON menuitem = sokoke_action_create_popup_menu_item ( gtk_action_group_get_action (actions, "ZoomIn")); @@ -2377,6 +2710,7 @@ static const GtkActionEntry encodings[] = { { "EncodingAutomatic" }, { "EncodingChinese" }, + { "EncodingChineseSimplified" }, { "EncodingJapanese" }, { "EncodingKorean" }, { "EncodingRussian" }, @@ -2413,7 +2747,7 @@ gtk_action_group_get_action (actions, "BookmarkAdd")); gtk_menu_shell_append (menu_shell, menuitem); - if (view->speed_dial_in_new_tabs && !midori_view_is_blank (view)) + if (!midori_view_is_blank (view) && !sokoke_is_app_or_private ()) { menuitem = sokoke_action_create_popup_menu_item ( gtk_action_group_get_action (actions, "AddSpeedDial")); @@ -2422,22 +2756,23 @@ 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 ( gtk_action_group_get_action (actions, "SaveAs")); gtk_menu_shell_append (menu_shell, menuitem); - /* Currently views that don't support source, don't support - saving either. If that changes, we need to think of something. */ - if (!midori_view_can_view_source (view)) - gtk_widget_set_sensitive (menuitem, FALSE); menuitem = sokoke_action_create_popup_menu_item ( gtk_action_group_get_action (actions, "SourceView")); gtk_menu_shell_append (menu_shell, menuitem); + + if (!g_object_get_data (G_OBJECT (browser), "midori-toolbars-visible")) + { + menuitem = sokoke_action_create_popup_menu_item ( + gtk_action_group_get_action (actions, "Navigationbar")); + gtk_menu_shell_append (menu_shell, menuitem); + } } - #if WEBKIT_CHECK_VERSION (1, 1, 17) if ((!is_document || manual) && katze_object_get_boolean (view->settings, "enable-developer-extras")) { @@ -2448,7 +2783,16 @@ g_object_set_data (G_OBJECT (menuitem), "x", GINT_TO_POINTER (x)); g_object_set_data (G_OBJECT (menuitem), "y", GINT_TO_POINTER (y)); } - #endif + + if (state & GDK_WINDOW_STATE_FULLSCREEN) + { + menuitem = sokoke_action_create_popup_menu_item ( + gtk_action_group_get_action (actions, "Fullscreen")); + + gtk_image_menu_item_set_use_stock (GTK_IMAGE_MENU_ITEM (menuitem), TRUE); + gtk_menu_item_set_label (GTK_MENU_ITEM (menuitem), GTK_STOCK_LEAVE_FULLSCREEN); + gtk_menu_shell_append (menu_shell, menuitem); + } gtk_widget_show_all (menu); } @@ -2472,15 +2816,14 @@ /* Emulate a pointer motion above the tap position and a right click at the according position. */ - gdk_window_get_pointer (web_view->window, &x, &y, NULL); + event.any.window = gtk_widget_get_window (web_view); + gdk_window_get_pointer (event.any.window, &x, &y, NULL); event.any.type = GDK_MOTION_NOTIFY; - event.any.window = web_view->window; event.motion.x = x; event.motion.y = y; g_signal_emit_by_name (web_view, "motion-notify-event", &event, &result); event.any.type = GDK_BUTTON_PRESS; - event.any.window = web_view->window; event.button.axes = NULL; event.button.x = x; event.button.y = y; @@ -2493,8 +2836,8 @@ webkit_web_view_web_view_ready_cb (GtkWidget* web_view, MidoriView* view) { - GtkWidget* new_view = gtk_widget_get_parent (gtk_widget_get_parent (web_view)); MidoriNewView where = MIDORI_NEW_VIEW_TAB; + GtkWidget* new_view = GTK_WIDGET (midori_view_get_for_widget (web_view)); /* FIXME: Open windows opened by scripts in tabs if they otherwise would be replacing the page the user opened. */ @@ -2510,7 +2853,7 @@ where = MIDORI_NEW_VIEW_WINDOW; gtk_widget_show (new_view); - g_signal_emit (view, signals[NEW_VIEW], 0, new_view, where); + g_signal_emit (view, signals[NEW_VIEW], 0, new_view, where, FALSE); return TRUE; } @@ -2526,9 +2869,7 @@ new_view = view; else { - new_view = (MidoriView*)midori_view_new_with_uri (NULL, NULL, - view->settings); - midori_view_construct_web_view (new_view); + new_view = (MidoriView*)midori_view_new_with_item (NULL, view->settings); g_signal_connect (new_view->web_view, "web-view-ready", G_CALLBACK (webkit_web_view_web_view_ready_cb), view); } @@ -2543,28 +2884,8 @@ WebKitWebPolicyDecision* decision, MidoriView* view) { - #if WEBKIT_CHECK_VERSION (1, 1, 3) - GtkWidget* dialog; - gchar* content_type; - gchar* description; - #if GTK_CHECK_VERSION (2, 14, 0) - GIcon* icon; - GtkWidget* image; - #endif - gchar* title; - GdkScreen* screen; - GtkIconTheme* icon_theme; - gint response; - #else - gchar* uri; - #endif - - if (web_frame != webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view))) - return FALSE; - if (webkit_web_view_can_show_mime_type (WEBKIT_WEB_VIEW (web_view), mime_type)) { - #if WEBKIT_CHECK_VERSION (1, 1, 14) gboolean view_source = FALSE; /* Dedicated source code views are always pseudo-blank pages */ if (midori_view_is_blank (view)) @@ -2575,29 +2896,66 @@ || !strcmp (mime_type, "text/xml"))) view_source = TRUE; webkit_web_view_set_view_source_mode (WEBKIT_WEB_VIEW (web_view), view_source); - #endif - katze_assign (view->mime_type, g_strdup (mime_type)); - midori_view_update_icon (view, NULL); - g_object_notify (G_OBJECT (view), "mime-type"); + if (web_frame == webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view))) + { + katze_assign (view->mime_type, g_strdup (mime_type)); + midori_view_unset_icon (view); + g_object_notify (G_OBJECT (view), "mime-type"); + } return FALSE; } + g_object_set_data(G_OBJECT (view), "download-mime-type", (gpointer)mime_type); + webkit_web_policy_decision_download (decision); + g_object_set_data(G_OBJECT (view), "download-mime-type", NULL); + return TRUE; +} - #if WEBKIT_CHECK_VERSION (1, 1, 3) - dialog = gtk_message_dialog_new ( - NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, - _("Open or download file")); - content_type = g_content_type_from_mime_type (mime_type); - 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); +static gboolean +webkit_web_view_download_requested_cb (GtkWidget* web_view, + WebKitDownload* download, + MidoriView* view) +{ + GtkWidget* dialog; + gchar* content_type; + gchar* description; + gchar* file_type; + gchar* name; + gchar* file_name; + WebKitWebFrame* web_frame; + const gchar* mime_type; + WebKitWebDataSource* datasource; + WebKitNetworkRequest* request; + WebKitNetworkRequest* original_request; + const gchar* original_uri; + gchar* fingerprint; + gchar* fplabel; + #if GTK_CHECK_VERSION (2, 14, 0) + GIcon* icon; + GtkWidget* image; + #endif + gchar* title; + GdkScreen* screen; + GtkIconTheme* icon_theme; + gint response; + gboolean handled; + + dialog = gtk_message_dialog_new ( + NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, + _("Open or download file")); + mime_type = g_object_get_data(G_OBJECT (view), "download-mime-type"); + content_type = g_content_type_from_mime_type (mime_type); + 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); + g_themed_icon_append_name (G_THEMED_ICON (icon), "document-x-generic"); image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG); g_object_unref (icon); gtk_widget_show (image); @@ -2605,14 +2963,39 @@ #endif g_free (content_type); if (g_strrstr (description, mime_type)) - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("File Type: '%s'"), mime_type); + file_type = g_strdup_printf (_("File Type: '%s'"), mime_type); else - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("File Type: %s ('%s')"), description, mime_type); + file_type = g_strdup_printf (_("File Type: %s ('%s')"), description, mime_type); g_free (description); + + name = sokoke_get_download_filename (download); + file_name = g_strdup_printf (_("File Name: %s"), name); + g_free (name); + + /* Link Fingerprint */ + /* We look at the original URI because redirection would lose the fragment */ + web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view)); + datasource = webkit_web_frame_get_provisional_data_source (web_frame); + if (datasource) + { + original_request = webkit_web_data_source_get_initial_request (datasource); + original_uri = webkit_network_request_get_uri (original_request); + midori_uri_get_fingerprint (original_uri, &fingerprint, &fplabel); + } + else + { + fingerprint = fplabel = NULL; + } + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + "%s\n%s\n%s %s", file_name, file_type, fplabel ? fplabel : "", fingerprint ? fingerprint : ""); + g_free (fingerprint); + g_free (fplabel); + g_free (file_name); + g_free (file_type); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); /* i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" */ + request = webkit_download_get_network_request (download); title = g_strdup_printf (_("Open %s"), webkit_network_request_get_uri (request)); gtk_window_set_title (GTK_WINDOW (dialog), title); @@ -2627,67 +3010,39 @@ gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_OPEN); } gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_SAVE, 1, - GTK_STOCK_SAVE_AS, 4, - GTK_STOCK_CANCEL, 2, - GTK_STOCK_OPEN, 3, + GTK_STOCK_SAVE, DOWNLOAD_SAVE, + GTK_STOCK_SAVE_AS, DOWNLOAD_SAVE_AS, + GTK_STOCK_CANCEL, DOWNLOAD_CANCEL, + GTK_STOCK_OPEN, DOWNLOAD_OPEN, NULL); + response = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); - g_object_set_data (G_OBJECT (view), "open-download", (gpointer)0); switch (response) { - case 4: - g_object_set_data (G_OBJECT (view), "save-as-download", (gpointer)1); - webkit_web_policy_decision_download (decision); - webkit_web_view_stop_loading (WEBKIT_WEB_VIEW (view->web_view)); - return TRUE; - case 3: - g_object_set_data (G_OBJECT (view), "open-download", (gpointer)1); - case 1: - webkit_web_policy_decision_download (decision); - /* Apparently WebKit will continue loading which ends in an error. - It's unclear whether it's a bug or we are doing something wrong. */ - webkit_web_view_stop_loading (WEBKIT_WEB_VIEW (view->web_view)); - return TRUE; - case 2: + case DOWNLOAD_SAVE_AS: + g_object_set_data (G_OBJECT (download), "save-as-download", (gpointer)1); + break; + case DOWNLOAD_OPEN: + g_object_set_data (G_OBJECT (download), "open-download", (gpointer)1); + case DOWNLOAD_SAVE: + break; + case DOWNLOAD_CANCEL: + case GTK_RESPONSE_DELETE_EVENT: + g_object_set_data (G_OBJECT (download), "cancel-download", (gpointer)1); + break; default: - /* Apparently WebKit will continue loading which ends in an error. - It's unclear whether it's a bug or we are doing something wrong. */ - webkit_web_view_stop_loading (WEBKIT_WEB_VIEW (view->web_view)); - return FALSE; + g_warn_if_reached (); } - #else - katze_assign (view->mime_type, NULL); - midori_view_update_icon (view, NULL); - g_object_notify (G_OBJECT (view), "mime-type"); - uri = g_strdup_printf ("error:nodisplay %s", - webkit_network_request_get_uri (request)); - midori_view_set_uri (view, uri); - g_free (uri); - - return TRUE; - #endif -} + /* Propagate original URI to make it available when the download finishes */ + g_object_set_data_full (G_OBJECT (request), "midori-original-uri", + g_strdup (original_uri), g_free); -#if WEBKIT_CHECK_VERSION (1, 1, 3) -static gboolean -webkit_web_view_download_requested_cb (GtkWidget* web_view, - WebKitDownload* download, - MidoriView* view) -{ - gboolean handled; - g_object_set_data (G_OBJECT (download), "open-download", - g_object_get_data (G_OBJECT (view), "open-download")); - g_object_set_data (G_OBJECT (download), "save-as-download", - g_object_get_data (G_OBJECT (view), "save-as-download")); - g_object_set_data (G_OBJECT (view), "open-download", (gpointer)0); - g_object_set_data (G_OBJECT (view), "save-as-download", (gpointer)0); g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled); return handled; } -#endif static gboolean webkit_web_view_console_message_cb (GtkWidget* web_view, @@ -2696,16 +3051,47 @@ const gchar* source_id, MidoriView* view) { - if (!strncmp (message, "speed_dial-get-thumbnail", 22)) - midori_view_speed_dial_get_thumb (web_view, message, view); - else if (!strncmp (message, "speed_dial-save", 13)) - midori_view_speed_dial_save (web_view, message); + if (g_object_get_data (G_OBJECT (webkit_get_default_session ()), + "pass-through-console")) + return FALSE; + + if (!strncmp (message, "speed_dial-save", 13)) + midori_view_speed_dial_save (view, message); else g_signal_emit (view, signals[CONSOLE_MESSAGE], 0, message, line, source_id); return TRUE; } -#if WEBKIT_CHECK_VERSION (1, 1, 5) +static void +midori_view_script_response_cb (GtkWidget* infobar, + gint response, + MidoriView* view) +{ + view->alerts--; +} + +static gboolean +midori_view_web_view_script_alert_cb (GtkWidget* web_view, + WebKitWebFrame* web_frame, + const gchar* message, + MidoriView* view) +{ + gchar* text; + + /* Allow a maximum of 5 alerts */ + if (view->alerts > 4) + return TRUE; + + view->alerts++; + /* i18n: The text of an infobar for JavaScript alert messages */ + text = g_strdup_printf ("JavaScript: %s", message); + midori_view_add_info_bar (view, GTK_MESSAGE_WARNING, text, + G_CALLBACK (midori_view_script_response_cb), view, + GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); + g_free (text); + return TRUE; +} + static gboolean midori_view_web_view_print_requested_cb (GtkWidget* web_view, WebKitWebFrame* web_frame, @@ -2714,7 +3100,6 @@ midori_view_print (view); return TRUE; } -#endif static void webkit_web_view_window_object_cleared_cb (GtkWidget* web_view, @@ -2723,7 +3108,29 @@ JSObjectRef js_window, MidoriView* view) { - g_signal_emit (view, signals[CONTEXT_READY], 0, js_context); + const gchar* page_uri; + + page_uri = webkit_web_frame_get_uri (web_frame); + if (!midori_uri_is_http (page_uri)) + return; + + if (katze_object_get_boolean (view->settings, "enable-private-browsing")) + { + /* Mask language, architecture, no plugin list */ + gchar* result = sokoke_js_script_eval (js_context, + "navigator = { 'appName': 'Netscape'," + "'appCodeName': 'Mozilla'," + "'appVersion': '5.0 (X11)'," + "'userAgent': navigator.userAgent," + "'language': 'en-US'," + "'platform': 'Linux i686'," + "'cookieEnabled': true," + "'javaEnabled': function () { return true; }," + "'mimeTypes': {}," + "'plugins': {'refresh': function () { } } };", + NULL); + g_free (result); + } } static void @@ -2740,10 +3147,10 @@ GParamSpec* pspec, gpointer data) { - GtkAdjustment* hadjustment = katze_object_get_object (view->scrolled_window, "hadjustment"); + GtkScrolledWindow* scrolled = GTK_SCROLLED_WINDOW (view->scrolled_window); + GtkAdjustment* hadjustment = gtk_scrolled_window_get_hadjustment (scrolled); g_signal_connect (hadjustment, "notify::value", G_CALLBACK (midori_view_hadjustment_notify_value_cb), view); - g_object_unref (hadjustment); } static void @@ -2760,54 +3167,85 @@ GParamSpec* pspec, gpointer data) { - GtkAdjustment* vadjustment = katze_object_get_object (view->scrolled_window, "vadjustment"); + GtkScrolledWindow* scrolled = GTK_SCROLLED_WINDOW (view->scrolled_window); + GtkAdjustment* vadjustment = gtk_scrolled_window_get_vadjustment (scrolled); g_signal_connect (vadjustment, "notify::value", G_CALLBACK (midori_view_vadjustment_notify_value_cb), view); - g_object_unref (vadjustment); } -void +static void katze_net_object_maybe_unref (gpointer object) { if (object) g_object_unref (object); } +static GHashTable* midori_view_get_memory (void) +{ + static GHashTable* memory = NULL; + if (!memory) + memory = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, katze_net_object_maybe_unref); + return g_hash_table_ref (memory); + +} + static void midori_view_init (MidoriView* view) { view->uri = NULL; view->title = NULL; view->security = MIDORI_SECURITY_NONE; - view->mime_type = g_strdup (""); + view->mime_type = NULL; view->icon = NULL; view->icon_uri = NULL; - view->memory = g_hash_table_new_full (g_str_hash, g_str_equal, - g_free, katze_net_object_maybe_unref); + view->memory = midori_view_get_memory (); view->progress = 0.0; view->load_status = MIDORI_LOAD_FINISHED; view->minimized = FALSE; view->statusbar_text = NULL; - #if WEBKIT_CHECK_VERSION (1, 1, 15) view->hit_test = NULL; - #endif view->link_uri = NULL; view->selected_text = NULL; - view->news_feeds = katze_array_new (KATZE_TYPE_ITEM); + view->news_feeds = NULL; + view->find_links = -1; + view->alerts = 0; view->item = katze_item_new (); view->scrollh = view->scrollv = -2; view->back_forward_set = FALSE; - view->download_manager = NULL; - view->news_aggregator = NULL; + #if GTK_CHECK_VERSION (3, 2, 0) + gtk_orientable_set_orientation (GTK_ORIENTABLE (view), GTK_ORIENTATION_VERTICAL); + #endif + view->web_view = NULL; /* Adjustments are not created initially, but overwritten later */ view->scrolled_window = katze_scrolled_new (NULL, NULL); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (view->scrolled_window), GTK_SHADOW_NONE); - gtk_container_add (GTK_CONTAINER (view), view->scrolled_window); + + #if GTK_CHECK_VERSION(3, 2, 0) + view->overlay = gtk_overlay_new (); + gtk_widget_show (view->overlay); + gtk_container_add (GTK_CONTAINER (view->overlay), view->scrolled_window); + gtk_box_pack_start (GTK_BOX (view), view->overlay, TRUE, TRUE, 0); + + /* Overlays must be created before showing GtkOverlay as of GTK+ 3.2 */ + view->overlay_label = gtk_label_new (NULL); + gtk_widget_set_halign (view->overlay_label, GTK_ALIGN_START); + gtk_widget_set_valign (view->overlay_label, GTK_ALIGN_END); + gtk_overlay_add_overlay (GTK_OVERLAY (view->overlay), view->overlay_label); + view->overlay_find = g_object_new (MIDORI_TYPE_FINDBAR, NULL); + gtk_widget_set_halign (view->overlay_find, GTK_ALIGN_END); + gtk_widget_set_valign (view->overlay_find, GTK_ALIGN_START); + gtk_overlay_add_overlay (GTK_OVERLAY (view->overlay), + view->overlay_find); + gtk_widget_set_no_show_all (view->overlay_find, TRUE); + #else + gtk_box_pack_start (GTK_BOX (view), view->scrolled_window, TRUE, TRUE, 0); + #endif g_signal_connect (view->item, "meta-data-changed", G_CALLBACK (midori_view_item_meta_data_changed), view); @@ -2815,6 +3253,8 @@ G_CALLBACK (midori_view_notify_hadjustment_cb), view); g_signal_connect (view->scrolled_window, "notify::vadjustment", G_CALLBACK (midori_view_notify_vadjustment_cb), view); + + midori_view_construct_web_view (view); } static void @@ -2830,14 +3270,17 @@ g_signal_handlers_disconnect_by_func (view->item, midori_view_item_meta_data_changed, view); - if (view->thumb_view) - gtk_widget_destroy (view->thumb_view); - katze_assign (view->uri, NULL); katze_assign (view->title, NULL); katze_object_assign (view->icon, NULL); katze_assign (view->icon_uri, NULL); - g_hash_table_destroy (view->memory); + + if (view->memory) + { + g_hash_table_unref (view->memory); + view->memory = NULL; + } + katze_assign (view->statusbar_text, NULL); katze_assign (view->link_uri, NULL); katze_assign (view->selected_text, NULL); @@ -2846,11 +3289,6 @@ katze_object_assign (view->settings, NULL); katze_object_assign (view->item, NULL); - katze_assign (view->download_manager, NULL); - katze_assign (view->news_aggregator, NULL); - - katze_object_assign (view->net, NULL); - G_OBJECT_CLASS (midori_view_parent_class)->finalize (object); } @@ -2867,8 +3305,7 @@ switch (prop_id) { case PROP_TITLE: - katze_assign (view->title, g_value_dup_string (value)); - midori_view_update_title (view); + midori_view_set_title (view, g_value_get_string (value)); break; case PROP_MINIMIZED: view->minimized = g_value_get_boolean (value); @@ -2888,10 +3325,7 @@ katze_assign (view->statusbar_text, g_value_dup_string (value)); break; case PROP_SETTINGS: - midori_view_set_settings (view, g_value_get_object (value)); - break; - case PROP_NET: - katze_object_assign (view->net, g_value_dup_object (value)); + _midori_view_set_settings (view, g_value_get_object (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -2945,9 +3379,6 @@ case PROP_SETTINGS: g_value_set_object (value, view->settings); break; - case PROP_NET: - g_value_set_object (value, view->net); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -2958,13 +3389,8 @@ midori_view_focus_in_event (GtkWidget* widget, GdkEventFocus* event) { - MidoriView* view = MIDORI_VIEW (widget); - - /* Always propagate focus to the child web view, - * create it if it's not there yet. */ - if (!view->web_view) - midori_view_construct_web_view (view); - gtk_widget_grab_focus (view->web_view); + /* Always propagate focus to the child web view */ + gtk_widget_grab_focus (midori_view_get_web_view (MIDORI_VIEW (widget))); return TRUE; } @@ -2976,7 +3402,7 @@ * * Return value: a new #MidoriView * - * Deprecated: 0.2.8: Use midori_view_new_with_uri() instead. + * Deprecated: 0.2.8: Use midori_view_new_with_item() instead. **/ GtkWidget* midori_view_new (KatzeNet* net) @@ -2985,22 +3411,32 @@ } static void -_midori_view_update_settings (MidoriView* view) +_midori_view_set_settings (MidoriView* view, + MidoriWebSettings* settings) { gboolean zoom_text_and_images, kinetic_scrolling; + if (view->settings) + g_signal_handlers_disconnect_by_func (view->settings, + midori_view_settings_notify_cb, view); + + katze_object_assign (view->settings, settings); + if (!settings) + return; + + g_object_ref (settings); + g_signal_connect (settings, "notify", + G_CALLBACK (midori_view_settings_notify_cb), view); + + g_object_set (view->web_view, "settings", settings, NULL); + g_object_get (view->settings, - "speed-dial-in-new-tabs", &view->speed_dial_in_new_tabs, - "download-manager", &view->download_manager, - "news-aggregator", &view->news_aggregator, "zoom-text-and-images", &zoom_text_and_images, "kinetic-scrolling", &kinetic_scrolling, "close-buttons-on-tabs", &view->close_buttons_on_tabs, "open-new-pages-in", &view->open_new_pages_in, - "ask-for-destination-folder", &view->ask_for_destination_folder, "middle-click-opens-selection", &view->middle_click_opens_selection, "open-tabs-in-the-background", &view->open_tabs_in_the_background, - "find-while-typing", &view->find_while_typing, NULL); if (view->web_view) @@ -3010,36 +3446,57 @@ } /** - * midori_view_new_with_uri: - * @uri: an URI string, or %NULL + * midori_view_new_with_title: * @title: a title, or %NULL * @settings: a #MidoriWebSettings, or %NULL + * @append: if %TRUE, the view should be appended * * Creates a new view with the specified parameters that * is visible by default. * * Return value: a new #MidoriView * - * Since: 0.2.8 + * Since: 0.3.0 + * Deprecated: 0.4.3 **/ GtkWidget* -midori_view_new_with_uri (const gchar* uri, - const gchar* title, - MidoriWebSettings* settings) +midori_view_new_with_title (const gchar* title, + MidoriWebSettings* settings, + gboolean append) { - MidoriView* view = g_object_new (MIDORI_TYPE_VIEW, NULL); - view->title = g_strdup (title); - if (title != NULL) - midori_view_update_title (view); + KatzeItem* item = katze_item_new (); + item->name = g_strdup (title); + if (append) + katze_item_set_meta_integer (item, "append", 1); + return midori_view_new_with_item (item, settings); +} + +/** + * midori_view_new_with_item: + * @item: a #KatzeItem, or %NULL + * @settings: a #MidoriWebSettings, or %NULL + * + * Creates a new view from an item that is visible by default. + * + * Return value: a new #MidoriView + * + * Since: 0.4.3 + **/ +GtkWidget* +midori_view_new_with_item (KatzeItem* item, + MidoriWebSettings* settings) +{ + MidoriView* view = g_object_new (MIDORI_TYPE_VIEW, + "title", item ? item->name : NULL, + NULL); if (settings) + _midori_view_set_settings (view, settings); + if (item) { - view->settings = g_object_ref (settings); - _midori_view_update_settings (view); - g_signal_connect (settings, "notify", - G_CALLBACK (midori_view_settings_notify_cb), view); + katze_object_assign (view->item, katze_item_copy (item)); + view->minimized = katze_item_get_meta_string ( + view->item, "minimized") != NULL; } - if (uri != NULL) - midori_view_set_uri (view, uri); gtk_widget_show ((GtkWidget*)view); return (GtkWidget*)view; } @@ -3056,19 +3513,7 @@ g_value_init (&value, pspec->value_type); g_object_get_property (G_OBJECT (view->settings), name, &value); - if (name == g_intern_string ("speed-dial-in-new-tabs")) - { - view->speed_dial_in_new_tabs = g_value_get_boolean (&value); - } - else if (name == g_intern_string ("download-manager")) - { - katze_assign (view->download_manager, g_value_dup_string (&value)); - } - else if (name == g_intern_string ("news-aggregator")) - { - katze_assign (view->news_aggregator, g_value_dup_string (&value)); - } - else if (name == g_intern_string ("zoom-text-and-images")) + if (name == g_intern_string ("zoom-text-and-images")) { if (view->web_view) g_object_set (view->web_view, "full-content-zoom", @@ -3086,24 +3531,16 @@ view->close_buttons_on_tabs); } else if (name == g_intern_string ("open-new-pages-in")) - { view->open_new_pages_in = g_value_get_enum (&value); - } - else if (name == g_intern_string ("ask-for-destination-folder")) - { - view->ask_for_destination_folder = g_value_get_boolean (&value); - } else if (name == g_intern_string ("middle-click-opens-selection")) - { view->middle_click_opens_selection = g_value_get_boolean (&value); - } else if (name == g_intern_string ("open-tabs-in-the-background")) - { view->open_tabs_in_the_background = g_value_get_boolean (&value); - } - else if (name == g_intern_string ("find-while-typing")) + else if (name == g_intern_string ("enable-scripts")) { - view->find_while_typing = g_value_get_boolean (&value); + /* Speed dial is only editable with scripts, so regenerate it */ + if (midori_view_is_blank (view)) + midori_view_reload (view, FALSE); } g_value_unset (&value); @@ -3121,25 +3558,12 @@ MidoriWebSettings* settings) { g_return_if_fail (MIDORI_IS_VIEW (view)); - g_return_if_fail (!settings || MIDORI_IS_WEB_SETTINGS (settings)); + g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings)); if (view->settings == settings) return; - if (view->settings) - g_signal_handlers_disconnect_by_func (view->settings, - midori_view_settings_notify_cb, view); - - katze_object_assign (view->settings, settings); - if (settings) - { - g_object_ref (settings); - if (view->web_view) - g_object_set (view->web_view, "settings", settings, NULL); - _midori_view_update_settings (view); - g_signal_connect (settings, "notify", - G_CALLBACK (midori_view_settings_notify_cb), view); - } + _midori_view_set_settings (view, settings); g_object_notify (G_OBJECT (view), "settings"); } @@ -3147,7 +3571,8 @@ * midori_view_load_status: * @web_view: a #MidoriView * - * Determines the current loading status of a view. + * Determines the current loading status of a view. There is no + * error state, unlike webkit_web_view_get_load_status(). * * Return value: the current #MidoriLoadStatus **/ @@ -3183,15 +3608,18 @@ MidoriView* view) { gchar* title; + const gchar* label; GtkWidget* window; GtkWidget* toplevel; GdkScreen* screen; gint width, height; + const gchar* icon_name; GtkIconTheme* icon_theme; GdkPixbuf* icon; GdkPixbuf* gray_icon; - title = g_strdup_printf (_("Inspect page - %s"), ""); + label = midori_view_get_display_title (view); + title = g_strdup_printf (_("Inspect page - %s"), label); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (window), title); g_free (title); @@ -3203,12 +3631,15 @@ width = gdk_screen_get_width (screen) / 1.7; height = gdk_screen_get_height (screen) / 1.7; gtk_window_set_default_size (GTK_WINDOW (window), width, height); + /* 700x100 is the approximate useful minimum dimensions */ + gtk_widget_set_size_request (inspector_view, 700, 100); } /* Attempt to make a gray version of the icon on the fly */ + icon_name = gtk_window_get_icon_name (GTK_WINDOW (toplevel)); icon_theme = gtk_icon_theme_get_for_screen ( gtk_widget_get_screen (GTK_WIDGET (view))); - icon = gtk_icon_theme_load_icon (icon_theme, "midori", 32, + icon = gtk_icon_theme_load_icon (icon_theme, icon_name, 32, GTK_ICON_LOOKUP_USE_BUILTIN, NULL); if (icon) { @@ -3222,10 +3653,16 @@ g_object_unref (icon); } else - gtk_window_set_icon_name (GTK_WINDOW (window), "midori"); + gtk_window_set_icon_name (GTK_WINDOW (window), icon_name); + #if GTK_CHECK_VERSION (3, 4, 0) + gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (window), TRUE); + #endif gtk_container_add (GTK_CONTAINER (window), inspector_view); gtk_widget_show_all (window); + g_signal_connect (window, "key-press-event", + G_CALLBACK (midori_view_inspector_window_key_press_event_cb), NULL); + /* FIXME: Update window title with URI */ } @@ -3246,14 +3683,11 @@ } static gboolean -midori_view_web_inspector_show_window_cb (gpointer inspector, - MidoriView* view) +midori_view_web_inspector_show_window_cb (WebKitWebInspector* inspector, + MidoriView* view) { - GtkWidget* inspector_view; - GtkWidget* window; - - g_object_get (inspector, "web-view", &inspector_view, NULL); - window = gtk_widget_get_toplevel (inspector_view); + WebKitWebView* inspector_view = webkit_web_inspector_get_web_view (inspector); + GtkWidget* window = gtk_widget_get_toplevel (GTK_WIDGET (inspector_view)); if (!window) return FALSE; gtk_window_present (GTK_WINDOW (window)); @@ -3264,9 +3698,8 @@ midori_view_web_inspector_attach_window_cb (gpointer inspector, MidoriView* view) { - GtkWidget* inspector_view = katze_object_get_object (inspector, "web-view"); + WebKitWebView* inspector_view = webkit_web_inspector_get_web_view (inspector); g_signal_emit (view, signals[ATTACH_INSPECTOR], 0, inspector_view); - g_object_unref (inspector_view); return TRUE; } @@ -3274,22 +3707,33 @@ midori_view_web_inspector_detach_window_cb (gpointer inspector, MidoriView* view) { - GtkWidget* inspector_view = katze_object_get_object (inspector, "web-view"); - GtkWidget* parent = gtk_widget_get_parent (inspector_view); + WebKitWebView* inspector_view = webkit_web_inspector_get_web_view (inspector); + GtkWidget* parent = gtk_widget_get_parent (GTK_WIDGET (inspector_view)); if (GTK_IS_WINDOW (parent)) return FALSE; + gtk_widget_hide (parent); - gtk_container_remove (GTK_CONTAINER (parent), inspector_view); + g_signal_emit (view, signals[DETACH_INSPECTOR], 0, inspector_view); midori_view_web_inspector_construct_window (inspector, - WEBKIT_WEB_VIEW (view->web_view), inspector_view, view); - g_object_unref (inspector_view); + WEBKIT_WEB_VIEW (view->web_view), GTK_WIDGET (inspector_view), view); + return TRUE; +} + +static gboolean +midori_view_web_inspector_close_window_cb (gpointer inspector, + MidoriView* view) +{ + WebKitWebView* inspector_view = webkit_web_inspector_get_web_view (inspector); + GtkWidget* scrolled = gtk_widget_get_parent (GTK_WIDGET (inspector_view)); + if (!scrolled) + return FALSE; + gtk_widget_hide (gtk_widget_get_parent (scrolled)); return TRUE; } static void midori_view_construct_web_view (MidoriView* view) { - WebKitWebFrame* web_frame; gpointer inspector; g_return_if_fail (!view->web_view); @@ -3298,7 +3742,6 @@ /* Load something to avoid a bug where WebKit might not set a main frame */ webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), ""); - web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); #if HAVE_HILDON gtk_widget_tap_and_hold_setup (view->web_view, NULL, NULL, 0); @@ -3309,9 +3752,13 @@ 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, + "signal::database-quota-exceeded", + midori_view_web_view_database_quota_exceeded_cb, view, + #if WEBKIT_CHECK_VERSION (1, 1, 23) + "signal::geolocation-policy-decision-requested", + midori_view_web_view_geolocation_decision_cb, view, #endif "signal::load-started", webkit_web_view_load_started_cb, view, @@ -3325,13 +3772,10 @@ "signal::notify::icon-uri", midori_web_view_notify_icon_uri_cb, view, #endif - #if WEBKIT_CHECK_VERSION (1, 1, 4) + "signal::notify::uri", + webkit_web_view_notify_uri_cb, view, "signal::notify::title", webkit_web_view_notify_title_cb, view, - #else - "signal::title-changed", - webkit_web_view_title_changed_cb, view, - #endif "signal::status-bar-text-changed", webkit_web_view_statusbar_text_changed_cb, view, "signal::leave-notify-event", @@ -3339,7 +3783,9 @@ "signal::hovering-over-link", webkit_web_view_hovering_over_link_cb, view, "signal::button-press-event", - gtk_widget_button_press_event_cb, view, + midori_view_web_view_button_press_event_cb, view, + "signal::button-release-event", + midori_view_web_view_button_release_event_cb, view, "signal-after::key-press-event", gtk_widget_key_press_event_cb, view, "signal::scroll-event", @@ -3348,33 +3794,22 @@ webkit_web_view_populate_popup_cb, view, "signal::console-message", webkit_web_view_console_message_cb, view, + "signal::script-alert", + midori_view_web_view_script_alert_cb, view, "signal::window-object-cleared", webkit_web_view_window_object_cleared_cb, view, "signal::create-web-view", webkit_web_view_create_web_view_cb, view, "signal-after::mime-type-policy-decision-requested", webkit_web_view_mime_type_decision_cb, view, - #if WEBKIT_CHECK_VERSION (1, 1, 3) "signal::download-requested", webkit_web_view_download_requested_cb, view, - #endif - #if WEBKIT_CHECK_VERSION (1, 1, 5) "signal::print-requested", midori_view_web_view_print_requested_cb, view, - #endif - #if WEBKIT_CHECK_VERSION (1, 1, 6) "signal-after::load-error", webkit_web_view_load_error_cb, view, - #endif NULL); - #if !WEBKIT_CHECK_VERSION (1, 1, 6) - g_object_connect (web_frame, - "signal::load-done", - webkit_web_frame_load_done_cb, view, - NULL); - #endif - if (view->settings) { g_object_set (view->web_view, "settings", view->settings, @@ -3385,7 +3820,7 @@ gtk_container_add (GTK_CONTAINER (view->scrolled_window), view->web_view); gtk_widget_show_all (view->scrolled_window); - inspector = katze_object_get_object (view->web_view, "web-inspector"); + inspector = webkit_web_view_get_inspector ((WebKitWebView*)view->web_view); g_object_connect (inspector, "signal::inspect-web-view", midori_view_web_inspector_inspect_web_view_cb, view, @@ -3395,15 +3830,256 @@ midori_view_web_inspector_attach_window_cb, view, "signal::detach-window", midori_view_web_inspector_detach_window_cb, view, + "signal::close-window", + midori_view_web_inspector_close_window_cb, view, NULL); - g_object_unref (inspector); } +static void +list_netscape_plugins (GString* ns_plugins, + JSContextRef js_context) +{ + if (!midori_web_settings_has_plugin_support ()) + return; + + /* Joins available plugins like this: URI1|title1,URI2|title2 */ + gchar* value = sokoke_js_script_eval (js_context, + "function plugins (l) { var f = new Array (); for (var i in l) " + "{ var p = l[i].name + '|' + l[i].filename; " + "if (f.indexOf (p) == -1) f.push (p); } return f; }" + "plugins (navigator.plugins)", NULL); + gchar** items = g_strsplit (value, ",", 0); + guint i = 0; + g_string_append (ns_plugins, "

Netscape Plugins:

"); + if (items != NULL) + while (items[i] != NULL) + { + gchar** parts = g_strsplit (items[i], "|", 2); + if (parts && *parts && !g_str_equal (parts[1], "undefined")) + { + g_string_append (ns_plugins, ""); + } + g_strfreev (parts); + i++; + } + if (g_str_has_prefix (value, "undefined")) + g_string_append (ns_plugins, ""); + g_string_append (ns_plugins, "
"); + g_string_append (ns_plugins, parts[1]); + g_string_append (ns_plugins, ""); + g_string_append (ns_plugins, parts[0]); + g_string_append (ns_plugins, "
No plugins found
"); + g_strfreev (items); + g_free (value); +} + +static void +list_geolocation (GString* markup) +{ + g_string_append (markup, + "" + "" + ""); +} + +static gchar* +list_video_formats (JSContextRef js_context) +{ + gchar* value = sokoke_js_script_eval (js_context, + "var supported = function (format) { " + "var video = document.createElement('video');" + "return !!video.canPlayType && video.canPlayType (format) != 'no' " + "? 'x' : '  '; };" + "' H264 [' +" + "supported('video/mp4; codecs=\"avc1.42E01E, mp4a.40.2\"') + ']' + " + "'   Ogg Theora [' + " + "supported('video/ogg; codecs=\"theora, vorbis\"') + ']' + " + "'   WebM [' + " + "supported('video/webm; codecs=\"vp8, vorbis\"') + ']' " + "", NULL); + return value; +} + +static const gchar* valid_about_uris[] = { + "about:widgets", + "about:private", + "error:nodocs", + "http://.invalid", + "about:geolocation", +}; + +static void +list_about_uris (GString* markup) +{ + g_string_append (markup, "

"); + guint i; + for (i = 0; i < G_N_ELEMENTS (valid_about_uris); i++) + g_string_append_printf (markup, "%s  ", + valid_about_uris[i], valid_about_uris[i]); +} + +static gchar* +prepare_speed_dial_html (MidoriView* view, + gboolean load_missing) +{ + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view)); + GKeyFile* key_file; + GString* markup = NULL; + guint slot_count = 1, i, grid_index = 3, slot_size; + gchar* speed_dial_head; + gchar* file_path; + gchar** groups; + + g_object_get (browser, "speed-dial", &key_file, NULL); + file_path = sokoke_find_data_filename ("speeddial-head-" MIDORI_VERSION ".html", TRUE); + + if (key_file != NULL + && g_access (file_path, F_OK) == 0 + && g_file_get_contents (file_path, &speed_dial_head, NULL, NULL)) + { + gchar* header = sokoke_replace_variables (speed_dial_head, + "{title}", _("Speed Dial"), + "{click_to_add}", _("Click to add a shortcut"), + "{enter_shortcut_address}", _("Enter shortcut address"), + "{enter_shortcut_name}", _("Enter shortcut title"), + "{are_you_sure}", _("Are you sure you want to delete this shortcut?"), + NULL); + + markup = g_string_new (header); + + g_free (speed_dial_head); + g_free (file_path); + g_free (header); + } + else + { + g_free (file_path); + return NULL; + } + + groups = g_key_file_get_groups (key_file, NULL); + for (i = 0; groups[i]; i++) + { + if (g_key_file_has_key (key_file, groups[i], "uri", NULL)) + slot_count++; + } + + /* try to guess the best X by X grid size */ + while ((grid_index * grid_index) < slot_count) + grid_index++; + + /* percent width size of one slot */ + slot_size = (100 / grid_index); + /* No editing in private/ app mode or without scripts */ + g_string_append_printf (markup, + "%s%s" + "\n", + sokoke_is_app_or_private () ? "" : "", + slot_size + 1, slot_size - 4); + + /* Combined width of slots should always be less than 100%. + * Use half of the remaining percentage as a margin size */ + g_string_append_printf (markup, + "", + (100 - ((slot_size - 4) * grid_index)) / 2); + + if (katze_object_get_boolean (view->settings, "close-buttons-left")) + g_string_append_printf (markup, + ""); + + for (i = 0; groups[i]; i++) + { + gchar* uri = g_key_file_get_string (key_file, groups[i], "uri", NULL); + if (uri && strstr (uri, "://")) + { + gchar* title = g_key_file_get_string (key_file, groups[i], "title", NULL); + gchar* thumb_file = sokoke_build_thumbnail_path (uri); + gchar* encoded; + guint slot = atoi (groups[i] + strlen ("Dial ")); + + if (g_access (thumb_file, F_OK) == 0) + { + gsize sz; + gchar* thumb_content; + g_file_get_contents (thumb_file, &thumb_content, &sz, NULL); + encoded = g_base64_encode ((guchar*)thumb_content, sz); + g_free (thumb_content); + } + else + { + encoded = NULL; + if (load_missing) + midori_view_speed_dial_get_thumb (view, groups[i], uri); + } + g_free (thumb_file); + + g_string_append_printf (markup, + "

" + "" + "" + "
%s
\n", + slot, slot, uri, encoded ? encoded : "", slot, title ? title : ""); + + g_free (title); + g_free (encoded); + } + else if (strcmp (groups[i], "settings")) + g_key_file_remove_group (key_file, groups[i], NULL); + + g_free (uri); + } + g_strfreev (groups); + + g_string_append_printf (markup, + "
" + "" + "
%s
\n", + slot_count + 1, slot_count + 1, _("Click to add a shortcut")); + g_string_append_printf (markup, + "
\n\n\n"); + + return g_string_free (markup, FALSE); +} + + /** * midori_view_set_uri: * @view: a #MidoriView * * Opens the specified URI in the view. + * + * Since 0.3.0 a warning is shown if the view is not yet + * contained in a browser. This is because extensions + * can't monitor page loading if that happens. **/ void midori_view_set_uri (MidoriView* view, @@ -3413,224 +4089,235 @@ g_return_if_fail (MIDORI_IS_VIEW (view)); - /* Treat "about:blank" and "" equally, see midori_view_is_blank(). */ - if (!uri || !strcmp (uri, "about:blank")) uri = ""; + if (!gtk_widget_get_parent (GTK_WIDGET (view))) + g_warning ("Calling %s() before adding the view to a browser. This " + "breaks extensions that monitor page loading.", G_STRFUNC); if (g_getenv ("MIDORI_UNARMED") == NULL) { - if (!view->web_view) - midori_view_construct_web_view (view); - - if (view->speed_dial_in_new_tabs && !strcmp (uri, "")) + if (!uri || !strcmp (uri, "") || !strcmp (uri, "about:blank")) { - #if !WEBKIT_CHECK_VERSION (1, 1, 14) - SoupServer* res_server; - guint port; - #endif - gchar* res_root; - gchar* speed_dial_head; - gchar* speed_dial_body; - gchar* body_fname; - gchar* stock_root; - gchar* filepath; - - katze_assign (view->uri, g_strdup ("")); - katze_item_set_uri (view->item, ""); - - filepath = sokoke_find_data_filename ("midori/res/speeddial-head.html"); - g_file_get_contents (filepath, &speed_dial_head, NULL, NULL); - g_free (filepath); - 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); + #ifdef G_ENABLE_DEBUG + GTimer* timer = NULL; - if (g_access (body_fname, F_OK) != 0) - { - filepath = sokoke_find_data_filename ("midori/res/speeddial.json"); - if (g_file_get_contents (filepath, - &speed_dial_body, NULL, NULL)) - g_file_set_contents (body_fname, speed_dial_body, -1, NULL); - else - speed_dial_body = g_strdup (""); - g_free (filepath); - } - else - g_file_get_contents (body_fname, &speed_dial_body, NULL, NULL); + if (g_getenv ("MIDORI_STARTTIME") != NULL) + timer = g_timer_new (); + #endif - data = sokoke_replace_variables (speed_dial_head, - "{res}", res_root, - "{stock}", stock_root, - "{json_data}", speed_dial_body, - "{title}", _("Speed dial"), - "{click_to_add}", _("Click to add a shortcut"), - "{enter_shortcut_address}", _("Enter shortcut address"), - "{enter_shortcut_name}", _("Enter shortcut title"), - "{are_you_sure}", _("Are you sure you want to delete this shortcut?"), - "{set_dial_size}", _("Set number of columns and rows"), - "{enter_dial_size}", _("Enter number of columns and rows:"), - "{invalid_dial_size}", _("Invalid input for the size of the speed dial"), - "{set_thumb_size}", _("Thumb size:"), - "{set_thumb_small}", _("Small"), - "{set_thumb_normal}", _("Medium"), - "{set_thumb_big}", _("Big"), NULL); + katze_assign (view->uri, NULL); + katze_assign (view->mime_type, NULL); + katze_item_set_meta_integer (view->item, "delay", -1); + if (speeddial_markup == NULL) + speeddial_markup = prepare_speed_dial_html (view, TRUE); midori_view_load_alternate_string (view, - data, res_root, "about:blank", NULL); + speeddial_markup ? speeddial_markup : "", "about:blank", NULL); - g_free (res_root); - g_free (stock_root); - g_free (data); - g_free (speed_dial_head); - g_free (speed_dial_body); - g_free (body_fname); + #ifdef G_ENABLE_DEBUG + if (g_getenv ("MIDORI_STARTTIME") != NULL) + { + g_debug ("Speed Dial: \t%fs", g_timer_elapsed (timer, NULL)); + g_timer_destroy (timer); + } + #endif } /* This is not prefectly elegant, but creating special pages inline is the simplest solution. */ - else if (g_str_has_prefix (uri, "error:") || g_str_has_prefix (uri, "about:")) + else if (g_str_has_prefix (uri, "error:") || midori_uri_is_blank (uri)) { data = NULL; - #if !WEBKIT_CHECK_VERSION (1, 1, 3) - if (!strncmp (uri, "error:nodisplay ", 16)) - { - gchar* title; - gchar* logo_path; - gchar* logo_uri; - - katze_assign (view->uri, g_strdup (&uri[16])); - title = g_strdup_printf (_("Document cannot be displayed")); - logo_path = sokoke_find_data_filename ("midori/logo-shade.png"); - logo_uri = g_filename_to_uri (logo_path, NULL, NULL); - g_free (logo_path); - data = g_strdup_printf ( - "%s" - "

%s

" - "" - "

The document %s of type '%s' cannot be displayed." - "", - title, title, logo_uri, view->uri, view->mime_type); - g_free (title); - g_free (logo_uri); - } - #endif if (!strncmp (uri, "error:nodocs ", 13)) { gchar* title; - gchar* logo_path; - gchar* logo_uri; katze_assign (view->uri, g_strdup (&uri[13])); title = g_strdup_printf (_("No documentation installed")); - logo_path = sokoke_find_data_filename ("midori/logo-shade.png"); - logo_uri = g_filename_to_uri (logo_path, NULL, NULL); - g_free (logo_path); data = g_strdup_printf ( "%s" "

%s

" - "" - "

There is no documentation installed at %s." + "

There is no documentation installed at %s. " "You may want to ask your distribution or " "package maintainer for it or if this a custom build " - "verify that the build is setup properly." + "verify that the build is setup properly. " + "View the FAQ online" "", - title, title, logo_uri, view->uri); + title, title, view->uri); g_free (title); - g_free (logo_uri); } - else if (!strcmp (uri, "about:version")) + else if (!strcmp (uri, "about:widgets")) + { + static const gchar* widgets[] = { + "", + "

", + "

demo", + "

demo", + "

", + "

", + "

", + "", + "

", + "", + "", + "", + "", + "", + "", + "Lorem ipsum doloret sit amet...", + "", + "", + "", + "

", + "", + }; + guint i; + GString* demo = g_string_new (""); + g_string_append_printf (demo, + "%s

%s

", uri, uri); + g_string_append (demo, "
"); + for (i = 0; i < G_N_ELEMENTS (widgets); i++) + g_string_append_printf (demo, widgets[i], ""); + g_string_append (demo, "
"); + for (i = 0; i < G_N_ELEMENTS (widgets); i++) + g_string_append_printf (demo, widgets[i], " disabled"); + g_string_append (demo, "
"); + for (i = 0; i < G_N_ELEMENTS (widgets); i++) + g_string_append_printf (demo, widgets[i], " class=\"fallback\""); + g_string_append (demo, "
"); + katze_assign (view->uri, g_strdup (uri)); + data = g_string_free (demo, FALSE); + } + else if (!strcmp (uri, "about:private")) + { + katze_assign (view->uri, g_strdup ("")); + data = g_strdup_printf ( + "%s" + "" + "
" + "" + "" + "

%s

" + "

%s

  • %s
  • %s
  • %s
" + "

%s

  • %s
  • %s
  • %s
  • %s
" + "

", + _("Private Browsing"), _("Private Browsing"), + _("Midori doesn't store any personal data:"), + _("No history or web cookies are being saved."), + _("Extensions are disabled."), + _("HTML5 storage, local database and application caches are disabled."), + _("Midori prevents websites from tracking the user:"), + _("Referrer URLs are stripped down to the hostname."), + _("DNS prefetching is disabled."), + _("The language and timezone are not revealed to websites."), + _("Flash and other Netscape plugins cannot be listed by websites.")); + } + else if (!strcmp (uri, "about:geolocation")) + { + GString* markup = g_string_new (""); + katze_assign (view->uri, g_strdup (uri)); + list_geolocation (markup); + data = g_string_free (markup, FALSE); + } + else if (!strcmp (uri, "about:") || !strcmp (uri, "about:version")) { - gchar** argument_vector = sokoke_get_argv (NULL); - gchar* command_line = g_strjoinv (" ", argument_vector); + gchar* arguments = g_strjoinv (" ", sokoke_get_argv (NULL)); + gchar* command_line = sokoke_replace_variables ( + arguments, g_get_home_dir (), "~", NULL); + gchar* architecture, *platform; + const gchar* sys_name = midori_web_settings_get_system_name ( + &architecture, &platform); gchar* ident = katze_object_get_string (view->settings, "user-agent"); - #if defined (G_OS_WIN32) - gchar* sys_name = g_strdup ("Windows"); - #else - gchar* sys_name; - struct utsname name; - if (uname (&name) != -1) - sys_name = g_strdup_printf ("%s %s", name.sysname, name.machine); - else - sys_name = g_strdup ("Unix"); - #endif + WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); + JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); + gchar* video_formats = list_video_formats (js_context); + + /* FIXME: This is for workarounding a crash deeper down the callstack on some systems. */ + static char const * const version_format_strings[] = { + "   libsoup %s", + "cairo%s ", "(%s)", + "granite%s", + "libnotify%s", + "single instance%s", + "Platform%s ", "%s ", "%s", + "Identification%s", + "Video Formats%s", + }; + char const * version_strings[] = { + LIBSOUP_VERSION, + CAIRO_VERSION_STRING, cairo_version_string (), + GRANITE_VERSION, + LIBNOTIFY_VERSION, + #ifdef HAVE_HILDON_2_2 + "Hildon 2.2", + #elif HAVE_HILDON + "Hildon", + #elif HAVE_UNIQUE + "libunique " UNIQUE_VERSION, + #else + "Sockets", + #endif + platform, sys_name, architecture ? architecture : "", ident, + video_formats, + }; + int i = 0; + GString * tmp = g_string_new("");; + + GString* more = g_string_new (""); + list_netscape_plugins (more, js_context); + list_about_uris (more); katze_assign (view->uri, g_strdup (uri)); - #ifndef WEBKIT_USER_AGENT_MAJOR_VERSION - #define WEBKIT_USER_AGENT_MAJOR_VERSION 532 - #define WEBKIT_USER_AGENT_MINOR_VERSION 1 - #endif - #if defined (HAVE_LIBSOUP_2_29_3) - #define LIBSOUP_VERSION "2.29.3" - #elif defined (HAVE_LIBSOUP_2_27_90) - #define LIBSOUP_VERSION "2.27.90" - #else - #define LIBSOUP_VERSION "2.25.2" - #endif - #ifdef G_ENABLE_DEBUG - #define DEBUGGING " (Debug)" - #else - #define DEBUGGING "" - #endif - data = g_strdup_printf ( + g_string_append_printf (tmp, "about:version" "

about:version

" + "

%s

" "" "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "
Command line%s
Midori" PACKAGE_VERSION "%s
WebKitGTK+%d.%d.%d (%d.%d.%d)
GTK+%d.%d.%d (%d.%d.%d)
Glib%d.%d.%d (%d.%d.%d)
libsoup%s
libnotify%s
libidn%s
libunique%s
libhildon%s
Platform%s
Identification%s
" - "", + "Command line%s" + "Midori%s (%s)" + "GTK+%d.%d.%d (%d.%d.%d)" + "   Glib %d.%d.%d (%d.%d.%d)" + "WebKitGTK+%d.%d.%d (%d.%d.%d)", + _("Version numbers in brackets show the version used at runtime."), command_line, - DEBUGGING, - WEBKIT_MAJOR_VERSION, - WEBKIT_MINOR_VERSION, - WEBKIT_MICRO_VERSION, - webkit_major_version (), - webkit_minor_version (), - webkit_micro_version (), + PACKAGE_VERSION, midori_app_get_name (NULL), GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION, gtk_major_version, gtk_minor_version, gtk_micro_version, GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION, glib_major_version, glib_minor_version, glib_micro_version, - LIBSOUP_VERSION, - HAVE_LIBNOTIFY ? "Yes" : "No", - HAVE_LIBIDN ? "Yes" : "No", - HAVE_UNIQUE ? "Yes" : "No", - HAVE_HILDON ? "Yes" : "No", - sys_name, ident); + WEBKIT_MAJOR_VERSION, WEBKIT_MINOR_VERSION, WEBKIT_MICRO_VERSION, + webkit_major_version (), webkit_minor_version (), webkit_micro_version ()); + + for (i = 0; + i < sizeof (version_format_strings) / sizeof (version_format_strings[0]); + ++i) + g_string_append_printf (tmp, version_format_strings[i], version_strings[i]); + + g_string_append_printf ( + tmp, "%s", (gchar*)(more->str)); + + data = g_string_free (tmp, FALSE); + g_free (command_line); + g_free (arguments); g_free (ident); - g_free (sys_name); - } + g_free (video_formats); + g_string_free (more, TRUE); + } else { katze_assign (view->uri, g_strdup (uri)); data = g_strdup_printf ( "%s

%s

" - "" "", view->uri, view->uri); } @@ -3638,28 +4325,25 @@ webkit_web_view_load_html_string ( WEBKIT_WEB_VIEW (view->web_view), data, view->uri); g_free (data); - katze_item_set_uri (view->item, uri); + katze_item_set_meta_integer (view->item, "delay", -1); + if (g_strcmp0 (view->item->uri, view->uri)) + katze_item_set_uri (view->item, view->uri); g_object_notify (G_OBJECT (view), "uri"); - return; } - #if WEBKIT_CHECK_VERSION (1, 1, 6) - else if (g_str_has_prefix (uri, "pause:")) + else if (katze_item_get_meta_boolean (view->item, "delay")) { - gchar* title; - - title = g_strdup_printf ("%s", view->title); - katze_assign (view->uri, g_strdup (&uri[6])); + katze_assign (view->uri, g_strdup (uri)); + katze_item_set_meta_integer (view->item, "delay", -1); midori_view_display_error ( - view, view->uri, title, + view, view->uri, view->title ? view->title : view->uri, _("Page loading delayed"), _("Loading delayed either due to a recent crash or startup preferences."), _("Load Page"), NULL); - g_free (title); - katze_item_set_uri (view->item, uri); + if (g_strcmp0 (view->item->uri, uri)) + katze_item_set_uri (view->item, uri); g_object_notify (G_OBJECT (view), "uri"); } - #endif else if (g_str_has_prefix (uri, "javascript:")) { gboolean result; @@ -3668,21 +4352,20 @@ result = midori_view_execute_script (view, &uri[11], &exception); if (!result) { - sokoke_message_dialog (GTK_MESSAGE_ERROR, "javascript:", exception); + sokoke_message_dialog (GTK_MESSAGE_ERROR, "javascript:", + exception, FALSE); g_free (exception); } } - else if (g_str_has_prefix (uri, "mailto:") - || g_str_has_prefix (uri, "tel:") - || g_str_has_prefix (uri, "callto:")) + else if (g_str_has_prefix (uri, "mailto:") || sokoke_external_uri (uri)) { sokoke_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL); } else { - katze_assign (view->uri, sokoke_format_uri_for_display (uri)); - katze_item_set_uri (view->item, uri); - katze_item_set_meta_integer (view->item, "delay", -1); + katze_assign (view->uri, midori_uri_format_for_display (uri)); + if (g_strcmp0 (view->item->uri, view->uri)) + katze_item_set_uri (view->item, view->uri); g_object_notify (G_OBJECT (view), "uri"); webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), uri); } @@ -3690,6 +4373,33 @@ } /** + * midori_view_set_overlay_text: + * @view: a #MidoriView + * @text: a URI or text string + * + * Show a specified URI or text on top of the view. + * Has no effect with < GTK+ 3.2.0. + * + * Since: 0.4.5 + **/ +void +midori_view_set_overlay_text (MidoriView* view, + const gchar* text) +{ + g_return_if_fail (MIDORI_IS_VIEW (view)); + + #if GTK_CHECK_VERSION (3, 2, 0) + if (text == NULL) + gtk_widget_hide (view->overlay_label); + else + { + gtk_label_set_text (GTK_LABEL (view->overlay_label), text); + gtk_widget_show (view->overlay_label); + } + #endif +} + +/** * midori_view_is_blank: * @view: a #MidoriView * @@ -3700,7 +4410,7 @@ { g_return_val_if_fail (MIDORI_IS_VIEW (view), TRUE); - return midori_view_get_display_uri (view)[0] == '\0'; + return midori_uri_is_blank (midori_view_get_display_uri (view)); } /** @@ -3747,7 +4457,6 @@ return view->icon_uri; } - /** * midori_view_get_display_uri: * @view: a #MidoriView @@ -3783,8 +4492,6 @@ * as a title. Most of the time this will be the title * or the current URI. * - * An empty page is represented as "about:blank". - * * You can assume that the string is not %NULL. * * Return value: a title string @@ -3833,10 +4540,34 @@ gboolean midori_view_has_selection (MidoriView* view) { +#if WEBKIT_CHECK_VERSION (1, 4, 3) + WebKitDOMDocument* doc; + WebKitDOMDOMWindow* window; + WebKitDOMDOMSelection* selection; + WebKitDOMRange* range; +#endif + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); + +#if WEBKIT_CHECK_VERSION (1, 4, 3) + doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view->web_view)); + window = webkit_dom_document_get_default_view (doc); + selection = webkit_dom_dom_window_get_selection (window); + if (selection == NULL + || webkit_dom_dom_selection_get_range_count (selection) == 0) + return FALSE; + + range = webkit_dom_dom_selection_get_range_at (selection, 0, NULL); + if (range == NULL) + return FALSE; + + katze_assign (view->selected_text, webkit_dom_range_get_text (range)); +#else katze_assign (view->selected_text, webkit_web_view_get_selected_text ( WEBKIT_WEB_VIEW (view->web_view))); +#endif + if (view->selected_text && *view->selected_text) return TRUE; else @@ -3957,23 +4688,13 @@ } static void -midori_view_tab_label_menu_open_cb (GtkWidget* menuitem, - GtkWidget* view) -{ - MidoriBrowser* browser = midori_browser_get_for_widget (view); - midori_browser_set_current_tab (browser, view); -} - - -static void midori_view_tab_label_menu_duplicate_tab_cb (GtkWidget* menuitem, MidoriView* view) { MidoriNewView where = MIDORI_NEW_VIEW_TAB; - GtkWidget* new_view = midori_view_new_with_uri ( - midori_view_get_display_uri (view), - NULL, view->settings); - g_signal_emit (view, signals[NEW_VIEW], 0, new_view, where); + GtkWidget* new_view = midori_view_new_with_item (view->item, view->settings); + g_signal_emit (view, signals[NEW_VIEW], 0, new_view, where, TRUE); + midori_view_set_uri (MIDORI_VIEW (new_view), view->uri); } static void @@ -4040,10 +4761,6 @@ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); 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); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_view_tab_label_menu_open_cb), view); menuitem = gtk_image_menu_item_new_from_stock (STOCK_WINDOW_NEW, NULL); gtk_menu_item_set_label (GTK_MENU_ITEM (menuitem), _("Open in New _Window")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); @@ -4074,9 +4791,9 @@ } static gboolean -midori_view_tab_label_button_release_event (GtkWidget* tab_label, - GdkEventButton* event, - GtkWidget* widget) +midori_view_tab_label_button_press_event (GtkWidget* tab_label, + GdkEventButton* event, + GtkWidget* widget) { if (event->button == 2) { @@ -4084,7 +4801,7 @@ gtk_widget_destroy (widget); return TRUE; } - else if (event->button == 3) + else if (MIDORI_EVENT_CONTEXT_MENU (event)) { /* Show a context menu on right click */ GtkWidget* menu = midori_view_get_tab_menu (MIDORI_VIEW (widget)); @@ -4104,6 +4821,7 @@ gtk_widget_destroy (widget); } +#if !GTK_CHECK_VERSION (3, 0, 0) static void midori_view_tab_icon_style_set_cb (GtkWidget* tab_close, GtkStyle* previous_style) @@ -4112,24 +4830,20 @@ gtk_widget_size_request (gtk_bin_get_child (GTK_BIN (tab_close)), &size); gtk_widget_set_size_request (tab_close, size.width, size.height); } +#endif static void midori_view_update_tab_title (GtkWidget* label, gint size, gdouble angle) { - gint width; - - sokoke_widget_get_text_size (label, "M", &width, NULL); if (angle == 0.0 || angle == 360.0) { - gtk_widget_set_size_request (label, width * size, -1); if (gtk_label_get_ellipsize (GTK_LABEL (label)) != PANGO_ELLIPSIZE_START) gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); } else { - gtk_widget_set_size_request (label, -1, width * size); gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_NONE); } gtk_label_set_angle (GTK_LABEL (label), angle); @@ -4161,7 +4875,11 @@ static void midori_view_tab_label_parent_set (GtkWidget* tab_label, +#if GTK_CHECK_VERSION(3,0,0) + GObject* old_parent, +#else GtkObject* old_parent, +#endif MidoriView* view) { GtkWidget* parent; @@ -4195,13 +4913,16 @@ if (old_angle != angle) { + GtkWidget* align; + if (angle == 0.0) box = gtk_hbox_new (FALSE, 1); else box = gtk_vbox_new (FALSE, 1); gtk_box_repack (GTK_BOX (box), view->tab_icon); gtk_box_repack (GTK_BOX (box), view->tab_title); - gtk_box_repack (GTK_BOX (box), view->tab_close); + align = gtk_widget_get_parent (view->tab_close); + gtk_box_repack (GTK_BOX (box), align); gtk_container_remove (GTK_CONTAINER (tab_label), gtk_bin_get_child (GTK_BIN (tab_label))); @@ -4236,6 +4957,32 @@ return PANGO_ELLIPSIZE_END; } +static void midori_view_tab_label_data_received (GtkWidget* widget, + GdkDragContext* context, + gint x, + gint y, + GtkSelectionData* data, + guint ttype, + guint timestamp, + MidoriView* view) +{ + gchar **uri; + gchar* text; + + uri = gtk_selection_data_get_uris (data); + if (uri != NULL) + { + midori_view_set_uri (view, uri[0]); + g_strfreev (uri); + } + else + { + text = (gchar*) gtk_selection_data_get_text (data); + midori_view_set_uri (view, text); + g_free (text); + } +} + /** * midori_view_get_proxy_tab_label: * @view: a #MidoriView @@ -4258,7 +5005,28 @@ { GtkWidget* event_box; GtkWidget* hbox; - GtkRcStyle* rcstyle; + static const gchar style_fixup[] = + #if GTK_CHECK_VERSION (3, 0, 0) + "* {\n" + "-GtkButton-default-border : 0;\n" + "-GtkButton-default-outside-border : 0;\n" + "-GtkButton-inner-border: 0;\n" + "-GtkWidget-focus-line-width : 0;\n" + "-GtkWidget-focus-padding : 0;\n" + "padding: 0;\n" + "}"; + GtkStyleContext* context; + GtkCssProvider* css_provider; + #else + "style \"midori-close-button-style\"\n" + "{\n" + "GtkWidget::focus-padding = 0\n" + "GtkWidget::focus-line-width = 0\n" + "xthickness = 0\n" + "ythickness = 0\n" + "}\n" + "widget \"*.midori-close-button\" style \"midori-close-button-style\""; + #endif GtkWidget* image; GtkWidget* align; @@ -4272,6 +5040,7 @@ view->tab_title = gtk_label_new (midori_view_get_display_title (view)); gtk_misc_set_alignment (GTK_MISC (view->tab_title), 0.0, 0.5); + gtk_misc_set_padding (GTK_MISC (view->tab_title), 0, 0); event_box = gtk_event_box_new (); gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE); @@ -4282,24 +5051,35 @@ view->tab_close = gtk_button_new (); gtk_button_set_relief (GTK_BUTTON (view->tab_close), GTK_RELIEF_NONE); gtk_button_set_focus_on_click (GTK_BUTTON (view->tab_close), FALSE); - rcstyle = gtk_rc_style_new (); - rcstyle->xthickness = rcstyle->ythickness = 0; - gtk_widget_modify_style (view->tab_close, rcstyle); - g_object_unref (rcstyle); + #if GTK_CHECK_VERSION (3, 0, 0) + context = gtk_widget_get_style_context (view->tab_close); + css_provider = gtk_css_provider_new (); + gtk_css_provider_load_from_data (css_provider, style_fixup, -1, NULL); + gtk_style_context_add_provider (context, GTK_STYLE_PROVIDER (css_provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + #else + gtk_rc_parse_string (style_fixup); + gtk_widget_set_name (view->tab_close, "midori-close-button"); + g_signal_connect (view->tab_close, "style-set", + G_CALLBACK (midori_view_tab_icon_style_set_cb), NULL); + #endif image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); gtk_container_add (GTK_CONTAINER (view->tab_close), image); - align = gtk_alignment_new (1.0, 0.0, 0.0, 0.0); + align = gtk_alignment_new (1.0, 0.5, 0.0, 0.0); gtk_container_add (GTK_CONTAINER (align), view->tab_close); - #if HAVE_OSX - gtk_box_pack_end (GTK_BOX (hbox), view->tab_icon, FALSE, FALSE, 0); - gtk_box_pack_end (GTK_BOX (hbox), view->tab_title, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (hbox), align, FALSE, FALSE, 0); - #else - gtk_box_pack_start (GTK_BOX (hbox), view->tab_icon, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), view->tab_title, FALSE, TRUE, 0); - gtk_box_pack_end (GTK_BOX (hbox), align, FALSE, FALSE, 0); - #endif + if (katze_object_get_boolean (view->settings, "close-buttons-left")) + { + gtk_box_pack_end (GTK_BOX (hbox), view->tab_icon, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX (hbox), view->tab_title, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), align, FALSE, FALSE, 0); + } + else + { + gtk_box_pack_start (GTK_BOX (hbox), view->tab_icon, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), view->tab_title, TRUE, TRUE, 0); + gtk_box_pack_end (GTK_BOX (hbox), align, FALSE, FALSE, 0); + } gtk_widget_show_all (GTK_WIDGET (event_box)); if (view->minimized) @@ -4307,10 +5087,10 @@ if (!view->close_buttons_on_tabs) gtk_widget_hide (view->tab_close); - g_signal_connect (event_box, "button-release-event", - G_CALLBACK (midori_view_tab_label_button_release_event), view); - g_signal_connect (view->tab_close, "style-set", - G_CALLBACK (midori_view_tab_icon_style_set_cb), NULL); + g_signal_connect (event_box, "button-press-event", + G_CALLBACK (midori_view_tab_label_button_press_event), view); + g_signal_connect (view->tab_close, "button-press-event", + G_CALLBACK (midori_view_tab_label_button_press_event), view); g_signal_connect (view->tab_close, "clicked", G_CALLBACK (midori_view_tab_close_clicked), view); @@ -4325,6 +5105,13 @@ g_signal_connect (view->tab_label, "parent-set", G_CALLBACK (midori_view_tab_label_parent_set), view); + gtk_drag_dest_set (view->tab_label, GTK_DEST_DEFAULT_ALL, NULL, + 0, GDK_ACTION_COPY); + gtk_drag_dest_add_text_targets (view->tab_label); + gtk_drag_dest_add_uri_targets (view->tab_label); + g_signal_connect (view->tab_label, "drag-data-received", + G_CALLBACK (midori_view_tab_label_data_received), + view); } return view->tab_label; } @@ -4409,7 +5196,9 @@ { g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); - return view->web_view != NULL && !g_str_has_prefix (view->mime_type, "image/"); + return view->web_view != NULL + && (katze_object_get_boolean (view->settings, "zoom-text-and-images") + || !g_str_has_prefix (view->mime_type ? view->mime_type : "", "image/")); } gboolean @@ -4417,7 +5206,9 @@ { g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); - return view->web_view != NULL && !g_str_has_prefix (view->mime_type, "image/"); + return view->web_view != NULL + && (katze_object_get_boolean (view->settings, "zoom-text-and-images") + || !g_str_has_prefix (view->mime_type ? view->mime_type : "", "image/")); } gboolean @@ -4429,7 +5220,7 @@ g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); - if (midori_view_is_blank (view)) + if (midori_view_is_blank (view) || view->mime_type == NULL) return FALSE; content_type = g_content_type_from_mime_type (view->mime_type); @@ -4440,6 +5231,158 @@ return is_text; } +/** + * midori_view_can_save: + * @view: a #MidoriView + * + * Determines if the view can be saved to disk. + * + * Return value: %TRUE if the website or image can be saved + * + * Since: 0.4.3 + **/ +gboolean +midori_view_can_save (MidoriView* view) +{ + GtkWidget* web_view; + WebKitWebDataSource *data_source; + WebKitWebFrame *frame; + const GString *data; + + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); + + if (midori_view_is_blank (view) || view->mime_type == NULL) + return FALSE; + + web_view = midori_view_get_web_view (view); + if (webkit_web_view_get_view_source_mode (WEBKIT_WEB_VIEW (web_view))) + return FALSE; + + frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view)); + data_source = webkit_web_frame_get_data_source (frame); + data = webkit_web_data_source_get_data (data_source); + + if (data != NULL) + return TRUE; + + return FALSE; +} + +static gchar* +midori_view_get_uri_extension (const gchar* uri) +{ + gchar* slash; + gchar* period; + gchar* ext_end; + + /* Find the last slash in the URI and search for the last period + *after* the last slash. This is not completely accurate + but should cover most (simple) URIs */ + slash = strrchr (uri, '/'); + /* Huh, URI without slashes? */ + if (!slash) + return NULL; + + ext_end = period = strrchr (slash, '.'); + if (!period) + return NULL; + + /* Skip the period */ + ext_end++; + /* If *ext_end is 0 here, the URI ended with a period, so skip */ + if (!*ext_end) + return NULL; + + /* Find the end of the extension */ + while (*ext_end && g_ascii_isalnum (*ext_end)) + ext_end++; + + return g_strdup (period); +} + +static const gchar* +midori_view_fallback_extension (MidoriView* view, + const gchar* extension) +{ + if (!view->mime_type) + extension = ""; + if (extension && *extension) + return extension; + if (strstr (view->mime_type, "css")) + return ".css"; + if (strstr (view->mime_type, "javascript")) + return ".js"; + if (strstr (view->mime_type, "html")) + return ".htm"; + return ""; +} + +/** + * midori_view_save_source: + * @view: a #MidoriView + * @uri: an alternative destination URI, or %NULL + * @outfile: a destination filename, or %NULL + * + * Saves the data in the view to disk. + * + * Return value: the destination filename + * + * Since: 0.4.4 + **/ +gchar* +midori_view_save_source (MidoriView* view, + const gchar* uri, + const gchar* outfile) +{ + WebKitWebFrame *frame; + WebKitWebDataSource *data_source; + const GString *data; + gchar* unique_filename; + gint fd; + FILE* fp; + size_t ret; + + frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); + data_source = webkit_web_frame_get_data_source (frame); + data = webkit_web_data_source_get_data (data_source); + + if (uri == NULL) + uri = midori_view_get_display_uri (view); + + if (!outfile) + { + gchar* extension = midori_view_get_uri_extension (uri); + unique_filename = g_strdup_printf ("%s/midori-%s/%uXXXXXX%s", + g_get_tmp_dir (), g_get_user_name (), + g_str_hash (uri), midori_view_fallback_extension (view, extension)); + g_free (extension); + fd = g_mkstemp (unique_filename); + } + else + { + unique_filename = g_strdup (outfile); + fd = g_open (unique_filename, O_WRONLY|O_CREAT, 0644); + } + + if (fd != -1) + { + if ((fp = fdopen (fd, "w"))) + { + ret = fwrite (data ? data->str : "", 1, data ? data->len : 0, fp); + fclose (fp); + if (ret - (data ? data->len : 0) != 0) + { + midori_view_add_info_bar (view, GTK_MESSAGE_ERROR, + unique_filename, NULL, view, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + katze_assign (unique_filename, NULL); + } + } + close (fd); + } + return unique_filename; +} + #define can_do(what) \ gboolean \ midori_view_can_##what (MidoriView* view) \ @@ -4464,24 +5407,9 @@ midori_view_reload (MidoriView* view, gboolean from_cache) { - gchar* title; - g_return_if_fail (MIDORI_IS_VIEW (view)); -#if WEBKIT_CHECK_VERSION (1, 1, 14) - title = NULL; -#elif WEBKIT_CHECK_VERSION (1, 1, 6) - /* WebKit 1.1.6 doesn't handle "alternate content" flawlessly, - so reloading via Javascript works but not via API calls. */ - title = g_strdup_printf (_("Error - %s"), view->uri); -#else - /* Error pages are special, we want to try loading the destination - again, not the error page which isn't even a proper page */ - title = g_strdup_printf (_("Error - %s"), view->uri); -#endif - if (view->title && title && strstr (title, view->title)) - webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), view->uri); - else if (!(view->uri && *view->uri && strncmp (view->uri, "about:", 6))) + if (midori_uri_is_blank (view->uri)) { gchar* uri = g_strdup (view->uri); midori_view_set_uri (view, uri); @@ -4492,8 +5420,6 @@ else webkit_web_view_reload_bypass_cache (WEBKIT_WEB_VIEW (view->web_view)); katze_item_set_meta_integer (view->item, "delay", -1); - - g_free (title); } /** @@ -4539,6 +5465,9 @@ g_return_if_fail (MIDORI_IS_VIEW (view)); webkit_web_view_go_back (WEBKIT_WEB_VIEW (view->web_view)); + /* Force the speed dial to kick in if going back to a blank page */ + if (midori_view_is_blank (view)) + midori_view_set_uri (view, ""); } /** @@ -4573,70 +5502,98 @@ } /** - * midori_view_get_previous_page + * midori_view_go_back_or_forward * @view: a #MidoriView + * @steps: number of steps to jump in history * - * Determines the previous sub-page in the view. + * Goes back or forward in history. * - * Return value: an URI, or %NULL + * Since: 0.4.5 + **/ +void +midori_view_go_back_or_forward (MidoriView* view, + gint steps) +{ + g_return_if_fail (MIDORI_IS_VIEW (view)); + + webkit_web_view_go_back_or_forward (WEBKIT_WEB_VIEW (view->web_view), steps); + /* Force the speed dial to kick in if going back to a blank page */ + if (midori_view_is_blank (view)) + midori_view_set_uri (view, ""); +} + +/** + * midori_view_can_go_back_or_forward + * @view: a #MidoriView + * @steps: number of steps to jump in history * - * Since: 0.2.3 + * Determines whether the view can go back or forward by number of steps. + * + * Since: 0.4.5 **/ -const gchar* -midori_view_get_previous_page (MidoriView* view) +gboolean +midori_view_can_go_back_or_forward (MidoriView* view, + gint steps) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); + + if (view->web_view) + return webkit_web_view_can_go_back_or_forward (WEBKIT_WEB_VIEW (view->web_view), steps); + else + return FALSE; +} + +static gchar* +midori_view_get_related_page (MidoriView* view, + const gchar* rel, + const gchar* local) { + gchar* script; static gchar* uri = NULL; WebKitWebFrame* web_frame; JSContextRef js_context; - g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); - if (!view->web_view) return NULL; web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); js_context = webkit_web_frame_get_global_context (web_frame); - katze_assign (uri, sokoke_js_script_eval (js_context, - "(function (g) {" - "var ind = ['prev','←','«','<'];" - "var nind = ['next','→','»','>'];" - "for (h in g) {" - "l = g[h];" - "for (i in l)" - "if (l[i].rel && (l[i].rel == ind[0]))" - "return l[i].href;" - "for (j in ind)" - "for (i in l)" - "if (l[i].innerHTML" - "&& (l[i].innerHTML.toLowerCase ().indexOf (ind[j]) != -1)" - "&& (l[i].innerHTML.toLowerCase ().indexOf (nind[j]) == -1))" - "return l[i].href;" - "var wa = window.location.href.split (/\\d+/);" - "var wn = window.location.href.split (/[^\\d]+/);" - "wn = wn.slice (1,wn.length - 1);" - "var cand = [];" - "for (i in wn)" - "{" - "cand[i] = '';" - "for (j = 0; j <= i; j++)" - "{" - "cand[i] += wa[j];" - "if (wn[j])" - "cand[i] += parseInt (wn[j]) - ((i == j) ? 1 : 0);" - "}" - "}" - "for (j in cand)" - "for (i in l)" - "if (cand[j].length && l[i].href && (l[i].href.indexOf (cand[j]) == 0))" - "return l[i].href;" - "}" - "return 0;" - "}) ([document.getElementsByTagName ('link')," - "document.getElementsByTagName ('a')]);", NULL)); + script = g_strdup_printf ( + "(function (tags) {" + "for (var tag in tags) {" + "var l = document.getElementsByTagName (tag);" + "for (var i in l) { " + "if ((l[i].rel && l[i].rel.toLowerCase () == '%s') " + " || (l[i].innerHTML" + " && (l[i].innerHTML.toLowerCase ().indexOf ('%s') != -1 " + " || l[i].innerHTML.toLowerCase ().indexOf ('%s') != -1)))" + "{ return l[i].href; } } } return 0; })(" + "{ link:'link', a:'a' });", rel, rel, local); + katze_assign (uri, sokoke_js_script_eval (js_context, script, NULL)); + g_free (script); return uri && uri[0] != '0' ? uri : NULL; } /** + * midori_view_get_previous_page + * @view: a #MidoriView + * + * Determines the previous sub-page in the view. + * + * Return value: an URI, or %NULL + * + * Since: 0.2.3 + **/ +const gchar* +midori_view_get_previous_page (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); + + /* i18n: word stem of "previous page" type links, case is not important */ + return midori_view_get_related_page (view, "prev", _("previous")); +} + +/** * midori_view_get_next_page * @view: a #MidoriView * @@ -4649,57 +5606,12 @@ const gchar* midori_view_get_next_page (MidoriView* view) { - static gchar* uri = NULL; - WebKitWebFrame* web_frame; - JSContextRef js_context; - g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); - if (!view->web_view) - return NULL; - - web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); - js_context = webkit_web_frame_get_global_context (web_frame); - katze_assign (uri, sokoke_js_script_eval (js_context, - "(function (g) {" - "var ind = ['next','→','»','>'];" - "var nind = ['prev','←','«','<'];" - "for (h in g) {" - "l = g[h];" - "for (i in l)" - "if (l[i].rel && (l[i].rel == ind[0]))" - "return l[i].href;" - "for (j in ind)" - "for (i in l)" - "if (l[i].innerHTML" - "&& (l[i].innerHTML.toLowerCase ().indexOf (ind[j]) != -1)" - "&& (l[i].innerHTML.toLowerCase ().indexOf (nind[j]) == -1))" - "return l[i].href;" - "var wa = window.location.href.split (/\\d+/);" - "var wn = window.location.href.split (/[^\\d]+/);" - "wn = wn.slice (1,wn.length - 1);" - "var cand = [];" - "for (i in wn)" - "{" - "cand[i] = '';" - "for (j = 0; j <= i; j++)" - "{" - "cand[i] += wa[j];" - "if (wn[j])" - "cand[i] += parseInt (wn[j]) + ((i == j) ? 1 : 0);" - "}" - "}" - "for (j in cand)" - "for (i in l)" - "if (cand[j].length && l[i].href && (l[i].href.indexOf (cand[j]) == 0))" - "return l[i].href;" - "}" - "return 0;" - "}) ([document.getElementsByTagName ('link')," - "document.getElementsByTagName ('a')]);", NULL)); - return uri && uri[0] != '0' ? uri : NULL; + /* i18n: word stem of "next page" type links, case is not important */ + return midori_view_get_related_page (view, "next", _("next")); } -#if WEBKIT_CHECK_VERSION (1, 1, 5) + static GtkWidget* midori_view_print_create_custom_widget_cb (GtkPrintOperation* operation, MidoriView* view) @@ -4709,12 +5621,9 @@ box = gtk_vbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (box), 4); - button = gtk_check_button_new (); - g_object_set_data (G_OBJECT (operation), "print-backgrounds", button); + button = katze_property_proxy (view->settings, "print-backgrounds", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Print background images")); gtk_widget_set_tooltip_text (button, _("Whether background images should be printed")); - if (katze_object_get_boolean (view->settings, "print-backgrounds")) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0); gtk_widget_show_all (box); @@ -4722,21 +5631,6 @@ } static void -midori_view_print_custom_widget_apply_cb (GtkPrintOperation* operation, - GtkWidget* widget, - MidoriView* view) -{ - GtkWidget* button; - - button = g_object_get_data (G_OBJECT (operation), "print-backgrounds"); - g_object_set (view->settings, - "print-backgrounds", - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)), - NULL); -} -#endif - -static void midori_view_print_response_cb (GtkWidget* dialog, gint response, gpointer data) @@ -4754,24 +5648,19 @@ midori_view_print (MidoriView* view) { WebKitWebFrame* frame; - #if WEBKIT_CHECK_VERSION (1, 1, 5) GtkPrintOperation* operation; GError* error; - #endif g_return_if_fail (MIDORI_IS_VIEW (view)); frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); - #if WEBKIT_CHECK_VERSION (1, 1, 5) operation = gtk_print_operation_new (); gtk_print_operation_set_custom_tab_label (operation, _("Features")); -#if GTK_CHECK_VERSION (2, 18, 0) + #if GTK_CHECK_VERSION (2, 18, 0) gtk_print_operation_set_embed_page_setup (operation, TRUE); -#endif + #endif g_signal_connect (operation, "create-custom-widget", G_CALLBACK (midori_view_print_create_custom_widget_cb), view); - g_signal_connect (operation, "custom-widget-apply", - G_CALLBACK (midori_view_print_custom_widget_apply_cb), view); error = NULL; webkit_web_frame_print_full (frame, operation, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, &error); @@ -4790,9 +5679,6 @@ G_CALLBACK (midori_view_print_response_cb), NULL); gtk_widget_show (dialog); } - #else - webkit_web_frame_print (frame); - #endif } /** @@ -4826,6 +5712,15 @@ { g_return_if_fail (MIDORI_IS_VIEW (view)); + #if GTK_CHECK_VERSION (3, 2, 0) + if (gtk_widget_get_visible (view->overlay_find)) + { + text = midori_findbar_get_text (MIDORI_FINDBAR (view->overlay_find)); + webkit_web_view_search_text (WEBKIT_WEB_VIEW (view->web_view), + text, case_sensitive, forward, TRUE); + return; + } + #endif g_signal_emit (view, signals[SEARCH_TEXT], 0, webkit_web_view_search_text (WEBKIT_WEB_VIEW (view->web_view), text, case_sensitive, forward, TRUE), NULL); @@ -4926,24 +5821,38 @@ gint width, gint height) { - GtkWidget* web_view; + g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); + return midori_view_web_view_get_snapshot ((GtkWidget*)view->web_view, width, height); +} + +static GdkPixbuf* +midori_view_web_view_get_snapshot (GtkWidget* web_view, + gint width, + gint height) +{ + GtkAllocation allocation; gboolean fast; gint x, y, w, h; GdkRectangle rect; + #if !GTK_CHECK_VERSION (3, 0, 0) + GdkWindow* window; GdkPixmap* pixmap; GdkEvent event; gboolean result; GdkColormap* colormap; + #else + cairo_surface_t* surface; + cairo_t* cr; + #endif GdkPixbuf* pixbuf; - g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); - web_view = view->web_view; - g_return_val_if_fail (web_view->window, NULL); + g_return_val_if_fail (WEBKIT_IS_WEB_VIEW (web_view), NULL); - x = web_view->allocation.x; - y = web_view->allocation.y; - w = web_view->allocation.width; - h = web_view->allocation.height; + gtk_widget_get_allocation (web_view, &allocation); + x = allocation.x; + y = allocation.y; + w = allocation.width; + h = allocation.height; /* If width and height are both negative, we try to render faster at the cost of correctness or beauty. Only a part of the page is @@ -4958,20 +5867,33 @@ fast = TRUE; } + #if GTK_CHECK_VERSION (3, 0, 0) + surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, + allocation.width, allocation.height); + cr = cairo_create (surface); + cairo_rectangle (cr, x, y, width, height); + cairo_clip (cr); + gtk_widget_draw (web_view, cr); + pixbuf = gdk_pixbuf_get_from_surface (surface, x, y, width, height); + cairo_surface_destroy (surface); + cairo_destroy (cr); + #else rect.x = x; rect.y = y; rect.width = w; rect.height = h; - pixmap = gdk_pixmap_new (web_view->window, w, h, - gdk_drawable_get_depth (web_view->window)); + window = gtk_widget_get_window (web_view); + g_return_val_if_fail (window != NULL, NULL); + + pixmap = gdk_pixmap_new (window, w, h, gdk_drawable_get_depth (window)); event.expose.type = GDK_EXPOSE; event.expose.window = pixmap; event.expose.send_event = FALSE; event.expose.count = 0; event.expose.area.x = 0; event.expose.area.y = 0; - gdk_drawable_get_size (GDK_DRAWABLE (web_view->window), + gdk_drawable_get_size (GDK_DRAWABLE (window), &event.expose.area.width, &event.expose.area.height); event.expose.region = gdk_region_rectangle (&event.expose.area); @@ -4981,6 +5903,7 @@ pixbuf = gdk_pixbuf_get_from_drawable (NULL, pixmap, colormap, 0, 0, 0, 0, rect.width, rect.height); g_object_unref (pixmap); + #endif if (width || height) { @@ -5016,6 +5939,29 @@ } /** + * midori_view_get_for_widget: + * @widget: a #GtkWidget + * + * Determines the view appropriate for the specified widget. + * + * Return value: a #MidoriView + * + * Since 0.4.5 + **/ +MidoriView* +midori_view_get_for_widget (GtkWidget* web_view) +{ + GtkWidget* scrolled = gtk_widget_get_parent (web_view); + #if GTK_CHECK_VERSION(3, 2, 0) + GtkWidget* overlay = gtk_widget_get_parent (scrolled); + GtkWidget* view = gtk_widget_get_parent (overlay); + #else + GtkWidget* view = gtk_widget_get_parent (scrolled); + #endif + return MIDORI_VIEW (view); +} + +/** * midori_view_get_security * @view: a #MidoriView * @@ -5032,63 +5978,86 @@ } static void -thumb_view_load_status_cb (MidoriView* thumb_view, - GParamSpec* pspec, - MidoriView* view) +thumb_view_load_status_cb (WebKitWebView* thumb_view_, + GParamSpec* pspec, + MidoriView* view) { GdkPixbuf* img; - gchar* file_content; - gchar* encoded; - gchar* dom_id; - gchar* js; - gsize sz; + #if HAVE_OFFSCREEN + GdkPixbuf* pixbuf_scaled; + #endif + gchar* file_path; + gchar* thumb_dir; + gchar* spec; + gchar* url; + gchar* dial_id; + MidoriBrowser* browser; + GKeyFile* key_file; + const gchar* title; - if (katze_object_get_enum (thumb_view, "load-status") != MIDORI_LOAD_FINISHED) + if (webkit_web_view_get_load_status (thumb_view_) != WEBKIT_LOAD_FINISHED) return; - gtk_widget_realize (midori_view_get_web_view (MIDORI_VIEW (thumb_view))); - img = midori_view_get_snapshot (MIDORI_VIEW (thumb_view), 240, 160); - gdk_pixbuf_save_to_buffer (img, &file_content, &sz, "png", NULL, "compression", "7", NULL); - encoded = g_base64_encode ((guchar *)file_content, sz ); - - /* Call Javascript function to replace shortcut's content */ - dom_id = g_object_get_data (G_OBJECT (thumb_view), "dom-id"); - js = g_strdup_printf ("setThumbnail('%s','%s','%s');", - dom_id, encoded, thumb_view->uri); - webkit_web_view_execute_script (WEBKIT_WEB_VIEW (view->web_view), js); - free (js); + spec = g_object_get_data (G_OBJECT (thumb_view), "spec"); + url = strstr (spec, "|") + 1; + dial_id = g_strndup (spec, url - spec - 1); + + #if HAVE_OFFSCREEN + img = gtk_offscreen_window_get_pixbuf (GTK_OFFSCREEN_WINDOW ( + gtk_widget_get_parent (GTK_WIDGET (thumb_view)))); + pixbuf_scaled = gdk_pixbuf_scale_simple (img, 240, 160, GDK_INTERP_TILES); + katze_object_assign (img, pixbuf_scaled); + #else + gtk_widget_realize (thumb_view); + img = midori_view_web_view_get_snapshot (thumb_view, 240, 160); + #endif + file_path = sokoke_build_thumbnail_path (url); + thumb_dir = g_build_path (G_DIR_SEPARATOR_S, g_get_user_cache_dir (), + PACKAGE_NAME, "thumbnails", NULL); + + if (!g_file_test (thumb_dir, G_FILE_TEST_EXISTS)) + katze_mkdir_with_parents (thumb_dir, 0700); + + gdk_pixbuf_save (img, file_path, "png", NULL, "compression", "7", NULL); + g_object_unref (img); - g_free (dom_id); - g_free (encoded); - g_free (file_content); - - g_signal_handlers_disconnect_by_func ( - thumb_view, thumb_view_load_status_cb, view); - - /* Destroying the view here may trigger a WebKitGTK+ 1.1.14 bug */ - #if !WEBKIT_CHECK_VERSION (1, 1, 14) || WEBKIT_CHECK_VERSION (1, 1, 15) - gtk_widget_destroy (GTK_WIDGET (thumb_view)); - view->thumb_view = NULL; - #endif + g_free (file_path); + g_free (thumb_dir); + + browser = midori_browser_get_for_widget (GTK_WIDGET (view)); + g_object_get (browser, "speed-dial", &key_file, NULL); + title = webkit_web_view_get_title (WEBKIT_WEB_VIEW (thumb_view)); + g_key_file_set_string (key_file, dial_id, "title", title ? title : url); + midori_view_save_speed_dial_config (view, key_file); + + thumb_queue = g_list_remove (thumb_queue, spec); + if (thumb_queue != NULL) + { + g_object_set_data_full (G_OBJECT (thumb_view), "spec", + thumb_queue->data, (GDestroyNotify)g_free); + webkit_web_view_open (WEBKIT_WEB_VIEW (thumb_view), + strstr (thumb_queue->data, "|") + 1); + } + else + g_signal_handlers_disconnect_by_func ( + thumb_view, thumb_view_load_status_cb, view); } /** - * midori_view_speed_dial_inject_thumb + * midori_view_speed_dial_get_thumb * @view: a #MidoriView - * @filename: filename of the thumbnail * @dom_id: Id of the shortcut on speed_dial page in wich to inject content * @url: url of the shortcut */ static void -midori_view_speed_dial_inject_thumb (MidoriView* view, - gchar* filename, - gchar* dom_id, - gchar* url) +midori_view_speed_dial_get_thumb (MidoriView* view, + gchar* dial_id, + gchar* url) { - GtkWidget* thumb_view; - MidoriWebSettings* settings; + WebKitWebSettings* settings; GtkWidget* browser; + #if !HAVE_OFFSCREEN GtkWidget* notebook; GtkWidget* label; @@ -5103,76 +6072,155 @@ notebook = katze_object_get_object (browser, "notebook"); if (!notebook) return; + #endif - if (!view->thumb_view) + if (!thumb_view) { - view->thumb_view = midori_view_new (view->net); - gtk_container_add (GTK_CONTAINER (notebook), view->thumb_view); + thumb_view = webkit_web_view_new (); + settings = g_object_new (WEBKIT_TYPE_WEB_SETTINGS, + "enable-scripts", FALSE, + "enable-plugins", FALSE, "auto-load-images", TRUE, + "enable-html5-database", FALSE, "enable-html5-local-storage", FALSE, + #if WEBKIT_CHECK_VERSION (1, 1, 22) + "enable-java-applet", FALSE, + #endif + NULL); + webkit_web_view_set_settings (WEBKIT_WEB_VIEW (thumb_view), settings); + #if HAVE_OFFSCREEN + browser = gtk_offscreen_window_new (); + gtk_container_add (GTK_CONTAINER (browser), thumb_view); + gtk_widget_set_size_request (thumb_view, 800, 600); + gtk_widget_show_all (browser); + #else + gtk_container_add (GTK_CONTAINER (notebook), thumb_view); + g_signal_connect (thumb_view, "destroy", + G_CALLBACK (gtk_widget_destroyed), + &thumb_view); /* We use an empty label. It's not invisible but at least hard to spot. */ label = gtk_event_box_new (); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), view->thumb_view, label); - gtk_widget_show (view->thumb_view); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), thumb_view, label); + gtk_widget_show (thumb_view); + #endif } + #if !HAVE_OFFSCREEN g_object_unref (notebook); - thumb_view = view->thumb_view; - settings = g_object_new (MIDORI_TYPE_WEB_SETTINGS, "enable-scripts", FALSE, - "enable-plugins", FALSE, "auto-load-images", TRUE, NULL); - midori_view_set_settings (MIDORI_VIEW (thumb_view), settings); + #endif + + thumb_queue = g_list_append (thumb_queue, g_strconcat (dial_id, "|", url, NULL)); + if (g_list_nth_data (thumb_queue, 1) != NULL) + return; - g_object_set_data (G_OBJECT (thumb_view), "dom-id", dom_id); + g_object_set_data_full (G_OBJECT (thumb_view), "spec", + thumb_queue->data, (GDestroyNotify)g_free); g_signal_connect (thumb_view, "notify::load-status", G_CALLBACK (thumb_view_load_status_cb), view); - midori_view_set_uri (MIDORI_VIEW (thumb_view), url); + webkit_web_view_open (WEBKIT_WEB_VIEW (thumb_view), url); } /** - * midori_view_speed_dial_get_thumb - * @web_view: a #WebkitView - * @message: Console log data - * - * Load a thumbnail, and set the DOM + * midori_view_speed_dial_save + * @view: a #MidoriView + * @message: message from JavaScript * - * message[0] == console message call - * message[1] == shortcut id in the DOM - * message[2] == shortcut uri + * Save speed_dial settings * **/ static void -midori_view_speed_dial_get_thumb (GtkWidget* web_view, - const gchar* message, - MidoriView* view) +midori_view_speed_dial_save (MidoriView* view, + const gchar* message) { - gchar** t_data = g_strsplit (message," ", 4); + gchar* action; + GKeyFile* key_file; + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view)); + gchar* msg = g_strdup (message + 16); + gchar** parts = g_strsplit (msg, " ", 4); - if (t_data[1] == NULL || t_data[2] == NULL ) - return; + g_object_get (browser, "speed-dial", &key_file, NULL); + action = parts[0]; + + if (g_str_equal (action, "add") || g_str_equal (action, "rename") + || g_str_equal (action, "delete") || g_str_equal (action, "swap")) + { + gchar* tmp = g_strdup (parts[1] + 1); + guint slot_id = atoi (tmp); + gchar* dial_id = g_strdup_printf ("Dial %d", slot_id); + g_free (tmp); + + + if (g_str_equal (action, "delete")) + { + gchar* uri = g_key_file_get_string (key_file, dial_id, "uri", NULL); + gchar* file_path = sokoke_build_thumbnail_path (uri); + + g_key_file_remove_group (key_file, dial_id, NULL); + g_unlink (file_path); + + g_free (uri); + g_free (file_path); + } + else if (g_str_equal (action, "add")) + { + g_key_file_set_string (key_file, dial_id, "uri", parts[2]); + midori_view_speed_dial_get_thumb (view, dial_id, parts[2]); + } + else if (g_str_equal (action, "rename")) + { + guint offset = strlen (parts[0]) + strlen (parts[1]) + 2; + gchar* title = g_strdup (msg + offset); + g_key_file_set_string (key_file, dial_id, "title", title); + g_free (title); + } + else if (g_str_equal (action, "swap")) + { + gchar* tmp1 = g_strdup (parts[2] + 1); + guint slot2_id = atoi (tmp1); + gchar* dial2_id = g_strdup_printf ("Dial %d", slot2_id); + gchar* uri, *uri2, *title, *title2; + g_free (tmp1); + + uri = g_key_file_get_string (key_file, dial_id, "uri", NULL); + title = g_key_file_get_string (key_file, dial_id, "title", NULL); + uri2 = g_key_file_get_string (key_file, dial2_id, "uri", NULL); + title2 = g_key_file_get_string (key_file, dial2_id, "title", NULL); + + g_key_file_set_string (key_file, dial_id, "uri", uri2); + g_key_file_set_string (key_file, dial2_id, "uri", uri); + g_key_file_set_string (key_file, dial_id, "title", title2); + g_key_file_set_string (key_file, dial2_id, "title", title); - midori_view_speed_dial_inject_thumb (view, NULL, - g_strdup (t_data[1]), g_strdup (t_data[2])); - g_strfreev (t_data); + g_free (uri); + g_free (uri2); + g_free (title); + g_free (title2); + g_free (dial2_id); + } + + g_free (dial_id); + } + + midori_view_save_speed_dial_config (view, key_file); + + g_free (msg); + g_free (action); } -/** - * midori_view_speed_dial_save - * @web_view: a #WebkitView - * - * Save speed_dial DOM structure to body template - * - **/ -static void -midori_view_speed_dial_save (GtkWidget* web_view, - const gchar* message) +void +midori_view_save_speed_dial_config (MidoriView* view, + GKeyFile* key_file) { - gchar* json = g_strdup (message + 15); - gchar* fname = g_build_filename (sokoke_set_config_dir (NULL), - "speeddial.json", NULL); - - GRegex* reg_double = g_regex_new ("\\\\\"", 0, 0, NULL); - gchar* safe = g_regex_replace_literal (reg_double, json, -1, 0, "\\\\\"", 0, NULL); - g_file_set_contents (fname, safe, -1, NULL); - - g_free (fname); - g_free (json); - g_free (safe); - g_regex_unref (reg_double); + gchar* config_file; + guint i = 0; + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view)); + GtkWidget* tab; + + config_file = g_build_filename (sokoke_set_config_dir (NULL), "speeddial", NULL); + sokoke_key_file_save_to_file (key_file, config_file, NULL); + g_free (config_file); + + katze_assign (speeddial_markup, prepare_speed_dial_html (view, FALSE)); + + while ((tab = midori_browser_get_nth_tab (browser, i++))) + if (midori_view_is_blank (MIDORI_VIEW (tab))) + midori_view_reload (MIDORI_VIEW (tab), FALSE); + } diff -Nru midori-0.2.8/midori/midori-view.h midori-0.4.6/midori/midori-view.h --- midori-0.2.8/midori/midori-view.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/midori-view.h 2012-05-14 22:13:42.000000000 +0000 @@ -18,18 +18,11 @@ G_BEGIN_DECLS -typedef enum -{ - MIDORI_LOAD_PROVISIONAL, - MIDORI_LOAD_COMMITTED, - MIDORI_LOAD_FINISHED -} MidoriLoadStatus; - -GType -midori_load_status_get_type (void) G_GNUC_CONST; - -#define MIDORI_TYPE_LOAD_STATUS \ - (midori_load_status_get_type ()) +#define MIDORI_LOAD_PROVISIONAL WEBKIT_LOAD_PROVISIONAL +#define MIDORI_LOAD_COMMITTED WEBKIT_LOAD_COMMITTED +#define MIDORI_LOAD_FINISHED WEBKIT_LOAD_FINISHED +#define MidoriLoadStatus WebKitLoadStatus +#define MIDORI_TYPE_LOAD_STATUS WEBKIT_TYPE_LOAD_STATUS typedef enum { @@ -81,8 +74,12 @@ midori_view_new (KatzeNet* net); GtkWidget* -midori_view_new_with_uri (const gchar* uri, - const gchar* title, +midori_view_new_with_title (const gchar* title, + MidoriWebSettings* settings, + gboolean append); + +GtkWidget* +midori_view_new_with_item (KatzeItem* item, MidoriWebSettings* settings); void @@ -99,6 +96,10 @@ midori_view_set_uri (MidoriView* view, const gchar* uri); +void +midori_view_set_overlay_text (MidoriView* view, + const gchar* text); + gboolean midori_view_is_blank (MidoriView* view); @@ -182,6 +183,14 @@ void midori_view_go_forward (MidoriView* view); + +void midori_view_go_back_or_forward (MidoriView* view, + gint steps); + +gboolean +midori_view_can_go_back_or_forward (MidoriView* view, + gint steps); + const gchar* midori_view_get_previous_page (MidoriView* view); @@ -198,6 +207,14 @@ midori_view_can_view_source (MidoriView* view); gboolean +midori_view_can_save (MidoriView* view); + +gchar* +midori_view_save_source (MidoriView* view, + const gchar* uri, + const gchar* outfile); + +gboolean midori_view_can_find (MidoriView* view); void @@ -231,6 +248,9 @@ GtkWidget* midori_view_get_web_view (MidoriView* view); +MidoriView* +midori_view_get_for_widget (GtkWidget* web_view); + MidoriSecurity midori_view_get_security (MidoriView* view); @@ -239,6 +259,18 @@ GtkWidget* menu, gboolean manual); +GtkWidget* +midori_view_add_info_bar (MidoriView* view, + GtkMessageType message_type, + const gchar* message, + GCallback response_cb, + gpointer user_data, + const gchar* first_button_text, + ...); + +void +midori_view_save_speed_dial_config (MidoriView* view, + GKeyFile* key_file); G_END_DECLS diff -Nru midori-0.2.8/midori/midori-websettings.c midori-0.4.6/midori/midori-websettings.c --- midori-0.2.8/midori/midori-websettings.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/midori-websettings.c 2012-05-14 22:13:42.000000000 +0000 @@ -1,5 +1,6 @@ /* Copyright (C) 2008-2010 Christian Dywan + Copyright (C) 2011 Peter Hatina This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -12,17 +13,23 @@ #include "midori-websettings.h" #include "sokoke.h" +#include /* Vala API */ #include +#include #include -#if HAVE_CONFIG_H - #include +#include +#if HAVE_UNISTD_H + #include #endif - #if defined (G_OS_UNIX) #include #endif +#if defined(__FreeBSD__) + #include + #include +#endif struct _MidoriWebSettings { @@ -34,25 +41,18 @@ gboolean show_navigationbar : 1; gboolean show_bookmarkbar : 1; gboolean show_panel : 1; - gboolean show_transferbar : 1; gboolean show_statusbar : 1; MidoriToolbarStyle toolbar_style : 3; - gboolean progress_in_location : 1; - gboolean search_engines_in_completion : 1; gboolean compact_sidepanel : 1; - gboolean show_panel_controls : 1; gboolean right_align_sidepanel : 1; gboolean open_panels_in_windows : 1; MidoriStartup load_on_startup : 2; gboolean show_crash_dialog : 1; - gboolean speed_dial_in_new_tabs : 1; - gboolean ask_for_destination_folder : 1; - gboolean notify_transfer_completed : 1; MidoriPreferredEncoding preferred_encoding : 3; gboolean always_show_tabbar : 1; gboolean close_buttons_on_tabs : 1; + gint close_buttons_left; MidoriNewPage open_new_pages_in : 2; - MidoriNewPage open_external_pages_in : 2; gboolean middle_click_opens_selection : 1; gboolean open_tabs_in_the_background : 1; gboolean open_tabs_next_to_current : 1; @@ -60,10 +60,8 @@ gboolean zoom_text_and_images : 1; gboolean find_while_typing : 1; gboolean kinetic_scrolling : 1; - MidoriAcceptCookies accept_cookies : 2; - gboolean original_cookies_only : 1; + gboolean first_party_cookies_only : 1; gboolean remember_last_visited_pages : 1; - gboolean remember_last_downloaded_files : 1; MidoriProxy proxy_type : 2; MidoriIdentity identify_as : 3; @@ -74,19 +72,34 @@ gint last_web_search; gint maximum_cookie_age; gint maximum_history_age; + gint search_width; gchar* toolbar_items; gchar* homepage; gchar* download_folder; - gchar* download_manager; gchar* text_editor; gchar* news_aggregator; gchar* location_entry_search; gchar* http_proxy; + gint http_proxy_port; + #if WEBKIT_CHECK_VERSION (1, 3, 11) + gint maximum_cache_size; + #endif gchar* http_accept_language; gchar* ident_string; gint clear_private_data; + gchar* clear_data; + gchar* site_data_rules; + #if !WEBKIT_CHECK_VERSION (1, 3, 13) + gboolean enable_dns_prefetching; + #endif + gboolean strip_referer; + gboolean enforce_font_family; + gboolean flash_window_on_bg_tabs; + gchar* user_stylesheet_uri; + gchar* user_stylesheet_uri_cached; + GHashTable* user_stylesheets; }; struct _MidoriWebSettingsClass @@ -112,26 +125,18 @@ PROP_SHOW_NAVIGATIONBAR, PROP_SHOW_BOOKMARKBAR, PROP_SHOW_PANEL, - PROP_SHOW_TRANSFERBAR, PROP_SHOW_STATUSBAR, PROP_TOOLBAR_STYLE, - PROP_PROGRESS_IN_LOCATION, - PROP_SEARCH_ENGINES_IN_COMPLETION, PROP_TOOLBAR_ITEMS, PROP_COMPACT_SIDEPANEL, - PROP_SHOW_PANEL_CONTROLS, PROP_RIGHT_ALIGN_SIDEPANEL, PROP_OPEN_PANELS_IN_WINDOWS, PROP_LOAD_ON_STARTUP, PROP_HOMEPAGE, PROP_SHOW_CRASH_DIALOG, - PROP_SPEED_DIAL_IN_NEW_TABS, PROP_DOWNLOAD_FOLDER, - PROP_ASK_FOR_DESTINATION_FOLDER, - PROP_NOTIFY_TRANSFER_COMPLETED, - PROP_DOWNLOAD_MANAGER, PROP_TEXT_EDITOR, PROP_NEWS_AGGREGATOR, PROP_LOCATION_ENTRY_SEARCH, @@ -139,17 +144,21 @@ PROP_ALWAYS_SHOW_TABBAR, PROP_CLOSE_BUTTONS_ON_TABS, + PROP_CLOSE_BUTTONS_LEFT, PROP_OPEN_NEW_PAGES_IN, - PROP_OPEN_EXTERNAL_PAGES_IN, PROP_MIDDLE_CLICK_OPENS_SELECTION, PROP_OPEN_TABS_IN_THE_BACKGROUND, PROP_OPEN_TABS_NEXT_TO_CURRENT, PROP_OPEN_POPUPS_IN_TABS, + PROP_FLASH_WINDOW_ON_BG_TABS, + PROP_ENABLE_WEBGL, + PROP_ENABLE_FULLSCREEN, PROP_AUTO_LOAD_IMAGES, PROP_ENABLE_SCRIPTS, PROP_ENABLE_PLUGINS, PROP_ENABLE_DEVELOPER_EXTRAS, + PROP_ENABLE_SPELL_CHECKING, PROP_ENABLE_HTML5_DATABASE, PROP_ENABLE_HTML5_LOCAL_STORAGE, PROP_ENABLE_OFFLINE_WEB_APPLICATION_CACHE, @@ -157,19 +166,28 @@ PROP_ZOOM_TEXT_AND_IMAGES, PROP_FIND_WHILE_TYPING, PROP_KINETIC_SCROLLING, - PROP_ACCEPT_COOKIES, PROP_MAXIMUM_COOKIE_AGE, + PROP_FIRST_PARTY_COOKIES_ONLY, PROP_MAXIMUM_HISTORY_AGE, - PROP_REMEMBER_LAST_DOWNLOADED_FILES, PROP_PROXY_TYPE, PROP_HTTP_PROXY, + PROP_HTTP_PROXY_PORT, + PROP_MAXIMUM_CACHE_SIZE, PROP_IDENTIFY_AS, PROP_USER_AGENT, PROP_PREFERRED_LANGUAGES, - PROP_CLEAR_PRIVATE_DATA + PROP_CLEAR_PRIVATE_DATA, + PROP_CLEAR_DATA, + PROP_SITE_DATA_RULES, + PROP_ENABLE_DNS_PREFETCHING, + PROP_STRIP_REFERER, + PROP_ENFORCE_FONT_FAMILY, + PROP_USER_STYLESHEET_URI, + + PROP_SEARCH_WIDTH, }; GType @@ -197,12 +215,10 @@ if (!type) { static const GEnumValue values[] = { - { MIDORI_STARTUP_BLANK_PAGE, "MIDORI_STARTUP_BLANK_PAGE", N_("Show Blank page") }, + { MIDORI_STARTUP_BLANK_PAGE, "MIDORI_STARTUP_BLANK_PAGE", N_("Show Speed Dial") }, { MIDORI_STARTUP_HOMEPAGE, "MIDORI_STARTUP_HOMEPAGE", N_("Show Homepage") }, { MIDORI_STARTUP_LAST_OPEN_PAGES, "MIDORI_STARTUP_LAST_OPEN_PAGES", N_("Show last open tabs") }, - #if WEBKIT_CHECK_VERSION (1, 1, 6) { MIDORI_STARTUP_DELAYED_PAGES, "MIDORI_STARTUP_DELAYED_PAGES", N_("Show last tabs without loading") }, - #endif { 0, NULL, NULL } }; type = g_enum_register_static ("MidoriStartup", values); @@ -217,7 +233,8 @@ if (!type) { static const GEnumValue values[] = { - { MIDORI_ENCODING_CHINESE, "MIDORI_ENCODING_CHINESE", N_("Chinese (BIG5)") }, + { MIDORI_ENCODING_CHINESE, "MIDORI_ENCODING_CHINESE", N_("Chinese Traditional (BIG5)") }, + { MIDORI_ENCODING_CHINESE_SIMPLIFIED, "MIDORI_ENCODING_CHINESE_SIMPLIFIED", N_("Chinese Simplified (GB18030)") }, { 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)") }, @@ -286,30 +303,14 @@ } GType -midori_accept_cookies_get_type (void) -{ - static GType type = 0; - if (!type) - { - static const GEnumValue values[] = { - { MIDORI_ACCEPT_COOKIES_ALL, "MIDORI_ACCEPT_COOKIES_ALL", N_("All cookies") }, - { MIDORI_ACCEPT_COOKIES_SESSION, "MIDORI_ACCEPT_COOKIES_SESSION", N_("Session cookies") }, - { MIDORI_ACCEPT_COOKIES_NONE, "MIDORI_ACCEPT_COOKIES_NONE", N_("None") }, - { 0, NULL, NULL } - }; - type = g_enum_register_static ("MidoriAcceptCookies", values); - } - return type; -} - -GType midori_identity_get_type (void) { static GType type = 0; if (!type) { static const GEnumValue values[] = { - { MIDORI_IDENT_MIDORI, "MIDORI_IDENT_MIDORI", N_("Midori") }, + { MIDORI_IDENT_MIDORI, "MIDORI_IDENT_MIDORI", N_("_Automatic") }, + { MIDORI_IDENT_GENUINE, "MIDORI_IDENT_GENUINE", N_("Midori") }, { MIDORI_IDENT_SAFARI, "MIDORI_IDENT_SAFARI", N_("Safari") }, { MIDORI_IDENT_IPHONE, "MIDORI_IDENT_IPHONE", N_("iPhone") }, { MIDORI_IDENT_FIREFOX, "MIDORI_IDENT_FIREFOX", N_("Firefox") }, @@ -348,6 +349,37 @@ } return g_get_home_dir (); } +static gboolean +midori_web_settings_low_memory_profile () +{ +#ifdef _WIN32 + /* See http://msdn.microsoft.com/en-us/library/windows/desktop/aa366589(v=vs.85).aspx */ + MEMORYSTATUSEX mem; + mem.dwLength = sizeof (mem); + if (GlobalMemoryStatusEx (&mem)) + return mem.ullTotalPhys / 1024 / 1024 < 352; +#elif defined(__FreeBSD__) + size_t size; + int mem_total; + size = sizeof mem_total; + + sysctlbyname("hw.realmem", &mem_total, &size, NULL, 0); + + return mem_total / 1048576 < 352; +#else + gchar* contents; + const gchar* total; + if (!g_file_get_contents ("/proc/meminfo", &contents, NULL, NULL)) + return FALSE; + if (contents && (total = strstr (contents, "MemTotal:")) && *total) + { + const gchar* value = katze_skip_whitespace (total + 9); + gdouble mem_total = g_ascii_strtoll (value, NULL, 0); + return mem_total / 1024.0 < 352 + 1; + } +#endif + return FALSE; +} static void midori_web_settings_class_init (MidoriWebSettingsClass* class) @@ -378,7 +410,7 @@ _("Last window width"), _("The last saved window width"), 0, G_MAXINT, 0, - flags)); + flags | MIDORI_PARAM_DELAY_SAVING)); g_object_class_install_property (gobject_class, PROP_LAST_WINDOW_HEIGHT, @@ -387,7 +419,7 @@ _("Last window height"), _("The last saved window height"), 0, G_MAXINT, 0, - flags)); + flags | MIDORI_PARAM_DELAY_SAVING)); /** * MidoriWebSettings:last-window-state: @@ -404,7 +436,7 @@ "The last saved window state", MIDORI_TYPE_WINDOW_STATE, MIDORI_WINDOW_NORMAL, - flags)); + flags | MIDORI_PARAM_DELAY_SAVING)); g_object_class_install_property (gobject_class, PROP_LAST_PANEL_POSITION, @@ -413,7 +445,7 @@ _("Last panel position"), _("The last saved panel position"), 0, G_MAXINT, 0, - flags)); + flags | MIDORI_PARAM_DELAY_SAVING)); g_object_class_install_property (gobject_class, PROP_LAST_PANEL_PAGE, @@ -423,7 +455,7 @@ _("Last panel page"), _("The last saved panel page"), 0, G_MAXINT, 0, - flags)); + flags | MIDORI_PARAM_DELAY_SAVING)); g_object_class_install_property (gobject_class, PROP_LAST_WEB_SEARCH, @@ -441,7 +473,7 @@ "show-menubar", _("Show Menubar"), _("Whether to show the menubar"), - TRUE, + FALSE, flags)); g_object_class_install_property (gobject_class, @@ -471,22 +503,6 @@ FALSE, flags)); - /** - * MidoriWebSettings:show-transferbar: - * - * Whether to show the transferbar. - * - * Since: 0.1.5 - */ - g_object_class_install_property (gobject_class, - PROP_SHOW_TRANSFERBAR, - g_param_spec_boolean ( - "show-transferbar", - _("Show Transferbar"), - _("Whether to show the transferbar"), - TRUE, - flags)); - g_object_class_install_property (gobject_class, PROP_SHOW_STATUSBAR, g_param_spec_boolean ( @@ -507,45 +523,13 @@ MIDORI_TOOLBAR_DEFAULT, flags)); - /** - * MidoriWebSettings:progress-in-location: - * - * Whether to show loading progress in the location entry. - * - * Since: 0.1.3 - */ - g_object_class_install_property (gobject_class, - PROP_PROGRESS_IN_LOCATION, - g_param_spec_boolean ( - "progress-in-location", - _("Show progress in location entry"), - _("Whether to show loading progress in the location entry"), - TRUE, - flags)); - - /** - * MidoriWebSettings:search-engines-in-completion: - * - * Whether to show search engines in the location completion. - * - * Since: 0.1.6 - */ - g_object_class_install_property (gobject_class, - PROP_SEARCH_ENGINES_IN_COMPLETION, - g_param_spec_boolean ( - "search-engines-in-completion", - _("Search engines in location completion"), - _("Whether to show search engines in the location completion"), - TRUE, - flags)); - g_object_class_install_property (gobject_class, PROP_TOOLBAR_ITEMS, g_param_spec_string ( "toolbar-items", _("Toolbar Items"), _("The items to show on the toolbar"), - "TabNew,Back,Forward,Next,ReloadStop,Location,Panel,Search,Trash", + "TabNew,Back,Forward,Next,ReloadStop,BookmarkAdd,Location,Search,Trash,CompactMenu", flags)); g_object_class_install_property (gobject_class, @@ -558,22 +542,6 @@ flags)); /** - * MidoriWebSettings:show-panel-controls: - * - * Whether to show the operating controls of the panel. - * - * Since: 0.1.9 - */ - g_object_class_install_property (gobject_class, - PROP_SHOW_PANEL_CONTROLS, - g_param_spec_boolean ( - "show-panel-controls", - _("Show operating controls of the panel"), - _("Whether to show the operating controls of the panel"), - TRUE, - flags)); - - /** * MidoriWebSettings:right-sidepanel: * * Whether to align the sidepanel on the right. @@ -641,23 +609,6 @@ TRUE, flags)); - /** - * MidoriWebSettings:speed-dial-in-new-tabs: - * - * Show spee dial in newly opened tabs. - * - * Since: 0.1.7 - */ - g_object_class_install_property (gobject_class, - PROP_SPEED_DIAL_IN_NEW_TABS, - g_param_spec_boolean ( - "speed-dial-in-new-tabs", - /* i18n: Speed dial, webpage shortcuts, named for the phone function */ - _("Show speed dial in new tabs"), - _("Show speed dial in newly opened tabs"), - TRUE, - flags)); - g_object_class_install_property (gobject_class, PROP_DOWNLOAD_FOLDER, g_param_spec_string ( @@ -665,61 +616,6 @@ _("Save downloaded files to:"), _("The folder downloaded files are saved to"), midori_get_download_dir (), - #if WEBKIT_CHECK_VERSION (1, 1, 3) - flags)); - #else - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - #endif - - /** - * MidoriWebSettings:ask-for-destination-folder: - * - * Whether to ask for the destination folder when downloading a file. - * - * Note: Only since 0.2.0 is this value actually used. - * - * Since: 0.1.7 - */ - g_object_class_install_property (gobject_class, - PROP_ASK_FOR_DESTINATION_FOLDER, - g_param_spec_boolean ( - "ask-for-destination-folder", - _("Ask for the destination folder"), - _("Whether to ask for the destination folder when downloading a file"), - FALSE, - #if WEBKIT_CHECK_VERSION (1, 1, 15) - flags)); - #else - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - #endif - - /** - * MidoriWebSettings:notify-transfer-completed: - * - * Whether to show a notification when a transfer has been completed. - * - * Since: 0.1.7 - */ - g_object_class_install_property (gobject_class, - PROP_NOTIFY_TRANSFER_COMPLETED, - g_param_spec_boolean ( - "notify-transfer-completed", - _("Notify when a transfer has been completed"), - _("Whether to show a notification when a transfer has been completed"), - TRUE, - #if WEBKIT_CHECK_VERSION (1, 1, 3) - flags)); - #else - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - #endif - - g_object_class_install_property (gobject_class, - PROP_DOWNLOAD_MANAGER, - g_param_spec_string ( - "download-manager", - _("Download Manager"), - _("An external download manager"), - NULL, flags)); g_object_class_install_property (gobject_class, @@ -773,8 +669,13 @@ "always-show-tabbar", _("Always Show Tabbar"), _("Always show the tabbar"), - FALSE, - flags)); + TRUE, + #ifdef HAVE_GRANITE + G_PARAM_READABLE + #else + flags + #endif + )); g_object_class_install_property (gobject_class, PROP_CLOSE_BUTTONS_ON_TABS, @@ -785,6 +686,23 @@ TRUE, flags)); + /** + * MidoriWebSettings:close-buttons-left: + * + * Whether to show close buttons on the left side. + * + * Since: 0.3.1 + */ + g_object_class_install_property (gobject_class, + PROP_CLOSE_BUTTONS_LEFT, + g_param_spec_boolean ( + "close-buttons-left", + "Close buttons on the left", + "Whether to show close buttons on the left side", + FALSE, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property (gobject_class, PROP_OPEN_NEW_PAGES_IN, g_param_spec_enum ( @@ -796,16 +714,6 @@ flags)); g_object_class_install_property (gobject_class, - PROP_OPEN_EXTERNAL_PAGES_IN, - g_param_spec_enum ( - "open-external-pages-in", - _("Open external pages in:"), - _("Where to open externally opened pages"), - MIDORI_TYPE_NEW_PAGE, - MIDORI_NEW_PAGE_TAB, - flags)); - - g_object_class_install_property (gobject_class, PROP_MIDDLE_CLICK_OPENS_SELECTION, g_param_spec_boolean ( "middle-click-opens-selection", @@ -865,8 +773,8 @@ "enable-plugins", _("Enable Netscape plugins"), _("Enable embedded Netscape plugin objects"), - TRUE, - flags)); + midori_web_settings_has_plugin_support (), + midori_web_settings_has_plugin_support () ? flags : G_PARAM_READABLE)); /* Override properties to override defaults */ g_object_class_install_property (gobject_class, PROP_ENABLE_DEVELOPER_EXTRAS, @@ -876,7 +784,13 @@ "Enable special extensions for developers", TRUE, flags)); - #if WEBKIT_CHECK_VERSION (1, 1, 8) + g_object_class_install_property (gobject_class, + PROP_ENABLE_SPELL_CHECKING, + g_param_spec_boolean ("enable-spell-checking", + _("Enable Spell Checking"), + _("Enable spell checking while typing"), + TRUE, + flags)); g_object_class_install_property (gobject_class, PROP_ENABLE_HTML5_DATABASE, g_param_spec_boolean ("enable-html5-database", @@ -891,8 +805,6 @@ _("Whether to enable HTML5 local storage support"), FALSE, flags)); - #endif - #if WEBKIT_CHECK_VERSION (1, 1, 13) g_object_class_install_property (gobject_class, PROP_ENABLE_OFFLINE_WEB_APPLICATION_CACHE, g_param_spec_boolean ("enable-offline-web-application-cache", @@ -900,16 +812,43 @@ _("Whether to enable offline web application cache"), FALSE, flags)); - #endif #if WEBKIT_CHECK_VERSION (1, 1, 18) g_object_class_install_property (gobject_class, PROP_ENABLE_PAGE_CACHE, g_param_spec_boolean ("enable-page-cache", "Enable page cache", "Whether the page cache should be used", - TRUE, + !midori_web_settings_low_memory_profile (), flags)); #endif + g_object_class_install_property (gobject_class, + PROP_FLASH_WINDOW_ON_BG_TABS, + g_param_spec_boolean ( + "flash-window-on-new-bg-tabs", + _("Flash window on background tabs"), + _("Flash the browser window if a new tab was opened in the background"), + FALSE, + flags)); + if (g_object_class_find_property (gobject_class, "enable-webgl")) + g_object_class_install_property (gobject_class, + PROP_ENABLE_WEBGL, + g_param_spec_boolean ( + "enable-webgl", + _("Enable WebGL support"), + _("Allow websites to use OpenGL rendering"), + /* Enable by default for git builds */ + !g_str_equal (PACKAGE_VERSION, MIDORI_VERSION), + flags)); + if (g_object_class_find_property (gobject_class, "enable-fullscreen")) + g_object_class_install_property (gobject_class, + PROP_ENABLE_FULLSCREEN, + g_param_spec_boolean ( + "enable-fullscreen", + "Enable Fullscreen", + "Allow experimental fullscreen API", + TRUE, + flags)); + /** * MidoriWebSettings:zoom-text-and-images: @@ -960,45 +899,46 @@ flags)); g_object_class_install_property (gobject_class, - PROP_ACCEPT_COOKIES, - g_param_spec_enum ( - "accept-cookies", - _("Accept cookies"), - _("What type of cookies to accept"), - MIDORI_TYPE_ACCEPT_COOKIES, - MIDORI_ACCEPT_COOKIES_ALL, - flags)); - - g_object_class_install_property (gobject_class, PROP_MAXIMUM_COOKIE_AGE, g_param_spec_int ( "maximum-cookie-age", - _("Maximum cookie age"), + _("Delete old Cookies after:"), _("The maximum number of days to save cookies for"), 0, G_MAXINT, 30, flags)); + /** + * MidoriWebSettings:first-party-cookies-only: + * + * Whether only first party cookies should be accepted. + * WebKitGTK+ 1.1.21 is required for this to work. + * + * Since: 0.4.2 + */ + g_object_class_install_property (gobject_class, + PROP_FIRST_PARTY_COOKIES_ONLY, + g_param_spec_boolean ( + "first-party-cookies-only", + _("Only accept Cookies from sites you visit"), + _("Block cookies sent by third-party websites"), + #ifdef HAVE_LIBSOUP_2_29_91 + TRUE, + g_object_class_find_property (gobject_class, /* WebKitGTK+ >= 1.1.21 */ + "enable-file-access-from-file-uris") ? flags : G_PARAM_READABLE)); + #else + FALSE, + G_PARAM_READABLE)); + #endif g_object_class_install_property (gobject_class, PROP_MAXIMUM_HISTORY_AGE, g_param_spec_int ( "maximum-history-age", - _("Maximum history age"), + _("Delete pages from history after:"), _("The maximum number of days to save the history for"), 0, G_MAXINT, 30, flags)); - g_object_class_install_property (gobject_class, - PROP_REMEMBER_LAST_DOWNLOADED_FILES, - g_param_spec_boolean ( - "remember-last-downloaded-files", - _("Remember last downloaded files"), - _("Whether the last downloaded files are saved"), - TRUE, - flags)); - - - /** * MidoriWebSettings:proxy-type: * @@ -1026,6 +966,41 @@ flags)); /** + * MidoriWebSettings:http-proxy-port: + * + * The proxy server port used for HTTP connections + * + * Since: 0.4.2 + */ + g_object_class_install_property (gobject_class, + PROP_HTTP_PROXY_PORT, + g_param_spec_int ( + "http-proxy-port", + _("Port"), + _("The proxy server port used for HTTP connections"), + 1, 65535, 8080, + flags + )); + + #if WEBKIT_CHECK_VERSION (1, 3, 11) + /** + * MidoriWebSettings:maximum-cache-size: + * + * The maximum size of cached pages on disk. + * + * Since: 0.3.4 + */ + g_object_class_install_property (gobject_class, + PROP_MAXIMUM_CACHE_SIZE, + g_param_spec_int ( + "maximum-cache-size", + _("Web Cache"), + _("The maximum size of cached pages on disk"), + 0, G_MAXINT, 100, + flags)); + #endif + + /** * MidoriWebSettings:identify-as: * * What to identify as to web pages. @@ -1062,7 +1037,8 @@ /** * MidoriWebSettings:preferred-languages: * - * A comma separated list of languages preferred for rendering multilingual webpages. + * A comma separated list of languages preferred for rendering multilingual + * webpages and spell checking. * * Since: 0.2.3 */ @@ -1078,7 +1054,7 @@ /** * MidoriWebSettings:clear-private-data: * - * The private data selected for deletion. + * The core data selected for deletion. * * Since: 0.1.7 */ @@ -1091,6 +1067,112 @@ 0, G_MAXINT, 0, flags)); + /** + * MidoriWebSettings:clear-data: + * + * The data selected for deletion, including extensions. + * + * Since: 0.2.9 + */ + g_object_class_install_property (gobject_class, + PROP_CLEAR_DATA, + g_param_spec_string ( + "clear-data", + _("Clear data"), + _("The data selected for deletion"), + NULL, + flags)); + /** + * MidoriWebSettings:site-data-rules: + * + * Rules for accepting, denying and preserving cookies and other data. + * See midori_web_settings_get_site_data_policy() for details. + * + * Since: 0.4.4 + */ + g_object_class_install_property (gobject_class, + PROP_SITE_DATA_RULES, + g_param_spec_string ( + "site-data-rules", + "Rules for accepting, denying and preserving cookies and other data", + "Cookies, HTML5 databases, local storage and application cache blocking", + NULL, + flags)); + #if !WEBKIT_CHECK_VERSION (1, 3, 13) + /** + * MidoriWebSettings:enable-dns-prefetching: + * + * Whether to resolve host names in advance. + * + * Since: 0.3.4 + */ + g_object_class_install_property (gobject_class, + PROP_ENABLE_DNS_PREFETCHING, + g_param_spec_boolean ( + "enable-dns-prefetching", + "Whether to resolve host names in advance", + "Whether host names on a website or in bookmarks should be prefetched", + TRUE, + flags)); + #endif + + /** + * MidoriWebSettings:strip-referer: + * + * Whether to strip referrer details sent to external sites. + * + * Since: 0.3.4 + */ + g_object_class_install_property (gobject_class, + PROP_STRIP_REFERER, + g_param_spec_boolean ( + "strip-referer", + /* i18n: Reworded: Shorten details propagated when going to another page */ + _("Strip referrer details sent to websites"), + /* i18n: Referer here is not a typo but a technical term */ + _("Whether the \"Referer\" header should be shortened to the hostname"), + FALSE, + flags)); + /** + * MidoriWebSettings:enforc-font-family: + * + * Whether to enforce user font preferences with an internal stylesheet. + * + * Since: 0.4.2 + */ + g_object_class_install_property (gobject_class, + PROP_ENFORCE_FONT_FAMILY, + g_param_spec_boolean ( + "enforce-font-family", + _("Always use my font choices"), + _("Override fonts picked by websites with user preferences"), + FALSE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_USER_STYLESHEET_URI, + g_param_spec_string ( + "user-stylesheet-uri", + "User stylesheet URI", + "Load stylesheets from a local URI", + NULL, + flags | MIDORI_PARAM_DELAY_SAVING)); + + /** + * MidoriWebSettings:search-entry-width: + * + * Search action width in pixels + * + * Since: 0.4.3 + **/ + g_object_class_install_property (gobject_class, + PROP_SEARCH_WIDTH, + g_param_spec_int ( + "search-width", + "Search action width", + "Search action width in pixels", + 10, G_MAXINT, 200, + flags | MIDORI_PARAM_DELAY_SAVING)); } static void @@ -1107,6 +1189,8 @@ encoding = string ? string : ""; if (!strcmp (encoding, "BIG5")) web_settings->preferred_encoding = MIDORI_ENCODING_CHINESE; + else if (!strcmp (encoding, "GB18030")) + web_settings->preferred_encoding = MIDORI_ENCODING_CHINESE_SIMPLIFIED; else if (!strcmp (encoding, "SHIFT_JIS")) web_settings->preferred_encoding = MIDORI_ENCODING_JAPANESE; else if (!strcmp (encoding, "EUC-KR")) @@ -1124,18 +1208,40 @@ } static void +notify_default_font_family_cb (GObject* object, + GParamSpec* pspec) +{ + if (katze_object_get_boolean (object, "enforce-font-family")) + g_object_set (object, "enforce-font-family", TRUE, NULL); +} +static void midori_web_settings_init (MidoriWebSettings* web_settings) { - web_settings->notify_transfer_completed = TRUE; web_settings->download_folder = g_strdup (midori_get_download_dir ()); web_settings->http_proxy = NULL; - web_settings->show_panel_controls = TRUE; web_settings->open_popups_in_tabs = TRUE; - web_settings->remember_last_downloaded_files = TRUE; web_settings->kinetic_scrolling = TRUE; + web_settings->user_stylesheet_uri = web_settings->user_stylesheet_uri_cached = NULL; + web_settings->user_stylesheets = NULL; + + #if WEBKIT_CHECK_VERSION (1, 2, 6) && !WEBKIT_CHECK_VERSION (1, 2, 8) + /* Shadows are very slow with WebKitGTK+ 1.2.7 */ + midori_web_settings_add_style (web_settings, "box-shadow-workaround", + "* { -webkit-box-shadow: none !important; }"); + #endif + + #if defined (_WIN32) && WEBKIT_CHECK_VERSION (1, 7, 1) + /* Try to work-around black borders on native widgets and GTK+2 on Win32 */ + midori_web_settings_add_style (web_settings, "black-widgets-workaround", + "input[type='checkbox'] { -webkit-appearance: checkbox !important }" + " input[type='radio'] { -webkit-appearance: radio !important }" + " * { -webkit-appearance: none !important }"); + #endif g_signal_connect (web_settings, "notify::default-encoding", G_CALLBACK (notify_default_encoding_cb), NULL); + g_signal_connect (web_settings, "notify::default-font-family", + G_CALLBACK (notify_default_font_family_cb), NULL); } static void @@ -1148,95 +1254,201 @@ katze_assign (web_settings->toolbar_items, NULL); katze_assign (web_settings->homepage, NULL); katze_assign (web_settings->download_folder, NULL); - katze_assign (web_settings->download_manager, NULL); katze_assign (web_settings->text_editor, NULL); katze_assign (web_settings->news_aggregator, NULL); katze_assign (web_settings->location_entry_search, NULL); katze_assign (web_settings->http_proxy, NULL); katze_assign (web_settings->ident_string, NULL); + katze_assign (web_settings->user_stylesheet_uri, NULL); + katze_assign (web_settings->user_stylesheet_uri_cached, NULL); + if (web_settings->user_stylesheets != NULL) + g_hash_table_destroy (web_settings->user_stylesheets); G_OBJECT_CLASS (midori_web_settings_parent_class)->finalize (object); } -#if defined (G_OS_UNIX) && !HAVE_OSX +/** + * midori_web_settings_has_plugin_support: + * + * Determines if Netscape plugins are supported. + * + * Returns: %TRUE if Netscape plugins can be used + * + * Since: 0.4.4 + **/ +gboolean +midori_web_settings_has_plugin_support (void) +{ + #ifdef G_OS_WIN32 + return FALSE; + #else + return g_getenv ("MIDORI_UNARMED") == NULL + && g_strcmp0 (g_getenv ("MOZ_PLUGIN_PATH"), "/"); + #endif +} + +/** + * midori_web_settings_get_site_data_policy: + * + * Tests if @uri may store site data. + * + * Returns: a #MidoriSiteDataPolicy + * + * Since: 0.4.4 + **/ +MidoriSiteDataPolicy +midori_web_settings_get_site_data_policy (MidoriWebSettings* settings, + const gchar* uri) +{ + MidoriSiteDataPolicy policy = MIDORI_SITE_DATA_UNDETERMINED; + gchar* hostname; + const gchar* match; + + g_return_val_if_fail (MIDORI_IS_WEB_SETTINGS (settings), policy); + + if (!(settings->site_data_rules && *settings->site_data_rules)) + return policy; + + /* + * Values prefixed with "-" are always blocked + * Values prefixed with "+" are always accepted + * Values prefixed with "!" are not cleared in Clear Private Data + * FIXME: "*" is a wildcard + * FIXME: indicate type of storage the rule applies to + * FIXME: support matching of the whole URI + **/ + hostname = midori_uri_parse_hostname (uri, NULL); + match = strstr (settings->site_data_rules, hostname ? hostname : uri); + if (match != NULL && match != settings->site_data_rules) + { + const gchar* prefix = match - 1; + if (*prefix == '-') + policy = MIDORI_SITE_DATA_BLOCK; + else if (*prefix == '+') + policy = MIDORI_SITE_DATA_ACCEPT; + else if (*prefix == '!') + policy = MIDORI_SITE_DATA_PRESERVE; + else + g_warning ("%s: Matched with no prefix '%s'", G_STRFUNC, match); + } + g_free (hostname); + return policy; +} + +#if (!HAVE_OSX && defined (G_OS_UNIX)) || defined (G_OS_WIN32) static gchar* -get_sys_name (void) +get_sys_name (gchar** architecture) { static gchar* sys_name = NULL; + static gchar* sys_architecture = NULL; if (!sys_name) { + #ifdef G_OS_WIN32 + /* 6.1 Win7, 6.0 Vista, 5.1 XP and 5.0 Win2k */ + guint version = g_win32_get_windows_version (); + sys_name = g_strdup_printf ("NT %d.%d", LOBYTE (version), HIBYTE (version)); + #else struct utsname name; if (uname (&name) != -1) - sys_name = g_strdup(name.sysname); + { + sys_name = g_strdup (name.sysname); + sys_architecture = g_strdup (name.machine); + } else - sys_name = "Unix"; + sys_name = "Linux"; + #endif } + + if (architecture != NULL) + *architecture = sys_architecture; return sys_name; } #endif -static gchar* -generate_ident_string (MidoriIdentity identify_as) -{ - const gchar* platform = - #ifdef GDK_WINDOWING_X11 - "X11"; - #elif defined(GDK_WINDOWING_WIN32) +/** + * midori_web_settings_get_system_name: + * @architecture: location of a string, or %NULL + * @platform: location of a string, or %NULL + * + * Determines the system name, architecture and platform. + * @architecturce can have a %NULL value. + * + * Returns: a string + * + * Since: 0.4.2 + **/ +const gchar* +midori_web_settings_get_system_name (gchar** architecture, + gchar** platform) +{ + if (architecture != NULL) + *architecture = NULL; + + if (platform != NULL) + *platform = + #if HAVE_HILDON + "Maemo;" + #elif defined (G_OS_WIN32) "Windows"; #elif defined(GDK_WINDOWING_QUARTZ) - "Macintosh"; + "Macintosh;"; #elif defined(GDK_WINDOWING_DIRECTFB) - "DirectFB"; + "DirectFB;"; #else - "Unknown"; + "X11;"; #endif - const gchar* os = + return #if HAVE_OSX "Mac OS X"; - #elif defined (G_OS_UNIX) - get_sys_name (); - #elif defined (G_OS_WIN32) - "Windows"; + #elif defined (G_OS_UNIX) || defined (G_OS_WIN32) + get_sys_name (architecture); #else - "Unknown"; + "Linux"; #endif +} +static gchar* +generate_ident_string (MidoriWebSettings* web_settings, + MidoriIdentity identify_as) +{ const gchar* appname = "Midori/" G_STRINGIFY (MIDORI_MAJOR_VERSION) "." G_STRINGIFY (MIDORI_MINOR_VERSION); const gchar* lang = pango_language_to_string (gtk_get_default_language ()); + gchar* platform; + const gchar* os = midori_web_settings_get_system_name (NULL, &platform); - #ifndef WEBKIT_USER_AGENT_MAJOR_VERSION - #define WEBKIT_USER_AGENT_MAJOR_VERSION 532 - #define WEBKIT_USER_AGENT_MINOR_VERSION 1 - #endif const int webcore_major = WEBKIT_USER_AGENT_MAJOR_VERSION; const int webcore_minor = WEBKIT_USER_AGENT_MINOR_VERSION; + #if WEBKIT_CHECK_VERSION (1, 1, 18) + g_object_set (web_settings, "enable-site-specific-quirks", + identify_as != MIDORI_IDENT_GENUINE, NULL); + #endif + switch (identify_as) { + case MIDORI_IDENT_GENUINE: + return g_strdup_printf ("Mozilla/5.0 (%s %s) AppleWebKit/%d.%d+ %s", + platform, os, webcore_major, webcore_minor, appname); case MIDORI_IDENT_MIDORI: - return g_strdup_printf ("%s (%s; %s; U; %s) WebKit/%d.%d+", - appname, platform, os, lang, webcore_major, webcore_minor); case MIDORI_IDENT_SAFARI: - return g_strdup_printf ("Mozilla/5.0 (%s; U; %s; %s) " - "AppleWebKit/%d+ (KHTML, like Gecko) Safari/%d.%d+ %s", - platform, os, lang, webcore_major, webcore_major, webcore_minor, appname); + g_object_set (web_settings, "enable-site-specific-quirks", TRUE, NULL); + return g_strdup_printf ("Mozilla/5.0 (Macintosh; U; Intel Mac OS X; %s) " + "AppleWebKit/%d+ (KHTML, like Gecko) Version/5.0 Safari/%d.%d+ %s", + lang, webcore_major, webcore_major, webcore_minor, appname); case MIDORI_IDENT_IPHONE: - return g_strdup_printf ("Mozilla/5.0 (iPhone; U; %s; %s) " - "AppleWebKit/532+ (KHTML, like Gecko) Version/3.0 Mobile/1A538b " - "Safari/419.3 %s", - os, lang, appname); + return g_strdup_printf ("Mozilla/5.0 (iPhone; U; CPU like Mac OS X; %s) " + "AppleWebKit/532+ (KHTML, like Gecko) Version/3.0 Mobile/1A538b Safari/419.3 %s", + lang, appname); case MIDORI_IDENT_FIREFOX: - return g_strdup_printf ("Mozilla/5.0 (%s; U; %s; %s; rv:1.9.0.2) " - "Gecko/2008092313 Firefox/3.8 %s", - platform, os, lang, appname); + return g_strdup_printf ("Mozilla/5.0 (%s %s; rv:2.0.1) Gecko/20100101 Firefox/4.0.1 %s", + platform, os, appname); case MIDORI_IDENT_EXPLORER: - return g_strdup_printf ("Mozilla/4.0 (compatible; " - "MSIE 6.0; Windows NT 5.1; %s) %s", + return g_strdup_printf ("Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; %s) %s", lang, appname); default: return g_strdup_printf ("%s", appname); @@ -1244,6 +1456,14 @@ } static void +midori_web_settings_process_stylesheets (MidoriWebSettings* settings, + gint delta_len); + +static void +base64_space_pad (gchar* base64, + guint len); + +static void midori_web_settings_set_property (GObject* object, guint prop_id, const GValue* value, @@ -1287,9 +1507,6 @@ case PROP_SHOW_PANEL: web_settings->show_panel = g_value_get_boolean (value); break; - case PROP_SHOW_TRANSFERBAR: - web_settings->show_transferbar = g_value_get_boolean (value); - break; case PROP_SHOW_STATUSBAR: web_settings->show_statusbar = g_value_get_boolean (value); break; @@ -1297,21 +1514,12 @@ case PROP_TOOLBAR_STYLE: web_settings->toolbar_style = g_value_get_enum (value); break; - case PROP_PROGRESS_IN_LOCATION: - web_settings->progress_in_location = g_value_get_boolean (value); - break; - case PROP_SEARCH_ENGINES_IN_COMPLETION: - web_settings->search_engines_in_completion = g_value_get_boolean (value); - break; case PROP_TOOLBAR_ITEMS: katze_assign (web_settings->toolbar_items, g_value_dup_string (value)); break; case PROP_COMPACT_SIDEPANEL: web_settings->compact_sidepanel = g_value_get_boolean (value); break; - case PROP_SHOW_PANEL_CONTROLS: - web_settings->show_panel_controls = g_value_get_boolean (value); - break; case PROP_RIGHT_ALIGN_SIDEPANEL: web_settings->right_align_sidepanel = g_value_get_boolean (value); break; @@ -1328,21 +1536,9 @@ case PROP_SHOW_CRASH_DIALOG: web_settings->show_crash_dialog = g_value_get_boolean (value); break; - case PROP_SPEED_DIAL_IN_NEW_TABS: - web_settings->speed_dial_in_new_tabs = g_value_get_boolean (value); - break; case PROP_DOWNLOAD_FOLDER: katze_assign (web_settings->download_folder, g_value_dup_string (value)); break; - case PROP_ASK_FOR_DESTINATION_FOLDER: - web_settings->ask_for_destination_folder = g_value_get_boolean (value); - break; - case PROP_NOTIFY_TRANSFER_COMPLETED: - web_settings->notify_transfer_completed = g_value_get_boolean (value); - break; - case PROP_DOWNLOAD_MANAGER: - katze_assign (web_settings->download_manager, g_value_dup_string (value)); - break; case PROP_TEXT_EDITOR: katze_assign (web_settings->text_editor, g_value_dup_string (value)); break; @@ -1359,6 +1555,9 @@ case MIDORI_ENCODING_CHINESE: g_object_set (object, "default-encoding", "BIG5", NULL); break; + case MIDORI_ENCODING_CHINESE_SIMPLIFIED: + g_object_set (object, "default-encoding", "GB18030", NULL); + break; case MIDORI_ENCODING_JAPANESE: g_object_set (object, "default-encoding", "SHIFT_JIS", NULL); break; @@ -1388,9 +1587,6 @@ case PROP_OPEN_NEW_PAGES_IN: web_settings->open_new_pages_in = g_value_get_enum (value); break; - case PROP_OPEN_EXTERNAL_PAGES_IN: - web_settings->open_external_pages_in = g_value_get_enum (value); - break; case PROP_MIDDLE_CLICK_OPENS_SELECTION: web_settings->middle_click_opens_selection = g_value_get_boolean (value); break; @@ -1413,14 +1609,21 @@ 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); + g_object_set (web_settings, + "WebKitWebSettings::enable-plugins", g_value_get_boolean (value), + #if WEBKIT_CHECK_VERSION (1, 1, 22) + "enable-java-applet", g_value_get_boolean (value), + #endif + NULL); break; case PROP_ENABLE_DEVELOPER_EXTRAS: g_object_set (web_settings, "WebKitWebSettings::enable-developer-extras", g_value_get_boolean (value), NULL); break; - #if WEBKIT_CHECK_VERSION (1, 1, 8) + case PROP_ENABLE_SPELL_CHECKING: + g_object_set (web_settings, "WebKitWebSettings::enable-spell-checking", + g_value_get_boolean (value), NULL); + break; case PROP_ENABLE_HTML5_DATABASE: g_object_set (web_settings, "WebKitWebSettings::enable-html5-database", g_value_get_boolean (value), NULL); @@ -1429,13 +1632,10 @@ g_object_set (web_settings, "WebKitWebSettings::enable-html5-local-storage", g_value_get_boolean (value), NULL); break; - #endif - #if WEBKIT_CHECK_VERSION (1, 1, 13) case PROP_ENABLE_OFFLINE_WEB_APPLICATION_CACHE: g_object_set (web_settings, "WebKitWebSettings::enable-offline-web-application-cache", g_value_get_boolean (value), NULL); break; - #endif #if WEBKIT_CHECK_VERSION (1, 1, 18) case PROP_ENABLE_PAGE_CACHE: g_object_set (web_settings, "WebKitWebSettings::enable-page-cache", @@ -1451,19 +1651,16 @@ case PROP_KINETIC_SCROLLING: web_settings->kinetic_scrolling = g_value_get_boolean (value); break; - case PROP_ACCEPT_COOKIES: - web_settings->accept_cookies = g_value_get_enum (value); - break; case PROP_MAXIMUM_COOKIE_AGE: web_settings->maximum_cookie_age = g_value_get_int (value); break; + case PROP_FIRST_PARTY_COOKIES_ONLY: + web_settings->first_party_cookies_only = g_value_get_boolean (value); + break; case PROP_MAXIMUM_HISTORY_AGE: web_settings->maximum_history_age = g_value_get_int (value); break; - case PROP_REMEMBER_LAST_DOWNLOADED_FILES: - web_settings->remember_last_downloaded_files = g_value_get_boolean (value); - break; case PROP_PROXY_TYPE: web_settings->proxy_type = g_value_get_enum (value); @@ -1471,33 +1668,105 @@ case PROP_HTTP_PROXY: katze_assign (web_settings->http_proxy, g_value_dup_string (value)); break; + case PROP_HTTP_PROXY_PORT: + web_settings->http_proxy_port = g_value_get_int (value); + break; + #if WEBKIT_CHECK_VERSION (1, 3, 11) + case PROP_MAXIMUM_CACHE_SIZE: + web_settings->maximum_cache_size = g_value_get_int (value); + break; + #endif case PROP_IDENTIFY_AS: web_settings->identify_as = g_value_get_enum (value); if (web_settings->identify_as != MIDORI_IDENT_CUSTOM) { - gchar* string = generate_ident_string (web_settings->identify_as); + gchar* string = generate_ident_string (web_settings, web_settings->identify_as); katze_assign (web_settings->ident_string, string); - #if WEBKIT_CHECK_VERSION (1, 1, 11) g_object_set (web_settings, "user-agent", string, NULL); - #else - g_object_notify (object, "user-agent"); - #endif } break; case PROP_USER_AGENT: if (web_settings->identify_as == MIDORI_IDENT_CUSTOM) katze_assign (web_settings->ident_string, g_value_dup_string (value)); - #if WEBKIT_CHECK_VERSION (1, 1, 11) g_object_set (web_settings, "WebKitWebSettings::user-agent", web_settings->ident_string, NULL); - #endif break; case PROP_PREFERRED_LANGUAGES: katze_assign (web_settings->http_accept_language, g_value_dup_string (value)); + g_object_set (web_settings, "spell-checking-languages", + web_settings->http_accept_language, NULL); break; case PROP_CLEAR_PRIVATE_DATA: web_settings->clear_private_data = g_value_get_int (value); break; + case PROP_CLEAR_DATA: + katze_assign (web_settings->clear_data, g_value_dup_string (value)); + break; + case PROP_SITE_DATA_RULES: + katze_assign (web_settings->site_data_rules, g_value_dup_string (value)); + break; + #if !WEBKIT_CHECK_VERSION (1, 3, 13) + case PROP_ENABLE_DNS_PREFETCHING: + web_settings->enable_dns_prefetching = g_value_get_boolean (value); + break; + #endif + case PROP_STRIP_REFERER: + web_settings->strip_referer = g_value_get_boolean (value); + break; + case PROP_ENFORCE_FONT_FAMILY: + if ((web_settings->enforce_font_family = g_value_get_boolean (value))) + { + gchar* font_family = katze_object_get_string (web_settings, + "default-font-family"); + gchar* monospace = katze_object_get_string (web_settings, + "monospace-font-family"); + gchar* css = g_strdup_printf ("body * { font-family: %s !important; } \ + code, code *, pre, pre *, blockquote, blockquote *, \ + input, textarea { font-family: %s !important; }", + font_family, monospace); + midori_web_settings_add_style (web_settings, "enforce-font-family", css); + g_free (font_family); + g_free (monospace); + g_free (css); + } + else + midori_web_settings_remove_style (web_settings, "enforce-font-family"); + break; + case PROP_FLASH_WINDOW_ON_BG_TABS: + web_settings->flash_window_on_bg_tabs = g_value_get_boolean (value); + break; + case PROP_ENABLE_WEBGL: + g_object_set (web_settings, "WebKitWebSettings::enable-webgl", + g_value_get_boolean (value), NULL); + break; + case PROP_ENABLE_FULLSCREEN: + g_object_set (web_settings, "WebKitWebSettings::enable-fullscreen", + g_value_get_boolean (value), NULL); + break; + case PROP_USER_STYLESHEET_URI: + { + gint old_len = web_settings->user_stylesheet_uri_cached + ? strlen (web_settings->user_stylesheet_uri_cached) : 0; + gint new_len = 0; + if ((web_settings->user_stylesheet_uri = g_value_dup_string (value))) + { + gchar* import = g_strdup_printf ("@import url(\"%s\");", + web_settings->user_stylesheet_uri); + gchar* encoded = g_base64_encode ((const guchar*)import, strlen (import)); + new_len = strlen (encoded); + base64_space_pad (encoded, new_len); + g_free (import); + katze_assign (web_settings->user_stylesheet_uri_cached, encoded); + } + /* Make original user-stylesheet-uri available to main.c */ + g_object_set_data (G_OBJECT (web_settings), "user-stylesheet-uri", + web_settings->user_stylesheet_uri); + midori_web_settings_process_stylesheets (web_settings, new_len - old_len); + } + break; + case PROP_SEARCH_WIDTH: + web_settings->search_width = g_value_get_int (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -1548,9 +1817,6 @@ case PROP_SHOW_PANEL: g_value_set_boolean (value, web_settings->show_panel); break; - case PROP_SHOW_TRANSFERBAR: - g_value_set_boolean (value, web_settings->show_transferbar); - break; case PROP_SHOW_STATUSBAR: g_value_set_boolean (value, web_settings->show_statusbar); break; @@ -1558,21 +1824,12 @@ case PROP_TOOLBAR_STYLE: g_value_set_enum (value, web_settings->toolbar_style); break; - case PROP_PROGRESS_IN_LOCATION: - g_value_set_boolean (value, web_settings->progress_in_location); - break; - case PROP_SEARCH_ENGINES_IN_COMPLETION: - g_value_set_boolean (value, web_settings->search_engines_in_completion); - break; case PROP_TOOLBAR_ITEMS: g_value_set_string (value, web_settings->toolbar_items); break; case PROP_COMPACT_SIDEPANEL: g_value_set_boolean (value, web_settings->compact_sidepanel); break; - case PROP_SHOW_PANEL_CONTROLS: - g_value_set_boolean (value, web_settings->show_panel_controls); - break; case PROP_RIGHT_ALIGN_SIDEPANEL: g_value_set_boolean (value, web_settings->right_align_sidepanel); break; @@ -1589,21 +1846,9 @@ case PROP_SHOW_CRASH_DIALOG: g_value_set_boolean (value, web_settings->show_crash_dialog); break; - case PROP_SPEED_DIAL_IN_NEW_TABS: - g_value_set_boolean (value, web_settings->speed_dial_in_new_tabs); - break; case PROP_DOWNLOAD_FOLDER: g_value_set_string (value, web_settings->download_folder); break; - case PROP_ASK_FOR_DESTINATION_FOLDER: - g_value_set_boolean (value, web_settings->ask_for_destination_folder); - break; - case PROP_NOTIFY_TRANSFER_COMPLETED: - g_value_set_boolean (value, web_settings->notify_transfer_completed); - break; - case PROP_DOWNLOAD_MANAGER: - g_value_set_string (value, web_settings->download_manager); - break; case PROP_TEXT_EDITOR: g_value_set_string (value, web_settings->text_editor); break; @@ -1623,12 +1868,47 @@ case PROP_CLOSE_BUTTONS_ON_TABS: g_value_set_boolean (value, web_settings->close_buttons_on_tabs); break; + case PROP_CLOSE_BUTTONS_LEFT: + #if HAVE_OSX + g_value_set_boolean (value, TRUE); + #elif defined (G_OS_WIN32) + g_value_set_boolean (value, FALSE); + #else + if (!web_settings->close_buttons_left) + { + /* Look for close button in layout specified in index.theme */ + GdkScreen* screen = gdk_screen_get_default (); + GtkSettings* settings = gtk_settings_get_for_screen (screen); + gchar* theme = katze_object_get_string (settings, "gtk-theme-name"); + gchar* theme_file = g_build_filename ("themes", theme, "index.theme", NULL); + gchar* filename = sokoke_find_data_filename (theme_file, FALSE); + g_free (theme_file); + web_settings->close_buttons_left = 1; + if (g_access (filename, F_OK) != 0) + katze_assign (filename, + g_build_filename (g_get_home_dir (), ".themes", + theme, "index.theme", NULL)); + g_free (theme); + if (g_access (filename, F_OK) == 0) + { + GKeyFile* keyfile = g_key_file_new (); + gchar* button_layout; + g_key_file_load_from_file (keyfile, filename, 0, NULL); + button_layout = g_key_file_get_string (keyfile, + "X-GNOME-Metatheme", "ButtonLayout", NULL); + if (button_layout && strstr (button_layout, "close:")) + web_settings->close_buttons_left = 2; + g_free (button_layout); + g_key_file_free (keyfile); + } + g_free (filename); + } + g_value_set_boolean (value, web_settings->close_buttons_left == 2); + #endif + break; case PROP_OPEN_NEW_PAGES_IN: g_value_set_enum (value, web_settings->open_new_pages_in); break; - case PROP_OPEN_EXTERNAL_PAGES_IN: - g_value_set_enum (value, web_settings->open_external_pages_in); - break; case PROP_MIDDLE_CLICK_OPENS_SELECTION: g_value_set_boolean (value, web_settings->middle_click_opens_selection); break; @@ -1658,7 +1938,10 @@ g_value_set_boolean (value, katze_object_get_boolean (web_settings, "WebKitWebSettings::enable-developer-extras")); break; - #if WEBKIT_CHECK_VERSION (1, 1, 8) + case PROP_ENABLE_SPELL_CHECKING: + g_value_set_boolean (value, katze_object_get_boolean (web_settings, + "WebKitWebSettings::enable-spell-checking")); + break; case PROP_ENABLE_HTML5_DATABASE: g_value_set_boolean (value, katze_object_get_boolean (web_settings, "WebKitWebSettings::enable-html5-database")); @@ -1667,13 +1950,10 @@ g_value_set_boolean (value, katze_object_get_boolean (web_settings, "WebKitWebSettings::enable-html5-local-storage")); break; - #endif - #if WEBKIT_CHECK_VERSION (1, 1, 13) case PROP_ENABLE_OFFLINE_WEB_APPLICATION_CACHE: g_value_set_boolean (value, katze_object_get_boolean (web_settings, "WebKitWebSettings::enable-offline-web-application-cache")); break; - #endif #if WEBKIT_CHECK_VERSION (1, 1, 18) case PROP_ENABLE_PAGE_CACHE: g_value_set_boolean (value, katze_object_get_boolean (web_settings, @@ -1689,19 +1969,16 @@ case PROP_KINETIC_SCROLLING: g_value_set_boolean (value, web_settings->kinetic_scrolling); break; - case PROP_ACCEPT_COOKIES: - g_value_set_enum (value, web_settings->accept_cookies); - break; case PROP_MAXIMUM_COOKIE_AGE: g_value_set_int (value, web_settings->maximum_cookie_age); break; + case PROP_FIRST_PARTY_COOKIES_ONLY: + g_value_set_boolean (value, web_settings->first_party_cookies_only); + break; case PROP_MAXIMUM_HISTORY_AGE: g_value_set_int (value, web_settings->maximum_history_age); break; - case PROP_REMEMBER_LAST_DOWNLOADED_FILES: - g_value_set_boolean (value, web_settings->remember_last_downloaded_files); - break; case PROP_PROXY_TYPE: g_value_set_enum (value, web_settings->proxy_type); @@ -1709,13 +1986,21 @@ case PROP_HTTP_PROXY: g_value_set_string (value, web_settings->http_proxy); break; + case PROP_HTTP_PROXY_PORT: + g_value_set_int (value, web_settings->http_proxy_port); + break; + #if WEBKIT_CHECK_VERSION (1, 3, 11) + case PROP_MAXIMUM_CACHE_SIZE: + g_value_set_int (value, web_settings->maximum_cache_size); + break; + #endif case PROP_IDENTIFY_AS: g_value_set_enum (value, web_settings->identify_as); break; case PROP_USER_AGENT: if (!g_strcmp0 (web_settings->ident_string, "")) { - gchar* string = generate_ident_string (web_settings->identify_as); + gchar* string = generate_ident_string (web_settings, web_settings->identify_as); katze_assign (web_settings->ident_string, string); } g_value_set_string (value, web_settings->ident_string); @@ -1726,6 +2011,41 @@ case PROP_CLEAR_PRIVATE_DATA: g_value_set_int (value, web_settings->clear_private_data); break; + case PROP_CLEAR_DATA: + g_value_set_string (value, web_settings->clear_data); + break; + case PROP_SITE_DATA_RULES: + g_value_set_string (value, web_settings->site_data_rules); + break; + #if !WEBKIT_CHECK_VERSION (1, 3, 13) + case PROP_ENABLE_DNS_PREFETCHING: + g_value_set_boolean (value, web_settings->enable_dns_prefetching); + break; + #endif + case PROP_STRIP_REFERER: + g_value_set_boolean (value, web_settings->strip_referer); + break; + case PROP_ENFORCE_FONT_FAMILY: + g_value_set_boolean (value, web_settings->enforce_font_family); + break; + case PROP_FLASH_WINDOW_ON_BG_TABS: + g_value_set_boolean (value, web_settings->flash_window_on_bg_tabs); + break; + case PROP_ENABLE_WEBGL: + g_value_set_boolean (value, katze_object_get_boolean (web_settings, + "WebKitWebSettings::enable-webgl")); + break; + case PROP_ENABLE_FULLSCREEN: + g_value_set_boolean (value, katze_object_get_boolean (web_settings, + "WebKitWebSettings::enable-fullscreen")); + break; + case PROP_USER_STYLESHEET_URI: + g_value_take_string (value, katze_object_get_string (web_settings, + "WebKitWebSettings::user-stylesheet-uri")); + break; + case PROP_SEARCH_WIDTH: + g_value_set_int (value, web_settings->search_width); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -1749,3 +2069,114 @@ return web_settings; } + +static void +midori_web_settings_process_stylesheets (MidoriWebSettings* settings, + gint delta_len) +{ + GHashTableIter it; + GString* css; + gchar* encoded; + gpointer value; + static guint length = 0; + + g_return_if_fail ((gint)length >= -delta_len); + + length += delta_len; + + /* Precalculate size to avoid re-allocations */ + css = g_string_sized_new (length); + + if (settings->user_stylesheet_uri_cached != NULL) + g_string_append (css, settings->user_stylesheet_uri_cached); + + if (settings->user_stylesheets != NULL) + { + g_hash_table_iter_init (&it, settings->user_stylesheets); + while (g_hash_table_iter_next (&it, NULL, &value)) + g_string_append (css, (gchar*)value); + } + + /* data: uri prefix from Source/WebCore/page/Page.cpp:700 in WebKit */ + encoded = g_strconcat ("data:text/css;charset=utf-8;base64,", css->str, NULL); + g_object_set (G_OBJECT (settings), "WebKitWebSettings::user-stylesheet-uri", encoded, NULL); + g_free (encoded); + g_string_free (css, TRUE); +} + +static void +base64_space_pad (gchar* base64, + guint len) +{ + /* Replace '=' padding at the end with encoded spaces + so WebKit will accept concatenations to this string */ + if (len > 2 && base64[len - 2] == '=') + { + base64[len - 3] += 2; + base64[len - 2] = 'A'; + } + if (len > 1 && base64[len - 1] == '=') + base64[len - 1] = 'g'; +} + +/** + * midori_web_settings_add_style: + * @rule_id: a static string identifier + * @style: a CSS stylesheet + * + * Adds or replaces a custom stylesheet. + * + * Since: 0.4.2 + **/ +void +midori_web_settings_add_style (MidoriWebSettings* settings, + const gchar* rule_id, + const gchar* style) +{ + gchar* base64; + guint len; + + g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings)); + g_return_if_fail (rule_id != NULL); + g_return_if_fail (style != NULL); + + len = strlen (style); + base64 = g_base64_encode ((const guchar*)style, len); + len = ((len + 2) / 3) * 4; + base64_space_pad (base64, len); + + if (settings->user_stylesheets == NULL) + settings->user_stylesheets = g_hash_table_new_full (g_str_hash, NULL, + NULL, g_free); + + g_hash_table_insert (settings->user_stylesheets, (gchar*)rule_id, base64); + midori_web_settings_process_stylesheets (settings, len); +} + +/** + * midori_web_settings_remove_style: + * @rule_id: the string identifier used previously + * + * Removes a stylesheet from midori settings. + * + * Since: 0.4.2 + **/ +void +midori_web_settings_remove_style (MidoriWebSettings* settings, + const gchar* rule_id) +{ + gchar* str; + + g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings)); + g_return_if_fail (rule_id != NULL); + + if (settings->user_stylesheets != NULL) + { + if ((str = g_hash_table_lookup (settings->user_stylesheets, rule_id))) + { + guint len = strlen (str); + g_hash_table_remove (settings->user_stylesheets, rule_id); + midori_web_settings_process_stylesheets (settings, -len); + } + } +} diff -Nru midori-0.2.8/midori/midori-websettings.h midori-0.4.6/midori/midori-websettings.h --- midori-0.2.8/midori/midori-websettings.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/midori-websettings.h 2012-05-14 22:13:42.000000000 +0000 @@ -34,16 +34,19 @@ typedef struct _MidoriWebSettings MidoriWebSettings; typedef struct _MidoriWebSettingsClass MidoriWebSettingsClass; +#define MIDORI_PARAM_DELAY_SAVING (1 << 8) + enum { MIDORI_CLEAR_NONE = 0, MIDORI_CLEAR_HISTORY = 1, - MIDORI_CLEAR_COOKIES = 2, - MIDORI_CLEAR_FLASH_COOKIES = 4, - MIDORI_CLEAR_WEBSITE_ICONS = 8, - MIDORI_CLEAR_TRASH = 16, + MIDORI_CLEAR_COOKIES = 2, /* deprecated */ + MIDORI_CLEAR_FLASH_COOKIES = 4, /* deprecated */ + MIDORI_CLEAR_WEBSITE_ICONS = 8, /* deprecated */ + MIDORI_CLEAR_TRASH = 16, /* deprecated */ MIDORI_CLEAR_ON_QUIT = 32, - MIDORI_CLEAR_WEB_CACHE = 64, + MIDORI_CLEAR_WEB_CACHE = 64, /* deprecated */ + MIDORI_CLEAR_SESSION = 128, }; typedef enum @@ -66,9 +69,7 @@ MIDORI_STARTUP_BLANK_PAGE, /* One blank tab or speed dial is opened */ MIDORI_STARTUP_HOMEPAGE, /* One homepage tab is opened */ MIDORI_STARTUP_LAST_OPEN_PAGES, /* The session is loaded and saved */ - #if WEBKIT_CHECK_VERSION (1, 1, 6) MIDORI_STARTUP_DELAYED_PAGES /* The session is saved, loading pages is delayed */ - #endif } MidoriStartup; GType @@ -79,7 +80,8 @@ typedef enum { - MIDORI_ENCODING_CHINESE, + MIDORI_ENCODING_CHINESE /* Traditional */, + MIDORI_ENCODING_CHINESE_SIMPLIFIED, MIDORI_ENCODING_JAPANESE, MIDORI_ENCODING_KOREAN, MIDORI_ENCODING_RUSSIAN, @@ -138,20 +140,8 @@ typedef enum { - MIDORI_ACCEPT_COOKIES_ALL, - MIDORI_ACCEPT_COOKIES_SESSION, - MIDORI_ACCEPT_COOKIES_NONE -} MidoriAcceptCookies; - -GType -midori_accept_cookies_get_type (void) G_GNUC_CONST; - -#define MIDORI_TYPE_ACCEPT_COOKIES \ - (midori_accept_cookies_get_type ()) - -typedef enum -{ - MIDORI_IDENT_MIDORI, + MIDORI_IDENT_MIDORI /* Automatic */, + MIDORI_IDENT_GENUINE /* Midori */, MIDORI_IDENT_SAFARI, MIDORI_IDENT_IPHONE, MIDORI_IDENT_FIREFOX, @@ -171,6 +161,34 @@ MidoriWebSettings* midori_web_settings_new (void); +void +midori_web_settings_add_style (MidoriWebSettings* settings, + const gchar* rule_id, + const gchar* style); + +void +midori_web_settings_remove_style (MidoriWebSettings* settings, + const gchar* rule_id); + +const gchar* +midori_web_settings_get_system_name (gchar** architecture, + gchar** platform); + +gboolean +midori_web_settings_has_plugin_support (void); + +typedef enum +{ + MIDORI_SITE_DATA_UNDETERMINED, + MIDORI_SITE_DATA_BLOCK, + MIDORI_SITE_DATA_ACCEPT, + MIDORI_SITE_DATA_PRESERVE, +} MidoriSiteDataPolicy; + +MidoriSiteDataPolicy +midori_web_settings_get_site_data_policy (MidoriWebSettings* settings, + const gchar* uri); + G_END_DECLS #endif /* __MIDORI_WEB_SETTINGS_H__ */ diff -Nru midori-0.2.8/midori/midori.h midori-0.4.6/midori/midori.h --- midori-0.2.8/midori/midori.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/midori.h 2012-05-14 22:13:42.000000000 +0000 @@ -14,16 +14,18 @@ #include "midori-app.h" #include "midori-array.h" +#include "midori-bookmarks.h" #include "midori-browser.h" #include "midori-extension.h" #include "midori-locationaction.h" #include "midori-panel.h" #include "midori-preferences.h" #include "midori-searchaction.h" -#include "midori-stock.h" #include "midori-view.h" #include "midori-viewable.h" #include "midori-websettings.h" +#include "midori-platform.h" +#include /* Vala API */ /* For convenience, include localization header */ #include diff -Nru midori-0.2.8/midori/midori.vapi midori-0.4.6/midori/midori.vapi --- midori-0.2.8/midori/midori.vapi 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/midori.vapi 2012-05-14 22:13:42.000000000 +0000 @@ -3,6 +3,8 @@ [CCode (cprefix = "Midori", lower_case_cprefix = "midori_")] namespace Midori { + public const string VERSION_SUFFIX; + [CCode (cheader_filename = "midori/midori.h")] public class App : GLib.Object { public App (); @@ -39,37 +41,39 @@ public int add_uri (string uri); public unowned View get_nth_tab (int n); public GLib.List get_tabs (); + public void block_action (Gtk.Action action); + public void unblock_action (Gtk.Action action); public unowned Gtk.ActionGroup get_action_group (); public unowned Browser get_for_widget (Gtk.Widget widget); public unowned string[] get_toolbar_actions (); public unowned GLib.Object get_proxy_items (); [NoAccessorMethod] - public Gtk.MenuBar menubar { get; } + public Gtk.MenuBar menubar { owned get; } [NoAccessorMethod] - public Gtk.Toolbar navigationbar { get; } + public Gtk.Toolbar navigationbar { owned get; } [NoAccessorMethod] - public Gtk.Notebook notebook { get; } + public Gtk.Notebook notebook { owned get; } [NoAccessorMethod] - public Gtk.Widget panel { get; } + public Gtk.Widget panel { owned get; } [NoAccessorMethod] - public string uri { get; set; } + public string uri { owned get; set; } public Gtk.Widget? tab { get; set; } [NoAccessorMethod] public uint load_status { get; } [NoAccessorMethod] - public Gtk.Statusbar statusbar { get; } + public Gtk.Statusbar statusbar { owned get; } [NoAccessorMethod] - public string statusbar_text { get; set; } + public string statusbar_text { owned get; set; } public Midori.WebSettings settings { get; set; } [NoAccessorMethod] - public GLib.Object bookmarks { get; set; } + public GLib.Object bookmarks { owned get; set; } [NoAccessorMethod] - public GLib.Object trash { get; set; } + public GLib.Object trash { owned get; set; } [NoAccessorMethod] - public GLib.Object search_engines { get; set; } + public GLib.Object search_engines { owned get; set; } [NoAccessorMethod] - public GLib.Object history { get; set; } + public GLib.Object history { owned get; set; } [NoAccessorMethod] public bool show_tabs { get; set; } @@ -91,6 +95,18 @@ public Extension (); public unowned Midori.App get_app (); + public void install_boolean (string name, bool default_value); + public void install_integer (string name, int default_value); + public void install_string (string name, string default_value); + + public bool get_boolean (string name); + public int get_integer (string name); + public unowned string get_string (string name); + + public void set_boolean (string name, bool value); + public void set_integer (string name, int value); + public void set_string (string name, string value); + [NoAccessorMethod] public string name { get; set; } [NoAccessorMethod] @@ -99,14 +115,21 @@ public string version { get; set; } [NoAccessorMethod] public string authors { get; set; } + [NoAccessorMethod] + public string website { get; set; } + [NoAccessorMethod] + public string key { get; set; } public signal void activate (Midori.App app); public signal void deactivate (); + public signal void open_preferences (); } public class View : Gtk.VBox { [CCode (type = "GtkWidget*")] public View (GLib.Object net); + public View.with_title (string? title=null, WebSettings? settings=null + , bool append=false); public void set_uri (string uri); public bool is_blank (); public unowned string get_display_uri (); @@ -144,6 +167,9 @@ public WebSettings settings { get; set; } public GLib.Object net { get; } + [HasEmitter] + public signal bool download_requested (WebKit.Download download); + } public class WebSettings : WebKit.WebSettings { diff -Nru midori-0.2.8/midori/socket.c midori-0.4.6/midori/socket.c --- midori-0.2.8/midori/socket.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/socket.c 2012-05-14 22:13:42.000000000 +0000 @@ -54,9 +54,6 @@ #endif #include "socket.h" -#if USE_SSL -# include -#endif #ifdef G_ENABLE_DEBUG # define debug_print g_debug @@ -562,10 +559,6 @@ #ifdef G_OS_WIN32 gulong val; -#if USE_SSL - if (sock->ssl) - return TRUE; -#endif if (ioctlsocket(sock->sock, FIONREAD, &val) < 0) { g_warning("sock_has_read_data(): ioctlsocket() failed: %d\n", WSAGetLastError()); @@ -595,22 +588,6 @@ fd_set fds; GIOCondition condition = sock->condition; -#if USE_SSL - if (sock->ssl) { - if (condition & G_IO_IN) { - if (SSL_pending(sock->ssl) > 0) - return TRUE; - if (SSL_want_write(sock->ssl)) - condition |= G_IO_OUT; - } - - if (condition & G_IO_OUT) { - if (SSL_want_read(sock->ssl)) - condition |= G_IO_IN; - } - } -#endif - FD_ZERO(&fds); FD_SET(sock->sock, &fds); @@ -647,19 +624,6 @@ sock->callback = func; sock->condition = condition; sock->data = data; - -#if USE_SSL - if (sock->ssl) { - GSource *source; - - source = g_source_new(&sock_watch_funcs, sizeof(SockSource)); - ((SockSource *)source)->sock = sock; - g_source_set_priority(source, G_PRIORITY_DEFAULT); - g_source_set_can_recurse(source, FALSE); - return g_source_attach(source, NULL); - } -#endif - return g_io_add_watch(sock->sock_ch, condition, sock_watch_cb, sock); } @@ -1375,10 +1339,6 @@ { g_return_val_if_fail(sock != NULL, -1); -#if USE_SSL - if (sock->ssl) - return ssl_read(sock->ssl, buf, len); -#endif return fd_read(sock->sock, buf, len); } @@ -1394,44 +1354,10 @@ #endif } -#if USE_SSL -gint ssl_read(SSL *ssl, gchar *buf, gint len) -{ - gint err, ret; - - if (SSL_pending(ssl) == 0) { - if (fd_check_io(SSL_get_rfd(ssl), G_IO_IN) < 0) - return -1; - } - - ret = SSL_read(ssl, buf, len); - - switch ((err = SSL_get_error(ssl, ret))) { - case SSL_ERROR_NONE: - return ret; - case SSL_ERROR_WANT_READ: - case SSL_ERROR_WANT_WRITE: - errno = EAGAIN; - return -1; - case SSL_ERROR_ZERO_RETURN: - return 0; - default: - g_warning("SSL_read() returned error %d, ret = %d\n", err, ret); - if (ret == 0) - return 0; - return -1; - } -} -#endif - gint sock_write(SockInfo *sock, const gchar *buf, gint len) { g_return_val_if_fail(sock != NULL, -1); -#if USE_SSL - if (sock->ssl) - return ssl_write(sock->ssl, buf, len); -#endif return fd_write(sock->sock, buf, len); } @@ -1459,34 +1385,10 @@ #endif } -#if USE_SSL -gint ssl_write(SSL *ssl, const gchar *buf, gint len) -{ - gint ret; - - ret = SSL_write(ssl, buf, len); - - switch (SSL_get_error(ssl, ret)) { - case SSL_ERROR_NONE: - return ret; - case SSL_ERROR_WANT_READ: - case SSL_ERROR_WANT_WRITE: - errno = EAGAIN; - return -1; - default: - return -1; - } -} -#endif - gint sock_write_all(SockInfo *sock, const gchar *buf, gint len) { g_return_val_if_fail(sock != NULL, -1); -#if USE_SSL - if (sock->ssl) - return ssl_write_all(sock->ssl, buf, len); -#endif return fd_write_all(sock->sock, buf, len); } @@ -1506,24 +1408,6 @@ return wrlen; } -#if USE_SSL -gint ssl_write_all(SSL *ssl, const gchar *buf, gint len) -{ - gint n, wrlen = 0; - - while (len) { - n = ssl_write(ssl, buf, len); - if (n <= 0) - return -1; - len -= n; - wrlen += n; - buf += n; - } - - return wrlen; -} -#endif - gint fd_recv(gint fd, gchar *buf, gint len, gint flags) { #ifdef G_OS_WIN32 @@ -1570,38 +1454,10 @@ return bp - buf; } -#if USE_SSL -gint ssl_gets(SSL *ssl, gchar *buf, gint len) -{ - gchar *newline, *bp = buf; - gint n; - - if (--len < 1) - return -1; - do { - if ((n = ssl_peek(ssl, bp, len)) <= 0) - return -1; - if ((newline = memchr(bp, '\n', n)) != NULL) - n = newline - bp + 1; - if ((n = ssl_read(ssl, bp, n)) < 0) - return -1; - bp += n; - len -= n; - } while (!newline && len); - - *bp = '\0'; - return bp - buf; -} -#endif - gint sock_gets(SockInfo *sock, gchar *buf, gint len) { g_return_val_if_fail(sock != NULL, -1); -#if USE_SSL - if (sock->ssl) - return ssl_gets(sock->ssl, buf, len); -#endif return fd_gets(sock->sock, buf, len); } @@ -1630,42 +1486,11 @@ return (gint)size; } -#if USE_SSL -gint ssl_getline(SSL *ssl, gchar **line) -{ - gchar buf[BUFFSIZE]; - gchar *str = NULL; - gint len; - gulong size = 0; - gulong cur_offset = 0; - - while ((len = ssl_gets(ssl, buf, sizeof(buf))) > 0) { - size += len; - str = g_realloc(str, size + 1); - memcpy(str + cur_offset, buf, len + 1); - cur_offset += len; - if (buf[len - 1] == '\n') - break; - } - - *line = str; - - if (!str) - return -1; - else - return (gint)size; -} -#endif - gint sock_getline(SockInfo *sock, gchar **line) { g_return_val_if_fail(sock != NULL, -1); g_return_val_if_fail(line != NULL, -1); -#if USE_SSL - if (sock->ssl) - return ssl_getline(sock->ssl, line); -#endif return fd_getline(sock->sock, line); } @@ -1679,44 +1504,10 @@ } /* peek at the socket data without actually reading it */ -#if USE_SSL -gint ssl_peek(SSL *ssl, gchar *buf, gint len) -{ - gint err, ret; - - if (SSL_pending(ssl) == 0) { - if (fd_check_io(SSL_get_rfd(ssl), G_IO_IN) < 0) - return -1; - } - - ret = SSL_peek(ssl, buf, len); - - switch ((err = SSL_get_error(ssl, ret))) { - case SSL_ERROR_NONE: - return ret; - case SSL_ERROR_WANT_READ: - case SSL_ERROR_WANT_WRITE: - errno = EAGAIN; - return -1; - case SSL_ERROR_ZERO_RETURN: - return 0; - default: - g_warning("SSL_peek() returned error %d, ret = %d\n", err, ret); - if (ret == 0) - return 0; - return -1; - } -} -#endif - gint sock_peek(SockInfo *sock, gchar *buf, gint len) { g_return_val_if_fail(sock != NULL, -1); -#if USE_SSL - if (sock->ssl) - return ssl_peek(sock->ssl, buf, len); -#endif return fd_recv(sock->sock, buf, len, MSG_PEEK); } @@ -1727,11 +1518,6 @@ if (!sock) return 0; -#if USE_SSL - if (sock->ssl) - ssl_done_socket(sock); -#endif - if (sock->sock_ch) { g_io_channel_shutdown(sock->sock_ch, FALSE, NULL); g_io_channel_unref(sock->sock_ch); @@ -1759,13 +1545,4 @@ #endif } -#if USE_SSL -void ssl_done_socket(SockInfo *sockinfo) -{ - if (sockinfo->ssl) { - SSL_free(sockinfo->ssl); - } -} -#endif - #endif diff -Nru midori-0.2.8/midori/socket.h midori-0.4.6/midori/socket.h --- midori-0.2.8/midori/socket.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/socket.h 2012-05-14 22:13:42.000000000 +0000 @@ -12,21 +12,14 @@ #ifndef __SYLPH_SOCKET_H__ #define __SYLPH_SOCKET_H__ -#if HAVE_CONFIG_H -# include "config.h" -#endif - #include +#include "config.h" #if HAVE_NETDB_H # include #endif typedef struct _SockInfo SockInfo; -#if USE_SSL -# include -#endif - typedef enum { CONN_READY, @@ -45,11 +38,6 @@ struct _SockInfo { gint sock; -#if USE_SSL - SSL *ssl; -#else - gpointer ssl; -#endif GIOChannel *sock_ch; gchar *hostname; @@ -114,15 +102,4 @@ gint fd_getline (gint sock, gchar **line); gint fd_close (gint sock); -/* Functions for SSL */ -#if USE_SSL -gint ssl_read (SSL *ssl, gchar *buf, gint len); -gint ssl_write (SSL *ssl, const gchar *buf, gint len); -gint ssl_write_all (SSL *ssl, const gchar *buf, gint len); -gint ssl_gets (SSL *ssl, gchar *buf, gint len); -gint ssl_getline (SSL *ssl, gchar **line); -gint ssl_peek (SSL *ssl, gchar *buf, gint len); -void ssl_done_socket (SockInfo *sockinfo); -#endif - #endif /* __SYLPH_SOCKET_H__ */ diff -Nru midori-0.2.8/midori/sokoke.c midori-0.4.6/midori/sokoke.c --- midori-0.2.8/midori/sokoke.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/sokoke.c 2012-05-14 22:13:42.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2007-2009 Christian Dywan + Copyright (C) 2007-2011 Christian Dywan Copyright (C) 2009 Dale Whittaker Copyright (C) 2009 Alexander Butenko @@ -13,12 +13,10 @@ #include "sokoke.h" -#if HAVE_CONFIG_H - #include -#endif - -#include "midori-stock.h" +#include "midori-core.h" +#include "midori-platform.h" +#include #if HAVE_UNISTD_H #include #endif @@ -33,12 +31,7 @@ #include #include #include - -#if HAVE_LIBIDN - #include - #include - #include -#endif +#include #ifdef HAVE_HILDON_FM #include @@ -51,44 +44,6 @@ #include #endif -#if !GTK_CHECK_VERSION(2, 12, 0) - -void -gtk_widget_set_has_tooltip (GtkWidget* widget, - gboolean has_tooltip) -{ - /* Do nothing */ -} - -void -gtk_widget_set_tooltip_text (GtkWidget* widget, - const gchar* text) -{ - if (text && *text) - { - static GtkTooltips* tooltips = NULL; - if (G_UNLIKELY (!tooltips)) - tooltips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tooltips, widget, text, NULL); - } -} - -void -gtk_tool_item_set_tooltip_text (GtkToolItem* toolitem, - const gchar* text) -{ - if (text && *text) - { - static GtkTooltips* tooltips = NULL; - if (G_UNLIKELY (!tooltips)) - tooltips = gtk_tooltips_new (); - - gtk_tool_item_set_tooltip (toolitem, tooltips, text, NULL); - } -} - -#endif - static gchar* sokoke_js_string_utf8 (JSStringRef js_string) { @@ -110,13 +65,15 @@ { gchar* value; JSStringRef js_value_string; + JSStringRef js_script; + JSValueRef js_exception = NULL; + JSValueRef js_value; g_return_val_if_fail (js_context, FALSE); g_return_val_if_fail (script, FALSE); - JSStringRef js_script = JSStringCreateWithUTF8CString (script); - JSValueRef js_exception = NULL; - JSValueRef js_value = JSEvaluateScript (js_context, js_script, + js_script = JSStringCreateWithUTF8CString (script); + js_value = JSEvaluateScript (js_context, js_script, JSContextGetGlobalObject (js_context), NULL, 0, &js_exception); JSStringRelease (js_script); @@ -153,7 +110,8 @@ void sokoke_message_dialog (GtkMessageType message_type, const gchar* short_message, - const gchar* detailed_message) + const gchar* detailed_message, + gboolean modal) { GtkWidget* dialog = gtk_message_dialog_new ( NULL, 0, message_type, @@ -165,9 +123,18 @@ "%s", short_message); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", detailed_message); - g_signal_connect (dialog, "response", - G_CALLBACK (sokoke_message_dialog_response_cb), NULL); - gtk_widget_show (dialog); + if (modal) + { + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + } + else + { + g_signal_connect (dialog, "response", + G_CALLBACK (sokoke_message_dialog_response_cb), NULL); + gtk_widget_show (dialog); + } + } /** @@ -230,7 +197,11 @@ g_free (content_type); files = g_list_prepend (NULL, file); #if GTK_CHECK_VERSION (2, 14, 0) + #if GTK_CHECK_VERSION (3, 0, 0) + context = gdk_display_get_app_launch_context (gdk_screen_get_display (screen)); + #else context = gdk_app_launch_context_new (); + #endif gdk_app_launch_context_set_screen (context, screen); gdk_app_launch_context_set_timestamp (context, timestamp); #else @@ -247,6 +218,48 @@ return success; } +static void +sokoke_open_with_response_cb (GtkWidget* dialog, + gint response, + GtkEntry* entry) +{ + if (response == GTK_RESPONSE_ACCEPT) + { + const gchar* command = gtk_entry_get_text (entry); + const gchar* uri = g_object_get_data (G_OBJECT (dialog), "uri"); + sokoke_spawn_program (command, uri); + } + gtk_widget_destroy (dialog); +} + +static GAppInfo* +sokoke_default_for_uri (const gchar* uri, + gchar** scheme_ptr) +{ + gchar* scheme; + GAppInfo* info; + + scheme = g_uri_parse_scheme (uri); + if (scheme_ptr != NULL) + *scheme_ptr = scheme; + if (!scheme) + return NULL; + + info = g_app_info_get_default_for_uri_scheme (scheme); + #if !GLIB_CHECK_VERSION (2, 28, 0) + if (!info) + { + gchar* type = g_strdup_printf ("x-scheme-handler/%s", scheme); + info = g_app_info_get_default_for_type (type, FALSE); + g_free (type); + } + #endif + if (info != NULL && scheme_ptr != NULL) + g_free (scheme); + return info; + +} + /** * sokoke_show_uri: * @screen: a #GdkScreen, or %NULL @@ -257,6 +270,7 @@ * Shows the specified URI with an appropriate application. This * supports xdg-open, exo-open and gnome-open as fallbacks if * GIO doesn't do the trick. + * x-scheme-handler is supported for GLib < 2.28 as of 0.3.3. * * On Maemo, hildon_uri_open() is used. * @@ -268,81 +282,30 @@ 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); #elif defined (G_OS_WIN32) + CoInitializeEx (NULL, COINIT_APARTMENTTHREADED); + SHELLEXECUTEINFO info = { sizeof (info) }; + info.nShow = SW_SHOWNORMAL; + info.lpFile = uri; - const gchar* fallbacks [] = { "explorer" }; - gsize i; - GAppInfo *app_info; - GFile *file; - gchar *free_uri; - - g_return_val_if_fail (uri != NULL, FALSE); - g_return_val_if_fail (!error || !*error, FALSE); - g_return_val_if_fail (GDK_IS_SCREEN (screen) || !screen, FALSE); - - file = g_file_new_for_uri (uri); - app_info = g_file_query_default_handler (file, NULL, error); - - if (app_info != NULL) - { - GdkAppLaunchContext *context; - gboolean result; - GList l; - - context = gdk_app_launch_context_new (); - gdk_app_launch_context_set_screen (context, screen); - gdk_app_launch_context_set_timestamp (context, timestamp); - - l.data = (char *)file; - l.next = l.prev = NULL; - result = g_app_info_launch (app_info, &l, (GAppLaunchContext*)context, error); - - g_object_unref (context); - g_object_unref (app_info); - g_object_unref (file); - - if (result) - return TRUE; - } - else - g_object_unref (file); - - free_uri = g_filename_from_uri (uri, NULL, NULL); - if (free_uri) - { - gchar *quoted = g_shell_quote (free_uri); - uri = quoted; - g_free (free_uri); - free_uri = quoted; - } - - for (i = 0; i < G_N_ELEMENTS (fallbacks); i++) - { - gchar* command = g_strconcat (fallbacks[i], " ", uri, NULL); - gboolean result = g_spawn_command_line_async (command, error); - g_free (command); - if (result) - { - g_free (free_uri); - return TRUE; - } - if (error) - *error = NULL; - } - - g_free (free_uri); - - return FALSE; - + return ShellExecuteEx (&info); #else + #if !GLIB_CHECK_VERSION (2, 28, 0) + GAppInfo* info; + gchar* scheme; + #endif const gchar* fallbacks [] = { "xdg-open", "exo-open", "gnome-open" }; gsize i; + GtkWidget* dialog; + GtkWidget* box; + gchar* filename; + gchar* ms; + GtkWidget* entry; g_return_val_if_fail (GDK_IS_SCREEN (screen) || !screen, FALSE); g_return_val_if_fail (uri != NULL, FALSE); @@ -358,6 +321,25 @@ return TRUE; #endif + #if !GLIB_CHECK_VERSION (2, 28, 0) + info = sokoke_default_for_uri (uri, &scheme); + if (info) + { + gchar* argument = g_strdup (&uri[scheme - uri]); + GList* uris = g_list_prepend (NULL, argument); + if (g_app_info_launch_uris (info, uris, NULL, NULL)) + { + g_list_free (uris); + g_free (scheme); + g_object_unref (info); + return TRUE; + } + g_list_free (uris); + g_free (scheme); + g_object_unref (info); + } + #endif + for (i = 0; i < G_N_ELEMENTS (fallbacks); i++) { gchar* command = g_strconcat (fallbacks[i], " ", uri, NULL); @@ -369,21 +351,44 @@ *error = NULL; } - return FALSE; + dialog = gtk_dialog_new_with_buttons (_("Open with"), NULL, 0, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + box = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); + if (g_str_has_prefix (uri, "file:///")) + filename = g_filename_from_uri (uri, NULL, NULL); + else + filename = g_strdup (uri); + ms = g_strdup_printf (_("Choose an application or command to open \"%s\":"), + filename); + gtk_box_pack_start (GTK_BOX (box), gtk_label_new (ms), TRUE, FALSE, 4); + g_free (ms); + entry = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); + gtk_box_pack_start (GTK_BOX (box), entry, TRUE, FALSE, 4); + g_signal_connect (dialog, "response", + G_CALLBACK (sokoke_open_with_response_cb), entry); + g_object_set_data_full (G_OBJECT (dialog), "uri", + filename, (GDestroyNotify)g_free); + gtk_widget_show_all (dialog); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); + gtk_widget_grab_focus (entry); + + return TRUE; #endif } gboolean sokoke_spawn_program (const gchar* command, - const gchar* argument, - gboolean filename) + const gchar* argument) { GError* error; g_return_val_if_fail (command != NULL, FALSE); g_return_val_if_fail (argument != NULL, FALSE); - if (filename) + if (!g_strstr_len (argument, 8, "://") + && !g_str_has_prefix (argument, "about:")) { gboolean success; @@ -396,7 +401,7 @@ { sokoke_message_dialog (GTK_MESSAGE_ERROR, _("Could not run external program."), - "Failed to initialize libosso"); + "Failed to initialize libosso", FALSE); return FALSE; } @@ -406,7 +411,7 @@ osso_deinitialize (osso); sokoke_message_dialog (GTK_MESSAGE_ERROR, _("Could not run external program."), - "Failed to get dbus connection from osso context"); + "Failed to get dbus connection from osso context", FALSE); return FALSE; } @@ -434,7 +439,7 @@ { sokoke_message_dialog (GTK_MESSAGE_ERROR, _("Could not run external program."), - error ? error->message : ""); + error ? error->message : "", FALSE); if (error) g_error_free (error); return FALSE; @@ -444,23 +449,26 @@ { /* FIXME: Implement Hildon specific version */ gchar* uri_format; + gchar* argument_quoted; gchar* command_ready; gchar** argv; if ((uri_format = strstr (command, "%u"))) uri_format[1] = 's'; + argument_quoted = g_shell_quote (argument); if (strstr (command, "%s")) - command_ready = g_strdup_printf (command, argument); + command_ready = g_strdup_printf (command, argument_quoted); else - command_ready = g_strconcat (command, " ", argument, NULL); + command_ready = g_strconcat (command, " ", argument_quoted, NULL); + g_free (argument_quoted); 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); + error->message, FALSE); g_error_free (error); g_free (command_ready); return FALSE; @@ -474,7 +482,7 @@ { sokoke_message_dialog (GTK_MESSAGE_ERROR, _("Could not run external program."), - error->message); + error->message, FALSE); g_error_free (error); } @@ -484,155 +492,28 @@ return TRUE; } -/** - * sokoke_hostname_from_uri: - * @uri: an URI string - * @path: location of a string pointer - * - * Returns the hostname of the specified URI. - * - * If there is a path, it is stored in @path. - * - * Return value: a newly allocated hostname - **/ -gchar* -sokoke_hostname_from_uri (const gchar* uri, - gchar** path) -{ - gchar* hostname; - - if ((hostname = strchr (uri, '/'))) - { - if (hostname[1] == '/') - hostname += 2; - if ((*path = strchr (hostname, '/'))) - return g_strndup (hostname, *path - hostname); - else - return g_strdup (hostname); - } - - return g_strdup (uri); -} - -/** - * sokoke_hostname_to_ascii: - * @uri: an URI string - * - * The specified hostname is encoded if it is not ASCII. - * - * If no IDN support is available at compile time, - * the hostname will be returned unaltered. - * - * Return value: a newly allocated hostname - **/ -static gchar* -sokoke_hostname_to_ascii (const gchar* hostname) -{ - #ifdef HAVE_LIBSOUP_2_27_90 - return g_hostname_to_ascii (hostname); - #elif HAVE_LIBIDN - uint32_t* q; - char* encoded; - int rc; - - if ((q = stringprep_utf8_to_ucs4 (hostname, -1, NULL))) - { - rc = idna_to_ascii_4z (q, &encoded, IDNA_ALLOW_UNASSIGNED); - free (q); - if (rc == IDNA_SUCCESS) - return encoded; - } - #endif - return g_strdup (hostname); -} - -/** - * sokoke_uri_to_ascii: - * @uri: an URI string - * - * The specified URI is parsed and the hostname - * part of it is encoded if it is not ASCII. - * - * If no IDN support is available at compile time, - * the URI will be returned unaltered. - * - * Return value: a newly allocated URI - **/ -gchar* -sokoke_uri_to_ascii (const gchar* uri) +void +sokoke_spawn_app (const gchar* uri, + gboolean private) { - gchar* proto = NULL; - gchar* path = NULL; - gchar* hostname; - gchar* encoded; - - if (strchr (uri, '/') && (proto = strchr (uri, ':'))) - { - gulong offset; - gchar* buffer; - - offset = g_utf8_pointer_to_offset (uri, proto); - buffer = g_malloc0 (offset + 1); - g_utf8_strncpy (buffer, uri, offset); - proto = buffer; + const gchar* executable = sokoke_get_argv (NULL)[0]; + /* "midori" + "/usr/bin/midori" + "c:/Program Files/Midori/bin/midori.exe" */ + gchar* quoted = g_shell_quote (executable); + gchar* command; + if (private) + { + gchar* quoted_config = g_shell_quote (sokoke_set_config_dir (NULL)); + command = g_strconcat (quoted, " -c ", quoted_config, + " -p", NULL); + g_free (quoted_config); } - - hostname = sokoke_hostname_from_uri (uri, &path); - encoded = sokoke_hostname_to_ascii (hostname); - - if (encoded) - { - gchar* res = g_strconcat (proto ? proto : "", proto ? "://" : "", - encoded, path, NULL); - g_free (encoded); - return res; - } - g_free (hostname); - return g_strdup (uri); -} - -static gchar* -sokoke_idn_to_punycode (gchar* uri) -{ - #if HAVE_LIBIDN - gchar* result = sokoke_uri_to_ascii (uri); - g_free (uri); - return result; - #else - return uri; - #endif -} - -/** - * sokoke_search_uri: - * @uri: a search URI with or without %s - * @keywords: keywords - * - * Takes a search engine URI and inserts the specified - * keywords. The @keywords are percent encoded. If the - * search URI contains a %s they keywords are inserted - * in that place, otherwise appended to the URI. - * - * Return value: a newly allocated search URI - **/ -gchar* sokoke_search_uri (const gchar* uri, - const gchar* keywords) -{ - gchar* escaped; - gchar* search; - - g_return_val_if_fail (keywords != NULL, NULL); - - if (!uri) - return g_strdup (keywords); - - escaped = g_uri_escape_string (keywords, ":/", TRUE); - if (strstr (uri, "%s")) - search = g_strdup_printf (uri, escaped); else - search = g_strconcat (uri, escaped, NULL); - g_free (escaped); - return search; + command = g_strconcat (quoted, " -a", NULL); + g_free (quoted); + sokoke_spawn_program (command, uri); + g_free (command); } static void @@ -662,7 +543,7 @@ gint host_resolved = 0; uri = g_strconcat ("http://", hostname, NULL); - if (sokoke_prefetch_uri (uri, sokoke_resolve_hostname_cb, + if (sokoke_prefetch_uri (NULL, uri, sokoke_resolve_hostname_cb, &host_resolved)) { GTimer* timer = g_timer_new (); @@ -674,6 +555,23 @@ return host_resolved == 1 ? TRUE : FALSE; } +gboolean +sokoke_external_uri (const gchar* uri) +{ + GAppInfo* info; + + if (!uri || !strncmp (uri, "http", 4) + || !strncmp (uri, "file", 4) + || !strncmp (uri, "geo", 3) + || !strncmp (uri, "about:", 6)) + return FALSE; + + info = sokoke_default_for_uri (uri, NULL); + if (info) + g_object_unref (info); + return info != NULL; +} + /** * sokoke_magic_uri: * @uri: a string typed by a user @@ -693,29 +591,45 @@ g_return_val_if_fail (uri, NULL); - /* Just return if it's a javascript: or mailto: uri */ - if (!strncmp (uri, "javascript:", 11) - || !strncmp (uri, "mailto:", 7) - || !strncmp (uri, "tel:", 4) - || !strncmp (uri, "callto:", 7) - || !strncmp (uri, "data:", 5) - || !strncmp (uri, "about:", 6)) - return g_strdup (uri); /* Add file:// if we have a local path */ if (g_path_is_absolute (uri)) - return g_strconcat ("file://", uri, NULL); - /* Do we have a protocol? */ - if (g_strstr_len (uri, 8, "://")) - return sokoke_idn_to_punycode (g_strdup (uri)); - - /* Do we have an IP address? */ - if (g_ascii_isdigit (uri[0]) && g_strstr_len (uri, 4, ".")) + return g_filename_to_uri (uri, NULL, NULL); + /* Parse geo URI geo:48.202778,16.368472;crs=wgs84;u=40 as a location */ + if (!strncmp (uri, "geo:", 4)) + { + gchar* comma; + gchar* semicolon; + gchar* latitude; + gchar* longitude; + gchar* geo; + + comma = strchr (&uri[4], ','); + /* geo:latitude,longitude[,altitude][;u=u][;crs=crs] */ + if (!(comma && *comma)) + return g_strdup (uri); + semicolon = strchr (comma + 1, ';'); + if (!semicolon) + semicolon = strchr (comma + 1, ','); + latitude = g_strndup (&uri[4], comma - &uri[4]); + if (semicolon) + longitude = g_strndup (comma + 1, semicolon - comma - 1); + else + longitude = g_strdup (comma + 1); + geo = g_strdup_printf ("http://www.openstreetmap.org/?mlat=%s&mlon=%s", + latitude, longitude); + g_free (latitude); + g_free (longitude); + return geo; + } + if (midori_uri_is_location (uri) || sokoke_external_uri (uri)) + return g_strdup (uri); + if (midori_uri_is_ip_address (uri)) return g_strconcat ("http://", uri, NULL); search = NULL; if (!strchr (uri, ' ') && ((search = strchr (uri, ':')) || (search = strchr (uri, '@'))) && - search[0] && !g_ascii_isalpha (search[1])) - return sokoke_idn_to_punycode (g_strconcat ("http://", uri, NULL)); + search[0] && g_ascii_isdigit (search[1])) + return g_strconcat ("http://", uri, NULL); if ((!strcmp (uri, "localhost") || strchr (uri, '/')) && sokoke_resolve_hostname (uri)) return g_strconcat ("http://", uri, NULL); @@ -729,7 +643,7 @@ { search = g_strconcat ("http://", uri, NULL); g_strfreev (parts); - return sokoke_idn_to_punycode (search); + return search; } } g_strfreev (parts); @@ -737,102 +651,6 @@ return NULL; } -/** - * sokoke_uri_unescape_string: - * @uri: an URI string - * - * Unescape @uri if needed, and pass through '+'. - * - * Return value: a newly allocated URI - **/ -gchar* -sokoke_uri_unescape_string (const gchar* uri) -{ - if (strchr (uri,'%')) - return g_uri_unescape_string (uri, "+"); - return g_strdup (uri); -} - -/** - * sokoke_format_uri_for_display: - * @uri: an URI string - * - * Formats an URI for display, for instance by converting - * percent encoded characters and by decoding punycode. - * - * Return value: a newly allocated URI - **/ -gchar* -sokoke_format_uri_for_display (const gchar* uri) -{ - if (uri && g_str_has_prefix (uri, "http://")) - { - gchar* unescaped = sokoke_uri_unescape_string (uri); - #ifdef HAVE_LIBSOUP_2_27_90 - gchar* path = NULL; - 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) - { - gchar* result = g_strconcat ("http://", decoded, path, NULL); - g_free (unescaped); - g_free (decoded); - g_free (hostname); - return result; - } - g_free (hostname); - 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); - return decoded; - #else - return unescaped; - #endif - } - return g_strdup (uri); -} - -void -sokoke_combo_box_add_strings (GtkComboBox* combobox, - const gchar* label_first, ...) -{ - const gchar* label; - - /* Add a number of strings to a combobox, terminated with NULL - This works only for text comboboxes */ - va_list args; - va_start (args, label_first); - - for (label = label_first; label; label = va_arg (args, const gchar*)) - gtk_combo_box_append_text (combobox, label); - - va_end (args); -} - void sokoke_widget_set_visible (GtkWidget* widget, gboolean visible) { /* Show or hide the widget */ @@ -842,13 +660,6 @@ gtk_widget_hide (widget); } -void -sokoke_container_show_children (GtkContainer* container) -{ - /* Show every child but not the container itself */ - gtk_container_foreach (container, (GtkCallback)(gtk_widget_show_all), NULL); -} - typedef enum { SOKOKE_DESKTOP_UNTESTED, @@ -866,7 +677,16 @@ static SokokeDesktop desktop = SOKOKE_DESKTOP_UNTESTED; if (G_UNLIKELY (desktop == SOKOKE_DESKTOP_UNTESTED)) { - /* Are we running in Xfce? */ + desktop = SOKOKE_DESKTOP_UNKNOWN; + + /* Are we running in Xfce >= 4.8? */ + if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "xfce")) + { + desktop = SOKOKE_DESKTOP_XFCE; + } + else + { + /* Are we running in Xfce <= 4.6? */ GdkDisplay* display = gdk_display_get_default (); Display* xdisplay = GDK_DISPLAY_XDISPLAY (display); Window root_window = RootWindow (xdisplay, 0); @@ -880,13 +700,13 @@ save_mode_atom, 0, (~0L), False, AnyPropertyType, &actual_type, &actual_format, &n_items, &bytes, (unsigned char**)&value); - desktop = SOKOKE_DESKTOP_UNKNOWN; if (status == Success) { if (n_items == 6 && !strncmp (value, "xfce4", 6)) desktop = SOKOKE_DESKTOP_XFCE; XFree (value); } + } } return desktop; @@ -927,8 +747,7 @@ xfce_heading = gtk_event_box_new (); entry = gtk_entry_new (); - gtk_widget_modify_bg (xfce_heading, GTK_STATE_NORMAL, - &entry->style->base[GTK_STATE_NORMAL]); + hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 6); if (icon) @@ -938,8 +757,6 @@ GTK_ICON_SIZE_DIALOG); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); label = gtk_label_new (NULL); - gtk_widget_modify_fg (label, GTK_STATE_NORMAL - , &entry->style->text[GTK_STATE_NORMAL]); markup = g_strdup_printf ("%s", title); gtk_label_set_markup (GTK_LABEL (label), markup); @@ -948,6 +765,16 @@ g_free (markup); gtk_widget_destroy (entry); + #if !GTK_CHECK_VERSION (3, 0, 0) + { + GtkStyle* style = gtk_widget_get_style (entry); + gtk_widget_modify_bg (xfce_heading, GTK_STATE_NORMAL, + &style->base[GTK_STATE_NORMAL]); + gtk_widget_modify_fg (label, GTK_STATE_NORMAL + , &style->text[GTK_STATE_NORMAL]); + } + #endif + vbox = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), xfce_heading, FALSE, FALSE, 0); @@ -959,94 +786,6 @@ return NULL; } -void -sokoke_widget_set_pango_font_style (GtkWidget* widget, - PangoStyle style) -{ - /* Conveniently change the pango font style - For some reason we need to reset if we actually want the normal style */ - if (style == PANGO_STYLE_NORMAL) - gtk_widget_modify_font (widget, NULL); - else - { - PangoFontDescription* font_description = pango_font_description_new (); - pango_font_description_set_style (font_description, PANGO_STYLE_ITALIC); - gtk_widget_modify_font (widget, font_description); - pango_font_description_free (font_description); - } -} - -static gboolean -sokoke_on_entry_focus_in_event (GtkEntry* entry, - GdkEventFocus* event, - gpointer userdata) -{ - gint has_default = GPOINTER_TO_INT ( - g_object_get_data (G_OBJECT (entry), "sokoke_has_default")); - if (has_default) - { - gtk_entry_set_text (entry, ""); - g_object_set_data (G_OBJECT (entry), "sokoke_has_default", - GINT_TO_POINTER (0)); - sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), - PANGO_STYLE_NORMAL); - } - return FALSE; -} - -static gboolean -sokoke_on_entry_focus_out_event (GtkEntry* entry, - GdkEventFocus* event, - gpointer userdata) -{ - const gchar* text = gtk_entry_get_text (entry); - if (text && !*text) - { - const gchar* default_text = (const gchar*)g_object_get_data ( - G_OBJECT (entry), "sokoke_default_text"); - gtk_entry_set_text (entry, default_text); - g_object_set_data (G_OBJECT (entry), - "sokoke_has_default", GINT_TO_POINTER (1)); - sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), - PANGO_STYLE_ITALIC); - } - return FALSE; -} - -void -sokoke_entry_set_default_text (GtkEntry* entry, - const gchar* default_text) -{ - /* Note: The default text initially overwrites any previous text */ - gchar* old_value = g_object_get_data (G_OBJECT (entry), - "sokoke_default_text"); - if (!old_value) - { - g_object_set_data (G_OBJECT (entry), "sokoke_has_default", - GINT_TO_POINTER (1)); - sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), - PANGO_STYLE_ITALIC); - gtk_entry_set_text (entry, default_text); - } - else if (!gtk_widget_has_focus (GTK_WIDGET (entry))) - { - gint has_default = GPOINTER_TO_INT ( - g_object_get_data (G_OBJECT (entry), "sokoke_has_default")); - if (has_default) - { - gtk_entry_set_text (entry, default_text); - sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), - PANGO_STYLE_ITALIC); - } - } - g_object_set_data (G_OBJECT (entry), "sokoke_default_text", - (gpointer)default_text); - g_signal_connect (entry, "focus-in-event", - G_CALLBACK (sokoke_on_entry_focus_in_event), NULL); - g_signal_connect (entry, "focus-out-event", - G_CALLBACK (sokoke_on_entry_focus_out_event), NULL); -} - gchar* sokoke_key_file_get_string_default (GKeyFile* key_file, const gchar* group, @@ -1208,6 +947,7 @@ } gtk_widget_set_sensitive (menuitem, sensitive); sokoke_widget_set_visible (menuitem, visible); + gtk_widget_set_no_show_all (menuitem, TRUE); g_signal_connect_swapped (menuitem, "activate", G_CALLBACK (gtk_action_activate), action); @@ -1239,160 +979,13 @@ } /** - * sokoke_days_between: - * @day1: a time_t timestamp value - * @day2: a time_t timestamp value - * - * Calculates the number of days between two timestamps. - * - * Return value: an integer. - **/ -gint -sokoke_days_between (const time_t* day1, - const time_t* day2) -{ - GDate* date1; - GDate* date2; - gint age; - - date1 = g_date_new (); - date2 = g_date_new (); - - g_date_set_time_t (date1, *day1); - g_date_set_time_t (date2, *day2); - - age = g_date_days_between (date1, date2); - - g_date_free (date1); - g_date_free (date2); - - return age; -} - -/** - * sokoke_register_stock_items: - * - * Registers several custom stock items used throughout Midori. - **/ -void -sokoke_register_stock_items (void) -{ - GtkIconSource* icon_source; - GtkIconSet* icon_set; - GtkIconFactory* factory; - gsize i; - - typedef struct - { - const gchar* stock_id; - const gchar* label; - GdkModifierType modifier; - guint keyval; - const gchar* fallback; - } FatStockItem; - static FatStockItem items[] = - { - { STOCK_EXTENSION, NULL, 0, 0, GTK_STOCK_CONVERT }, - { STOCK_IMAGE, NULL, 0, 0, GTK_STOCK_ORIENTATION_PORTRAIT }, - { STOCK_WEB_BROWSER, NULL, 0, 0, "gnome-web-browser" }, - { STOCK_NEWS_FEED, NULL, 0, 0, GTK_STOCK_INDEX }, - { STOCK_SCRIPT, NULL, 0, 0, GTK_STOCK_EXECUTE }, - { STOCK_STYLE, NULL, 0, 0, GTK_STOCK_SELECT_COLOR }, - { STOCK_TRANSFER, NULL, 0, 0, GTK_STOCK_SAVE }, - - { STOCK_BOOKMARK, N_("_Bookmark"), 0, 0, GTK_STOCK_FILE }, - { STOCK_BOOKMARKS, N_("_Bookmarks"), GDK_CONTROL_MASK | GDK_SHIFT_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 }, - { STOCK_HISTORY, N_("_History"), GDK_CONTROL_MASK | GDK_SHIFT_MASK, GDK_H, GTK_STOCK_SORT_ASCENDING }, - { STOCK_HOMEPAGE, N_("_Homepage"), 0, 0, GTK_STOCK_HOME }, - { STOCK_SCRIPTS, N_("_Userscripts"), 0, 0, GTK_STOCK_EXECUTE }, - { STOCK_TAB_NEW, N_("New _Tab"), 0, 0, GTK_STOCK_ADD }, - { STOCK_TRANSFERS, N_("_Transfers"), GDK_CONTROL_MASK | GDK_SHIFT_MASK, GDK_J, GTK_STOCK_SAVE }, - { STOCK_PLUGINS, N_("Netscape p_lugins"), 0, 0, GTK_STOCK_CONVERT }, - { STOCK_USER_TRASH, N_("_Closed Tabs"), 0, 0, "gtk-undo-ltr" }, - { STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, GTK_STOCK_ADD }, - { GTK_STOCK_DIRECTORY, N_("New _Folder"), 0, 0, NULL }, - }; - - factory = gtk_icon_factory_new (); - for (i = 0; i < G_N_ELEMENTS (items); i++) - { - icon_set = gtk_icon_set_new (); - icon_source = gtk_icon_source_new (); - if (items[i].fallback) - { - gtk_icon_source_set_icon_name (icon_source, items[i].fallback); - items[i].fallback = NULL; - gtk_icon_set_add_source (icon_set, icon_source); - } - gtk_icon_source_set_icon_name (icon_source, items[i].stock_id); - gtk_icon_set_add_source (icon_set, icon_source); - gtk_icon_source_free (icon_source); - gtk_icon_factory_add (factory, items[i].stock_id, icon_set); - gtk_icon_set_unref (icon_set); - } - 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 -} - -/** * sokoke_set_config_dir: * @new_config_dir: an absolute path, or %NULL * * Retrieves and/ or sets the base configuration folder. * + * "/" means no configuration is saved. + * * Return value: the configuration folder, or %NULL **/ const gchar* @@ -1415,6 +1008,12 @@ return config_dir; } +gboolean +sokoke_is_app_or_private (void) +{ + return !strcmp ("/", sokoke_set_config_dir (NULL)); +} + /** * sokoke_remove_path: * @path: an absolute path @@ -1496,6 +1095,45 @@ } /** + * sokoke_find_lib_path: + * @folder: the lib subfolder + * + * Looks for the specified folder in the lib directories. + * + * Return value: a newly allocated full path, or %NULL + **/ +gchar* sokoke_find_lib_path (const gchar* folder) +{ + #ifdef G_OS_WIN32 + gchar* path = g_win32_get_package_installation_directory_of_module (NULL); + gchar* lib_path = g_build_filename (path, "lib", folder ? folder : "", NULL); + g_free (path); + if (g_access (lib_path, F_OK) == 0) + return lib_path; + #else + const gchar* lib_dirs[] = + { + LIBDIR, + "/usr/local/lib", + "/usr/lib", + NULL + }; + guint i; + + for (i = 0; i < G_N_ELEMENTS (lib_dirs); i++) + { + gchar* lib_path = g_build_filename (lib_dirs[i], folder ? folder : "", NULL); + if (g_access (lib_path, F_OK) == 0) + return lib_path; + else + g_free (lib_path); + } + #endif + + return NULL; +} + +/** * sokoke_find_data_filename: * @filename: a filename or relative path * @@ -1505,26 +1143,39 @@ * Return value: a newly allocated full path **/ gchar* -sokoke_find_data_filename (const gchar* filename) +sokoke_find_data_filename (const gchar* filename, + gboolean res) { + const gchar* res1 = res ? PACKAGE_NAME : ""; + const gchar* res2 = res ? "res" : ""; const gchar* const* data_dirs = g_get_system_data_dirs (); guint i = 0; const gchar* data_dir; gchar* path; - path = g_build_filename (g_get_user_data_dir (), filename, NULL); + #ifdef G_OS_WIN32 + gchar* install_path = g_win32_get_package_installation_directory_of_module (NULL); + path = g_build_filename (install_path, "share", res1, res2, filename, NULL); + g_free (install_path); + if (g_access (path, F_OK) == 0) + return path; + + g_free (path); + #endif + + path = g_build_filename (g_get_user_data_dir (), res1, res2, filename, NULL); if (g_access (path, F_OK) == 0) return path; g_free (path); while ((data_dir = data_dirs[i++])) { - path = g_build_filename (data_dir, filename, NULL); + path = g_build_filename (data_dir, res1, res2, filename, NULL); if (g_access (path, F_OK) == 0) return path; g_free (path); } - return g_build_filename (MDATADIR, filename, NULL); + return g_build_filename (MDATADIR, res1, res2, filename, NULL); } /** @@ -1546,101 +1197,6 @@ return stored_argv; } -#if !WEBKIT_CHECK_VERSION (1, 1, 14) -static void -res_server_handler_cb (SoupServer* res_server, - SoupMessage* msg, - const gchar* path, - GHashTable* query, - SoupClientContext* client, - gpointer data) -{ - if (g_str_has_prefix (path, "/res")) - { - gchar* filename = g_build_filename ("midori", path, NULL); - gchar* filepath = sokoke_find_data_filename (filename); - gchar* contents; - gsize length; - - g_free (filename); - if (g_file_get_contents (filepath, &contents, &length, NULL)) - { - gchar* content_type = g_content_type_guess (filepath, (guchar*)contents, - length, NULL); - gchar* mime_type = g_content_type_get_mime_type (content_type); - g_free (content_type); - soup_message_set_response (msg, mime_type, SOUP_MEMORY_TAKE, - contents, length); - g_free (mime_type); - soup_message_set_status (msg, 200); - } - else - soup_message_set_status (msg, 404); - g_free (filepath); - } - else if (g_str_has_prefix (path, "/stock/")) - { - GtkIconTheme* icon_theme = gtk_icon_theme_get_default (); - const gchar* icon_name = &path[7] ? &path[7] : ""; - gint icon_size = 22; - GdkPixbuf* icon; - gchar* contents; - gsize length; - - 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]; - } - } - - icon = gtk_icon_theme_load_icon (icon_theme, icon_name, - icon_size, 0, NULL); - if (!icon) - icon = gtk_icon_theme_load_icon (icon_theme, "gtk-missing-image", - icon_size, 0, NULL); - - gdk_pixbuf_save_to_buffer (icon, &contents, &length, "png", NULL, NULL); - g_object_unref (icon); - soup_message_set_response (msg, "image/png", SOUP_MEMORY_TAKE, - contents, length); - soup_message_set_status (msg, 200); - } - else - { - soup_message_set_status (msg, 404); - } -} - -SoupServer* -sokoke_get_res_server (void) -{ - static SoupServer* res_server = NULL; - SoupAddress* addr = NULL; - - if (G_UNLIKELY (!res_server)) - { - addr = soup_address_new ("localhost", SOUP_ADDRESS_ANY_PORT); - soup_address_resolve_sync (addr, NULL); - res_server = soup_server_new ("interface", addr, NULL); - g_object_unref (addr); - soup_server_add_handler (res_server, "/", - res_server_handler_cb, NULL, NULL); - soup_server_run_async (res_server); - } - - return res_server; -} -#endif - gchar* sokoke_replace_variables (const gchar* template, const gchar* variable_first, ...) @@ -1691,7 +1247,7 @@ /* Hack to allow Ctrl + Shift + Tab */ if (event->keyval == 65056) - event->keyval = GDK_Tab; + event->keyval = GDK_KEY_Tab; /* We don't use gtk_accel_groups_activate because it refuses to activate anything that gtk_accelerator_valid doesn't like. */ @@ -1777,6 +1333,7 @@ /** * sokoke_prefetch_uri: + * @settings: a #MidoriWebSettings instance, or %NULL * @uri: an URI string * * Attempts to prefetch the specified URI, that is @@ -1785,45 +1342,35 @@ * Return value: %TRUE on success **/ gboolean -sokoke_prefetch_uri (const char* uri, +sokoke_prefetch_uri (MidoriWebSettings* settings, + const char* uri, SoupAddressCallback callback, gpointer user_data) { #define MAXHOSTS 50 static gchar* hosts = NULL; static gint host_count = G_MAXINT; + gchar* hostname; - SoupURI* s_uri; - - if (!uri) - return FALSE; - s_uri = soup_uri_new (uri); - if (!s_uri || !s_uri->host) + if (settings && !katze_object_get_boolean (settings, "enable-dns-prefetching")) return FALSE; - #if GLIB_CHECK_VERSION (2, 22, 0) - if (g_hostname_is_ip_address (s_uri->host)) - #else - if (g_ascii_isdigit (s_uri->host[0]) && g_strstr_len (s_uri->host, 4, ".")) - #endif + if (!(hostname = midori_uri_parse_hostname (uri, NULL)) + || g_hostname_is_ip_address (hostname) + || !midori_uri_is_http (uri)) { - soup_uri_free (s_uri); - return FALSE; - } - if (!g_str_has_prefix (uri, "http")) - { - soup_uri_free (s_uri); + g_free (hostname); return FALSE; } if (!hosts || - !g_regex_match_simple (s_uri->host, hosts, + !g_regex_match_simple (hostname, hosts, G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)) { SoupAddress* address; gchar* new_hosts; - address = soup_address_new (s_uri->host, SOUP_ADDRESS_ANY_PORT); + address = soup_address_new (hostname, SOUP_ADDRESS_ANY_PORT); soup_address_resolve_async (address, 0, 0, callback, user_data); g_object_unref (address); @@ -1833,12 +1380,12 @@ host_count = 0; } host_count++; - new_hosts = g_strdup_printf ("%s|%s", hosts, s_uri->host); + new_hosts = g_strdup_printf ("%s|%s", hosts, hostname); katze_assign (hosts, new_hosts); } else if (callback) callback (NULL, SOUP_STATUS_OK, user_data); - soup_uri_free (s_uri); + g_free (hostname); return TRUE; } @@ -1957,3 +1504,246 @@ return langs_str; } + +/** + * sokoke_register_privacy_item: + * @name: the name of the privacy item + * @label: a user visible, localized label + * @clear: a callback clearing data + * + * Registers an item to clear data, either via the + * Clear Private Data dialogue or when Midori quits. + * + * Return value: a #GList if all arguments are %NULL + **/ +GList* +sokoke_register_privacy_item (const gchar* name, + const gchar* label, + GCallback clear) +{ + static GList* items = NULL; + SokokePrivacyItem* item; + + if (name == NULL && label == NULL && clear == NULL) + return items; + + g_return_val_if_fail (name != NULL, NULL); + g_return_val_if_fail (label != NULL, NULL); + g_return_val_if_fail (clear != NULL, NULL); + + item = g_new (SokokePrivacyItem, 1); + item->name = g_strdup (name); + item->label = g_strdup (label); + item->clear = clear; + items = g_list_append (items, item); + return NULL; +} + +void +sokoke_widget_copy_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 ? text : "", -1); + clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_PRIMARY); + gtk_clipboard_set_text (clipboard, text ? text : "", -1); +} + +gchar* +sokoke_build_thumbnail_path (const gchar* name) +{ + gchar* path = NULL; + if (name != NULL) + { + gchar* checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, name, -1); + gchar* filename = g_strdup_printf ("%s.png", checksum); + + path = g_build_filename (g_get_user_cache_dir (), "midori", "thumbnails", + filename, NULL); + + g_free (filename); + g_free (checksum); + } + return path; +} + +gchar* +midori_download_prepare_tooltip_text (WebKitDownload* download) +{ + gdouble* last_time; + guint64* last_size; + gint hour = 3600, min = 60; + gint hours_left, minutes_left, seconds_left; + guint64 total_size = webkit_download_get_total_size (download); + guint64 current_size = webkit_download_get_current_size (download); + gdouble time_elapsed = webkit_download_get_elapsed_time (download); + gdouble time_estimated, time_diff; + gchar* current, *total, *download_speed; + gchar* hours_str, *minutes_str, *seconds_str; + GString* tooltip = g_string_new (NULL); + + time_diff = time_elapsed / current_size; + time_estimated = (total_size - current_size) * time_diff; + + hours_left = time_estimated / hour; + minutes_left = (time_estimated - (hours_left * hour)) / min; + seconds_left = (time_estimated - (hours_left * hour) - (minutes_left * min)); + + hours_str = g_strdup_printf (ngettext ("%d hour", "%d hours", hours_left), hours_left); + minutes_str = g_strdup_printf (ngettext ("%d minute", "%d minutes", minutes_left), minutes_left); + seconds_str = g_strdup_printf (ngettext ("%d second", "%d seconds", seconds_left), seconds_left); + + current = g_format_size (current_size); + total = g_format_size (total_size); + last_time = g_object_get_data (G_OBJECT (download), "last-time"); + last_size = g_object_get_data (G_OBJECT (download), "last-size"); + + /* i18n: Download tooltip (size): 4KB of 43MB */ + g_string_append_printf (tooltip, _("%s of %s"), current, total); + g_free (current); + g_free (total); + + if (time_elapsed != *last_time) + download_speed = g_format_size ( + (current_size - *last_size) / (time_elapsed - *last_time)); + else + /* i18n: Unknown number of bytes, used for transfer rate like ?B/s */ + download_speed = g_strdup (_("?B")); + + /* i18n: Download tooltip (transfer rate): (130KB/s) */ + g_string_append_printf (tooltip, _(" (%s/s)"), download_speed); + g_free (download_speed); + + if (time_estimated > 0) + { + gchar* eta = NULL; + if (hours_left > 0) + eta = g_strdup_printf ("%s, %s", hours_str, minutes_str); + else if (minutes_left >= 10) + eta = g_strdup_printf ("%s", minutes_str); + else if (minutes_left < 10 && minutes_left > 0) + eta = g_strdup_printf ("%s, %s", minutes_str, seconds_str); + else if (seconds_left > 0) + eta = g_strdup_printf ("%s", seconds_str); + if (eta != NULL) + { + /* i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning */ + g_string_append_printf (tooltip, _(" - %s remaining"), eta); + g_free (eta); + } + } + + g_free (hours_str); + g_free (seconds_str); + g_free (minutes_str); + + if (time_elapsed - *last_time > 5.0) + { + *last_time = time_elapsed; + *last_size = current_size; + } + + return g_string_free (tooltip, FALSE); +} + +static gboolean +sokoke_entry_has_placeholder_text (GtkEntry* entry) +{ + const gchar* text = gtk_entry_get_text (entry); + const gchar* hint = gtk_entry_get_placeholder_text (entry); + if (!gtk_widget_has_focus (GTK_WIDGET (entry)) + && hint != NULL + && (text == NULL || !strcmp (text, hint))) + return TRUE; + return FALSE; +} + +static void +sokoke_entry_changed_cb (GtkEditable* editable, + GtkEntry* entry) +{ + const gchar* text = gtk_entry_get_text (entry); + gboolean visible = text && *text + && ! sokoke_entry_has_placeholder_text (entry); + gtk_icon_entry_set_icon_from_stock ( + GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_SECONDARY, + visible ? GTK_STOCK_CLEAR : NULL); +} + +static gboolean +sokoke_entry_focus_out_event_cb (GtkEditable* editable, + GdkEventFocus* event, + GtkEntry* entry) +{ + sokoke_entry_changed_cb (editable, entry); + return FALSE; +} + +static void +sokoke_entry_icon_released_cb (GtkEntry* entry, + GtkIconEntryPosition icon_pos, + GdkEvent* event, + gpointer user_data) +{ + if (icon_pos != GTK_ICON_ENTRY_SECONDARY) + return; + + gtk_entry_set_text (entry, ""); + gtk_widget_grab_focus (GTK_WIDGET (entry)); +} + +void +sokoke_entry_set_clear_button_visible (GtkEntry* entry, + gboolean visible) +{ + g_return_if_fail (GTK_IS_ENTRY (entry)); + + gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_SECONDARY, TRUE); + if (visible) + { + g_object_connect (entry, + "signal::icon-release", + G_CALLBACK (sokoke_entry_icon_released_cb), NULL, + "signal::focus-in-event", + G_CALLBACK (sokoke_entry_focus_out_event_cb), entry, + "signal::focus-out-event", + G_CALLBACK (sokoke_entry_focus_out_event_cb), entry, + "signal::changed", + G_CALLBACK (sokoke_entry_changed_cb), entry, NULL); + sokoke_entry_changed_cb ((GtkEditable*)entry, entry); + } + else + { + g_object_disconnect (entry, + "any_signal::icon-release", + G_CALLBACK (sokoke_entry_icon_released_cb), NULL, + "any_signal::focus-in-event", + G_CALLBACK (sokoke_entry_focus_out_event_cb), entry, + "any_signal::focus-out-event", + G_CALLBACK (sokoke_entry_focus_out_event_cb), entry, + "any_signal::changed", + G_CALLBACK (sokoke_entry_changed_cb), entry, NULL); + gtk_icon_entry_set_icon_from_stock ( + GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_SECONDARY, NULL); + } +} + +gchar* +sokoke_get_download_filename (WebKitDownload* download) +{ + /* https://bugs.webkit.org/show_bug.cgi?id=83161 */ + /* https://d19vezwu8eufl6.cloudfront.net/nlp/slides%2F03-01-FormalizingNB.pdf */ + gchar* filename = g_strdup (webkit_download_get_suggested_filename (download)); + #ifdef G_OS_WIN32 + g_strdelimit (filename, "/\\<>:\"|?*", '_'); + #else + g_strdelimit (filename, "/", '_'); + #endif + return filename; +} + diff -Nru midori-0.2.8/midori/sokoke.h midori-0.4.6/midori/sokoke.h --- midori-0.2.8/midori/sokoke.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/sokoke.h 2012-05-14 22:13:42.000000000 +0000 @@ -13,64 +13,10 @@ #ifndef __SOKOKE_H__ #define __SOKOKE_H__ 1 -/* Common behavior modifiers */ -#define MIDORI_MOD_NEW_WINDOW(state) (state & GDK_SHIFT_MASK) -#define MIDORI_MOD_NEW_TAB(state) (state & GDK_CONTROL_MASK) -#define MIDORI_MOD_BACKGROUND(state) (state & GDK_SHIFT_MASK) -#define MIDORI_MOD_SCROLL(state) (state & GDK_CONTROL_MASK) - -#include - -#include #include - -#if !GLIB_CHECK_VERSION (2, 14, 0) - #define G_PARAM_STATIC_STRINGS \ - (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB) -#endif - -#if !GLIB_CHECK_VERSION (2, 18, 0) - #define g_content_type_from_mime_type(mtp) g_strdup (mtp) -#endif - -#if !GTK_CHECK_VERSION (2, 14, 0) - #define gtk_dialog_get_content_area(dlg) dlg->vbox -#endif - -#if !GTK_CHECK_VERSION (2, 16, 0) - #define GTK_ACTIVATABLE GTK_WIDGET - #define gtk_activatable_get_related_action gtk_widget_get_action - #define gtk_menu_item_set_label(menuitem, label) \ - gtk_label_set_label (GTK_LABEL (GTK_BIN (menuitem)->child), \ - label ? label : ""); -#endif - -#if !GTK_CHECK_VERSION (2, 18, 0) - #define gtk_widget_is_toplevel(widget) GTK_WIDGET_TOPLEVEL (widget) - #define gtk_widget_has_focus(widget) GTK_WIDGET_HAS_FOCUS (widget) - #define gtk_widget_get_visible(widget) GTK_WIDGET_VISIBLE (widget) - #define gtk_widget_get_sensitive(widget) GTK_WIDGET_IS_SENSITIVE (widget) -#endif - -#if !GTK_CHECK_VERSION (2, 20, 0) - #define gtk_widget_get_realized(widget) GTK_WIDGET_REALIZED (widget) -#endif - -#if !GTK_CHECK_VERSION(2, 12, 0) - -void -gtk_widget_set_has_tooltip (GtkWidget* widget, - gboolean has_tooltip); - -void -gtk_widget_set_tooltip_text (GtkWidget* widget, - const gchar* text); - -void -gtk_tool_item_set_tooltip_text (GtkToolItem* toolitem, - const gchar* text); - -#endif +#include +#include +#include gchar* sokoke_js_script_eval (JSContextRef js_context, @@ -80,7 +26,8 @@ void sokoke_message_dialog (GtkMessageType message_type, const gchar* short_message, - const gchar* detailed_message); + const gchar* detailed_message, + gboolean modal); gboolean sokoke_show_uri_with_mime_type (GdkScreen* screen, @@ -96,50 +43,28 @@ GError** error); gboolean -sokoke_spawn_program (const gchar* command, - const gchar* argument, - gboolean quote); +sokoke_spawn_program (const gchar* command, + const gchar* argument); -gchar* sokoke_search_uri (const gchar* uri, - const gchar* keywords); - -gchar* -sokoke_hostname_from_uri (const gchar* uri, - gchar** path); +void +sokoke_spawn_app (const gchar* uri, + gboolean inherit_config); -gchar* -sokoke_uri_to_ascii (const gchar* uri); +gboolean +sokoke_external_uri (const gchar* uri); gchar* sokoke_magic_uri (const gchar* uri); -gchar* -sokoke_uri_unescape_string (const gchar* uri); - -gchar* -sokoke_format_uri_for_display (const gchar* uri); - -void -sokoke_combo_box_add_strings (GtkComboBox* combobox, - const gchar* label_first, - ...); - void sokoke_widget_set_visible (GtkWidget* widget, gboolean visible); -void -sokoke_container_show_children (GtkContainer* container); - GtkWidget* sokoke_xfce_header_new (const gchar* icon, const gchar* title); void -sokoke_widget_set_pango_font_style (GtkWidget* widget, - PangoStyle style); - -void sokoke_entry_set_default_text (GtkEntry* entry, const gchar* default_text); @@ -197,17 +122,13 @@ gint64 sokoke_time_t_to_julian (const time_t* timestamp); -gint -sokoke_days_between (const time_t* day1, - const time_t* day2); - -void -sokoke_register_stock_items (void); - const gchar* sokoke_set_config_dir (const gchar* new_config_dir); gboolean +sokoke_is_app_or_private (void); + +gboolean sokoke_remove_path (const gchar* path, gboolean ignore_errors); @@ -216,16 +137,15 @@ const gchar* filename); gchar* -sokoke_find_data_filename (const gchar* filename); +sokoke_find_lib_path (const gchar* folder); + +gchar* +sokoke_find_data_filename (const gchar* filename, + gboolean res); gchar** sokoke_get_argv (gchar** argument_vector); -#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, ...); @@ -242,7 +162,8 @@ GtkFileChooserAction action); gboolean -sokoke_prefetch_uri (const char* uri, +sokoke_prefetch_uri (MidoriWebSettings* settings, + const char* uri, SoupAddressCallback callback, gpointer user_data); @@ -255,5 +176,33 @@ gboolean sokoke_recursive_fork_protection (const gchar* uri, gboolean set_uri); +gchar* +sokoke_get_download_filename (WebKitDownload* download); + +typedef struct +{ + gchar* name; + gchar* label; + GCallback clear; +} SokokePrivacyItem; + +GList* +sokoke_register_privacy_item (const gchar* name, + const gchar* label, + GCallback clear); + +void +sokoke_widget_copy_clipboard (GtkWidget* widget, + const gchar* text); + +gchar* +sokoke_build_thumbnail_path (const gchar* name); + +gchar* +midori_download_prepare_tooltip_text (WebKitDownload* download); + +void +sokoke_entry_set_clear_button_visible (GtkEntry* entry, + gboolean visible); #endif /* !__SOKOKE_H__ */ diff -Nru midori-0.2.8/midori/webkitgtk-3.0.deps midori-0.4.6/midori/webkitgtk-3.0.deps --- midori-0.2.8/midori/webkitgtk-3.0.deps 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/midori/webkitgtk-3.0.deps 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,8 @@ +atk +gio-2.0 +cairo +pango +gdk-pixbuf-2.0 +gdk-3.0 +gtk+-3.0 +libsoup-2.4 diff -Nru midori-0.2.8/midori/webkitgtk-3.0.vapi midori-0.4.6/midori/webkitgtk-3.0.vapi --- midori-0.2.8/midori/webkitgtk-3.0.vapi 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/midori/webkitgtk-3.0.vapi 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,653 @@ +/* webkit-1.0.vapi generated by vapigen, do not modify. */ + +[CCode (cprefix = "WebKit", lower_case_cprefix = "webkit_")] +namespace WebKit { + [CCode (cheader_filename = "webkit/webkit.h")] + public class Download : GLib.Object { + [CCode (has_construct_function = false)] + public Download (WebKit.NetworkRequest request); + public void cancel (); + public uint64 get_current_size (); + public unowned string get_destination_uri (); + public double get_elapsed_time (); + public unowned WebKit.NetworkRequest get_network_request (); + public unowned WebKit.NetworkResponse get_network_response (); + public double get_progress (); + public WebKit.DownloadStatus get_status (); + public unowned string get_suggested_filename (); + public uint64 get_total_size (); + public unowned string get_uri (); + public void set_destination_uri (string destination_uri); + public void start (); + public uint64 current_size { get; } + public string destination_uri { get; set; } + public WebKit.NetworkRequest network_request { get; construct; } + public WebKit.NetworkResponse network_response { get; construct; } + public double progress { get; } + public WebKit.DownloadStatus status { get; } + public string suggested_filename { get; } + public uint64 total_size { get; } + public virtual signal bool error (int p0, int p1, string p2); + } + [CCode (cheader_filename = "webkit/webkit.h")] + public class GeolocationPolicyDecision : GLib.Object { + [CCode (has_construct_function = false)] + protected GeolocationPolicyDecision (); + } + [CCode (cheader_filename = "webkit/webkit.h")] + public class HitTestResult : GLib.Object { + [CCode (has_construct_function = false)] + protected HitTestResult (); + [NoAccessorMethod] + public WebKit.HitTestResultContext context { get; construct; } + [NoAccessorMethod] + public string image_uri { owned get; construct; } + [NoAccessorMethod] + public string link_uri { owned get; construct; } + [NoAccessorMethod] + public string media_uri { owned get; construct; } + } + [CCode (cheader_filename = "webkit/webkit.h")] + public class NetworkRequest : GLib.Object { + [CCode (has_construct_function = false)] + public NetworkRequest (string uri); + public unowned Soup.Message get_message (); + public unowned string get_uri (); + public void set_uri (string uri); + public Soup.Message message { get; construct; } + public string uri { get; set; } + } + [CCode (cheader_filename = "webkit/webkit.h")] + public class NetworkResponse : GLib.Object { + [CCode (has_construct_function = false)] + public NetworkResponse (string uri); + public unowned Soup.Message get_message (); + public unowned string get_uri (); + public void set_uri (string uri); + public Soup.Message message { get; construct; } + public string uri { get; set; } + } + [CCode (cheader_filename = "webkit/webkit.h")] + public class SecurityOrigin : GLib.Object { + [CCode (has_construct_function = false)] + protected SecurityOrigin (); + public unowned GLib.List get_all_web_databases (); + public unowned string get_host (); + public uint get_port (); + public unowned string get_protocol (); + public uint64 get_web_database_quota (); + public uint64 get_web_database_usage (); + public void set_web_database_quota (uint64 quota); + public string host { get; } + public uint port { get; } + public string protocol { get; } + public uint64 web_database_quota { get; set; } + public uint64 web_database_usage { get; } + } + [CCode (cheader_filename = "webkit/webkit.h")] + public class SoupAuthDialog : GLib.Object, Soup.SessionFeature { + [CCode (has_construct_function = false)] + protected SoupAuthDialog (); + public virtual signal unowned Gtk.Widget current_toplevel (Soup.Message message); + } + [CCode (cheader_filename = "webkit/webkit.h")] + public class WebBackForwardList : GLib.Object { + [CCode (has_construct_function = false)] + protected WebBackForwardList (); + public void add_item (WebKit.WebHistoryItem history_item); + public void clear (); + public bool contains_item (WebKit.WebHistoryItem history_item); + public unowned WebKit.WebHistoryItem get_back_item (); + public int get_back_length (); + public unowned GLib.List get_back_list_with_limit (int limit); + public unowned WebKit.WebHistoryItem get_current_item (); + public unowned WebKit.WebHistoryItem get_forward_item (); + public int get_forward_length (); + public unowned GLib.List get_forward_list_with_limit (int limit); + public int get_limit (); + public unowned WebKit.WebHistoryItem get_nth_item (int index); + public void go_back (); + public void go_forward (); + public void go_to_item (WebKit.WebHistoryItem history_item); + public void set_limit (int limit); + [CCode (has_construct_function = false)] + public WebBackForwardList.with_web_view (WebKit.WebView web_view); + } + [CCode (cheader_filename = "webkit/webkit.h")] + public class WebDataSource : GLib.Object { + [CCode (has_construct_function = false)] + public WebDataSource (); + public unowned GLib.StringBuilder get_data (); + public unowned string get_encoding (); + public unowned WebKit.NetworkRequest get_initial_request (); + public unowned WebKit.WebResource get_main_resource (); + public unowned WebKit.NetworkRequest get_request (); + public unowned GLib.List get_subresources (); + public unowned string get_unreachable_uri (); + public unowned WebKit.WebFrame get_web_frame (); + public bool is_loading (); + [CCode (has_construct_function = false)] + public WebDataSource.with_request (WebKit.NetworkRequest request); + } + [CCode (cheader_filename = "webkit/webkit.h")] + public class WebDatabase : GLib.Object { + [CCode (has_construct_function = false)] + protected WebDatabase (); + public unowned string get_display_name (); + public uint64 get_expected_size (); + public unowned string get_filename (); + public unowned string get_name (); + public unowned WebKit.SecurityOrigin get_security_origin (); + public uint64 get_size (); + public void remove (); + public string display_name { get; } + public uint64 expected_size { get; } + public string filename { get; } + public string name { get; construct; } + public WebKit.SecurityOrigin security_origin { get; construct; } + public uint64 size { get; } + } + [CCode (cheader_filename = "webkit/webkit.h")] + public class WebFrame : GLib.Object { + [CCode (has_construct_function = false)] + public WebFrame (WebKit.WebView web_view); + public unowned WebKit.WebFrame find_frame (string name); + public unowned WebKit.WebDataSource get_data_source (); + public Gtk.PolicyType get_horizontal_scrollbar_policy (); + public WebKit.LoadStatus get_load_status (); + public unowned string get_name (); + public unowned WebKit.NetworkResponse get_network_response (); + public unowned WebKit.WebFrame get_parent (); + public unowned WebKit.WebDataSource get_provisional_data_source (); + public unowned WebKit.SecurityOrigin get_security_origin (); + public unowned string get_title (); + public unowned string get_uri (); + public Gtk.PolicyType get_vertical_scrollbar_policy (); + public unowned WebKit.WebView get_web_view (); + public void load_alternate_string (string content, string base_url, string unreachable_url); + public void load_request (WebKit.NetworkRequest request); + public void load_string (string content, string mime_type, string encoding, string base_uri); + public void load_uri (string uri); + public void print (); + public Gtk.PrintOperationResult print_full (Gtk.PrintOperation operation, Gtk.PrintOperationAction action) throws GLib.Error; + public void reload (); + public void stop_loading (); + public Gtk.PolicyType horizontal_scrollbar_policy { get; } + public WebKit.LoadStatus load_status { get; } + public string name { get; } + public string title { get; } + public string uri { get; } + public Gtk.PolicyType vertical_scrollbar_policy { get; } + public virtual signal void cleared (); + public virtual signal void hovering_over_link (string p0, string p1); + public virtual signal void load_committed (); + public virtual signal void load_done (bool p0); + public virtual signal bool scrollbars_policy_changed (); + public virtual signal void title_changed (string p0); + } + [CCode (cheader_filename = "webkit/webkit.h")] + public class WebHistoryItem : GLib.Object { + [CCode (has_construct_function = false)] + public WebHistoryItem (); + public unowned WebKit.WebHistoryItem copy (); + public unowned string get_alternate_title (); + public double get_last_visited_time (); + public unowned string get_original_uri (); + public unowned string get_title (); + public unowned string get_uri (); + public void set_alternate_title (string title); + [CCode (has_construct_function = false)] + public WebHistoryItem.with_data (string uri, string title); + public string alternate_title { get; set; } + public double last_visited_time { get; } + public string original_uri { get; } + public string title { get; } + public string uri { get; } + } + [CCode (cheader_filename = "webkit/webkit.h")] + public class WebInspector : GLib.Object { + [CCode (has_construct_function = false)] + protected WebInspector (); + public void close (); + public unowned string get_inspected_uri (); + public unowned WebKit.WebView get_web_view (); + public void inspect_coordinates (double x, double y); + public void show (); + public string inspected_uri { get; } + [NoAccessorMethod] + public bool javascript_profiling_enabled { get; set; } + [NoAccessorMethod] + public bool timeline_profiling_enabled { get; set; } + public WebKit.WebView web_view { get; } + public virtual signal bool attach_window (); + public virtual signal bool close_window (); + public virtual signal bool detach_window (); + public virtual signal void finished (); + public virtual signal unowned WebKit.WebView inspect_web_view (WebKit.WebView p0); + public virtual signal bool show_window (); + } + [CCode (cheader_filename = "webkit/webkit.h")] + public class WebNavigationAction : GLib.Object { + [CCode (has_construct_function = false)] + protected WebNavigationAction (); + public int get_button (); + public int get_modifier_state (); + public unowned string get_original_uri (); + public WebKit.WebNavigationReason get_reason (); + public unowned string get_target_frame (); + public void set_original_uri (string originalUri); + public void set_reason (WebKit.WebNavigationReason reason); + public int button { get; construct; } + public int modifier_state { get; construct; } + public string original_uri { get; set construct; } + public WebKit.WebNavigationReason reason { get; set construct; } + public string target_frame { get; construct; } + } + [CCode (cheader_filename = "webkit/webkit.h")] + public class WebPolicyDecision : GLib.Object { + [CCode (has_construct_function = false)] + protected WebPolicyDecision (); + public void download (); + public void ignore (); + public void use (); + } + [CCode (cheader_filename = "webkit/webkit.h")] + public class WebResource : GLib.Object { + [CCode (has_construct_function = false)] + public WebResource (string data, ssize_t size, string uri, string mime_type, string encoding, string frame_name); + public unowned GLib.StringBuilder get_data (); + public unowned string get_encoding (); + public unowned string get_frame_name (); + public unowned string get_mime_type (); + public unowned string get_uri (); + public string encoding { get; } + public string frame_name { get; } + public string mime_type { get; } + public string uri { get; construct; } + } + [CCode (cheader_filename = "webkit/webkit.h")] + public class WebSettings : GLib.Object { + [CCode (has_construct_function = false)] + public WebSettings (); + public WebKit.WebSettings copy (); + public unowned string get_user_agent (); + [NoAccessorMethod] + public bool auto_load_images { get; set construct; } + [NoAccessorMethod] + public bool auto_resize_window { get; set construct; } + [NoAccessorMethod] + public bool auto_shrink_images { get; set construct; } + [NoAccessorMethod] + public string cursive_font_family { owned get; set construct; } + [NoAccessorMethod] + public string default_encoding { owned get; set construct; } + [NoAccessorMethod] + public string default_font_family { owned get; set construct; } + [NoAccessorMethod] + public int default_font_size { get; set construct; } + [NoAccessorMethod] + public int default_monospace_font_size { get; set construct; } + [NoAccessorMethod] + public WebKit.EditingBehavior editing_behavior { get; set construct; } + [NoAccessorMethod] + public bool enable_caret_browsing { get; set construct; } + [NoAccessorMethod] + public bool enable_default_context_menu { get; set construct; } + [NoAccessorMethod] + public bool enable_developer_extras { get; set construct; } + [NoAccessorMethod] + public bool enable_dom_paste { get; set construct; } + [NoAccessorMethod] + public bool enable_file_access_from_file_uris { get; set construct; } + [NoAccessorMethod] + public bool enable_html5_database { get; set construct; } + [NoAccessorMethod] + public bool enable_html5_local_storage { get; set construct; } + [NoAccessorMethod] + public bool enable_java_applet { get; set construct; } + [NoAccessorMethod] + public bool enable_offline_web_application_cache { get; set construct; } + [NoAccessorMethod] + public bool enable_page_cache { get; set construct; } + [NoAccessorMethod] + public bool enable_plugins { get; set construct; } + [NoAccessorMethod] + public bool enable_private_browsing { get; set construct; } + [NoAccessorMethod] + public bool enable_scripts { get; set construct; } + [NoAccessorMethod] + public bool enable_site_specific_quirks { get; set construct; } + [NoAccessorMethod] + public bool enable_spatial_navigation { get; set construct; } + [NoAccessorMethod] + public bool enable_spell_checking { get; set construct; } + [NoAccessorMethod] + public bool enable_universal_access_from_file_uris { get; set construct; } + [NoAccessorMethod] + public bool enable_xss_auditor { get; set construct; } + [NoAccessorMethod] + public bool enforce_96_dpi { get; set construct; } + [NoAccessorMethod] + public string fantasy_font_family { owned get; set construct; } + [NoAccessorMethod] + public bool javascript_can_access_clipboard { get; set construct; } + [NoAccessorMethod] + public bool javascript_can_open_windows_automatically { get; set construct; } + [NoAccessorMethod] + public int minimum_font_size { get; set construct; } + [NoAccessorMethod] + public int minimum_logical_font_size { get; set construct; } + [NoAccessorMethod] + public string monospace_font_family { owned get; set construct; } + [NoAccessorMethod] + public bool print_backgrounds { get; set construct; } + [NoAccessorMethod] + public bool resizable_text_areas { get; set construct; } + [NoAccessorMethod] + public string sans_serif_font_family { owned get; set construct; } + [NoAccessorMethod] + public string serif_font_family { owned get; set construct; } + [NoAccessorMethod] + public string spell_checking_languages { owned get; set construct; } + [NoAccessorMethod] + public bool tab_key_cycles_through_elements { get; set construct; } + [NoAccessorMethod] + public string user_agent { owned get; set construct; } + [NoAccessorMethod] + public string user_stylesheet_uri { owned get; set construct; } + [NoAccessorMethod] + public float zoom_step { get; set construct; } + } + [CCode (cheader_filename = "webkit/webkit.h")] + public class WebView : Gtk.Container, Atk.Implementor, Gtk.Buildable { + [CCode (type = "GtkWidget*", has_construct_function = false)] + public WebView (); + public bool can_copy_clipboard (); + public bool can_cut_clipboard (); + public bool can_go_back (); + public bool can_go_back_or_forward (int steps); + public bool can_go_forward (); + public bool can_paste_clipboard (); + public bool can_redo (); + public bool can_show_mime_type (string mime_type); + public bool can_undo (); + [NoWrapper] + public virtual unowned string choose_file (WebKit.WebFrame frame, string old_file); + public void delete_selection (); + public void execute_script (string script); + public unowned WebKit.WebBackForwardList get_back_forward_list (); + public unowned Gtk.TargetList get_copy_target_list (); + public unowned string get_custom_encoding (); + public bool get_editable (); + public unowned string get_encoding (); + public unowned WebKit.WebFrame get_focused_frame (); + public bool get_full_content_zoom (); + public unowned WebKit.HitTestResult get_hit_test_result (Gdk.EventButton event); + public unowned string get_icon_uri (); + public unowned WebKit.WebInspector get_inspector (); + public WebKit.LoadStatus get_load_status (); + public unowned WebKit.WebFrame get_main_frame (); + public unowned Gtk.TargetList get_paste_target_list (); + public double get_progress (); + public unowned WebKit.WebSettings get_settings (); + public unowned string get_title (); + public bool get_transparent (); + public unowned string get_uri (); + public bool get_view_source_mode (); + public unowned WebKit.WebWindowFeatures get_window_features (); + public float get_zoom_level (); + public void go_back (); + public void go_back_or_forward (int steps); + public void go_forward (); + public bool go_to_back_forward_item (WebKit.WebHistoryItem item); + public bool has_selection (); + public void load_html_string (string content, string base_uri); + public void load_request (WebKit.NetworkRequest request); + public void load_string (string content, string mime_type, string encoding, string base_uri); + public void load_uri (string uri); + public uint mark_text_matches (string str, bool case_sensitive, uint limit); + public void open (string uri); + public void reload (); + public void reload_bypass_cache (); + public bool search_text (string text, bool case_sensitive, bool forward, bool wrap); + public void set_custom_encoding (string encoding); + public void set_editable (bool flag); + public void set_full_content_zoom (bool full_content_zoom); + public void set_highlight_text_matches (bool highlight); + public void set_maintains_back_forward_list (bool flag); + public void set_settings (WebKit.WebSettings settings); + public void set_transparent (bool flag); + public void set_view_source_mode (bool view_source_mode); + public void set_zoom_level (float zoom_level); + public void stop_loading (); + public void unmark_text_matches (); + public void zoom_in (); + public void zoom_out (); + public Gtk.TargetList copy_target_list { get; } + public string custom_encoding { get; set; } + public bool editable { get; set; } + public string encoding { get; } + public bool full_content_zoom { get; set; } + public string icon_uri { get; } + [NoAccessorMethod] + public Gtk.IMContext im_context { owned get; } + public WebKit.LoadStatus load_status { get; } + public Gtk.TargetList paste_target_list { get; } + public double progress { get; } + public WebKit.WebSettings settings { get; set; } + public string title { get; } + public bool transparent { get; set; } + public string uri { get; } + [NoAccessorMethod] + public WebKit.WebInspector web_inspector { owned get; } + [NoAccessorMethod] + public WebKit.WebWindowFeatures window_features { owned get; set; } + public float zoom_level { get; set; } + public virtual signal bool close_web_view (); + public virtual signal bool console_message (string message, int line_number, string source_id); + [HasEmitter] + public virtual signal void copy_clipboard (); + public virtual signal unowned Gtk.Widget create_plugin_widget (string p0, string p1, GLib.HashTable p2); + public virtual signal WebKit.WebView create_web_view (WebKit.WebFrame web_frame); + [HasEmitter] + public virtual signal void cut_clipboard (); + public virtual signal void database_quota_exceeded (GLib.Object p0, GLib.Object p1); + public virtual signal void document_load_finished (WebKit.WebFrame p0); + public virtual signal bool download_requested (GLib.Object p0); + public virtual signal void geolocation_policy_decision_cancelled (WebKit.WebFrame p0); + public virtual signal bool geolocation_policy_decision_requested (WebKit.WebFrame p0, WebKit.GeolocationPolicyDecision p1); + public virtual signal void hovering_over_link (string? p0, string p1); + public virtual signal void icon_loaded (string p0); + public virtual signal void load_committed (WebKit.WebFrame p0); + public virtual signal bool load_error (WebKit.WebFrame p0, string p1, void* p2); + public virtual signal void load_finished (WebKit.WebFrame p0); + public virtual signal void load_progress_changed (int p0); + public virtual signal void load_started (WebKit.WebFrame p0); + public virtual signal bool mime_type_policy_decision_requested (WebKit.WebFrame p0, WebKit.NetworkRequest p1, string p2, WebKit.WebPolicyDecision p3); + [HasEmitter] + public virtual signal bool move_cursor (Gtk.MovementStep step, int count); + public virtual signal bool navigation_policy_decision_requested (WebKit.WebFrame p0, WebKit.NetworkRequest p1, WebKit.WebNavigationAction p2, WebKit.WebPolicyDecision p3); + public virtual signal WebKit.NavigationResponse navigation_requested (WebKit.WebFrame frame, WebKit.NetworkRequest request); + public virtual signal bool new_window_policy_decision_requested (WebKit.WebFrame p0, WebKit.NetworkRequest p1, WebKit.WebNavigationAction p2, WebKit.WebPolicyDecision p3); + [HasEmitter] + public virtual signal void paste_clipboard (); + public virtual signal void populate_popup (Gtk.Menu p0); + public virtual signal bool print_requested (WebKit.WebFrame p0); + [HasEmitter] + public virtual signal void redo (); + public virtual signal void resource_request_starting (WebKit.WebFrame p0, WebKit.WebResource p1, WebKit.NetworkRequest p2, WebKit.NetworkResponse p3); + public virtual signal bool script_alert (WebKit.WebFrame frame, string alert_message); + public virtual signal bool script_confirm (WebKit.WebFrame frame, string confirm_message, void* did_confirm); + public virtual signal bool script_prompt (WebKit.WebFrame frame, string message, string default_value, void* value); + [HasEmitter] + public virtual signal void select_all (); + public virtual signal void selection_changed (); + public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment); + public virtual signal void status_bar_text_changed (string p0); + public virtual signal void title_changed (WebKit.WebFrame p0, string p1); + [HasEmitter] + public virtual signal void undo (); + public virtual signal bool web_view_ready (); + public virtual signal void window_object_cleared (WebKit.WebFrame frame, void* context, void* window_object); + } + [CCode (cheader_filename = "webkit/webkit.h")] + public class WebWindowFeatures : GLib.Object { + [CCode (has_construct_function = false)] + public WebWindowFeatures (); + public bool equal (WebKit.WebWindowFeatures features2); + [NoAccessorMethod] + public bool fullscreen { get; set construct; } + [NoAccessorMethod] + public int height { get; set construct; } + [NoAccessorMethod] + public bool locationbar_visible { get; set construct; } + [NoAccessorMethod] + public bool menubar_visible { get; set construct; } + [NoAccessorMethod] + public bool scrollbar_visible { get; set construct; } + [NoAccessorMethod] + public bool statusbar_visible { get; set construct; } + [NoAccessorMethod] + public bool toolbar_visible { get; set construct; } + [NoAccessorMethod] + public int width { get; set construct; } + [NoAccessorMethod] + public int x { get; set construct; } + [NoAccessorMethod] + public int y { get; set construct; } + } + [CCode (cprefix = "WEBKIT_CACHE_MODEL_", cheader_filename = "webkit/webkit.h")] + public enum CacheModel { + DOCUMENT_VIEWER, + WEB_BROWSER + } + [CCode (cprefix = "WEBKIT_DOWNLOAD_ERROR_", cheader_filename = "webkit/webkit.h")] + public enum DownloadError { + CANCELLED_BY_USER, + DESTINATION, + NETWORK + } + [CCode (cprefix = "WEBKIT_DOWNLOAD_STATUS_", cheader_filename = "webkit/webkit.h")] + public enum DownloadStatus { + ERROR, + CREATED, + STARTED, + CANCELLED, + FINISHED + } + [CCode (cprefix = "WEBKIT_EDITING_BEHAVIOR_", cheader_filename = "webkit/webkit.h")] + public enum EditingBehavior { + MAC, + WINDOWS + } + [CCode (cprefix = "WEBKIT_HIT_TEST_RESULT_CONTEXT_", cheader_filename = "webkit/webkit.h")] + [Flags] + public enum HitTestResultContext { + DOCUMENT, + LINK, + IMAGE, + MEDIA, + SELECTION, + EDITABLE + } + [CCode (cprefix = "WEBKIT_LOAD_", cheader_filename = "webkit/webkit.h")] + public enum LoadStatus { + PROVISIONAL, + COMMITTED, + FINISHED, + FIRST_VISUALLY_NON_EMPTY_LAYOUT, + FAILED + } + [CCode (cprefix = "WEBKIT_NAVIGATION_RESPONSE_", cheader_filename = "webkit/webkit.h")] + public enum NavigationResponse { + ACCEPT, + IGNORE, + DOWNLOAD + } + [CCode (cprefix = "WEBKIT_NETWORK_ERROR_", cheader_filename = "webkit/webkit.h")] + public enum NetworkError { + FAILED, + TRANSPORT, + UNKNOWN_PROTOCOL, + CANCELLED, + FILE_DOES_NOT_EXIST + } + [CCode (cprefix = "WEBKIT_PLUGIN_ERROR_", cheader_filename = "webkit/webkit.h")] + public enum PluginError { + FAILED, + CANNOT_FIND_PLUGIN, + CANNOT_LOAD_PLUGIN, + JAVA_UNAVAILABLE, + CONNECTION_CANCELLED, + WILL_HANDLE_LOAD + } + [CCode (cprefix = "WEBKIT_POLICY_ERROR_", cheader_filename = "webkit/webkit.h")] + public enum PolicyError { + FAILED, + CANNOT_SHOW_MIME_TYPE, + CANNOT_SHOW_URL, + FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE, + CANNOT_USE_RESTRICTED_PORT + } + [CCode (cprefix = "WEBKIT_WEB_NAVIGATION_REASON_", cheader_filename = "webkit/webkit.h")] + public enum WebNavigationReason { + LINK_CLICKED, + FORM_SUBMITTED, + BACK_FORWARD, + RELOAD, + FORM_RESUBMITTED, + OTHER + } + [CCode (cprefix = "WEBKIT_WEB_VIEW_TARGET_INFO_", cheader_filename = "webkit/webkit.h")] + public enum WebViewTargetInfo { + HTML, + TEXT, + IMAGE, + URI_LIST, + NETSCAPE_URL + } + [CCode (cheader_filename = "webkit/webkit.h")] + public const int MAJOR_VERSION; + [CCode (cheader_filename = "webkit/webkit.h")] + public const int MICRO_VERSION; + [CCode (cheader_filename = "webkit/webkit.h")] + public const int MINOR_VERSION; + [CCode (cheader_filename = "webkit/webkit.h")] + public const int USER_AGENT_MAJOR_VERSION; + [CCode (cheader_filename = "webkit/webkit.h")] + public const int USER_AGENT_MINOR_VERSION; + [CCode (cheader_filename = "webkit/webkit.h")] + public static bool check_version (uint major, uint minor, uint micro); + [CCode (cheader_filename = "webkit/webkit.h")] + public static void geolocation_policy_allow (WebKit.GeolocationPolicyDecision decision); + [CCode (cheader_filename = "webkit/webkit.h")] + public static void geolocation_policy_deny (WebKit.GeolocationPolicyDecision decision); + [CCode (cheader_filename = "webkit/webkit.h")] + public static WebKit.CacheModel get_cache_model (); + [CCode (cheader_filename = "webkit/webkit.h")] + public static unowned Soup.Session get_default_session (); + [CCode (cheader_filename = "webkit/webkit.h")] + public static uint64 get_default_web_database_quota (); + [CCode (cheader_filename = "webkit/webkit.h")] + public static unowned string get_web_database_directory_path (); + [CCode (cheader_filename = "webkit/webkit.h")] + public static uint major_version (); + [CCode (cheader_filename = "webkit/webkit.h")] + public static uint micro_version (); + [CCode (cheader_filename = "webkit/webkit.h")] + public static uint minor_version (); + [CCode (cheader_filename = "webkit/webkit.h")] + public static GLib.Quark network_error_quark (); + [CCode (cheader_filename = "webkit/webkit.h")] + public static GLib.Quark plugin_error_quark (); + [CCode (cheader_filename = "webkit/webkit.h")] + public static GLib.Quark policy_error_quark (); + [CCode (cheader_filename = "webkit/webkit.h")] + public static void remove_all_web_databases (); + [CCode (cheader_filename = "webkit/webkit.h")] + public static void set_cache_model (WebKit.CacheModel cache_model); + [CCode (cheader_filename = "webkit/webkit.h")] + public static void set_default_web_database_quota (uint64 defaultQuota); + [CCode (cheader_filename = "webkit/webkit.h")] + public static void set_web_database_directory_path (string path); +} diff -Nru midori-0.2.8/midori/wscript_build midori-0.4.6/midori/wscript_build --- midori-0.2.8/midori/wscript_build 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/midori/wscript_build 2012-05-14 22:13:42.000000000 +0000 @@ -2,11 +2,13 @@ # WAF build script for midori # This file is licensed under the terms of the expat license, see the file EXPAT. +import Options import platform progressive = True libs = 'M UNIQUE LIBSOUP GMODULE GTHREAD LIBIDN GIO GTK SQLITE ' \ - 'LIBNOTIFY WEBKIT LIBXML X11 XSS WS2_32 OPENSSL HILDON HILDON_FM' + 'LIBNOTIFY WEBKIT JAVASCRIPTCOREGTK LIBXML X11 XSS WS2_32 HILDON' \ + 'HILDON_FM GRANITE' if progressive or Options.commands['check']: obj = bld.new_task_gen ('cc', 'staticlib') @@ -16,6 +18,7 @@ obj.uselib = libs obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal') obj.install_path = None + obj.packages = 'glib-2.0 gio-2.0 gtk+-2.0 libsoup-2.4 webkit-1.0' bld.add_group () if progressive: @@ -30,8 +33,8 @@ else: obj = bld.new_task_gen ('cc', 'program') obj.target = 'midori' - obj.includes = '.. ../katze . ../panels' - obj.find_sources_in_dirs ('../katze . ../panels') + obj.includes = '.. ../katze . ../panels ../toolbars' + obj.find_sources_in_dirs ('../katze . ../panels ../toolbars') obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal') obj.uselib = libs if bld.env['WINRC']: diff -Nru midori-0.2.8/panels/midori-bookmarks.c midori-0.4.6/panels/midori-bookmarks.c --- midori-0.2.8/panels/midori-bookmarks.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/panels/midori-bookmarks.c 2012-05-14 22:13:42.000000000 +0000 @@ -14,13 +14,10 @@ #include "midori-array.h" #include "midori-app.h" #include "midori-browser.h" -#include "midori-stock.h" +#include "midori-platform.h" #include "midori-view.h" #include "midori-viewable.h" -#include "sokoke.h" -#include "gtkiconentry.h" - #include #include @@ -32,7 +29,8 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, KatzeItem* bookmark, gboolean new_bookmark, - gboolean is_folder); + gboolean is_folder, + GtkWidget* proxy); void midori_browser_open_bookmark (MidoriBrowser* browser, @@ -127,16 +125,14 @@ KatzeArray* array, const gchar* folder) { - gchar* sqlcmd; KatzeArray* root_array; KatzeArray* subarray; KatzeItem* item; + GList* list; - sqlcmd = g_strdup_printf ("SELECT * FROM bookmarks where folder='%s'", folder); - root_array = katze_array_from_sqlite (db, sqlcmd); - g_free (sqlcmd); - - KATZE_ARRAY_FOREACH_ITEM (item, root_array) + if (!(root_array = midori_array_query (array, "*", "folder='%q'", folder))) + return; + KATZE_ARRAY_FOREACH_ITEM_L (item, root_array, list) { if (KATZE_ITEM_IS_FOLDER (item)) { @@ -148,6 +144,7 @@ else katze_array_add_item (array, item); } + g_list_free (list); } void @@ -155,14 +152,19 @@ KatzeArray* array, const gchar* folder) { + GList* list; KatzeItem* item; - KATZE_ARRAY_FOREACH_ITEM (item, array) + if (!db) + return; + + KATZE_ARRAY_FOREACH_ITEM_L (item, array, list) { if (KATZE_IS_ARRAY (item)) midori_bookmarks_import_array_db (db, KATZE_ARRAY (item), folder); midori_bookmarks_insert_item_db (db, item, folder); } + g_list_free (list); } static KatzeArray* @@ -170,37 +172,15 @@ const gchar* folder, const gchar* keyword) { - sqlite3* db; - sqlite3_stmt* statement; - gint result; - const gchar* sqlcmd; - - db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); + KatzeArray* array; if (keyword && *keyword) - { - gchar* filterstr; - sqlcmd = "SELECT uri, title, desc, app, toolbar, folder from bookmarks where " - " title like ? ORDER BY uri DESC"; - result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); - filterstr = g_strdup_printf ("%%%s%%", keyword); - sqlite3_bind_text (statement, 1, g_strdup (filterstr), -1, g_free); - g_free (filterstr); - } + array = midori_array_query (bookmarks->array, + "uri, title, desc, app, toolbar, folder", "title LIKE '%%%q%%'", keyword); else - { - if (!folder) - folder = ""; - sqlcmd = "SELECT uri, title, desc, app, toolbar, folder from bookmarks where " - " folder = ? ORDER BY uri DESC"; - result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); - sqlite3_bind_text (statement, 1, g_strdup (folder), -1, g_free); - } - - if (result != SQLITE_OK) - return NULL; - - return katze_array_from_statement (statement); + array = midori_array_query (bookmarks->array, + "uri, title, desc, app, toolbar, folder", "folder = '%q'", folder); + return array ? array : katze_array_new (KATZE_TYPE_ITEM); } static void @@ -232,34 +212,42 @@ void midori_bookmarks_insert_item_db (sqlite3* db, KatzeItem* item, - const gchar* folder) + const gchar* folder) { gchar* sqlcmd; char* errmsg = NULL; KatzeItem* old_parent; - gchar* parent; - gchar* uri; + const gchar* parent; + const gchar* uri = NULL; + const gchar* desc = NULL; + + /* Bookmarks must have a name, import may produce invalid items */ + g_return_if_fail (katze_item_get_name (item)); + + if (!db) + return; if (KATZE_ITEM_IS_BOOKMARK (item)) - uri = g_strdup (katze_item_get_uri (item)); - else - uri = g_strdup (""); + uri = katze_item_get_uri (item); + + if (katze_item_get_text (item)) + desc = katze_item_get_text (item); /* Use folder, otherwise fallback to parent folder */ old_parent = katze_item_get_parent (item); if (folder && *folder) - parent = g_strdup (folder); + parent = folder; else if (old_parent && katze_item_get_name (old_parent)) - parent = g_strdup (katze_item_get_name (old_parent)); + parent = katze_item_get_name (old_parent); else - parent = g_strdup (""); + parent = ""; sqlcmd = sqlite3_mprintf ( "INSERT into bookmarks (uri, title, desc, folder, toolbar, app) values" " ('%q', '%q', '%q', '%q', %d, %d)", - uri, + uri ? uri : "", katze_item_get_name (item), - katze_item_get_text (item), + desc ? desc : "", parent, katze_item_get_meta_boolean (item, "toolbar"), katze_item_get_meta_boolean (item, "app")); @@ -270,12 +258,28 @@ sqlite3_free (errmsg); } - g_free (uri); - g_free (parent); sqlite3_free (sqlcmd); } static void +midori_bookmarks_add_item_cb (KatzeArray* array, + KatzeItem* item, + MidoriBookmarks* bookmarks) +{ + GtkTreeModel* model; + model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview)); + if (!g_strcmp0 (katze_item_get_meta_string (item, "folder"), "")) + gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), + NULL, NULL, G_MAXINT, 0, item, -1); + else + { + gtk_tree_store_clear (GTK_TREE_STORE (model)); + midori_bookmarks_read_from_db_to_model (bookmarks, + GTK_TREE_STORE (model), NULL, NULL, bookmarks->filter); + } +} + +static void midori_bookmarks_remove_item_cb (KatzeArray* array, KatzeItem* item, MidoriBookmarks* bookmarks) @@ -287,6 +291,17 @@ } static void +midori_bookmarks_update_cb (KatzeArray* array, + MidoriBookmarks* bookmarks) +{ + GtkTreeModel* model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview)); + gtk_tree_store_clear (GTK_TREE_STORE (model)); + midori_bookmarks_read_from_db_to_model (bookmarks, + GTK_TREE_STORE (model), NULL, NULL, bookmarks->filter); +} + + +static void midori_bookmarks_row_changed_cb (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, @@ -294,31 +309,31 @@ { KatzeItem* item; GtkTreeIter parent; - sqlite3* db; - gchar* parent_name; + KatzeItem* new_parent = NULL; + const gchar* parent_name; - db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); gtk_tree_model_get (model, iter, 0, &item, -1); if (gtk_tree_model_iter_parent (model, &parent, iter)) { - KatzeItem* new_parent; - gtk_tree_model_get (model, &parent, 0, &new_parent, -1); /* Bookmarks must not be moved into non-folder items */ if (!KATZE_ITEM_IS_FOLDER (new_parent)) - parent_name = g_strdup (""); + parent_name = ""; else - parent_name = g_strdup (katze_item_get_name (new_parent)); - - g_object_unref (new_parent); + parent_name = katze_item_get_name (new_parent); } else - parent_name = g_strdup (""); + parent_name = ""; katze_array_remove_item (bookmarks->array, item); - midori_bookmarks_insert_item_db (db, item, parent_name); + katze_item_set_meta_string (item, "folder", parent_name); + katze_array_add_item (bookmarks->array, item); + + g_object_unref (item); + if (new_parent) + g_object_unref (new_parent); } static void @@ -327,9 +342,9 @@ MidoriBrowser* browser = midori_browser_get_for_widget (toolitem); /* FIXME: Take selected folder into account */ if (g_str_equal (gtk_widget_get_name (toolitem), "BookmarkFolderAdd")) - midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, TRUE); + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, TRUE, toolitem); else - midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE); + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE, toolitem); } static void @@ -351,12 +366,23 @@ browser = midori_browser_get_for_widget (bookmarks->treeview); midori_browser_edit_bookmark_dialog_new ( - browser, item, FALSE, KATZE_ITEM_IS_FOLDER (item)); + browser, item, FALSE, KATZE_ITEM_IS_FOLDER (item), NULL); g_object_unref (item); } } static void +midori_bookmarks_toolbar_update (MidoriBookmarks *bookmarks) +{ + gboolean selected; + + selected = katze_tree_view_get_selected_iter ( + GTK_TREE_VIEW (bookmarks->treeview), NULL, NULL); + gtk_widget_set_sensitive (GTK_WIDGET (bookmarks->delete), selected); + gtk_widget_set_sensitive (GTK_WIDGET (bookmarks->edit), selected); +} + +static void midori_bookmarks_delete_clicked_cb (GtkWidget* toolitem, MidoriBookmarks* bookmarks) { @@ -393,6 +419,7 @@ toolbar = gtk_toolbar_new (); gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); + gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE); bookmarks->toolbar = toolbar; toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD); gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkAdd"); @@ -419,6 +446,7 @@ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); bookmarks->delete = GTK_WIDGET (toolitem); + midori_bookmarks_toolbar_update (bookmarks); toolitem = gtk_separator_tool_item_new (); gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem), FALSE); gtk_tool_item_set_expand (toolitem, TRUE); @@ -468,11 +496,13 @@ g_object_ref (app); bookmarks->array = katze_object_get_object (app, "bookmarks"); - g_object_set_data (G_OBJECT (bookmarks->array), "treeview", bookmarks->treeview); + midori_bookmarks_read_from_db_to_model (bookmarks, GTK_TREE_STORE (model), NULL, "", NULL); + g_signal_connect (bookmarks->array, "add-item", + G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); g_signal_connect (bookmarks->array, "remove-item", G_CALLBACK (midori_bookmarks_remove_item_cb), bookmarks); - - midori_bookmarks_read_from_db_to_model (bookmarks, GTK_TREE_STORE (model), NULL, "", NULL); + g_signal_connect (bookmarks->array, "update", + G_CALLBACK (midori_bookmarks_update_cb), bookmarks); g_signal_connect_after (model, "row-changed", G_CALLBACK (midori_bookmarks_row_changed_cb), bookmarks); @@ -533,6 +563,8 @@ if (KATZE_ITEM_IS_FOLDER (item)) pixbuf = gtk_widget_render_icon (treeview, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); + else if ((pixbuf = katze_item_get_pixbuf (item, treeview))) + ; else if (KATZE_ITEM_IS_BOOKMARK (item)) pixbuf = katze_load_cached_icon (katze_item_get_uri (item), treeview); g_object_set (renderer, "pixbuf", pixbuf, NULL); @@ -777,23 +809,8 @@ GdkEventKey* event, MidoriBookmarks* bookmarks) { - GtkTreeModel* model; - GtkTreeIter iter; - - if (event->keyval != GDK_Delete) - return FALSE; - - if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) - { - KatzeItem* item; - KatzeArray* parent; - - gtk_tree_model_get (model, &iter, 0, &item, -1); - parent = katze_item_get_parent (item); - katze_array_remove_item (parent, item); - - g_object_unref (item); - } + if (event->keyval == GDK_KEY_Delete) + midori_bookmarks_delete_clicked_cb (widget, bookmarks); return FALSE; } @@ -849,6 +866,13 @@ 0, 0, NULL, -1); } +static void +midori_bookmarks_selection_changed_cb (GtkTreeSelection *treeview, + MidoriBookmarks *bookmarks) +{ + midori_bookmarks_toolbar_update (bookmarks); +} + static gboolean midori_bookmarks_filter_timeout_cb (gpointer data) { @@ -897,17 +921,14 @@ GtkTreeViewColumn* column; GtkCellRenderer* renderer_pixbuf; GtkCellRenderer* renderer_text; + GtkTreeSelection* selection; /* Create the filter entry */ entry = gtk_icon_entry_new (); gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FIND); - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_SECONDARY, - GTK_STOCK_CLEAR); - gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_SECONDARY, TRUE); + sokoke_entry_set_clear_button_visible (GTK_ENTRY (entry), TRUE); g_signal_connect (entry, "icon-release", G_CALLBACK (midori_bookmarks_filter_entry_clear_cb), bookmarks); g_signal_connect (entry, "changed", @@ -923,6 +944,7 @@ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (treeview), 1); column = gtk_tree_view_column_new (); + gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, @@ -950,6 +972,10 @@ "signal::row-collapsed", midori_bookmarks_row_collapsed_cb, bookmarks, NULL); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); + g_signal_connect_after (selection, "changed", + G_CALLBACK (midori_bookmarks_selection_changed_cb), + bookmarks); gtk_widget_show (treeview); gtk_box_pack_start (GTK_BOX (bookmarks), treeview, TRUE, TRUE, 0); bookmarks->treeview = treeview; @@ -964,19 +990,3 @@ g_object_unref (bookmarks->app); } -/** - * midori_bookmarks_new: - * - * Creates a new empty bookmarks. - * - * Return value: a new #MidoriBookmarks - * - * Since: 0.1.3 - **/ -GtkWidget* -midori_bookmarks_new (void) -{ - MidoriBookmarks* bookmarks = g_object_new (MIDORI_TYPE_BOOKMARKS, NULL); - - return GTK_WIDGET (bookmarks); -} diff -Nru midori-0.2.8/panels/midori-bookmarks.h midori-0.4.6/panels/midori-bookmarks.h --- midori-0.2.8/panels/midori-bookmarks.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/panels/midori-bookmarks.h 2012-05-14 22:13:42.000000000 +0000 @@ -12,8 +12,6 @@ #ifndef __MIDORI_BOOKMARKS_H__ #define __MIDORI_BOOKMARKS_H__ -#include "config.h" - #include #include #include diff -Nru midori-0.2.8/panels/midori-console.c midori-0.4.6/panels/midori-console.c --- midori-0.2.8/panels/midori-console.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/panels/midori-console.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,402 +0,0 @@ -/* - Copyright (C) 2008-2010 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 "midori-console.h" - -#include "midori-app.h" -#include "midori-browser.h" -#include "midori-stock.h" -#include "midori-view.h" - -#include "sokoke.h" -#include - -struct _MidoriConsole -{ - GtkVBox parent_instance; - - GtkWidget* toolbar; - GtkWidget* treeview; - MidoriApp* app; -}; - -struct _MidoriConsoleClass -{ - GtkVBoxClass parent_class; -}; - -static void -midori_console_viewable_iface_init (MidoriViewableIface* iface); - -G_DEFINE_TYPE_WITH_CODE (MidoriConsole, midori_console, GTK_TYPE_VBOX, - G_IMPLEMENT_INTERFACE (MIDORI_TYPE_VIEWABLE, - midori_console_viewable_iface_init)); - -enum -{ - PROP_0, - - PROP_APP -}; - -static void -midori_console_set_property (GObject* object, - guint prop_id, - const GValue* value, - GParamSpec* pspec); - -static void -midori_console_get_property (GObject* object, - guint prop_id, - GValue* value, - GParamSpec* pspec); - -static GtkWidget* -midori_console_get_toolbar (MidoriViewable* console); - -static void -midori_console_class_init (MidoriConsoleClass* class) -{ - GObjectClass* gobject_class; - GParamFlags flags; - - gobject_class = G_OBJECT_CLASS (class); - gobject_class->set_property = midori_console_set_property; - gobject_class->get_property = midori_console_get_property; - - flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; - - g_object_class_install_property (gobject_class, - PROP_APP, - g_param_spec_object ( - "app", - "App", - "The app", - MIDORI_TYPE_APP, - flags)); -} - -static const gchar* -midori_console_get_label (MidoriViewable* viewable) -{ - return _("Console"); -} - -static const gchar* -midori_console_get_stock_id (MidoriViewable* viewable) -{ - return STOCK_CONSOLE; -} - -static void -midori_console_viewable_iface_init (MidoriViewableIface* iface) -{ - iface->get_stock_id = midori_console_get_stock_id; - iface->get_label = midori_console_get_label; - iface->get_toolbar = midori_console_get_toolbar; -} - -static void -midori_view_console_message_cb (GtkWidget* view, - const gchar* message, - gint line, - const gchar* source_id, - MidoriConsole* console) -{ - midori_console_add (console, message, line, source_id); -} - -static void -midori_console_browser_add_tab_cb (MidoriBrowser* browser, - MidoriView* view, - MidoriConsole* console) -{ - g_signal_connect (view, "console-message", - G_CALLBACK (midori_view_console_message_cb), console); -} - -static void -midori_console_set_property (GObject* object, - guint prop_id, - const GValue* value, - GParamSpec* pspec) -{ - MidoriConsole* console = MIDORI_CONSOLE (object); - - switch (prop_id) - { - case PROP_APP: - console->app = g_value_get_object (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -midori_console_get_property (GObject* object, - guint prop_id, - GValue* value, - GParamSpec* pspec) -{ - MidoriConsole* console = MIDORI_CONSOLE (object); - - switch (prop_id) - { - case PROP_APP: - g_value_set_object (value, console->app); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -midori_console_button_copy_clicked_cb (GtkToolItem* toolitem, - MidoriConsole* console) -{ - GtkTreeModel* model; - GtkTreeIter iter; - - if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (console->treeview), - &model, &iter)) - { - GdkDisplay* display; - GtkClipboard* clipboard; - gchar* text; - gchar* message; - gint line; - gchar* source_id; - - display = gtk_widget_get_display (GTK_WIDGET (console)); - clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD); - gtk_tree_model_get (model, &iter, 0, &message, 1, &line, 2, &source_id, -1); - text = g_strdup_printf ("%d @ %s: %s", line, source_id, message); - g_free (source_id); - g_free (message); - gtk_clipboard_set_text (clipboard, text, -1); - g_free (text); - } -} - -static void -midori_console_button_copy_all_clicked_cb (GtkToolItem* toolitem, - MidoriConsole* console) -{ - GtkTreeModel* model; - GtkTreeIter iter; - gint count; - GString* all_text; - GdkDisplay* display; - GtkClipboard* clipboard; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (console->treeview)); - if (!gtk_tree_model_get_iter_first (model, &iter)) - return; - - count = gtk_tree_model_iter_n_children (model, NULL); - all_text = g_string_sized_new (count * 96); - - do - { - gchar* text; - gchar* message; - gint line; - gchar* source_id; - - gtk_tree_model_get (model, &iter, 0, &message, 1, &line, 2, &source_id, -1); - - text = g_strdup_printf ("%d @ %s: %s\n", line, source_id, message); - g_free (source_id); - g_free (message); - g_string_append (all_text, text); - g_free (text); - } - while (gtk_tree_model_iter_next (model, &iter)); - - display = gtk_widget_get_display (GTK_WIDGET (console)); - clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD); - gtk_clipboard_set_text (clipboard, all_text->str, -1); - g_string_free (all_text, TRUE); -} - -static void -midori_console_button_clear_clicked_cb (GtkToolItem* toolitem, - MidoriConsole* console) -{ - GtkTreeModel* model = gtk_tree_view_get_model ( - GTK_TREE_VIEW (console->treeview)); - gtk_tree_store_clear (GTK_TREE_STORE (model)); -} - -static void -midori_console_treeview_render_icon_cb (GtkTreeViewColumn* column, - GtkCellRenderer* renderer, - GtkTreeModel* model, - GtkTreeIter* iter, - GtkWidget* treeview) -{ - g_object_set (renderer, "stock-id", GTK_STOCK_DIALOG_WARNING, NULL); -} - -static void -midori_console_treeview_render_text_cb (GtkTreeViewColumn* column, - GtkCellRenderer* renderer, - GtkTreeModel* model, - GtkTreeIter* iter, - GtkWidget* treeview) -{ - gchar* message; - gint line; - gchar* source_id; - gchar* text; - - gtk_tree_model_get (model, iter, 0, &message, 1, &line, 2, &source_id, -1); - - g_strchomp (message); - text = g_strdup_printf ("%d @ %s\n%s", line, source_id, message); - g_object_set (renderer, "text", text, NULL); - g_free (text); - - g_free (message); - g_free (source_id); -} - -static void -midori_console_hierarchy_changed_cb (MidoriConsole* console, - GtkWidget* old_parent) -{ - MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (console)); - if (MIDORI_IS_BROWSER (browser)) - g_signal_connect (browser, "add-tab", - G_CALLBACK (midori_console_browser_add_tab_cb), console); -} - -static void -midori_console_init (MidoriConsole* console) -{ - /* Create the treeview */ - GtkTreeViewColumn* column; - GtkCellRenderer* renderer_text; - GtkCellRenderer* renderer_pixbuf; - GtkTreeStore* treestore = gtk_tree_store_new (3, G_TYPE_STRING, - G_TYPE_INT, - G_TYPE_STRING); - console->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treestore)); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (console->treeview), FALSE); - column = gtk_tree_view_column_new (); - renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); - gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); - gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, - (GtkTreeCellDataFunc)midori_console_treeview_render_icon_cb, - console->treeview, NULL); - 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)midori_console_treeview_render_text_cb, - console->treeview, NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (console->treeview), column); - g_object_unref (treestore); - gtk_widget_show (console->treeview); - gtk_box_pack_start (GTK_BOX (console), console->treeview, TRUE, TRUE, 0); - - g_signal_connect (console, "hierarchy-changed", - G_CALLBACK (midori_console_hierarchy_changed_cb), NULL); -} - -/** - * midori_console_new: - * - * Creates a new empty console. - * - * Return value: a new #MidoriConsole - **/ -GtkWidget* -midori_console_new (void) -{ - MidoriConsole* console = g_object_new (MIDORI_TYPE_CONSOLE, - NULL); - - return GTK_WIDGET (console); -} - -static GtkWidget* -midori_console_get_toolbar (MidoriViewable* console) -{ - if (!MIDORI_CONSOLE (console)->toolbar) - { - GtkWidget* toolbar; - GtkToolItem* toolitem; - - toolbar = gtk_toolbar_new (); - gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); - toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_COPY); - gtk_tool_item_set_is_important (toolitem, TRUE); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_console_button_copy_clicked_cb), console); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); - gtk_widget_show (GTK_WIDGET (toolitem)); - - toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DND_MULTIPLE); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("Copy _All")); - gtk_tool_item_set_tooltip_text (toolitem, _("Copy All")); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_console_button_copy_all_clicked_cb), console); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); - gtk_widget_show (GTK_WIDGET (toolitem)); - - /* TODO: What about a find entry here that filters e.g. by url? */ - toolitem = gtk_separator_tool_item_new (); - gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem), - FALSE); - 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_CLEAR); - gtk_tool_item_set_is_important (toolitem, TRUE); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_console_button_clear_clicked_cb), console); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); - gtk_widget_show (GTK_WIDGET (toolitem)); - MIDORI_CONSOLE (console)->toolbar = toolbar; - } - - return MIDORI_CONSOLE (console)->toolbar; -} - -/** - * midori_console_add: - * @console: a #MidoriConsole - * @message: a descriptive message - * @line: the line in the source file - * @source_id: the source - * - * Adds a new message to the console. - **/ -void -midori_console_add (MidoriConsole* console, - const gchar* message, - gint line, - const gchar* source_id) -{ - GtkTreeView* treeview; - GtkTreeModel* model; - - g_return_if_fail (MIDORI_IS_CONSOLE (console)); - - treeview = GTK_TREE_VIEW (console->treeview); - model = gtk_tree_view_get_model (treeview); - gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), - NULL, NULL, G_MAXINT, - 0, message, 1, line, 2, source_id, -1); -} diff -Nru midori-0.2.8/panels/midori-console.h midori-0.4.6/panels/midori-console.h --- midori-0.2.8/panels/midori-console.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/panels/midori-console.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -/* - Copyright (C) 2008 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 __MIDORI_CONSOLE_H__ -#define __MIDORI_CONSOLE_H__ - -#include - -#include - -#include "midori-viewable.h" - -G_BEGIN_DECLS - -#define MIDORI_TYPE_CONSOLE \ - (midori_console_get_type ()) -#define MIDORI_CONSOLE(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_CONSOLE, MidoriConsole)) -#define MIDORI_CONSOLE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_CONSOLE, MidoriConsoleClass)) -#define MIDORI_IS_CONSOLE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_CONSOLE)) -#define MIDORI_IS_CONSOLE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_CONSOLE)) -#define MIDORI_CONSOLE_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_CONSOLE, MidoriConsoleClass)) - -typedef struct _MidoriConsole MidoriConsole; -typedef struct _MidoriConsoleClass MidoriConsoleClass; - -GType -midori_console_get_type (void); - -GtkWidget* -midori_console_new (void); - -void -midori_console_add (MidoriConsole* console, - const gchar* message, - gint line, - const gchar* source_id); - -G_END_DECLS - -#endif /* __MIDORI_CONSOLE_H__ */ diff -Nru midori-0.2.8/panels/midori-extensions.c midori-0.4.6/panels/midori-extensions.c --- midori-0.2.8/panels/midori-extensions.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/panels/midori-extensions.c 2012-05-14 22:13:42.000000000 +0000 @@ -13,10 +13,10 @@ #include "midori-app.h" #include "midori-extension.h" -#include "midori-stock.h" +#include "midori-platform.h" #include "midori-viewable.h" +#include "midori-core.h" -#include "sokoke.h" #include struct _MidoriExtensions @@ -176,10 +176,7 @@ KATZE_ARRAY_FOREACH_ITEM (extension, array) 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)); + g_object_unref (array); } break; default: @@ -221,12 +218,48 @@ g_object_set (renderer, "activatable", midori_extension_is_prepared (extension), "active", midori_extension_is_active (extension) || g_object_get_data (G_OBJECT (extension), "static"), + "xpad", 4, NULL); g_object_unref (extension); } static void +midori_extensions_treeview_render_icon_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + MidoriExtension* extension; + gtk_tree_model_get (model, iter, 0, &extension, -1); + + g_object_set (renderer, "stock-id", STOCK_EXTENSION, + "stock-size", GTK_ICON_SIZE_BUTTON, + "sensitive", midori_extension_is_prepared (extension), + "xpad", 4, NULL); + g_object_unref (extension); +} + +static void +midori_extensions_treeview_render_preferences_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + MidoriExtension* extension; + gtk_tree_model_get (model, iter, 0, &extension, -1); + + g_object_set (renderer, "stock-id", GTK_STOCK_PREFERENCES, + "stock-size", GTK_ICON_SIZE_BUTTON, + "visible", midori_extension_has_preferences (extension), + "sensitive", midori_extension_is_active (extension), + "xpad", 4, NULL); + g_object_unref (extension); +} + +static void midori_extensions_treeview_render_text_cb (GtkTreeViewColumn* column, GtkCellRenderer* renderer, GtkTreeModel* model, @@ -334,14 +367,71 @@ } static void +midori_extensions_treeview_column_preference_clicked_cb (GtkWidget* widget, + GtkTreeView* treeview, + GtkTreePath* path) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + model = gtk_tree_view_get_model (treeview); + if (gtk_tree_model_get_iter (model, &iter, path)) + { + MidoriExtension* extension; + + gtk_tree_model_get (model, &iter, 0, &extension, -1); + if (midori_extension_is_active (extension)) + g_signal_emit_by_name (extension, "open-preferences"); + g_object_unref (extension); + } + +} + +static gboolean +midori_extensions_treeview_button_pressed_cb (GtkWidget* view, + GdkEventButton* bevent, + gpointer data) +{ + gboolean ret = FALSE; + GtkTreePath* path; + GtkTreeViewColumn* column; + guint signal_id; + + if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (view), + bevent->x, bevent->y, &path, &column, NULL, NULL)) + { + if (path != NULL) + { + if (MIDORI_IS_EXTENSIONS_COLUMN (column)) + { + signal_id = g_signal_lookup ("row-clicked", G_OBJECT_TYPE (column)); + + if (signal_id && g_signal_has_handler_pending (column, signal_id, 0, FALSE)) { + g_signal_emit (column, signal_id, 0, GTK_TREE_VIEW (view), path); + ret = TRUE; + } + } + gtk_tree_path_free (path); + } + } + return ret; +} + +static void midori_extensions_init (MidoriExtensions* extensions) { /* Create the treeview */ GtkTreeViewColumn* column; + GtkCellRenderer* renderer_icon; GtkCellRenderer* renderer_text; GtkCellRenderer* renderer_toggle; + GtkCellRenderer* renderer_preferences; GtkListStore* liststore = gtk_list_store_new (1, G_TYPE_OBJECT); extensions->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (liststore)); + g_object_connect (extensions->treeview, + "signal::button-press-event", + midori_extensions_treeview_button_pressed_cb, NULL, + NULL); gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (liststore), 0, GTK_SORT_ASCENDING); gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (liststore), @@ -357,12 +447,34 @@ G_CALLBACK (midori_extensions_cell_renderer_toggled_cb), extensions); gtk_tree_view_append_column (GTK_TREE_VIEW (extensions->treeview), column); column = gtk_tree_view_column_new (); + renderer_icon = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, renderer_icon, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_icon, + (GtkTreeCellDataFunc)midori_extensions_treeview_render_icon_cb, + extensions->treeview, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (extensions->treeview), column); + column = gtk_tree_view_column_new (); + gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); renderer_text = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_start (column, renderer_text, FALSE); + gtk_tree_view_column_set_expand (column, TRUE); gtk_tree_view_column_set_cell_data_func (column, renderer_text, (GtkTreeCellDataFunc)midori_extensions_treeview_render_text_cb, extensions->treeview, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (extensions->treeview), column); + column = GTK_TREE_VIEW_COLUMN (midori_extensions_column_new ()); + g_signal_connect (column, + "row-clicked", + G_CALLBACK (midori_extensions_treeview_column_preference_clicked_cb), + NULL); + renderer_preferences = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, renderer_preferences, FALSE); + gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_fixed_width (column, 30); + gtk_tree_view_column_set_cell_data_func (column, renderer_preferences, + (GtkTreeCellDataFunc)midori_extensions_treeview_render_preferences_cb, + extensions->treeview, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (extensions->treeview), column); g_object_unref (liststore); g_object_connect (extensions->treeview, "signal::row-activated", @@ -392,20 +504,3 @@ g_object_unref (array); } -/** - * midori_extensions_new: - * - * Creates a new empty extensions. - * - * Return value: a new #MidoriExtensions - * - * Since: 0.1.2 - **/ -GtkWidget* -midori_extensions_new (void) -{ - MidoriExtensions* extensions = g_object_new (MIDORI_TYPE_EXTENSIONS, - NULL); - - return GTK_WIDGET (extensions); -} diff -Nru midori-0.2.8/panels/midori-history.c midori-0.4.6/panels/midori-history.c --- midori-0.2.8/panels/midori-history.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/panels/midori-history.c 2012-05-14 22:13:42.000000000 +0000 @@ -14,16 +14,12 @@ #include "midori-app.h" #include "midori-array.h" #include "midori-browser.h" -#include "midori-stock.h" +#include "midori-platform.h" #include "midori-view.h" #include "midori-viewable.h" -#include "sokoke.h" -#include "gtkiconentry.h" - #include #include - #include #define COMPLETION_DELAY 200 @@ -32,7 +28,8 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, KatzeItem* bookmark, gboolean new_bookmark, - gboolean is_folder); + gboolean is_folder, + GtkWidget* proxy); struct _MidoriHistory @@ -120,18 +117,59 @@ return STOCK_HISTORY; } +#if !GLIB_CHECK_VERSION (2, 26, 0) +static gint +sokoke_days_between (const time_t* day1, + const time_t* day2) +{ + GDate* date1; + GDate* date2; + gint age; + + date1 = g_date_new (); + date2 = g_date_new (); + + g_date_set_time_t (date1, *day1); + g_date_set_time_t (date2, *day2); + + age = g_date_days_between (date1, date2); + + g_date_free (date1); + g_date_free (date2); + + return age; +} +#endif + static gchar* midori_history_format_date (KatzeItem *item) { + gint64 day = katze_item_get_added (item); + gchar* sdate; gint age; - gint64 day; + #if GLIB_CHECK_VERSION (2, 26, 0) + GDateTime* now = g_date_time_new_now_local (); + GDateTime* then = g_date_time_new_from_unix_local (day); + age = g_date_time_get_day_of_year (now) - g_date_time_get_day_of_year (then); + if (g_date_time_get_year (now) != g_date_time_get_year (then)) + age = 999; + + if (age == 0) + sdate = g_strdup (_("Today")); + else if (age == 1) + sdate = g_strdup (_("Yesterday")); + else if (age < 7) + sdate = g_strdup_printf (ngettext ("%d day ago", + "%d days ago", (gint)age), (gint)age); + else if (age == 7) + sdate = g_strdup (_("A week ago")); + else + sdate = g_date_time_format (then, "%x"); + #else gchar token[50]; - gchar* sdate; time_t current_time; current_time = time (NULL); - day = katze_item_get_added (item); - age = sokoke_days_between ((time_t*)&day, ¤t_time); /* A negative age is a date in the future, the clock is probably off */ @@ -151,26 +189,18 @@ sdate = g_strdup (_("Today")); else sdate = g_strdup (_("Yesterday")); + #endif return sdate; } static void -midori_history_clear_db (MidoriHistory* history) +midori_history_toolbar_update (MidoriHistory *history) { - gchar* sqlcmd; - sqlite3* db; - char* errmsg = NULL; - - db = g_object_get_data (G_OBJECT (history->array), "db"); - sqlcmd = sqlite3_mprintf ("DELETE FROM history"); + gboolean selected; - if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK) - { - g_printerr (_("Failed to remove history item: %s\n"), errmsg); - sqlite3_free (errmsg); - } - - sqlite3_free (sqlcmd); + selected = katze_tree_view_get_selected_iter ( + GTK_TREE_VIEW (history->treeview), NULL, NULL); + gtk_widget_set_sensitive (GTK_WIDGET (history->delete), selected); } static void @@ -183,6 +213,9 @@ db = g_object_get_data (G_OBJECT (history->array), "db"); + if (!db) + return; + if (KATZE_ITEM_IS_BOOKMARK (item)) sqlcmd = sqlite3_mprintf ( "DELETE FROM history WHERE uri = '%q' AND" @@ -226,16 +259,19 @@ db = g_object_get_data (G_OBJECT (history->array), "db"); + if (!db) + return katze_array_new (KATZE_TYPE_ITEM); + if (filter && *filter) { gchar* filterstr; sqlcmd = "SELECT * FROM (" - " SELECT uri, title, day FROM history" + " SELECT uri, title, day, date FROM history" " WHERE uri LIKE ?1 OR title LIKE ?1 GROUP BY uri " "UNION ALL " " SELECT replace (uri, '%s', keywords) AS uri, " - " keywords AS title, day FROM search " + " keywords AS title, day, 0 AS date FROM search " " WHERE uri LIKE ?1 OR keywords LIKE ?1 GROUP BY uri " ") ORDER BY day ASC"; result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); @@ -258,7 +294,7 @@ } if (result != SQLITE_OK) - return NULL; + return katze_array_new (KATZE_TYPE_ITEM); return katze_array_from_statement (statement); } @@ -327,7 +363,7 @@ if (result != GTK_RESPONSE_YES) return; - midori_history_clear_db (history); + katze_array_clear (history->array); } static void @@ -336,19 +372,21 @@ { GtkTreeModel* model; GtkTreeIter iter; - KatzeItem* item; + KatzeItem* item = NULL; + GtkWidget* proxy = GTK_IS_TOOL_ITEM (menuitem) ? menuitem : NULL; MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (history)); if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (history->treeview), &model, &iter)) gtk_tree_model_get (model, &iter, 0, &item, -1); if (KATZE_IS_ITEM (item) && katze_item_get_uri (item)) - midori_browser_edit_bookmark_dialog_new (browser, item, TRUE, FALSE); + { + midori_browser_edit_bookmark_dialog_new (browser, item, TRUE, FALSE, proxy); + g_object_unref (item); + } else - midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE); - - g_object_unref (item); + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE, proxy); } static GtkWidget* @@ -389,6 +427,7 @@ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); history->clear = GTK_WIDGET (toolitem); + midori_history_toolbar_update (history); g_signal_connect (history->bookmark, "destroy", G_CALLBACK (gtk_widget_destroyed), &history->bookmark); g_signal_connect (history->delete, "destroy", @@ -417,9 +456,8 @@ GtkTreeModel* model = gtk_tree_view_get_model (treeview); GtkTreeIter iter; KatzeItem* today; - time_t current_time; + time_t current_time = time (NULL); - current_time = time (NULL); if (gtk_tree_model_iter_children (model, &iter, NULL)) { gint64 day; @@ -428,7 +466,18 @@ gtk_tree_model_get (model, &iter, 0, &today, -1); day = katze_item_get_added (today); + #if GLIB_CHECK_VERSION (2, 26, 0) + has_today = g_date_time_get_day_of_month ( + g_date_time_new_from_unix_local (day)) + == g_date_time_get_day_of_month ( + g_date_time_new_from_unix_local (current_time)) + && g_date_time_get_day_of_year ( + g_date_time_new_from_unix_local (day)) + == g_date_time_get_day_of_year ( + g_date_time_new_from_unix_local (current_time)); + #else has_today = sokoke_days_between ((time_t*)&day, ¤t_time) == 0; + #endif g_object_unref (today); if (has_today) { @@ -454,6 +503,14 @@ } static void +midori_history_clear_cb (KatzeArray* array, + MidoriHistory* history) +{ + GtkTreeView* treeview = GTK_TREE_VIEW (history->treeview); + GtkTreeModel* model = gtk_tree_view_get_model (treeview); + gtk_tree_store_clear (GTK_TREE_STORE (model)); +} +static void midori_history_set_app (MidoriHistory* history, MidoriApp* app) { @@ -463,12 +520,14 @@ { g_signal_handlers_disconnect_by_func (history->array, midori_history_add_item_cb, history); + g_signal_handlers_disconnect_by_func (history->array, + midori_history_clear_cb, history); katze_object_assign (history->array, NULL); model = gtk_tree_view_get_model (GTK_TREE_VIEW (history->treeview)); gtk_tree_store_clear (GTK_TREE_STORE (model)); } - katze_assign (history->app, app); + katze_object_assign (history->app, app); if (!app) return; g_object_ref (app); @@ -476,6 +535,8 @@ history->array = katze_object_get_object (app, "history"); g_signal_connect (history->array, "add-item", G_CALLBACK (midori_history_add_item_cb), history); + g_signal_connect (history->array, "clear", + G_CALLBACK (midori_history_clear_cb), history); model = gtk_tree_view_get_model (GTK_TREE_VIEW (history->treeview)); if (history->array) midori_history_read_from_db_to_model (history, GTK_TREE_STORE (model), NULL, 0, NULL); @@ -533,6 +594,8 @@ if (!item) pixbuf = NULL; + else if ((pixbuf = katze_item_get_pixbuf (item, treeview))) + ; else if (katze_item_get_uri (item)) pixbuf = katze_load_cached_icon (katze_item_get_uri (item), treeview); else @@ -670,6 +733,10 @@ KatzeArray* array; db = g_object_get_data (G_OBJECT (history->array), "db"); + + if (!db) + return; + sqlcmd = g_strdup_printf ("SELECT uri, title, date, day " "FROM history WHERE day = %d " "GROUP BY uri ORDER BY date ASC", @@ -806,7 +873,7 @@ GtkTreeModel* model; GtkTreeIter iter; - if (event->keyval != GDK_Delete) + if (event->keyval != GDK_KEY_Delete) return FALSE; if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) @@ -910,6 +977,12 @@ gtk_entry_set_text (entry, ""); } +static void +midori_history_selection_changed_cb (GtkTreeView* treeview, + MidoriHistory* history) +{ + midori_history_toolbar_update (history); +} static void midori_history_init (MidoriHistory* history) @@ -921,18 +994,14 @@ GtkTreeViewColumn* column; GtkCellRenderer* renderer_pixbuf; GtkCellRenderer* renderer_text; + GtkTreeSelection* selection; /* Create the filter entry */ entry = gtk_icon_entry_new (); gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FIND); - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_SECONDARY, - GTK_STOCK_CLEAR); - gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_SECONDARY, - TRUE); + sokoke_entry_set_clear_button_visible (GTK_ENTRY (entry), TRUE); g_signal_connect (entry, "icon-release", G_CALLBACK (midori_history_filter_entry_clear_cb), history); g_signal_connect (entry, "changed", @@ -948,6 +1017,7 @@ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (treeview), 1); column = gtk_tree_view_column_new (); + gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, @@ -974,6 +1044,10 @@ "signal::popup-menu", midori_history_popup_menu_cb, history, NULL); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); + g_signal_connect_after (selection, "changed", + G_CALLBACK (midori_history_selection_changed_cb), + history); gtk_widget_show (treeview); gtk_box_pack_start (GTK_BOX (history), treeview, TRUE, TRUE, 0); history->treeview = treeview; @@ -992,23 +1066,9 @@ g_signal_handlers_disconnect_by_func (history->array, midori_history_add_item_cb, history); + g_signal_handlers_disconnect_by_func (history->array, + midori_history_clear_cb, history); g_object_unref (history->array); katze_assign (history->filter, NULL); } -/** - * midori_history_new: - * - * Creates a new empty history. - * - * Return value: a new #MidoriHistory - * - * Since: 0.1.3 - **/ -GtkWidget* -midori_history_new (void) -{ - MidoriHistory* history = g_object_new (MIDORI_TYPE_HISTORY, NULL); - - return GTK_WIDGET (history); -} diff -Nru midori-0.2.8/panels/midori-transfers.c midori-0.4.6/panels/midori-transfers.c --- midori-0.2.8/panels/midori-transfers.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/panels/midori-transfers.c 2012-05-14 22:13:42.000000000 +0000 @@ -13,10 +13,9 @@ #include "midori-app.h" #include "midori-browser.h" -#include "midori-stock.h" +#include "midori-platform.h" #include "midori-view.h" -#include "sokoke.h" #include struct _MidoriTransfers @@ -103,7 +102,6 @@ gint n = 0; while ((gtk_tree_model_iter_nth_child (model, &iter, NULL, n++))) { - #if WEBKIT_CHECK_VERSION (1, 1, 3) WebKitDownload* download; WebKitDownloadStatus status; @@ -117,7 +115,6 @@ n--; /* Decrement n since we just removed it */ } g_object_unref (download); - #endif } } @@ -161,7 +158,6 @@ iface->get_toolbar = midori_transfers_get_toolbar; } -#if WEBKIT_CHECK_VERSION (1, 1, 3) static void midori_transfers_download_notify_progress_cb (WebKitDownload* download, GParamSpec* pspec, @@ -198,7 +194,6 @@ g_signal_connect (download, "notify::status", G_CALLBACK (midori_transfers_download_notify_status_cb), transfers); } -#endif static void midori_transfers_set_property (GObject* object, @@ -257,24 +252,25 @@ GtkTreeIter* iter, GtkWidget* treeview) { - #if WEBKIT_CHECK_VERSION (1, 1, 3) WebKitDownload* download; gchar* current; gchar* total; gchar* size_text; gchar* text; + gchar* filename; gdouble progress; gtk_tree_model_get (model, iter, 1, &download, -1); /* FIXME: Ellipsize filename */ - current = g_format_size_for_display (webkit_download_get_current_size (download)); - total = g_format_size_for_display (webkit_download_get_total_size (download)); + current = g_format_size (webkit_download_get_current_size (download)); + total = g_format_size (webkit_download_get_total_size (download)); size_text = g_strdup_printf (_("%s of %s"), current, total); g_free (current); g_free (total); - text = g_strdup_printf ("%s\n%s", - webkit_download_get_suggested_filename (download), size_text); + filename = sokoke_get_download_filename (download); + text = g_strdup_printf ("%s\n%s", filename, size_text); + g_free (filename); g_free (size_text); /* Avoid a bug in WebKit */ if (webkit_download_get_status (download) != WEBKIT_DOWNLOAD_STATUS_CREATED) @@ -286,7 +282,6 @@ "xpad", 1, "ypad", 6, NULL); g_free (text); g_object_unref (download); - #endif } static void @@ -296,7 +291,6 @@ GtkTreeIter* iter, GtkWidget* treeview) { - #if WEBKIT_CHECK_VERSION (1, 1, 3) WebKitDownload* download; const gchar* stock_id; @@ -317,7 +311,6 @@ "stock-size", GTK_ICON_SIZE_MENU, NULL); g_object_unref (download); - #endif } static void @@ -330,7 +323,6 @@ GtkTreeIter iter; if (gtk_tree_model_get_iter (model, &iter, path)) { - #if WEBKIT_CHECK_VERSION (1, 1, 3) WebKitDownload* download; gtk_tree_model_get (model, &iter, 1, &download, -1); @@ -355,7 +347,6 @@ break; } g_object_unref (download); - #endif } } @@ -363,7 +354,6 @@ midori_transfers_hierarchy_changed_cb (MidoriTransfers* transfers, GtkWidget* old_parent) { - #if WEBKIT_CHECK_VERSION (1, 1, 3) MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (transfers)); if (MIDORI_IS_BROWSER (browser)) g_signal_connect (browser, "add-download", @@ -371,10 +361,8 @@ if (old_parent) g_signal_handlers_disconnect_by_func (old_parent, midori_transfers_browser_add_download_cb, transfers); - #endif } -#if WEBKIT_CHECK_VERSION (1, 1, 3) static GtkWidget* midori_transfers_popup_menu_item (GtkMenu* menu, const gchar* stock_id, @@ -455,7 +443,7 @@ download = g_object_get_data (G_OBJECT (menuitem), "WebKitDownload"); g_return_if_fail (download != NULL); - uri = webkit_download_get_destination_uri (download); + uri = webkit_download_get_uri (download); clipboard = gtk_clipboard_get_for_display ( gtk_widget_get_display (GTK_WIDGET (menuitem)), GDK_SELECTION_CLIPBOARD); @@ -486,7 +474,6 @@ katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR); } -#endif static gboolean midori_transfers_popup_menu_cb (GtkWidget* widget, @@ -497,7 +484,6 @@ if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) { - #if WEBKIT_CHECK_VERSION (1, 1, 3) WebKitDownload* download; gtk_tree_model_get (model, &iter, 1, &download, -1); @@ -505,7 +491,6 @@ midori_transfers_popup (widget, NULL, download, transfers); g_object_unref (download); return TRUE; - #endif } return FALSE; } @@ -523,7 +508,6 @@ if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) { - #if WEBKIT_CHECK_VERSION (1, 1, 3) WebKitDownload* download; gtk_tree_model_get (model, &iter, 1, &download, -1); @@ -531,7 +515,6 @@ midori_transfers_popup (widget, NULL, download, transfers); g_object_unref (download); return TRUE; - #endif } return FALSE; } @@ -547,6 +530,7 @@ transfers->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treestore)); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (transfers->treeview), FALSE); column = gtk_tree_view_column_new (); + gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, @@ -579,19 +563,3 @@ G_CALLBACK (midori_transfers_hierarchy_changed_cb), NULL); } -/** - * midori_transfers_new: - * - * Creates a new empty transfers. - * - * Return value: a new #MidoriTransfers - * - * Since 0.1.5 - **/ -GtkWidget* -midori_transfers_new (void) -{ - MidoriTransfers* transfers = g_object_new (MIDORI_TYPE_TRANSFERS, NULL); - - return GTK_WIDGET (transfers); -} diff -Nru midori-0.2.8/po/POTFILES.in midori-0.4.6/po/POTFILES.in --- midori-0.2.8/po/POTFILES.in 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/POTFILES.in 2012-05-14 22:13:42.000000000 +0000 @@ -1,10 +1,12 @@ # List of source files containing translatable strings. data/midori.desktop.in +data/midori-private.desktop.in midori/main.c midori/midori-app.c midori/midori-array.c midori/midori-browser.c +midori/midori-extension.c midori/midori-locationaction.c midori/midori-panel.c midori/midori-websettings.c @@ -15,7 +17,6 @@ toolbars/midori-findbar.c toolbars/midori-transferbar.c panels/midori-bookmarks.c -panels/midori-console.c panels/midori-extensions.c panels/midori-history.c panels/midori-transfers.c @@ -33,16 +34,16 @@ extensions/cookie-manager/cookie-manager-page.c extensions/cookie-manager/main.c extensions/copy-tabs.c -extensions/external-applications.vala extensions/feed-panel/feed-atom.c extensions/feed-panel/feed-panel.c extensions/feed-panel/feed-parse.c extensions/feed-panel/feed-rss.c extensions/feed-panel/main.c -extensions/formhistory.c +extensions/formhistory/formhistory.c +extensions/formhistory/formhistory-gdom-frontend.c +extensions/formhistory/formhistory-js-frontend.c extensions/history-list.vala extensions/mouse-gestures.c -extensions/page-holder.c extensions/shortcuts.c extensions/status-clock.c extensions/statusbar-features.c diff -Nru midori-0.2.8/po/ar.po midori-0.4.6/po/ar.po --- midori-0.2.8/po/ar.po 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/po/ar.po 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,3063 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# mohammad , 2012. +msgid "" +msgstr "" +"Project-Id-Version: midori\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-01-30 22:39+0000\n" +"PO-Revision-Date: 2012-01-31 08:37+0300\n" +"Last-Translator: mohammad \n" +"Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n" +"Language: ar\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " +"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" +"X-Generator: Virtaal 0.7.0\n" +"X-Poedit-Language: Arabic\n" +"X-Poedit-Country: MOROCCO\n" + +#: ../data/midori.desktop.in.h:1 +msgid "Browse the Web" +msgstr "تصفّح الإنترنت" + +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "شبكة الإنترنت؛WWW؛إكسبلورر" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:1978 ../midori/main.c:1998 +#: ../midori/main.c:2009 ../midori/midori-websettings.c:304 +msgid "Midori" +msgstr "ميدوري" + +#: ../data/midori.desktop.in.h:4 +msgid "Web Browser" +msgstr "متصفح الوب" + +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "متصفح ميدوري الخاص" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "فتح نافذة تصفح خاصة الجديدة" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4013 +msgid "Private Browsing" +msgstr "التصفح الخاص" + +#: ../midori/main.c:96 ../midori/main.c:102 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "لا يمكن تحميل الإعدادات: %s\n" + +#: ../midori/main.c:150 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "القيمة '%s' غبر صالحة ل %s" + +#: ../midori/main.c:155 ../midori/main.c:259 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "قيمة الإعدادات '%s' غبر صالحة" + +#: ../midori/main.c:364 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "فشل تحميل أدوات البحث. %s\n" + +#: ../midori/main.c:418 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "فشل محو السجل: %s\n" + +#: ../midori/main.c:438 ../midori/main.c:559 +#: ../extensions/formhistory/formhistory.c:249 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "فشل فتح قاعدة البيانات: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:502 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "فشل حذف العناصر القديمة للسجل: %s\n" + +#: ../midori/main.c:542 ../panels/midori-history.c:189 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "فشل حذف عنصر السجل: %s\n" + +#: ../midori/main.c:589 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "لا يمكن حفظ العلامات. %s" + +#: ../midori/main.c:611 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "لا يمكن حفظ الإعدادات. %s" + +#: ../midori/main.c:646 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "لا يمكن حفظ أدوات البحث. %s" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:683 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "لا يمكن حفظ المهملات. %s" + +#: ../midori/main.c:724 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "إمتدادات" + +#: ../midori/main.c:738 +msgid "Privacy" +msgstr "الخصوصية" + +#: ../midori/main.c:750 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"الكوكيز تخزن بيانات تسجيل الدخول والألعاب المحفوظة ، أو تعريف المستخدم " +"لأغراض الإعلان." + +#: ../midori/main.c:806 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "لا يمكن حفظ الجلسة. %s" + +#: ../midori/main.c:1024 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "لا يوجد ملف شهادة للجذر هو متاح. لا يمكن التحقق من شهادات SSL." + +#: ../midori/main.c:1092 +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:1111 +msgid "Modify _preferences" +msgstr "تحرير ال_تفضيلات" + +#: ../midori/main.c:1115 +msgid "Disable all _extensions" +msgstr "تعطيل كل الإمتدادات" + +#: ../midori/main.c:1128 +msgid "Discard old tabs" +msgstr "تجاهل العلامات القديمة" + +#: ../midori/main.c:1129 ../midori/midori-websettings.c:213 +msgid "Show last tabs without loading" +msgstr "أظهر أخر تبويب بدون تحميل" + +#: ../midori/main.c:1130 ../midori/midori-websettings.c:212 +msgid "Show last open tabs" +msgstr "أظهر اخر التبويبات المفتوحة" + +#: ../midori/main.c:1338 ../midori/main.c:2393 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "لا يمكن تحميل الجلسة: %s\n" + +#: ../midori/main.c:1476 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "حفظ لقطة في : %s\n" + +#: ../midori/main.c:1881 +msgid "Run ADDRESS as a web application" +msgstr "شغل العنوان كتطبيق وب" + +#: ../midori/main.c:1881 +msgid "ADDRESS" +msgstr "عنوان" + +#: ../midori/main.c:1884 +msgid "Use FOLDER as configuration folder" +msgstr "إستعمل المجلد كمجلد إعدادات" + +#: ../midori/main.c:1884 +msgid "FOLDER" +msgstr "مجلد" + +#: ../midori/main.c:1887 +msgid "Private browsing, no changes are saved" +msgstr "التصفح الخاص ، لا يتم حفظ أية تغييرات" + +#: ../midori/main.c:1889 +msgid "Show a diagnostic dialog" +msgstr "يظهر حوار التشخيص" + +#: ../midori/main.c:1891 +msgid "Run the specified filename as javascript" +msgstr "تشغيل ملف جافا سكريبت على النحو المحدد" + +#: ../midori/main.c:1893 +msgid "Take a snapshot of the specified URI" +msgstr "أخذ لقطة للعنوان المحدد" + +#: ../midori/main.c:1895 +msgid "Execute the specified command" +msgstr "تنفيذ الأمر المحدد" + +#: ../midori/main.c:1897 +msgid "List available commands to execute with -e/ --execute" +msgstr "قائمة الأوامر المتوفرة لتنفيذ مع -e/ --execute" + +#: ../midori/main.c:1899 +msgid "Display program version" +msgstr "إظهار نسخة البرنامج" + +#: ../midori/main.c:1901 +msgid "Addresses" +msgstr "عناوين" + +#: ../midori/main.c:1903 +msgid "Block URIs according to regular expression PATTERN" +msgstr "كتلة محددات وفقا للنمط التعبير العادي" + +#: ../midori/main.c:1903 +msgid "PATTERN" +msgstr "نموذج" + +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:1907 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "إعادة ميدوري ثانية بعد ثوان من الخمول" + +#: ../midori/main.c:1907 +msgid "SECONDS" +msgstr "ثواني" + +#: ../midori/main.c:1910 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "الموجهات التحذيرات حدة لتحديد FILENAME" + +#: ../midori/main.c:1910 +msgid "FILENAME" +msgstr "إسم الملف" + +#: ../midori/main.c:1975 +msgid "[Addresses]" +msgstr "[عناوين]" + +#: ../midori/main.c:1985 +msgid "The specified configuration folder is invalid." +msgstr "إعداد المجلد المحدد غير صالح." + +#: ../midori/main.c:2010 +msgid "Please report comments, suggestions and bugs to:" +msgstr "الرجاء الإبلاغ عن التعليقات والاقتراحات والعلل إلى:" + +#: ../midori/main.c:2012 +msgid "Check for new versions at:" +msgstr "تحقق من توفر نسخ جديدة في:" + +#: ../midori/main.c:2095 +msgid "Website icons" +msgstr "أيقونات الموقع" + +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2098 +msgid "Saved logins and _passwords" +msgstr "الحسابات و_كلمات السر المحفوظة" + +#: ../midori/main.c:2100 +msgid "Cookies" +msgstr "كعكات" + +#: ../midori/main.c:2103 +msgid "'Flash' Cookies" +msgstr "'فلاش' كعكات" + +#: ../midori/main.c:2106 +msgid "HTML5 _Databases" +msgstr "HTML5 _قاعدة بيانات" + +#: ../midori/main.c:2109 ../midori/midori-websettings.c:947 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "ملفات الوب المؤقتة" + +#: ../midori/main.c:2111 +msgid "Offline Application Cache" +msgstr "ذاكرة التطبيقات بدون اتصال" + +#: ../midori/main.c:2218 +msgid "An unknown error occured" +msgstr "حدث خطأ مجهول" + +#: ../midori/main.c:2324 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "هناك مثيل لميدوري قيد التشغيل بالفعل ولكن لا يستجيب.\n" + +#: ../midori/main.c:2360 +#, c-format +msgid "Bookmarks couldn't be loaded: %s\n" +msgstr "لا يمكن تحميل العلامات: %s\n" + +#: ../midori/main.c:2408 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "لا يمكن تحميل المهلملات: %s\n" + +#: ../midori/main.c:2421 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "لا يمكن تحميل التاريخ: %s\n" + +#: ../midori/main.c:2437 +msgid "The following errors occured:" +msgstr "حدثت الأخطاء التالية:" + +#: ../midori/main.c:2453 +msgid "_Ignore" +msgstr "_تجاهل" + +#: ../midori/midori-app.c:1331 +msgid "_Bookmark" +msgstr "_علامة" + +#: ../midori/midori-app.c:1332 ../midori/midori-browser.c:6049 +msgid "_Bookmarks" +msgstr "_علامات" + +#: ../midori/midori-app.c:1333 +msgid "Add Boo_kmark" +msgstr "أضِف _علامة" + +#: ../midori/midori-app.c:1334 +msgid "_Console" +msgstr "_طرفية" + +#: ../midori/midori-app.c:1335 +msgid "_Extensions" +msgstr "_إمتدادات" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1336 ../midori/midori-browser.c:4619 +msgid "_History" +msgstr "_سجل" + +#: ../midori/midori-app.c:1337 +msgid "_Homepage" +msgstr "_الصفحة الرئيسية" + +#: ../midori/midori-app.c:1338 +msgid "_Userscripts" +msgstr "_النصوص البرمجية المستخدمة" + +#: ../midori/midori-app.c:1339 +msgid "New _Tab" +msgstr "تب_ويب جديد" + +#: ../midori/midori-app.c:1340 +msgid "_Transfers" +msgstr "_النقل" + +#: ../midori/midori-app.c:1341 +msgid "Netscape p_lugins" +msgstr "Netscape _ملحقات" + +#: ../midori/midori-app.c:1342 +msgid "_Closed Tabs" +msgstr "_التبويبات المغلقة" + +#: ../midori/midori-app.c:1343 ../midori/midori-browser.c:5206 +msgid "New _Window" +msgstr "نافذة جديدة" + +#: ../midori/midori-app.c:1344 +msgid "New _Folder" +msgstr "مج_لد جديد" + +#: ../midori/midori-array.c:522 +msgid "File not found." +msgstr "لم يتم العثور على ملف." + +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +msgid "Malformed document." +msgstr "وثيقة مشوهة." + +#: ../midori/midori-array.c:628 +msgid "Unrecognized bookmark format." +msgstr "علامات غير معتمدة الصيغة." + +#: ../midori/midori-array.c:915 +msgid "Writing failed." +msgstr "فشل الكتابة." + +#: ../midori/midori-browser.c:326 ../midori/midori-browser.c:5288 +#: ../midori/midori-browser.c:5297 +msgid "Reload the current page" +msgstr "تحديث الصفحة الحالية" + +#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5294 +msgid "Stop loading the current page" +msgstr "إيقاف تحميل الصفحة الحالية" + +#: ../midori/midori-browser.c:465 +#, c-format +msgid "Failed to update title: %s\n" +msgstr "فشل تحديث عنوان: %s\n" + +#: ../midori/midori-browser.c:478 +#, c-format +msgid "Unexpected action '%s'." +msgstr "حدث غير متوقع'%s'." + +#: ../midori/midori-browser.c:568 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (التصفح الخاص)" + +#: ../midori/midori-browser.c:678 ../midori/midori-browser.c:711 +msgid "Toplevel folder" +msgstr "مجلد المستوي عالي" + +#: ../midori/midori-browser.c:768 +msgid "New folder" +msgstr "مجلد جديد" + +#: ../midori/midori-browser.c:768 +msgid "Edit folder" +msgstr "تحرير المجلد" + +#: ../midori/midori-browser.c:770 +msgid "New bookmark" +msgstr "علامة حديدة" + +#: ../midori/midori-browser.c:770 +msgid "Edit bookmark" +msgstr "تحرير العلامة" + +#: ../midori/midori-browser.c:801 +msgid "_Title:" +msgstr "_عنوان:" + +#: ../midori/midori-browser.c:821 ../midori/midori-searchaction.c:967 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "_عنوان:" + +#: ../midori/midori-browser.c:844 ../midori/midori-browser.c:4356 +msgid "_Folder:" +msgstr "_مجلد:" + +#: ../midori/midori-browser.c:860 +msgid "Add to _Speed Dial" +msgstr "أضف إلى _الحوار السريع" + +#: ../midori/midori-browser.c:873 +msgid "Show in the tool_bar" +msgstr "أظهر في شريط الأدوات" + +#: ../midori/midori-browser.c:888 +msgid "Run as _web application" +msgstr "تشغيل كتطبيق انترنت" + +#: ../midori/midori-browser.c:959 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "الملف \"%s\" لا يمكن حفظها في هذا المجلد." + +#: ../midori/midori-browser.c:961 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "ليس لديك إذن الكتابة في هذا الموقع." + +#: ../midori/midori-browser.c:968 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "لا توجد مساحة حرة كافية لتحميل \"%s\"." + +#: ../midori/midori-browser.c:971 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "الملف يحتاجج %s ولكن فقط %s مساحة حرة." + +#: ../midori/midori-browser.c:1015 ../midori/midori-browser.c:4425 +msgid "Save file as" +msgstr "حفظ الملف في" + +#: ../midori/midori-browser.c:1324 +msgid "New Window" +msgstr "نافذة جديدة" + +#: ../midori/midori-browser.c:1324 +msgid "A new window has been opened" +msgstr "تم فتح نافذة جديدة" + +#: ../midori/midori-browser.c:1327 +msgid "New Tab" +msgstr "تبويب جديد" + +#: ../midori/midori-browser.c:1327 +msgid "A new tab has been opened" +msgstr "تم فتح علامة تبويب جديدة" + +#: ../midori/midori-browser.c:1362 +msgid "Error opening the image!" +msgstr "حدث خطأ أثناء فتح الصورة!" + +#: ../midori/midori-browser.c:1363 +msgid "Can not open selected image in a default viewer." +msgstr "لا يمكن فتح الصورة المحددة في العارض الافتراضي." + +#: ../midori/midori-browser.c:1369 +msgid "Error downloading the image!" +msgstr "خطأ في تحميل الصورة!" + +#: ../midori/midori-browser.c:1370 +msgid "Can not download selected image." +msgstr "لا يمكن تنزيل الصورة المحددة." + +#: ../midori/midori-browser.c:1473 +msgid "Save file" +msgstr "حفظ الملف" + +#: ../midori/midori-browser.c:2327 +msgid "Open file" +msgstr "فتح الملف" + +#: ../midori/midori-browser.c:2458 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr "" +"لاستخدام URI أعلاه فتح مجمع الأخبار. عادة ما يكون هناك قائمة أو زر \"اشتراك " +"جديد\"، \"تغذية الأخبار الجديدة\" أو ما شابه ذلك.\n" +"ويمكنك أيضاً الذهاب الى الافضليات، تطبيقات في ميدوري، وحدد مجمع الخبر. المرة " +"التالية التي تقوم فوق رمز الأخبار تغذية، ستضاف تلقائيا." + +#: ../midori/midori-browser.c:2464 ../extensions/feed-panel/main.c:365 +msgid "New feed" +msgstr "تغدية جديدة" + +#: ../midori/midori-browser.c:2507 ../midori/midori-browser.c:5357 +#: ../panels/midori-bookmarks.c:426 +msgid "Add a new bookmark" +msgstr "أضف علامة جديدة" + +#: ../midori/midori-browser.c:3004 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "فارغ" + +#: ../midori/midori-browser.c:3500 +msgid "Toggle text cursor navigation" +msgstr "تبديل مؤشر ملاحة النص" + +#: ../midori/midori-browser.c:3818 ../midori/midori-browser.c:5743 +#, c-format +msgid "Failed to insert new history item: %s\n" +msgstr "فشل في إدراج التاريخ : %s\n" + +#: ../midori/midori-browser.c:4153 ../panels/midori-bookmarks.c:742 +#: ../panels/midori-history.c:747 +msgid "Open all in _Tabs" +msgstr "فتح الكل في تبويبات" + +#: ../midori/midori-browser.c:4160 ../panels/midori-bookmarks.c:748 +#: ../panels/midori-history.c:753 ../extensions/feed-panel/feed-panel.c:528 +msgid "Open in New _Tab" +msgstr "فتح في تبو_يب جديد" + +#: ../midori/midori-browser.c:4163 ../midori/midori-view.c:2575 +#: ../midori/midori-view.c:4507 ../panels/midori-bookmarks.c:750 +#: ../panels/midori-history.c:755 ../extensions/feed-panel/feed-panel.c:530 +msgid "Open in New _Window" +msgstr "افتح في _نافذة جديدة" + +#: ../midori/midori-browser.c:4243 +msgid "Arora" +msgstr "Arora" + +#: ../midori/midori-browser.c:4244 +msgid "Kazehakase" +msgstr "Kazehakase" + +#: ../midori/midori-browser.c:4245 +msgid "Opera" +msgstr "أوبيرا" + +#: ../midori/midori-browser.c:4246 +msgid "Konqueror" +msgstr "كُنكَرر" + +#: ../midori/midori-browser.c:4247 +msgid "Epiphany" +msgstr "إبِفَني" + +#: ../midori/midori-browser.c:4248 +#, c-format +msgid "Firefox (%s)" +msgstr "فيَرفُكس (%s)" + +#: ../midori/midori-browser.c:4269 +msgid "Import bookmarks..." +msgstr "يتم الأن إستيراد العلامات..." + +#: ../midori/midori-browser.c:4272 ../midori/midori-browser.c:5362 +msgid "_Import bookmarks" +msgstr "_إستورد العلامات" + +#: ../midori/midori-browser.c:4283 +msgid "_Application:" +msgstr "_تطبيق:" + +#: ../midori/midori-browser.c:4348 +msgid "Import from XBEL or HTML file" +msgstr "استيراد من ملف HTML أو XBEL" + +#: ../midori/midori-browser.c:4383 +msgid "Import from a file" +msgstr "استيراد من ملفّ" + +#: ../midori/midori-browser.c:4395 +msgid "Failed to import bookmarks" +msgstr "فشل إستراد العلامات" + +#: ../midori/midori-browser.c:4430 +msgid "XBEL Bookmarks" +msgstr "العلامات XBEL" + +#: ../midori/midori-browser.c:4435 +msgid "Netscape Bookmarks" +msgstr "مفضلة نتسكيب" + +#: ../midori/midori-browser.c:4449 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "يمكن لميدوري تصدير فقط XBEL (*.xbel) ونتسكيب (*.html)" + +#: ../midori/midori-browser.c:4464 +msgid "Failed to export bookmarks" +msgstr "فشل تصدير العلامات" + +#. i18n: Dialog: Clear Private Data, in the Tools menu +#: ../midori/midori-browser.c:4586 +msgid "Clear Private Data" +msgstr "حذف البيانات الخاصة" + +#: ../midori/midori-browser.c:4590 +msgid "_Clear private data" +msgstr "_حذف البيانات الخاصة" + +#: ../midori/midori-browser.c:4603 +msgid "Clear the following data:" +msgstr "حذف البيانات التالية:" + +#: ../midori/midori-browser.c:4613 +msgid "Last open _tabs" +msgstr "أظهر آخر التبويبات المفتوحة" + +#: ../midori/midori-browser.c:4639 +msgid "Clear private data when _quitting Midori" +msgstr "مسح البيانات الخاصة عند الخروج من ميدوري" + +#: ../midori/midori-browser.c:4815 +msgid "A lightweight web browser." +msgstr "متصفح الويب الخفيف." + +#: ../midori/midori-browser.c:4816 +msgid "See about:version for version info." +msgstr "انظر حول:لمعلومات نسخة الإصدار." + +#: ../midori/midori-browser.c:4818 +msgid "" +"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." +msgstr "" +"هذه المكتبة هي برمجيات حرة ، ويمكنك إعادة توزيعها و/أو تعديلها تحت شروط رخصة " +"جنو العمومية الصغرى كما نشرت من قبل مؤسسة البرمجيات الحرة ؛ إما الإصدار 2.1 " +"من الرخصة ، أو (باختيارك) أي إصدار لاحق." + +#: ../midori/midori-browser.c:4839 +msgid "translator-credits" +msgstr "" +"Arabic Xfce Translation Team (فريق تعريب إكسفس)\n" +" Karim Oulad Chalha (كريم اولاد الشلحة) \n" +" Mohamed Al Hargan(محمد الحرقان) " + +#: ../midori/midori-browser.c:5204 +msgid "_File" +msgstr "_ملف" + +#: ../midori/midori-browser.c:5207 +msgid "Open a new window" +msgstr "فتح نافذة جديدة" + +#: ../midori/midori-browser.c:5210 +msgid "Open a new tab" +msgstr "فتح تبويب جديد" + +#: ../midori/midori-browser.c:5212 +msgid "New P_rivate Browsing Window" +msgstr "نافذة تصفح جديدة خاصة" + +#: ../midori/midori-browser.c:5216 +msgid "Open a file" +msgstr "فتح ملف" + +#: ../midori/midori-browser.c:5218 +msgid "_Save Page As..." +msgstr "_حفظ الصفحة باسم..." + +#: ../midori/midori-browser.c:5219 +msgid "Save to a file" +msgstr "حفظ إلى ملف" + +#: ../midori/midori-browser.c:5221 +msgid "Add to Speed _dial" +msgstr "أضف إلى _الحوار السريع" + +#: ../midori/midori-browser.c:5225 +msgid "Add Shortcut to the _desktop" +msgstr "إضافة إلى اختصار سطح المكتب" + +#: ../midori/midori-browser.c:5227 +msgid "Create _Launcher" +msgstr "إنشاء مطلق" + +#: ../midori/midori-browser.c:5231 +msgid "Subscribe to News _feed" +msgstr "الاشتراك في مصدر أخبار" + +#: ../midori/midori-browser.c:5237 +msgid "_Close Tab" +msgstr "_غلق التبويب" + +#: ../midori/midori-browser.c:5238 +msgid "Close the current tab" +msgstr "إغلاق علامة التبويب الحالية" + +#: ../midori/midori-browser.c:5240 +msgid "C_lose Window" +msgstr "غلق التافذة" + +#: ../midori/midori-browser.c:5244 +msgid "Print the current page" +msgstr "اطبع الصفحة الحالية" + +#: ../midori/midori-browser.c:5246 +msgid "Close a_ll Windows" +msgstr "إغلاق جميع النوافذ" + +#: ../midori/midori-browser.c:5249 +msgid "_Edit" +msgstr "_تحرير" + +#: ../midori/midori-browser.c:5272 +msgid "_Find..." +msgstr "_العثور على..." + +#: ../midori/midori-browser.c:5273 +msgid "Find a word or phrase in the page" +msgstr "العثور على كلمة أو عبارة في الصفحة" + +#: ../midori/midori-browser.c:5275 +msgid "Find _Next" +msgstr "العثور على التالي" + +#: ../midori/midori-browser.c:5278 +msgid "Find _Previous" +msgstr "عث_ور على السابق" + +#: ../midori/midori-browser.c:5282 +msgid "Configure the application preferences" +msgstr "تكوين تفضيلات التطبيق" + +#: ../midori/midori-browser.c:5284 +msgid "_View" +msgstr "_عرض" + +#: ../midori/midori-browser.c:5285 +msgid "_Toolbars" +msgstr "_شريط الأدوات" + +#: ../midori/midori-browser.c:5290 +msgid "Reload page without caching" +msgstr "تحديث الصفحة دون التخزين المؤقت" + +#: ../midori/midori-browser.c:5300 +msgid "Increase the zoom level" +msgstr "زيادة مستوى التكبير" + +#: ../midori/midori-browser.c:5303 +msgid "Decrease the zoom level" +msgstr "انخفاض مستوى التكبير" + +#: ../midori/midori-browser.c:5307 +msgid "_Encoding" +msgstr "_تشفير" + +#: ../midori/midori-browser.c:5309 +msgid "View So_urce" +msgstr "عرض المصدر" + +#: ../midori/midori-browser.c:5312 +msgid "Ca_ret Browsing" +msgstr "إنشاء تصفح" + +#: ../midori/midori-browser.c:5316 +msgid "Toggle fullscreen view" +msgstr "تبديل لعرض ملء الشاشة" + +#: ../midori/midori-browser.c:5318 +msgid "Scroll _Left" +msgstr "انتقل لليسار" + +#: ../midori/midori-browser.c:5321 +msgid "Scroll _Down" +msgstr "انتقل إلى للاسفل" + +#: ../midori/midori-browser.c:5324 +msgid "Scroll _Up" +msgstr "انتقل إلى للأعلى" + +#: ../midori/midori-browser.c:5327 +msgid "Scroll _Right" +msgstr "انتقل إلى اليمين" + +#: ../midori/midori-browser.c:5330 +msgid "_Go" +msgstr "_إذهب" + +#: ../midori/midori-browser.c:5333 +msgid "Go back to the previous page" +msgstr "العودة إلى الصفحة السابقة" + +#: ../midori/midori-browser.c:5336 +msgid "Go forward to the next page" +msgstr "المضي قدما إلى الصفحة التالية" + +#. i18n: Visit the previous logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5340 +msgid "Go to the previous sub-page" +msgstr "انتقل إلى الصفحة الفرعية السابقة" + +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5344 +msgid "Go to the next sub-page" +msgstr "انتقل إلى صفحة فرعية اللاحقة" + +#: ../midori/midori-browser.c:5347 +msgid "Go to your homepage" +msgstr "ذهاب إلى الصفحة الرئيسية" + +#: ../midori/midori-browser.c:5349 +msgid "Empty Trash" +msgstr "سلة المهملات فارغة" + +#: ../midori/midori-browser.c:5352 +msgid "Undo _Close Tab" +msgstr "تراجع عن إ_غلاق التبويب" + +#: ../midori/midori-browser.c:5359 +msgid "Add a new _folder" +msgstr "أضف مجلد جديد" + +#: ../midori/midori-browser.c:5365 +msgid "_Export bookmarks" +msgstr "_صدّر العلامات" + +#: ../midori/midori-browser.c:5368 ../midori/midori-searchaction.c:497 +msgid "_Manage Search Engines" +msgstr "_إدارة محركات البحث" + +#: ../midori/midori-browser.c:5371 +msgid "_Clear Private Data" +msgstr "_حذف البيانات الخاصة" + +#: ../midori/midori-browser.c:5374 +msgid "_Inspect Page" +msgstr "_معاينة الصفحة" + +#: ../midori/midori-browser.c:5378 +msgid "_Previous Tab" +msgstr "_التبويب السابق" + +#: ../midori/midori-browser.c:5381 +msgid "_Next Tab" +msgstr "_التبويب التالي" + +#: ../midori/midori-browser.c:5383 +msgid "Move Tab _Backward" +msgstr "نقل علامة التبويب" + +#: ../midori/midori-browser.c:5385 +msgid "_Move Tab Forward" +msgstr "_حرك التبويب إلى الأمام" + +#: ../midori/midori-browser.c:5388 +msgid "Focus _Current Tab" +msgstr "فصل التبويب ال_حالي" + +#: ../midori/midori-browser.c:5391 +msgid "Focus _Next view" +msgstr "عرض التركيز التالي" + +#: ../midori/midori-browser.c:5394 +msgid "Only show the Icon of the _Current Tab" +msgstr "أظهر فقط أ_يقونة التبويب الحالي" + +#: ../midori/midori-browser.c:5397 +msgid "_Duplicate Current Tab" +msgstr "_مضاعفة التبويب الحالي" + +#: ../midori/midori-browser.c:5400 +msgid "Close Ot_her Tabs" +msgstr "أغلق تبويبات أخر_ى" + +#: ../midori/midori-browser.c:5403 +msgid "Open last _session" +msgstr "فتح آخر جلسة" + +#: ../midori/midori-browser.c:5406 +msgid "_Help" +msgstr "_مساعدة" + +#: ../midori/midori-browser.c:5408 +msgid "_Frequent Questions" +msgstr "_أسئلة شائعة" + +#: ../midori/midori-browser.c:5411 +msgid "_Report a Problem..." +msgstr "_بلغ عن عله..." + +#: ../midori/midori-browser.c:5423 +msgid "_Menubar" +msgstr "_شريط القائمة" + +#: ../midori/midori-browser.c:5427 +msgid "_Navigationbar" +msgstr "_شريط التصفح" + +#: ../midori/midori-browser.c:5431 +msgid "Side_panel" +msgstr "لوحة ال_جانبية" + +#: ../midori/midori-browser.c:5432 +msgid "Sidepanel" +msgstr "لوحة جانبية" + +#: ../midori/midori-browser.c:5435 +msgid "_Bookmarkbar" +msgstr "_شريط العلامات" + +#: ../midori/midori-browser.c:5439 +msgid "_Statusbar" +msgstr "_شريط الحالة" + +#: ../midori/midori-browser.c:5448 ../midori/midori-websettings.c:303 +msgid "_Automatic" +msgstr "_تلقائي" + +#: ../midori/midori-browser.c:5451 ../midori/midori-websettings.c:228 +msgid "Chinese (BIG5)" +msgstr "صيني (BIG5)" + +#. i18n: A double underscore "__" is used to prevent the mnemonic +#: ../midori/midori-browser.c:5455 +msgid "Japanese (SHIFT__JIS)" +msgstr "ياباني (_Shift-JIS)" + +#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:230 +msgid "Korean (EUC-KR)" +msgstr "كوري (_EUC-KR)" + +#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:231 +msgid "Russian (KOI8-R)" +msgstr "روسي (_KOI8-R)" + +#: ../midori/midori-browser.c:5464 ../midori/midori-websettings.c:232 +msgid "Unicode (UTF-8)" +msgstr "يونيكود (UTF-_8)" + +#: ../midori/midori-browser.c:5467 ../midori/midori-websettings.c:233 +msgid "Western (ISO-8859-1)" +msgstr "غربي (_ISO-8859-1)" + +#: ../midori/midori-browser.c:5470 ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:309 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "مخصص..." + +#: ../midori/midori-browser.c:5976 +msgid "_Separator" +msgstr "_فاصل" + +#: ../midori/midori-browser.c:5983 +msgid "_Location..." +msgstr "_موقع..." + +#: ../midori/midori-browser.c:5985 +msgid "Open a particular location" +msgstr "فتح موقع معين" + +#: ../midori/midori-browser.c:6007 +msgid "_Web Search..." +msgstr "_بحث في الوِب..." + +#: ../midori/midori-browser.c:6009 +msgid "Run a web search" +msgstr "شغل البحث في الوب" + +#: ../midori/midori-browser.c:6036 +msgid "Reopen a previously closed tab or window" +msgstr "إعادة فتح التبويب مغلقة سابقا ، أو نافذة" + +#: ../midori/midori-browser.c:6051 +msgid "Show the saved bookmarks" +msgstr "عرض العلامات المحفوظة" + +#: ../midori/midori-browser.c:6065 +msgid "_Tools" +msgstr "_أدوات" + +#: ../midori/midori-browser.c:6080 +msgid "_Window" +msgstr "_النافذة" + +#: ../midori/midori-browser.c:6082 +msgid "Show a list of all open tabs" +msgstr "أظهر قائمة كل التبويبات المفتوحة" + +#: ../midori/midori-browser.c:6096 +msgid "_Menu" +msgstr "_قائمة" + +#: ../midori/midori-browser.c:6098 +msgid "Menu" +msgstr "قائمة" + +#: ../midori/midori-browser.c:6768 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "إعداد غير متوقع '%s'" + +#: ../midori/midori-extension.c:310 +#, c-format +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "إعدادات الامتداد '%s' لا يمكن تحميلها: %s\n" + +#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1695 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "إعدادات الامتداد '%s' لا يمكن حفظها: %s\n" + +#: ../midori/midori-locationaction.c:425 +#, c-format +msgid "Failed to select from history\n" +msgstr "فشل التحديد من التاريخ\n" + +#: ../midori/midori-locationaction.c:509 +#, c-format +msgid "Search for %s" +msgstr "بحث عن %s" + +#: ../midori/midori-locationaction.c:539 +#, c-format +msgid "Search with %s" +msgstr "البحث بـ %s" + +#. i18n: Right-click on Location, Open an URL from the clipboard +#: ../midori/midori-locationaction.c:1315 +msgid "Paste and p_roceed" +msgstr "لصق ثم تابع" + +#: ../midori/midori-locationaction.c:1679 +msgid "Not verified" +msgstr "غير متحقق منه" + +#: ../midori/midori-locationaction.c:1697 +msgid "Verified and encrypted connection" +msgstr "التحقق من الاتصال وتشفيره" + +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 +msgid "Align sidepanel to the right" +msgstr "محاذاة اللوحة الجانبية إلى اليمين" + +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 +msgid "Close panel" +msgstr "أغلق الشريط" + +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 +msgid "Align sidepanel to the left" +msgstr "محاذاة اللوحة الجانبية إلى اليسار" + +#: ../midori/midori-websettings.c:210 +msgid "Show Speed Dial" +msgstr "عرض الطلب السريع" + +#: ../midori/midori-websettings.c:211 +msgid "Show Homepage" +msgstr "أظهر الصفحة الرئيسية" + +#: ../midori/midori-websettings.c:229 +msgid "Japanese (SHIFT_JIS)" +msgstr "ياباني (_Shift-JIS)" + +#: ../midori/midori-websettings.c:249 +msgid "New tab" +msgstr "تبويب جديد" + +#: ../midori/midori-websettings.c:250 +msgid "New window" +msgstr "نافذة جديدة" + +#: ../midori/midori-websettings.c:251 +msgid "Current tab" +msgstr "التبويب الحالي" + +#: ../midori/midori-websettings.c:266 +msgid "Default" +msgstr "المبدئي" + +#: ../midori/midori-websettings.c:267 +msgid "Icons" +msgstr "أيقونات" + +#: ../midori/midori-websettings.c:268 +msgid "Small icons" +msgstr "أيقونات الصغيرة" + +#: ../midori/midori-websettings.c:269 +msgid "Text" +msgstr "نص" + +#: ../midori/midori-websettings.c:270 +msgid "Icons and text" +msgstr "أيقونات ونص" + +#: ../midori/midori-websettings.c:271 +msgid "Text beside icons" +msgstr "نص بجانب الأيقونات" + +#: ../midori/midori-websettings.c:286 +msgid "Automatic (GNOME or environment)" +msgstr "تلقائي (جنوم أو environment)" + +#: ../midori/midori-websettings.c:287 +msgid "HTTP proxy server" +msgstr "خادم بروكسي HTTP" + +#: ../midori/midori-websettings.c:288 +msgid "No proxy server" +msgstr "بدون خادم بروكسي" + +#: ../midori/midori-websettings.c:305 +msgid "Safari" +msgstr "سافاري" + +#: ../midori/midori-websettings.c:306 +msgid "iPhone" +msgstr "iPhone" + +#: ../midori/midori-websettings.c:307 +msgid "Firefox" +msgstr "فيَرفُكس" + +#: ../midori/midori-websettings.c:308 +msgid "Internet Explorer" +msgstr "إنترنت إكسبلورر" + +#: ../midori/midori-websettings.c:361 +msgid "Remember last window size" +msgstr "نتذكر حجم الإطار الماضي" + +#: ../midori/midori-websettings.c:362 +msgid "Whether to save the last window size" +msgstr "إذا كنت تريد حفظ حجم الإطار الأخير" + +#: ../midori/midori-websettings.c:370 +msgid "Last window width" +msgstr "عرض آخر نافذة" + +#: ../midori/midori-websettings.c:371 +msgid "The last saved window width" +msgstr "عرض آخر نافذة محفوظة" + +#: ../midori/midori-websettings.c:379 +msgid "Last window height" +msgstr "آخر ارتفاع للنافذة" + +#: ../midori/midori-websettings.c:380 +msgid "The last saved window height" +msgstr "آخر ارتفاع محفوظ للنافذة" + +#: ../midori/midori-websettings.c:405 +msgid "Last panel position" +msgstr "آخر موقع للوحة" + +#: ../midori/midori-websettings.c:406 +msgid "The last saved panel position" +msgstr "آخر موقع محفوظ للوحة" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:415 +msgid "Last panel page" +msgstr "آخر صفحة للوحة" + +#: ../midori/midori-websettings.c:416 +msgid "The last saved panel page" +msgstr "آخر صفحة لوحة محفوظة" + +#: ../midori/midori-websettings.c:424 +msgid "Last Web search" +msgstr "آخر بحث إنترنت" + +#: ../midori/midori-websettings.c:425 +msgid "The last saved Web search" +msgstr "آخر بحث ويب محفوظ" + +#: ../midori/midori-websettings.c:434 +msgid "Show Menubar" +msgstr "عرض شريط القوائم" + +#: ../midori/midori-websettings.c:435 +msgid "Whether to show the menubar" +msgstr "إظهار شريط القوائم في كل ألأحوال" + +#: ../midori/midori-websettings.c:443 +msgid "Show Navigationbar" +msgstr "اظهر شريط التصفح" + +#: ../midori/midori-websettings.c:444 +msgid "Whether to show the navigationbar" +msgstr "إظهار شريط التصفح في كل ألأحوال" + +#: ../midori/midori-websettings.c:452 +msgid "Show Bookmarkbar" +msgstr "إظهار العلامات" + +#: ../midori/midori-websettings.c:453 +msgid "Whether to show the bookmarkbar" +msgstr "إظهار العلامات في كل ألأحوال" + +#: ../midori/midori-websettings.c:461 +msgid "Show Panel" +msgstr "تظهر لوحة" + +#: ../midori/midori-websettings.c:462 +msgid "Whether to show the panel" +msgstr "إظهار لوحة في كل ألأحوال" + +#: ../midori/midori-websettings.c:470 +msgid "Show Statusbar" +msgstr "عرض شريط الحالة" + +#: ../midori/midori-websettings.c:471 +msgid "Whether to show the statusbar" +msgstr "إظهار شريط الحالة في كل ألأحوال" + +#: ../midori/midori-websettings.c:480 +msgid "Toolbar Style:" +msgstr "نمط شريط الأدوات:" + +#: ../midori/midori-websettings.c:481 +msgid "The style of the toolbar" +msgstr "نمط شريط الأدوات" + +#: ../midori/midori-websettings.c:490 +msgid "Toolbar Items" +msgstr "عناصر شريط أدوات" + +#: ../midori/midori-websettings.c:491 +msgid "The items to show on the toolbar" +msgstr "العناصر التي تظهر على شريط الأدوات" + +#: ../midori/midori-websettings.c:499 +msgid "Compact Sidepanel" +msgstr "ضغط اللوحة الجانبية" + +#: ../midori/midori-websettings.c:500 +msgid "Whether to make the sidepanel compact" +msgstr "ضغط اللوحة الجانبية في كل ألأحوال" + +#: ../midori/midori-websettings.c:515 +msgid "Align sidepanel on the right" +msgstr "محاذاة اللوحة الجانبية على اليمين" + +#: ../midori/midori-websettings.c:516 +msgid "Whether to align the sidepanel on the right" +msgstr "محاذاة اللوحة الجانبية على اليمين في كل ألأحوال" + +#: ../midori/midori-websettings.c:531 +msgid "Open panels in separate windows" +msgstr "فتح اللوحات في إطارات منفصلة" + +#: ../midori/midori-websettings.c:532 +msgid "Whether to always open panels in separate windows" +msgstr "فتح اللوحات في إطارات منفصلة دائماً" + +#: ../midori/midori-websettings.c:541 +msgid "When Midori starts:" +msgstr "عندما يبدأ ميدوري:" + +#: ../midori/midori-websettings.c:542 +msgid "What to do when Midori starts" +msgstr "ماذا تفعل عندما يبدأ ميدوري" + +#: ../midori/midori-websettings.c:551 +msgid "Homepage:" +msgstr "الصفحة الرئيسية:" + +#: ../midori/midori-websettings.c:552 +msgid "The homepage" +msgstr "الصفحة الرئيسية" + +#: ../midori/midori-websettings.c:567 +msgid "Show crash dialog" +msgstr "عرض حوار التحطم" + +#: ../midori/midori-websettings.c:568 +msgid "Show a dialog after Midori crashed" +msgstr "عرض الحوار بعد تحطم ميدوري" + +#: ../midori/midori-websettings.c:576 +msgid "Save downloaded files to:" +msgstr "حفظ الملفات التي تم تحميلها في:" + +#: ../midori/midori-websettings.c:577 +msgid "The folder downloaded files are saved to" +msgstr "يتم حفظ ملفات التحميل في مجلد" + +#: ../midori/midori-websettings.c:585 +msgid "Text Editor" +msgstr "محرر المصوص" + +#: ../midori/midori-websettings.c:586 +msgid "An external text editor" +msgstr "محرر نص خارجي" + +#: ../midori/midori-websettings.c:601 +msgid "News Aggregator" +msgstr "مجمع الأخبار" + +#: ../midori/midori-websettings.c:602 +msgid "An external news aggregator" +msgstr "مجمع الأخبار الخارجية" + +#: ../midori/midori-websettings.c:610 +msgid "Location entry Search" +msgstr "دخول مكان البحث" + +#: ../midori/midori-websettings.c:611 +msgid "The search to perform inside the location entry" +msgstr "أداء البحث داخل الموقع" + +#: ../midori/midori-websettings.c:619 +msgid "Preferred Encoding" +msgstr "الترميز المفضل" + +#: ../midori/midori-websettings.c:620 +msgid "The preferred character encoding" +msgstr "ترميز الحرف المفضل" + +#: ../midori/midori-websettings.c:630 +msgid "Always Show Tabbar" +msgstr "أظهر دائما شريط التبويب" + +#: ../midori/midori-websettings.c:631 +msgid "Always show the tabbar" +msgstr "أظهر دائما شريط التبويب" + +#: ../midori/midori-websettings.c:639 +msgid "Close Buttons on Tabs" +msgstr "أزرار الإغلاق على الألسنة" + +#: ../midori/midori-websettings.c:640 +msgid "Whether tabs have close buttons" +msgstr "حتى إذا كانت العلامات على أزرار قريبة" + +#: ../midori/midori-websettings.c:665 +msgid "Open new pages in:" +msgstr "فتح صفحات جديدة في:" + +#: ../midori/midori-websettings.c:666 +msgid "Where to open new pages" +msgstr "أين يتم فتح صفحات جديدة" + +#: ../midori/midori-websettings.c:675 +msgid "Middle click opens Selection" +msgstr "نقر الزر الأوسط يفتح التحديد" + +#: ../midori/midori-websettings.c:676 +msgid "Load an address from the selection via middle click" +msgstr "تحميل عنوان محدد بالنقر على الزر الاوسط" + +#: ../midori/midori-websettings.c:684 +msgid "Open tabs in the background" +msgstr "فتح علامات التبويب في الخلفية" + +#: ../midori/midori-websettings.c:685 +msgid "Whether to open new tabs in the background" +msgstr "فتح علامات تبويب جديدة في الخلفية في كل الأحوال" + +#: ../midori/midori-websettings.c:693 +msgid "Open Tabs next to Current" +msgstr "فتح علامات بجانب الحالية" + +#: ../midori/midori-websettings.c:694 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "فتح علامات تبويب جديدة بجوار علامة التبويب الحالية أو بعد الأخيرة" + +#: ../midori/midori-websettings.c:702 +msgid "Open popups in tabs" +msgstr "فتح النوافذ المنبثقة في علامات تبويب" + +#: ../midori/midori-websettings.c:703 +msgid "Whether to open popup windows in tabs" +msgstr "فتح النوافذ المنبثقة في علامات تبويب في كل الأحوال" + +#: ../midori/midori-websettings.c:713 ../extensions/statusbar-features.c:131 +msgid "Load images automatically" +msgstr "تحميل الصور تلقائيا" + +#: ../midori/midori-websettings.c:714 +msgid "Load and display images automatically" +msgstr "تحميل وعرض الصور تلقائيا" + +#: ../midori/midori-websettings.c:721 ../extensions/statusbar-features.c:140 +msgid "Enable scripts" +msgstr "تمكين النصوص البرمجية" + +#: ../midori/midori-websettings.c:722 +msgid "Enable embedded scripting languages" +msgstr "تمكين لغات البرمجة المضمنة" + +#: ../midori/midori-websettings.c:729 ../extensions/statusbar-features.c:149 +msgid "Enable Netscape plugins" +msgstr "تمكين إضافات نتسكيب" + +#: ../midori/midori-websettings.c:730 +msgid "Enable embedded Netscape plugin objects" +msgstr "تمكين لغات البرمجة المضمنة في إضافات نتسكيب" + +#: ../midori/midori-websettings.c:750 +msgid "Enable Spell Checking" +msgstr "تمكين التدقيق الإملائي" + +#: ../midori/midori-websettings.c:751 +msgid "Enable spell checking while typing" +msgstr "تمكين التدقيق الإملائي أثناء الكتابة" + +#: ../midori/midori-websettings.c:757 +msgid "Enable HTML5 database support" +msgstr "تمكين قاعدة بيانات دعم HTML5 في كل الأحوال" + +#: ../midori/midori-websettings.c:758 +msgid "Whether to enable HTML5 database support" +msgstr "تمكين قاعدة بيانات دعم HTML5 في كل الأحوال" + +#: ../midori/midori-websettings.c:764 +msgid "Enable HTML5 local storage support" +msgstr "تمكين دعم HTML5 التخزين المحلية" + +#: ../midori/midori-websettings.c:765 +msgid "Whether to enable HTML5 local storage support" +msgstr "لتفعيل دعم تخزين المحلي HTML5" + +#: ../midori/midori-websettings.c:771 +msgid "Enable offline web application cache" +msgstr "تمكين التخزين المؤقت لتطبيق ويب" + +#: ../midori/midori-websettings.c:772 +msgid "Whether to enable offline web application cache" +msgstr "لتمكين تخزين المؤقت لتطبيقات الوب" + +#: ../midori/midori-websettings.c:788 +msgid "Flash window on background tabs" +msgstr "فتح الرابط في لسان في الخلف" + +#: ../midori/midori-websettings.c:789 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "فتح علامات التبويب الجديدة في الخلفية في كل الأحوال" + +#: ../midori/midori-websettings.c:797 +msgid "Enable WebGL support" +msgstr "تمكين قاعدة بيانات دعم HTML5 في كل الأحوال" + +#: ../midori/midori-websettings.c:798 +msgid "Allow websites to use OpenGL rendering" +msgstr "السماح للمواقع باستخدام OpenGL للتقديم" + +#: ../midori/midori-websettings.c:814 +msgid "Zoom Text and Images" +msgstr "تكبير النص والصور" + +#: ../midori/midori-websettings.c:815 +msgid "Whether to zoom text and images" +msgstr "تكبير النص والصور في كل الاحوال" + +#: ../midori/midori-websettings.c:830 +msgid "Find inline while typing" +msgstr "العثور على السطر أثناء الكتابة" + +#: ../midori/midori-websettings.c:831 +msgid "Whether to automatically find inline while typing" +msgstr "العثور على السطر أثناء الكتابة في كل الاحوال" + +#: ../midori/midori-websettings.c:846 +msgid "Kinetic scrolling" +msgstr "حركية التمرير" + +#: ../midori/midori-websettings.c:847 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "على كل ألأحوال حركة التمرير تناسب سرعة التنقل" + +#: ../midori/midori-websettings.c:855 +msgid "Delete old Cookies after:" +msgstr "حذف الكوكيز القديمة بعد:" + +#: ../midori/midori-websettings.c:856 +msgid "The maximum number of days to save cookies for" +msgstr "الحد الأقصى لعدد الأيام لحفظ الكوكيز" + +#: ../midori/midori-websettings.c:872 +msgid "Only accept Cookies from sites you visit" +msgstr "فقط قبول ملفات تعريف الارتباط من المواقع التي قمت بزيارتها" + +#: ../midori/midori-websettings.c:873 +msgid "Block cookies sent by third-party websites" +msgstr "حظر ملفات تعريف الارتباط المرسلة من مواقع الطرف الثالث" + +#: ../midori/midori-websettings.c:887 +msgid "Delete pages from history after:" +msgstr "حذف الصفحات القديمة بعد:" + +#: ../midori/midori-websettings.c:888 +msgid "The maximum number of days to save the history for" +msgstr "الحد الأقصى لعدد الأيام لحفظ التاريخ ل" + +#: ../midori/midori-websettings.c:903 +msgid "Proxy server" +msgstr "خادم بروكسي" + +#: ../midori/midori-websettings.c:904 +msgid "The type of proxy server to use" +msgstr "نوع الخادم الوكيل المستخدم" + +#: ../midori/midori-websettings.c:913 +msgid "HTTP Proxy Server" +msgstr "خادم وكيل HTTP" + +#: ../midori/midori-websettings.c:914 +msgid "The proxy server used for HTTP connections" +msgstr "خادم proxy المستعمل لإتصالات HTTP" + +#: ../midori/midori-websettings.c:929 +msgid "Port" +msgstr "المنفذ" + +#: ../midori/midori-websettings.c:930 +msgid "The proxy server port used for HTTP connections" +msgstr "منفذ الملقم الوكيل المستخدمة للاتصالات HTTP" + +#: ../midori/midori-websettings.c:948 +msgid "The maximum size of cached pages on disk" +msgstr "المساحة القصوى المخصصة لحفظ الصفحات على القرص" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:965 +msgid "Identify as" +msgstr "تعرف كـ" + +#: ../midori/midori-websettings.c:966 +msgid "What to identify as to web pages" +msgstr "كماذا تريد تعريف نفسك لصفحات الوب" + +#: ../midori/midori-websettings.c:982 +msgid "Identification string" +msgstr "تعريف الجملة" + +#: ../midori/midori-websettings.c:983 +msgid "The application identification string" +msgstr "تطبيق تعريف الجمل" + +#: ../midori/midori-websettings.c:999 +msgid "Preferred languages" +msgstr "اللغات المفضلة" + +#: ../midori/midori-websettings.c:1000 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"نقطة للفصل بين قائمة من اللغات المفضلة لجعل صفحات الوب متعددة اللغات, كمثال " +"\"ar\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" + +#: ../midori/midori-websettings.c:1015 +msgid "Clear private data" +msgstr "مسح البيانات الخاصة" + +#: ../midori/midori-websettings.c:1016 +msgid "The private data selected for deletion" +msgstr "البيانات الخاصة المحددة للحذف" + +#: ../midori/midori-websettings.c:1031 +msgid "Clear data" +msgstr "مسح البيانات" + +#: ../midori/midori-websettings.c:1032 +msgid "The data selected for deletion" +msgstr "بيانات محددة للحذف" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1065 +msgid "Strip referrer details sent to websites" +msgstr "شريط المرجعية أرسل التفاصيل إلى مواقع ويب" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1067 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "ما إذا كان ينبغي تقصير مسار \"إنعاش\" إلى اسم المضيف" + +#: ../midori/midori-websettings.c:1081 +msgid "Always use my font choices" +msgstr "دائماً استخدام الخطوط التي حددت" + +#: ../midori/midori-websettings.c:1082 +msgid "Override fonts picked by websites with user preferences" +msgstr "استبدل خطوط المواقع بخطوط تفضيلات المستخدم" + +#: ../midori/midori-view.c:1327 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s تريد حفظ قاعدة بيانات HTML5." + +#: ../midori/midori-view.c:1331 ../midori/midori-view.c:1361 +msgid "_Deny" +msgstr "_رفض" + +#: ../midori/midori-view.c:1331 ../midori/midori-view.c:1361 +msgid "_Allow" +msgstr "_سماح" + +#: ../midori/midori-view.c:1357 +#, c-format +msgid "%s wants to know your location." +msgstr "%s يريد أن يعرف مكانك." + +#: ../midori/midori-view.c:1448 +#, c-format +msgid "Error - %s" +msgstr "خطأ - %s" + +#: ../midori/midori-view.c:1449 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "هذه الصفحة '%s' لا يمكن تحميلها." + +#: ../midori/midori-view.c:1451 +msgid "Try again" +msgstr "حاول مجددا" + +#: ../midori/midori-view.c:1613 ../midori/midori-view.c:2516 +#, c-format +msgid "Send a message to %s" +msgstr "ارسال رسالة إلى %s" + +#: ../midori/midori-view.c:2347 ../midori/midori-view.c:2665 +msgid "Inspect _Element" +msgstr "تفقد عنصر" + +#: ../midori/midori-view.c:2399 +msgid "Open Link in New _Tab" +msgstr "فتح وصلة جديدة في لسان جديد" + +#: ../midori/midori-view.c:2403 +msgid "Open Link in _Foreground Tab" +msgstr "فتح الرابط في لسان للأمام" + +#: ../midori/midori-view.c:2404 +msgid "Open Link in _Background Tab" +msgstr "فتح الرابط في لسان في الخلف" + +#: ../midori/midori-view.c:2407 +msgid "Open Link in New _Window" +msgstr "فتح الرابط في نافذة جديدة" + +#: ../midori/midori-view.c:2410 +msgid "Open Link as Web A_pplication" +msgstr "فتح الرابط كتطبيق" + +#: ../midori/midori-view.c:2415 +msgid "Copy Link de_stination" +msgstr "انسخ وجهة الرابط" + +#: ../midori/midori-view.c:2431 +msgid "Open _Image in New Tab" +msgstr "فتح الصورة في لسان جديد" + +#: ../midori/midori-view.c:2434 +msgid "Copy Image _Address" +msgstr "نسخ عنوان الصورة" + +#: ../midori/midori-view.c:2437 +msgid "Save I_mage" +msgstr "حفظ الصورة" + +#: ../midori/midori-view.c:2440 +msgid "Open in Image _Viewer" +msgstr "افتح في عارض الصور" + +#: ../midori/midori-view.c:2447 +msgid "Copy Video _Address" +msgstr "نسخ عنوان الفيديو" + +#: ../midori/midori-view.c:2450 +msgid "Save _Video" +msgstr "حفظ الفيديو" + +#: ../midori/midori-view.c:2450 +msgid "Download _Video" +msgstr "تحميل الفيديو" + +#: ../midori/midori-view.c:2476 +msgid "Search _with" +msgstr "بحث باستخدام" + +#: ../midori/midori-view.c:2508 +msgid "_Search the Web" +msgstr "_بحث في الانترنت" + +#: ../midori/midori-view.c:2524 +msgid "Open Address in New _Tab" +msgstr "فتح العنوان في لسان جديد" + +#: ../midori/midori-view.c:2815 +msgid "Open or download file" +msgstr "فتح أو تحميل الملف" + +#: ../midori/midori-view.c:2834 +#, c-format +msgid "File Type: '%s'" +msgstr "نوع الملف: '%s'" + +#: ../midori/midori-view.c:2836 +#, 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:2853 +#, c-format +msgid "Open %s" +msgstr "فتح %s" + +#: ../midori/midori-view.c:3478 +#, c-format +msgid "Inspect page - %s" +msgstr "فحص الصفحة - %s" + +#: ../midori/midori-view.c:3772 +msgid "Speed Dial" +msgstr "حوار السريع" + +#: ../midori/midori-view.c:3773 ../midori/midori-view.c:3869 +msgid "Click to add a shortcut" +msgstr "انقر لإضافة اختصار" + +#: ../midori/midori-view.c:3774 +msgid "Enter shortcut address" +msgstr "أدخل عنوان الاختصار" + +#: ../midori/midori-view.c:3775 +msgid "Enter shortcut title" +msgstr "أدخل وسم للاختصار" + +#: ../midori/midori-view.c:3776 +msgid "Are you sure you want to delete this shortcut?" +msgstr "هل أنت متأكد أنك تريد حذف هذا الاختصار؟" + +#: ../midori/midori-view.c:3938 +#, c-format +msgid "No documentation installed" +msgstr "لا توجد وثائق مثبتة" + +#: ../midori/midori-view.c:4014 +msgid "Midori doesn't store any personal data:" +msgstr "لا يخزن ميدوري أي بيانات شخصية:" + +#: ../midori/midori-view.c:4015 +msgid "No history or web cookies are being saved." +msgstr "لم يتم حفظ التاريخ أو كعكات الويب." + +#: ../midori/midori-view.c:4016 +msgid "Extensions are disabled." +msgstr "تعطيل الملحقات." + +#: ../midori/midori-view.c:4017 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "يتم تعطيل تخزين HTML5، قاعدة البيانات المحلية ومخابئ التطبيق." + +#: ../midori/midori-view.c:4018 +msgid "Midori prevents websites from tracking the user:" +msgstr "ميدوري يمنع المواقع من تعقب المستخدم:" + +#: ../midori/midori-view.c:4019 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "تجريد إحالات URLs إلى اسم المضيف." + +#: ../midori/midori-view.c:4020 +msgid "DNS prefetching is disabled." +msgstr "تعطيل الجلب المسبق DNS." + +#: ../midori/midori-view.c:4021 +msgid "The language and timezone are not revealed to websites." +msgstr "اللغة والمنطقة الزمنية لا يكشف عنها لمواقع ويب." + +#: ../midori/midori-view.c:4022 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "فلاش وغيرها من الإضافات Netscape لا يمكن سردهابمواقع ويب." + +#: ../midori/midori-view.c:4060 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "أرقام إصدار في أقواس تظهر النسخة المستخدمة في التشغيل." + +#: ../midori/midori-view.c:4108 +msgid "Page loading delayed" +msgstr "تأخير تحميل الصفحة" + +#: ../midori/midori-view.c:4109 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "تأخر التحميل إما بسبب انهيار أو تفضيلات بدء التشغيل." + +#: ../midori/midori-view.c:4110 +msgid "Load Page" +msgstr "تحميل الصفحة" + +#: ../midori/midori-view.c:4249 +msgid "Blank page" +msgstr "صفحة فارغة" + +#: ../midori/midori-view.c:4511 +msgid "_Duplicate Tab" +msgstr "_ضاعف اللسان" + +#: ../midori/midori-view.c:4516 +msgid "Show Tab _Label" +msgstr "عرض عنوان اللسان" + +#: ../midori/midori-view.c:4516 +msgid "Show Tab _Icon Only" +msgstr "عرض أيقونة اللسان فقط" + +#: ../midori/midori-view.c:4522 +msgid "Close ot_her Tabs" +msgstr "غلق ألألسنه الأخري" + +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5176 +msgid "previous" +msgstr "السّابق" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5195 +msgid "next" +msgstr "التّالي" + +#: ../midori/midori-view.c:5208 +msgid "Print background images" +msgstr "طباعة صورة الخلفية" + +#: ../midori/midori-view.c:5209 +msgid "Whether background images should be printed" +msgstr "ما إذا كان ينبغي طباعة صور الخلفية" + +#: ../midori/midori-view.c:5241 +msgid "Features" +msgstr "الميزّات" + +#: ../midori/midori-preferences.c:297 +msgid "Startup" +msgstr "بدء التشغيل" + +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "استخدام الصفحة الحالية" + +#: ../midori/midori-preferences.c:314 +msgid "Use current page as homepage" +msgstr "استخدام الصفحة الحالية كصفحة بداية" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "الخطوط" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "مجموعة خطوط متناسبة" + +#: ../midori/midori-preferences.c:330 +msgid "The default font family used to display text" +msgstr "استخدم مجموعة الخط الافتراضي لعرض النص" + +#: ../midori/midori-preferences.c:333 +msgid "The default font size used to display text" +msgstr "حجم الخط الافتراضي المستخدم لعرض النص" + +#: ../midori/midori-preferences.c:335 +msgid "Fixed-width Font Family" +msgstr "عرض مجموعة خط ثابتة" + +#: ../midori/midori-preferences.c:339 +msgid "The font family used to display fixed-width text" +msgstr "مجموعة الخطوط المستخدمة لعرض النص ثابت العرض" + +#: ../midori/midori-preferences.c:342 +msgid "The font size used to display fixed-width text" +msgstr "حجم الخط المستخدم لعرض النص ثابت العرض" + +#: ../midori/midori-preferences.c:344 +msgid "Minimum Font Size" +msgstr "حجم الخط الأدنى" + +#: ../midori/midori-preferences.c:348 +msgid "The minimum font size used to display text" +msgstr "حجم الخط الأدنى المستخدم لعرض النص" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:359 +msgid "Behavior" +msgstr "السلوك" + +#: ../midori/midori-preferences.c:385 +msgid "Allow scripts to open popups" +msgstr "السماح للنصول البرمجية بفتح النوافذ المنبثقة" + +#: ../midori/midori-preferences.c:386 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "حتى لو كان مسموحا للنصوص البرمجية لفتح النوافذ المنبثقة تلقائيا" + +#. Page "Interface" +#: ../midori/midori-preferences.c:416 +msgid "Browsing" +msgstr "تصفح" + +#. Page "Network" +#: ../midori/midori-preferences.c:454 +msgid "Network" +msgstr "شبكة" + +#: ../midori/midori-preferences.c:461 +msgid "Hostname" +msgstr "اسم الجهاز" + +#: ../midori/midori-preferences.c:485 +msgid "MB" +msgstr "MB" + +#: ../midori/midori-searchaction.c:908 +msgid "Add search engine" +msgstr "أضف أداة البحث" + +#: ../midori/midori-searchaction.c:908 +msgid "Edit search engine" +msgstr "حرر أداة البحث" + +#: ../midori/midori-searchaction.c:937 +msgid "_Name:" +msgstr "_الإسم:" + +#: ../midori/midori-searchaction.c:953 +msgid "_Description:" +msgstr "_وصف:" + +#: ../midori/midori-searchaction.c:987 +msgid "_Icon:" +msgstr "_ايقونة:" + +#: ../midori/midori-searchaction.c:1001 +msgid "_Token:" +msgstr "_علامة:" + +#: ../midori/midori-searchaction.c:1301 +msgid "Manage Search Engines" +msgstr "إدارة أدوات البحث" + +#: ../midori/midori-searchaction.c:1401 +msgid "Use as _default" +msgstr "إستعمل _كإفتراضي" + +#: ../midori/sokoke.c:410 +msgid "Open with" +msgstr "إفتح بـ" + +#: ../midori/sokoke.c:418 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "إختر تطبيقا أو أمرا لفتح \"%s\":" + +#: ../midori/sokoke.c:459 ../midori/sokoke.c:469 ../midori/sokoke.c:497 +#: ../midori/sokoke.c:526 ../midori/sokoke.c:540 +msgid "Could not run external program." +msgstr "لا يمكن تشغيل البرنامج الخارجي." + +#: ../midori/sokoke.c:1677 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d ساعة" +msgstr[1] "%d ساعة" +msgstr[2] "%d ساعات" +msgstr[3] "%d ساعات" +msgstr[4] "%d ساعات" +msgstr[5] "%d ساعات" + +#: ../midori/sokoke.c:1678 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d دقيقة" +msgstr[1] "%d دقيقة" +msgstr[2] "%d دقيقتان" +msgstr[3] "%d دقائق" +msgstr[4] "%d دقائق" +msgstr[5] "%d دقائق" + +#: ../midori/sokoke.c:1679 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d ثانية" +msgstr[1] "%d ثانية" +msgstr[2] "%d ثوان" +msgstr[3] "%d ثوان" +msgstr[4] "%d ثوان" +msgstr[5] "%d ثوان" + +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1687 ../panels/midori-transfers.c:267 +#, c-format +msgid "%s of %s" +msgstr "%s لـ %s" + +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1696 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1699 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" + +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1716 +#, c-format +msgid " - %s remaining" +msgstr " - %s متبقي" + +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:263 +msgid "_Inline Find:" +msgstr "_بحث مضمن:" + +#: ../toolbars/midori-findbar.c:289 +msgid "Previous" +msgstr "السّابق" + +#: ../toolbars/midori-findbar.c:295 +msgid "Next" +msgstr "التّالي" + +#: ../toolbars/midori-findbar.c:299 +msgid "Match Case" +msgstr "حالة تطابق" + +#: ../toolbars/midori-findbar.c:308 +msgid "Highlight Matches" +msgstr "ميّز المتشابهات" + +#: ../toolbars/midori-findbar.c:319 +msgid "Close Findbar" +msgstr "إغلاق شريط المكتشف" + +#: ../toolbars/midori-transferbar.c:122 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "الملف '%s' تم تحميله." + +#: ../toolbars/midori-transferbar.c:125 +msgid "Transfer completed" +msgstr "إنتهاء النقل" + +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "الملف المحمل خاطئ." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"ارتباط مزود المجموع الاختباري غير متطابق. هذا يعني أن الملف ربما ناقص أو تم " +"تعديله." + +#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "محو الكل" + +#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 +msgid "Some files are being downloaded" +msgstr "يتم تحميل بعض الملفات" + +#: ../toolbars/midori-transferbar.c:374 +msgid "_Quit Midori" +msgstr "_خروج من ميدوري" + +#: ../toolbars/midori-transferbar.c:376 +msgid "The transfers will be cancelled if Midori quits." +msgstr "سيتم إلغاء النقل اذا تم إنها ميدوري." + +#: ../panels/midori-bookmarks.c:113 +msgid "Bookmarks" +msgstr "العلامات" + +#: ../panels/midori-bookmarks.c:256 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "فشل إضافة العلامة: %s\n" + +#: ../panels/midori-bookmarks.c:434 +msgid "Edit the selected bookmark" +msgstr "حرر العلامة المحددة" + +#: ../panels/midori-bookmarks.c:442 +msgid "Delete the selected bookmark" +msgstr "حذف العلامة المحددة" + +#: ../panels/midori-bookmarks.c:457 +msgid "Add a new folder" +msgstr "أضف مجلد جديد" + +#: ../panels/midori-bookmarks.c:591 ../panels/midori-history.c:579 +msgid "Separator" +msgstr "فاصل" + +#: ../panels/midori-history.c:110 +msgid "History" +msgstr "السجل" + +#: ../panels/midori-history.c:142 +msgid "A week ago" +msgstr "قبل أسبوع" + +#: ../panels/midori-history.c:144 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "%d سنة مضت" +msgstr[1] "%d سنتان مضت" +msgstr[2] "%d سنوات مضت" +msgstr[3] "%d سنوات مضت" +msgstr[4] "%d سنوات مضت" +msgstr[5] "%d سنوات مضت" + +#: ../panels/midori-history.c:147 +msgid "Today" +msgstr "اليوم" + +#: ../panels/midori-history.c:149 +msgid "Yesterday" +msgstr "البارحة" + +#: ../panels/midori-history.c:317 +msgid "Are you sure you want to remove all history items?" +msgstr "هل تريد حذف كل عناصر التاريخ؟" + +#: ../panels/midori-history.c:363 +msgid "Bookmark the selected history item" +msgstr "علم التاريخ المحدد" + +#: ../panels/midori-history.c:372 +msgid "Delete the selected history item" +msgstr "حذف كل عناصر التاريخ" + +#: ../panels/midori-history.c:380 +msgid "Clear the entire history" +msgstr "مسح تاريخ الدخول" + +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "النقل" + +#: ../panels/midori-transfers.c:467 +msgid "Open Destination _Folder" +msgstr "افتح الدليل الوجهة" + +#: ../panels/midori-transfers.c:470 +msgid "Copy Link Loc_ation" +msgstr "انسخ موقع الرابط" + +#: ../katze/katze-http-auth.c:210 +msgid "Authentication Required" +msgstr "مطلوب المصادقة" + +#: ../katze/katze-http-auth.c:226 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"مطلوب اسم مستخدم وكلمة \n" +"مرور لفتح هذا الموقع:" + +#: ../katze/katze-http-auth.c:240 +msgid "Username" +msgstr "إسم المستخدم" + +#: ../katze/katze-http-auth.c:253 +msgid "Password" +msgstr "كلمة المرور" + +#: ../katze/katze-http-auth.c:267 +msgid "_Remember password" +msgstr "_تذكّر كلمة السرّ" + +#: ../katze/katze-throbber.c:948 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "الأيقونة المحددة '%s' لا يمكن تحميلها" + +#: ../katze/katze-throbber.c:961 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "الرمز المخزن '%s' لا يمكن تحميله" + +#: ../katze/katze-throbber.c:1041 +msgid "Animation frames are broken" +msgstr "تعطل إطارات الصور المتحركة" + +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "خصائص '%s' غير صالحة لـ %s" + +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 +#: ../extensions/addons.c:308 +msgid "Choose file" +msgstr "إختر ملف" + +#: ../katze/katze-utils.c:500 +msgid "Choose folder" +msgstr "إختر مجلد" + +#: ../katze/katze-utils.c:604 +msgid "None" +msgstr "لا شيء" + +#: ../katze/katze-utils.c:719 +msgid "1 hour" +msgstr "1 ساعة" + +#: ../katze/katze-utils.c:720 +msgid "1 day" +msgstr "1 يوم" + +#: ../katze/katze-utils.c:721 +msgid "1 week" +msgstr "1 أسبوع" + +#: ../katze/katze-utils.c:722 +msgid "1 month" +msgstr "1 شهر" + +#: ../katze/katze-utils.c:723 +msgid "1 year" +msgstr "1 سنة" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 +#, c-format +msgid "Preferences for %s" +msgstr "تفضيلات ل %s" + +#: ../extensions/adblock.c:467 +msgid "Configure Advertisement filters" +msgstr "تكوين فلتر الإعلانات" + +#: ../extensions/adblock.c:498 +#, 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:846 +msgid "Edit rule" +msgstr "تحرير قاعد" + +#: ../extensions/adblock.c:860 +msgid "_Rule:" +msgstr "_قاعدة:" + +#: ../extensions/adblock.c:914 +msgid "Bl_ock image" +msgstr "منع الصور" + +#: ../extensions/adblock.c:919 +msgid "Bl_ock link" +msgstr "منع الروابط" + +#: ../extensions/adblock.c:1542 +msgid "Advertisement blocker" +msgstr "منع الإعلانات" + +#: ../extensions/adblock.c:1543 +msgid "Block advertisements according to a filter list" +msgstr "منع الإعلانات وفقا لقائمة التصفية" + +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "يبدو أن هذه الصفحة تحتوي على نصوص برمجية للمستخدم. هل ترغب في تثبيته؟" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "_تثبيت النصوص البرمجية" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "هذه الصفحة تحتوي على نمط المستخدم. هل ترغب في تثبيته؟" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_تثبيت نمط المستخدم" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "لا تقم بتثبيت" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 +msgid "Userscripts" +msgstr "النصوص البرمجية للمستعمل" + +#: ../extensions/addons.c:324 ../extensions/addons.c:683 +msgid "Userstyles" +msgstr "أنماط المستعمل" + +#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "خطأ" + +#: ../extensions/addons.c:421 +#, c-format +msgid "Do you want to delete '%s'?" +msgstr "هل تريد حذف '%s'؟" + +#: ../extensions/addons.c:427 +msgid "Delete user script" +msgstr "حذف النصوص البرمجية المستخدمة" + +#: ../extensions/addons.c:428 +msgid "Delete user style" +msgstr "حذف نمط المستخدم" + +#: ../extensions/addons.c:431 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "الملف %s سيحذف بشكل نهائي." + +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "فتح في محرر نص" + +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "فتح مجلد الهدف" + +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "إضافة ملحق جديد" + +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "إزالة الملحقات المختارة" + +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 +msgid "User addons" +msgstr "إضافات المستخدم" + +#: ../extensions/addons.c:1826 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "لا تستطيع مراقبة المجلد '%s': %s" + +#: ../extensions/addons.c:1915 +msgid "Support for userscripts and userstyles" +msgstr "دعم النصوص البرمجية وأنماط المستخدم" + +#: ../extensions/colorful-tabs.c:202 +msgid "Colorful Tabs" +msgstr "الألسنة الملونة" + +#: ../extensions/colorful-tabs.c:203 +msgid "Tint each tab distinctly" +msgstr "لون كل علامة تبويب" + +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 +msgid "Cookie Manager" +msgstr "مدير الكعكات" + +#: ../extensions/cookie-manager/cookie-manager-page.c:103 +msgid "Delete All" +msgstr "حذف الكل" + +#: ../extensions/cookie-manager/cookie-manager-page.c:105 +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:120 +msgid "Expand All" +msgstr "توسيع الكل" + +#: ../extensions/cookie-manager/cookie-manager-page.c:127 +msgid "Collapse All" +msgstr "طوي الكل" + +#: ../extensions/cookie-manager/cookie-manager-page.c:572 +msgid "Do you really want to delete all cookies?" +msgstr "هل تريد حذف جميع ملفات تعريف الارتباط؟" + +#: ../extensions/cookie-manager/cookie-manager-page.c:574 +msgid "Question" +msgstr "سؤال" + +#: ../extensions/cookie-manager/cookie-manager-page.c:583 +msgid "Only cookies which match the filter will be deleted." +msgstr "سيتم حذف الكوكيز التي تطابق عامل التصفية." + +#: ../extensions/cookie-manager/cookie-manager-page.c:671 +msgid "At the end of the session" +msgstr "في نهاية الدورة" + +#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" +"المضيف: %s\n" +"الإسم: %s\n" +"القيمة: %s\n" +"المسار: %s\n" +"الأمان: %s\n" +"الإنتهاء: %s" + +#: ../extensions/cookie-manager/cookie-manager-page.c:680 +msgid "Yes" +msgstr "نعم" + +#: ../extensions/cookie-manager/cookie-manager-page.c:680 +msgid "No" +msgstr "لا" + +#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#, c-format +msgid "" +"Domain: %s\n" +"Cookies: %d" +msgstr "" +"نطاق: %s\n" +"كوكيز: %d" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 +msgid "Name" +msgstr "إسم" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +msgid "_Expand All" +msgstr "_توسيع الكل" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 +msgid "_Collapse All" +msgstr "_طوي الكل" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +msgid "Filter:" +msgstr "مرشح:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "ادخل سلسلة أسماء أو نطاقات فلاتر لتصفية الكوكيز" + +#: ../extensions/cookie-manager/main.c:36 +msgid "List, view and delete cookies" +msgstr "القائمة ، عرض وحذف الكوكيز" + +#: ../extensions/copy-tabs.c:38 +msgid "Copy Tab _Addresses" +msgstr "نسخ عناواين التبويب" + +#: ../extensions/copy-tabs.c:95 +msgid "Copy Addresses of Tabs" +msgstr "نسخة من عناوين علامات الجدولة" + +#: ../extensions/copy-tabs.c:96 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "نسخ عناوين كافة علامات التبويب إلى الحافظة" + +#: ../extensions/feed-panel/feed-atom.c:209 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "فشل العثور على Atom المطلوب \"entry\" عناصر في بيانات XML." + +#: ../extensions/feed-panel/feed-atom.c:315 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "فشل العثور على Atom المطلوب \"feed\" عناصر في بيانات XML." + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:387 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "آخر التحديثات: %s." + +#: ../extensions/feed-panel/feed-panel.c:653 +msgid "Feeds" +msgstr "تغذيات" + +#: ../extensions/feed-panel/feed-panel.c:706 +msgid "Add new feed" +msgstr "أضف تغذية جديدة" + +#: ../extensions/feed-panel/feed-panel.c:713 +msgid "Delete feed" +msgstr "حذف التغذية" + +#: ../extensions/feed-panel/feed-panel.c:795 +msgid "_Feeds" +msgstr "_تغذية" + +#: ../extensions/feed-panel/feed-parse.c:195 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "فشل العثور على عنصر الجذر في بيانات تغذية XML." + +#: ../extensions/feed-panel/feed-parse.c:235 +#, c-format +msgid "Unsupported feed format." +msgstr "صيغة الخدمة غير معتمدة." + +#: ../extensions/feed-panel/feed-parse.c:265 +#, 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 "فشل العثور على \"channel\" عنصر في بيانات RSS XML." + +#: ../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 "فشل العثور على RSS المطلوب \"item\" عناصر في بيانات XML." + +#: ../extensions/feed-panel/feed-rss.c:248 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "فشل العثور على RSS المطلوب \"channel\" عناصر في بيانات XML." + +#: ../extensions/feed-panel/main.c:131 +#, c-format +msgid "Feed '%s' already exists" +msgstr "التغذية '%s' مدخلة مسبقاً" + +#: ../extensions/feed-panel/main.c:208 +#, c-format +msgid "Error loading feed '%s'" +msgstr "خطأ في تحميل التغذية '%s'" + +#: ../extensions/feed-panel/main.c:518 +msgid "Feed Panel" +msgstr "لوحة التغذية" + +#: ../extensions/feed-panel/main.c:519 +msgid "Read Atom/ RSS feeds" +msgstr "قراءة التغذيات Atom/ RSS" + +#: ../extensions/formhistory/formhistory.c:41 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "فشل في إضافة قيمة النموذج: %s\n" + +#: ../extensions/formhistory/formhistory.c:161 +msgid "Toggle form history state" +msgstr "تبديل شكل التاريخ" + +#: ../extensions/formhistory/formhistory.c:162 +msgid "Activate or deactivate form history for the current tab." +msgstr "تنشيط أو إلغاء تنشيط نموذج التاريخ لعلامة التبويب الحالية." + +#: ../extensions/formhistory/formhistory.c:263 +#: ../extensions/formhistory/formhistory.c:267 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "فشل في تنفيذ بيان قاعدة البيانات: %s\n" + +#: ../extensions/formhistory/formhistory.c:343 +msgid "only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" +"فقط تنشيط النموذج التاريخ عن طريق مفتاح التشغيل السريع (Ctrl + Shift + F) في " +"علامة التبويب" + +#: ../extensions/formhistory/formhistory.c:399 +msgid "Stores history of entered form data" +msgstr "تخزين تاريخ بيانات الدخول" + +#: ../extensions/formhistory/formhistory.c:402 +msgid "Form history filler" +msgstr "ترشيح صيغة التاريخ" + +#: ../extensions/formhistory/formhistory-gdom-frontend.c:219 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#, c-format +msgid "Failed to select suggestions\n" +msgstr "فشل في تحديد الاقتراحات\n" + +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "لا توجد تبويبات لم تسبق زيارتها" + +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "قائمة التاريخ" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "سلوك إغلاق التبويب" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "لا تفعل شيئا" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "التبديل إلى آخر تبويب مشاهدة" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "التحول إلى احدث تبويب" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "علامة التبويب الجديدة القادمة (قائمة التاريخ)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "التبويب الجديد من التاريخ" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "تبويب جديدة متقدمة (قائمة التاريخ)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "علامة تبويب جديدة من التاريخ السابق" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "عرض التبويب في الخلفية (قائمة التاريخ)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "عرض علامة التبويب الحالية المحددة في الخلفية" + +#: ../extensions/history-list.vala:569 +msgid "History List" +msgstr "السجل" + +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "الانتقال إلى علامة التبويب الأخيرة عند إغلاق علامات التبويب" + +#: ../extensions/mouse-gestures.c:301 +msgid "Mouse Gestures" +msgstr "إيماءات الفأرة" + +#: ../extensions/mouse-gestures.c:302 +msgid "Control Midori by moving the mouse" +msgstr "تحكم بميدوري عن طريق تحريك الفأرة" + +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "تحديث الصفحة أو إيقاف تحميل" + +#: ../extensions/shortcuts.c:176 +msgid "Customize Keyboard shortcuts" +msgstr "تخصيص اختصارات لوحة المفاتيح" + +#: ../extensions/shortcuts.c:285 +msgid "Customize Sh_ortcuts..." +msgstr "تخصيص الاختصارات..." + +#: ../extensions/shortcuts.c:322 +msgid "Shortcuts" +msgstr "إختصارات" + +#: ../extensions/shortcuts.c:323 +msgid "View and edit keyboard shortcuts" +msgstr "عرض وتحرير إختصار لوحة المفاتيح" + +#: ../extensions/status-clock.c:174 +msgid "Statusbar Clock" +msgstr "شريط حالة الساعة" + +#: ../extensions/status-clock.c:175 +msgid "Display date and time in the statusbar" +msgstr "عرض التاريخ والوقت في شريط الحالة" + +#: ../extensions/statusbar-features.c:128 +msgid "Images" +msgstr "صور" + +#: ../extensions/statusbar-features.c:137 +msgid "Scripts" +msgstr "نصوص برمجية" + +#: ../extensions/statusbar-features.c:146 +msgid "Netscape plugins" +msgstr "Netscape ملحقات" + +#: ../extensions/statusbar-features.c:192 +msgid "Statusbar Features" +msgstr "سمات شريط الحالة" + +#: ../extensions/statusbar-features.c:193 +msgid "Easily toggle features on web pages on and off" +msgstr "تبديل ملامح بسهولة على صفحات الويب تشغيل وإيقاف" + +#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683 +msgid "Tab Panel" +msgstr "لوحة التبويب" + +#: ../extensions/tab-panel.c:666 +msgid "T_ab Panel" +msgstr "لوحة التبويب" + +#: ../extensions/tab-panel.c:684 +msgid "Show tabs in a vertical panel" +msgstr "عرض علامات التبويب في لوحة عمودية" + +#: ../extensions/tabs-minimized.c:76 +msgid "Only Icons on Tabs by default" +msgstr "فقط الرموز على علامات افتراضيا" + +#: ../extensions/tabs-minimized.c:77 +msgid "New tabs have no label by default" +msgstr "علامات التبويب الجديدة ليس لها تسمية افتراضيا" + +#: ../extensions/toolbar-editor.c:393 +msgid "Customize Toolbar" +msgstr "تخصيص شريط الأدوات" + +#: ../extensions/toolbar-editor.c:413 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"تحديد عناصر ليتم عرضها على شريط الأدوات. يمكن ترتيب العناصر عن طريق السحب " +"والإفلات." + +#: ../extensions/toolbar-editor.c:429 +msgid "Available Items" +msgstr "العناصر المتوفرة" + +#: ../extensions/toolbar-editor.c:450 +msgid "Displayed Items" +msgstr "العناصر المعروضة" + +#: ../extensions/toolbar-editor.c:585 +msgid "Customize _Toolbar..." +msgstr "ت_خصيص شريط الادوات..." + +#: ../extensions/toolbar-editor.c:601 +msgid "_Customize..." +msgstr "_تخصيص..." + +#: ../extensions/toolbar-editor.c:631 +msgid "Toolbar Editor" +msgstr "محرر شريط الادوات" + +#: ../extensions/toolbar-editor.c:632 +msgid "Easily edit the toolbar layout" +msgstr "تحرير شريط الادوات بسهولة" + +#: ../extensions/web-cache.c:463 +msgid "Cache HTTP communication on disk" +msgstr "إخفاء ملف HTTP التواصل في القرص" + +#~ msgid "Lightweight web browser" +#~ msgstr "منصفح الوب الخفيف" + +#~ msgid "No filename specified" +#~ msgstr "لم يتم تحديد إسم الملف" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "لا تقم بحفظ أي بيانات خاصة أثناء التصفح" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "إضافة اختصار لسرعة الاتصال الهاتفي" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "إضافة اختصار إلى سطح المكتب" + +#~ msgid "Create a launcher" +#~ msgstr "إنشاء مطلق" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "اشترك في هذا المصدر الإخباري" + +#~ msgid "Close this window" +#~ msgstr "غلق هذه التافذة" + +#~ msgid "Close all open windows" +#~ msgstr "إغلاق جميع النوافذ المفتوحة" + +#~ msgid "Undo the last modification" +#~ msgstr "تراجع عن الإجراء الأخير" + +#~ msgid "Redo the last modification" +#~ msgstr "أعِد آخر عملية متراجع عنها" + +#~ msgid "Cut the selected text" +#~ msgstr "قص النص المحدد" + +#~ msgid "Copy the selected text" +#~ msgstr "أنسخ النص المحدد" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "ألصق النص من الحافظة" + +#~ msgid "Delete the selected text" +#~ msgstr "حذف النص المحدد" + +#~ msgid "Select all text" +#~ msgstr "حدد كل النص" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "العثور على التكرار التالي للكلمة أو جملة" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "العثور على التكرار السابقة من كلمة أو عبارة" + +#~ msgid "Reset the zoom level" +#~ msgstr "إستعادة مستوى التكبير" + +#~ msgid "View the source code of the page" +#~ msgstr "اعرض النص المصدري لهذه الصفحة" + +#~ msgid "Scroll to the left" +#~ msgstr "انتقل إلى اليسار" + +#~ msgid "Scroll down" +#~ msgstr "انتقل إلى للاسفل" + +#~ msgid "Scroll up" +#~ msgstr "انتقل إلى للأعلى" + +#~ msgid "Scroll to the right" +#~ msgstr "انتقل إلى اليمين" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "حذف محتويات سلة المهملات" + +#~ msgid "Open the last closed tab" +#~ msgstr "فتح علامة التبويب المغلقة حديثاً" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "أضف مجلد علامات جديد" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "أضف, حرر و إحذف أدوات البحث..." + +#~ msgid "Clear private data..." +#~ msgstr "حذف البيانات الخاصة ..." + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "معاينة تفاصيل الصفحة أدوات وصول المطورين ..." + +#~ msgid "Switch to the previous tab" +#~ msgstr "التحول إلى التبويب السابق" + +#~ msgid "Switch to the next tab" +#~ msgstr "التحول إلى التبويب التالي" + +#~ msgid "Move tab behind the previous tab" +#~ msgstr "حرك علامة التبويب السابقة للوراء" + +#~ msgid "Move tab in front of the next tab" +#~ msgstr "الانتقال للتبويب أمام علامة التبويب التالية" + +#~ msgid "Focus the current tab" +#~ msgstr "فصل التبويب الحالي" + +#~ msgid "Cycle focus between views" +#~ msgstr "حلقة التركيز بين طرق العرض" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "أظهر فقط أيقونة التبويب الحالي" + +#~ msgid "Duplicate the current tab" +#~ msgstr "تكرار التبويب الحالية" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "أغلق كل التبويبات بإستثناء التبويب الحالي" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "فتح العلامات المحفوظة في الدورة الماضية" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "تظهر أسئلة شائعة وأجوبتها" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "تعقب العلل وفتح ميدوري" + +#~ msgid "Show information about the program" +#~ msgstr "مزيد من المعلومات حول البرنامج" + +#~ msgid "Show menubar" +#~ msgstr "أظهر شريك القائمة" + +#~ msgid "Show navigationbar" +#~ msgstr "أظهر شريط التصفح" + +#~ msgid "Show sidepanel" +#~ msgstr "أظهر لوحة الجانبية" + +#~ msgid "Show bookmarkbar" +#~ msgstr "أظهر شريط العلامات" + +#~ msgid "Show statusbar" +#~ msgstr "عرض شريط الحالة" + +#~ msgid "MD5-Checksum:" +#~ msgstr "MD5-Checksum:" + +#~ msgid "SHA1-Checksum:" +#~ msgstr "SHA1-Checksum:" + +#~ msgid "Set number of columns and rows" +#~ msgstr "تعيين عدد الأعمدة والصفوف" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "أدخل عدد الأعمدة والصفوف :" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "المدخلات غير صالحة للطلب السريع" + +#~ msgid "Thumb size:" +#~ msgstr "حجم المصغرات:" + +#~ msgid "Small" +#~ msgstr "صغير" + +#~ msgid "Medium" +#~ msgstr "متوسط" + +#~ msgid "Big" +#~ msgstr "كبير" + +#~ msgid "Not available: %s" +#~ msgstr "غبر متوفر: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "ملفات المصدر غبر مثبتة" + +#~ msgid "Reset the last _session" +#~ msgstr "إستعادة أ_خر جلسة" + +#~ msgid "%d%% loaded" +#~ msgstr "تحميل %d%%" + +#~ msgid "Quit the application" +#~ msgstr "الخروج من التطبيق" + +#~ msgid "_Contents" +#~ msgstr "الم_حتويات" + +#~ msgid "Show Blank page" +#~ msgstr "أظهر صفحة فارغة" + +#~ msgid "All cookies" +#~ msgstr "كل كعكات" + +#~ msgid "Session cookies" +#~ msgstr "جلسة الكعكات" + +#~ msgid "General" +#~ msgstr "عام" + +#~ msgid "Appearance" +#~ msgstr "مظهر" + +#~ msgid "Font settings" +#~ msgstr "إعدادات الخطوط" + +#~ msgid "Interface" +#~ msgstr "واجهة" + +#~ msgid "Applications" +#~ msgstr "تطبيقات" + +#~ msgid "External applications" +#~ msgstr "تكبيقات خارجية" + +#~ msgid "_Form History" +#~ msgstr "صيغة الت_اريخ" + +#~ msgid "Next Tab (History List)" +#~ msgstr "التبويب التالي (السجل)" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "التبويب السابق (السجل)" + +#~ msgid "Previous tab from history" +#~ msgstr "التبويب السابق من السجل" + +#~ msgid "Pageholder" +#~ msgstr "مالك الصفحة" + +#~ msgid "_Pageholder" +#~ msgstr "_مالك الصفحة" diff -Nru midori-0.2.8/po/ast.po midori-0.4.6/po/ast.po --- midori-0.2.8/po/ast.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/ast.po 2012-05-14 22:13:42.000000000 +0000 @@ -1476,7 +1476,7 @@ msgstr "Inspeicionar la páxina - %s" #: ../midori/midori-view.c:2147 -msgid "Speed dial" +msgid "Speed Dial" msgstr "Marcación rápida" #: ../midori/midori-view.c:2148 @@ -2221,7 +2221,7 @@ msgstr "Personalizar la barra de xeres" #: ../extensions/toolbar-editor.c:407 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop." msgstr "Escueyi los elementos que s'amosarán na barra de ferramientes. Los elementos pueden reordenase arrastrando y soltando." #: ../extensions/toolbar-editor.c:423 diff -Nru midori-0.2.8/po/be.po midori-0.4.6/po/be.po --- midori-0.2.8/po/be.po 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/po/be.po 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,2798 @@ +# Belarussian traslation for Midori +# Copyright (C) 2012 Midori team +# This file is distributed under the same license as the Midori package. +# Andrej Zakharevich , 2012. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-05-04 17:12+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: \n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" + +#: ../data/midori.desktop.in.h:1 +msgid "Browse the Web" +msgstr "" + +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072 +#: ../midori/main.c:2086 ../midori/midori-websettings.c:312 +msgid "Midori" +msgstr "Midori" + +#: ../data/midori.desktop.in.h:4 +msgid "Web Browser" +msgstr "" + +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164 +msgid "Private Browsing" +msgstr "" + +#: ../midori/main.c:96 ../midori/main.c:102 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:150 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "" + +#: ../midori/main.c:155 ../midori/main.c:259 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "" + +#: ../midori/main.c:380 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "" + +#: ../midori/main.c:434 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "" + +#: ../midori/main.c:454 ../midori/main.c:581 +#: ../extensions/formhistory/formhistory.c:531 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:524 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "" + +#: ../midori/main.c:564 ../panels/midori-history.c:232 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "" + +#: ../midori/main.c:611 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:633 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:668 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:705 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:746 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Пашырэнні" + +#: ../midori/main.c:760 +msgid "Privacy" +msgstr "Прыватнасць" + +#: ../midori/main.c:772 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" + +#: ../midori/main.c:828 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:1046 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" + +#: ../midori/main.c:1115 +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:1134 +msgid "Modify _preferences" +msgstr "" + +#: ../midori/main.c:1138 +msgid "Disable all _extensions" +msgstr "" + +#: ../midori/main.c:1151 +msgid "Discard old tabs" +msgstr "" + +#: ../midori/main.c:1152 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "" + +#: ../midori/main.c:1153 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "" + +#: ../midori/main.c:1400 ../midori/main.c:2464 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1538 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "" + +#: ../midori/main.c:1951 +msgid "Run ADDRESS as a web application" +msgstr "" + +#: ../midori/main.c:1951 +msgid "ADDRESS" +msgstr "" + +#: ../midori/main.c:1954 +msgid "Use FOLDER as configuration folder" +msgstr "" + +#: ../midori/main.c:1954 +msgid "FOLDER" +msgstr "" + +#: ../midori/main.c:1957 +msgid "Private browsing, no changes are saved" +msgstr "" + +#: ../midori/main.c:1959 +msgid "Show a diagnostic dialog" +msgstr "" + +#: ../midori/main.c:1961 +msgid "Run the specified filename as javascript" +msgstr "" + +#: ../midori/main.c:1963 +msgid "Take a snapshot of the specified URI" +msgstr "" + +#: ../midori/main.c:1965 +msgid "Execute the specified command" +msgstr "" + +#: ../midori/main.c:1967 +msgid "List available commands to execute with -e/ --execute" +msgstr "" + +#: ../midori/main.c:1969 +msgid "Display program version" +msgstr "" + +#: ../midori/main.c:1971 +msgid "Addresses" +msgstr "" + +#: ../midori/main.c:1973 +msgid "Block URIs according to regular expression PATTERN" +msgstr "" + +#: ../midori/main.c:1973 +msgid "PATTERN" +msgstr "" + +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:1977 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "" + +#: ../midori/main.c:1977 +msgid "SECONDS" +msgstr "" + +#: ../midori/main.c:1980 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "" + +#: ../midori/main.c:1980 +msgid "FILENAME" +msgstr "" + +#: ../midori/main.c:2045 +msgid "[Addresses]" +msgstr "" + +#: ../midori/main.c:2087 +msgid "Please report comments, suggestions and bugs to:" +msgstr "" + +#: ../midori/main.c:2089 +msgid "Check for new versions at:" +msgstr "" + +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2173 +msgid "Saved logins and _passwords" +msgstr "" + +#: ../midori/main.c:2175 +msgid "Cookies and Website data" +msgstr "" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2179 ../midori/midori-websettings.c:996 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "" + +#: ../midori/main.c:2182 +msgid "Website icons" +msgstr "" + +#: ../midori/main.c:2288 +msgid "An unknown error occured" +msgstr "" + +#: ../midori/main.c:2395 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "" + +#: ../midori/main.c:2431 +#, c-format +msgid "Bookmarks couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:2479 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:2492 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:2508 +msgid "The following errors occured:" +msgstr "" + +#: ../midori/main.c:2524 +msgid "_Ignore" +msgstr "" + +#: ../midori/midori-app.c:1334 +msgid "_Bookmark" +msgstr "" + +#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060 +msgid "_Bookmarks" +msgstr "" + +#: ../midori/midori-app.c:1336 +msgid "Add Boo_kmark" +msgstr "" + +#: ../midori/midori-app.c:1337 +msgid "_Console" +msgstr "" + +#: ../midori/midori-app.c:1338 +msgid "_Extensions" +msgstr "" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589 +msgid "_History" +msgstr "" + +#: ../midori/midori-app.c:1340 +msgid "_Homepage" +msgstr "" + +#: ../midori/midori-app.c:1341 +msgid "_Userscripts" +msgstr "" + +#: ../midori/midori-app.c:1342 +msgid "New _Tab" +msgstr "" + +#: ../midori/midori-app.c:1343 +msgid "_Transfers" +msgstr "" + +#: ../midori/midori-app.c:1344 +msgid "Netscape p_lugins" +msgstr "" + +#: ../midori/midori-app.c:1345 +msgid "_Closed Tabs" +msgstr "" + +#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216 +msgid "New _Window" +msgstr "" + +#: ../midori/midori-app.c:1347 +msgid "New _Folder" +msgstr "" + +#: ../midori/midori-array.c:522 +msgid "File not found." +msgstr "" + +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +msgid "Malformed document." +msgstr "" + +#: ../midori/midori-array.c:628 +msgid "Unrecognized bookmark format." +msgstr "" + +#: ../midori/midori-array.c:915 +msgid "Writing failed." +msgstr "" + +#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298 +#: ../midori/midori-browser.c:5307 +msgid "Reload the current page" +msgstr "" + +#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304 +msgid "Stop loading the current page" +msgstr "" + +#: ../midori/midori-browser.c:476 +#, c-format +msgid "Failed to update title: %s\n" +msgstr "" + +#: ../midori/midori-browser.c:489 +#, c-format +msgid "Unexpected action '%s'." +msgstr "" + +#: ../midori/midori-browser.c:569 +#, c-format +msgid "%s (Private Browsing)" +msgstr "" + +#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716 +msgid "Toplevel folder" +msgstr "" + +#: ../midori/midori-browser.c:774 +msgid "New folder" +msgstr "" + +#: ../midori/midori-browser.c:774 +msgid "Edit folder" +msgstr "" + +#: ../midori/midori-browser.c:776 +msgid "New bookmark" +msgstr "" + +#: ../midori/midori-browser.c:776 +msgid "Edit bookmark" +msgstr "" + +#: ../midori/midori-browser.c:818 +msgid "_Title:" +msgstr "" + +#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "" + +#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326 +msgid "_Folder:" +msgstr "" + +#: ../midori/midori-browser.c:877 +msgid "Add to _Speed Dial" +msgstr "" + +#: ../midori/midori-browser.c:890 +msgid "Show in the tool_bar" +msgstr "" + +#: ../midori/midori-browser.c:905 +msgid "Run as _web application" +msgstr "" + +#: ../midori/midori-browser.c:976 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "" + +#: ../midori/midori-browser.c:978 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "" + +#: ../midori/midori-browser.c:985 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "" + +#: ../midori/midori-browser.c:988 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "" + +#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395 +msgid "Save file as" +msgstr "" + +#: ../midori/midori-browser.c:1320 +msgid "New Window" +msgstr "" + +#: ../midori/midori-browser.c:1320 +msgid "A new window has been opened" +msgstr "" + +#: ../midori/midori-browser.c:1323 +msgid "New Tab" +msgstr "" + +#: ../midori/midori-browser.c:1323 +msgid "A new tab has been opened" +msgstr "" + +#: ../midori/midori-browser.c:1358 +msgid "Error opening the image!" +msgstr "" + +#: ../midori/midori-browser.c:1359 +msgid "Can not open selected image in a default viewer." +msgstr "" + +#: ../midori/midori-browser.c:1365 +msgid "Error downloading the image!" +msgstr "" + +#: ../midori/midori-browser.c:1366 +msgid "Can not download selected image." +msgstr "" + +#: ../midori/midori-browser.c:1492 +msgid "Save file" +msgstr "" + +#: ../midori/midori-browser.c:2367 +msgid "Open file" +msgstr "" + +#: ../midori/midori-browser.c:2499 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr "" + +#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365 +msgid "New feed" +msgstr "" + +#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367 +#: ../panels/midori-bookmarks.c:427 +msgid "Add a new bookmark" +msgstr "" + +#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "" + +#: ../midori/midori-browser.c:3467 +msgid "Toggle text cursor navigation" +msgstr "" + +#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753 +#, c-format +msgid "Failed to insert new history item: %s\n" +msgstr "" + +#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 +msgid "Open all in _Tabs" +msgstr "" + +#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 +msgid "Open in New _Tab" +msgstr "" + +#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657 +#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530 +msgid "Open in New _Window" +msgstr "" + +#: ../midori/midori-browser.c:4213 +msgid "Arora" +msgstr "" + +#: ../midori/midori-browser.c:4214 +msgid "Kazehakase" +msgstr "" + +#: ../midori/midori-browser.c:4215 +msgid "Opera" +msgstr "" + +#: ../midori/midori-browser.c:4216 +msgid "Konqueror" +msgstr "" + +#: ../midori/midori-browser.c:4217 +msgid "Epiphany" +msgstr "" + +#: ../midori/midori-browser.c:4218 +#, c-format +msgid "Firefox (%s)" +msgstr "" + +#: ../midori/midori-browser.c:4239 +msgid "Import bookmarks..." +msgstr "" + +#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372 +msgid "_Import bookmarks" +msgstr "" + +#: ../midori/midori-browser.c:4253 +msgid "_Application:" +msgstr "" + +#: ../midori/midori-browser.c:4318 +msgid "Import from XBEL or HTML file" +msgstr "" + +#: ../midori/midori-browser.c:4353 +msgid "Import from a file" +msgstr "" + +#: ../midori/midori-browser.c:4365 +msgid "Failed to import bookmarks" +msgstr "" + +#: ../midori/midori-browser.c:4400 +msgid "XBEL Bookmarks" +msgstr "" + +#: ../midori/midori-browser.c:4405 +msgid "Netscape Bookmarks" +msgstr "" + +#: ../midori/midori-browser.c:4419 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "" + +#: ../midori/midori-browser.c:4434 +msgid "Failed to export bookmarks" +msgstr "" + +#. i18n: Dialog: Clear Private Data, in the Tools menu +#: ../midori/midori-browser.c:4556 +msgid "Clear Private Data" +msgstr "" + +#: ../midori/midori-browser.c:4560 +msgid "_Clear private data" +msgstr "" + +#: ../midori/midori-browser.c:4573 +msgid "Clear the following data:" +msgstr "" + +#: ../midori/midori-browser.c:4583 +msgid "Last open _tabs" +msgstr "" + +#: ../midori/midori-browser.c:4609 +msgid "Clear private data when _quitting Midori" +msgstr "" + +#: ../midori/midori-browser.c:4804 +msgid "A lightweight web browser." +msgstr "" + +#: ../midori/midori-browser.c:4805 +msgid "See about:version for version info." +msgstr "" + +#: ../midori/midori-browser.c:4807 +msgid "" +"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." +msgstr "" + +#: ../midori/midori-browser.c:4828 +msgid "translator-credits" +msgstr "" + +#: ../midori/midori-browser.c:5214 +msgid "_File" +msgstr "" + +#: ../midori/midori-browser.c:5217 +msgid "Open a new window" +msgstr "" + +#: ../midori/midori-browser.c:5220 +msgid "Open a new tab" +msgstr "" + +#: ../midori/midori-browser.c:5222 +msgid "New P_rivate Browsing Window" +msgstr "" + +#: ../midori/midori-browser.c:5226 +msgid "Open a file" +msgstr "" + +#: ../midori/midori-browser.c:5228 +msgid "_Save Page As..." +msgstr "" + +#: ../midori/midori-browser.c:5229 +msgid "Save to a file" +msgstr "" + +#: ../midori/midori-browser.c:5231 +msgid "Add to Speed _dial" +msgstr "" + +#: ../midori/midori-browser.c:5235 +msgid "Add Shortcut to the _desktop" +msgstr "" + +#: ../midori/midori-browser.c:5237 +msgid "Create _Launcher" +msgstr "" + +#: ../midori/midori-browser.c:5241 +msgid "Subscribe to News _feed" +msgstr "" + +#: ../midori/midori-browser.c:5247 +msgid "_Close Tab" +msgstr "" + +#: ../midori/midori-browser.c:5248 +msgid "Close the current tab" +msgstr "" + +#: ../midori/midori-browser.c:5250 +msgid "C_lose Window" +msgstr "" + +#: ../midori/midori-browser.c:5254 +msgid "Print the current page" +msgstr "" + +#: ../midori/midori-browser.c:5256 +msgid "Close a_ll Windows" +msgstr "" + +#: ../midori/midori-browser.c:5259 +msgid "_Edit" +msgstr "" + +#: ../midori/midori-browser.c:5282 +msgid "_Find..." +msgstr "" + +#: ../midori/midori-browser.c:5283 +msgid "Find a word or phrase in the page" +msgstr "" + +#: ../midori/midori-browser.c:5285 +msgid "Find _Next" +msgstr "" + +#: ../midori/midori-browser.c:5288 +msgid "Find _Previous" +msgstr "" + +#: ../midori/midori-browser.c:5292 +msgid "Configure the application preferences" +msgstr "" + +#: ../midori/midori-browser.c:5294 +msgid "_View" +msgstr "" + +#: ../midori/midori-browser.c:5295 +msgid "_Toolbars" +msgstr "" + +#: ../midori/midori-browser.c:5300 +msgid "Reload page without caching" +msgstr "" + +#: ../midori/midori-browser.c:5310 +msgid "Increase the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:5313 +msgid "Decrease the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:5317 +msgid "_Encoding" +msgstr "" + +#: ../midori/midori-browser.c:5319 +msgid "View So_urce" +msgstr "" + +#: ../midori/midori-browser.c:5322 +msgid "Ca_ret Browsing" +msgstr "" + +#: ../midori/midori-browser.c:5326 +msgid "Toggle fullscreen view" +msgstr "" + +#: ../midori/midori-browser.c:5328 +msgid "Scroll _Left" +msgstr "" + +#: ../midori/midori-browser.c:5331 +msgid "Scroll _Down" +msgstr "" + +#: ../midori/midori-browser.c:5334 +msgid "Scroll _Up" +msgstr "" + +#: ../midori/midori-browser.c:5337 +msgid "Scroll _Right" +msgstr "" + +#: ../midori/midori-browser.c:5340 +msgid "_Go" +msgstr "" + +#: ../midori/midori-browser.c:5343 +msgid "Go back to the previous page" +msgstr "" + +#: ../midori/midori-browser.c:5346 +msgid "Go forward to the next page" +msgstr "" + +#. i18n: Visit the previous logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5350 +msgid "Go to the previous sub-page" +msgstr "" + +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5354 +msgid "Go to the next sub-page" +msgstr "" + +#: ../midori/midori-browser.c:5357 +msgid "Go to your homepage" +msgstr "" + +#: ../midori/midori-browser.c:5359 +msgid "Empty Trash" +msgstr "" + +#: ../midori/midori-browser.c:5362 +msgid "Undo _Close Tab" +msgstr "" + +#: ../midori/midori-browser.c:5369 +msgid "Add a new _folder" +msgstr "" + +#: ../midori/midori-browser.c:5375 +msgid "_Export bookmarks" +msgstr "" + +#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497 +msgid "_Manage Search Engines" +msgstr "" + +#: ../midori/midori-browser.c:5381 +msgid "_Clear Private Data" +msgstr "" + +#: ../midori/midori-browser.c:5384 +msgid "_Inspect Page" +msgstr "" + +#: ../midori/midori-browser.c:5388 +msgid "_Previous Tab" +msgstr "" + +#: ../midori/midori-browser.c:5391 +msgid "_Next Tab" +msgstr "" + +#: ../midori/midori-browser.c:5393 +msgid "Move Tab _Backward" +msgstr "" + +#: ../midori/midori-browser.c:5395 +msgid "_Move Tab Forward" +msgstr "" + +#: ../midori/midori-browser.c:5398 +msgid "Focus _Current Tab" +msgstr "" + +#: ../midori/midori-browser.c:5401 +msgid "Focus _Next view" +msgstr "" + +#: ../midori/midori-browser.c:5404 +msgid "Only show the Icon of the _Current Tab" +msgstr "" + +#: ../midori/midori-browser.c:5407 +msgid "_Duplicate Current Tab" +msgstr "" + +#: ../midori/midori-browser.c:5410 +msgid "Close Ot_her Tabs" +msgstr "" + +#: ../midori/midori-browser.c:5413 +msgid "Open last _session" +msgstr "" + +#: ../midori/midori-browser.c:5416 +msgid "_Help" +msgstr "" + +#: ../midori/midori-browser.c:5418 +msgid "_Frequent Questions" +msgstr "" + +#: ../midori/midori-browser.c:5421 +msgid "_Report a Problem..." +msgstr "" + +#: ../midori/midori-browser.c:5433 +msgid "_Menubar" +msgstr "" + +#: ../midori/midori-browser.c:5437 +msgid "_Navigationbar" +msgstr "" + +#: ../midori/midori-browser.c:5441 +msgid "Side_panel" +msgstr "" + +#: ../midori/midori-browser.c:5442 +msgid "Sidepanel" +msgstr "" + +#: ../midori/midori-browser.c:5445 +msgid "_Bookmarkbar" +msgstr "" + +#: ../midori/midori-browser.c:5449 +msgid "_Statusbar" +msgstr "" + +#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311 +msgid "_Automatic" +msgstr "" + +#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236 +msgid "Chinese (BIG5)" +msgstr "" + +#. i18n: A double underscore "__" is used to prevent the mnemonic +#: ../midori/midori-browser.c:5465 +msgid "Japanese (SHIFT__JIS)" +msgstr "" + +#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238 +msgid "Korean (EUC-KR)" +msgstr "" + +#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239 +msgid "Russian (KOI8-R)" +msgstr "" + +#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240 +msgid "Unicode (UTF-8)" +msgstr "" + +#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241 +msgid "Western (ISO-8859-1)" +msgstr "" + +#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "" + +#: ../midori/midori-browser.c:5985 +msgid "_Separator" +msgstr "" + +#: ../midori/midori-browser.c:5992 +msgid "_Location..." +msgstr "" + +#: ../midori/midori-browser.c:5994 +msgid "Open a particular location" +msgstr "" + +#: ../midori/midori-browser.c:6016 +msgid "_Web Search..." +msgstr "" + +#: ../midori/midori-browser.c:6018 +msgid "Run a web search" +msgstr "" + +#: ../midori/midori-browser.c:6045 +msgid "Reopen a previously closed tab or window" +msgstr "" + +#: ../midori/midori-browser.c:6062 +msgid "Show the saved bookmarks" +msgstr "" + +#: ../midori/midori-browser.c:6079 +msgid "_Tools" +msgstr "" + +#: ../midori/midori-browser.c:6095 +msgid "_Window" +msgstr "" + +#: ../midori/midori-browser.c:6097 +msgid "Show a list of all open tabs" +msgstr "" + +#: ../midori/midori-browser.c:6111 +msgid "_Menu" +msgstr "" + +#: ../midori/midori-browser.c:6113 +msgid "Menu" +msgstr "" + +#: ../midori/midori-browser.c:6927 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "" + +#: ../midori/midori-extension.c:329 +#, c-format +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "" + +#: ../midori/midori-locationaction.c:394 +#, c-format +msgid "Search with %s" +msgstr "" + +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "" + +#: ../midori/midori-locationaction.c:537 +#, c-format +msgid "Failed to select from history\n" +msgstr "" + +#: ../midori/midori-locationaction.c:624 +#, c-format +msgid "Search for %s" +msgstr "" + +#. i18n: Right-click on Location, Open an URL from the clipboard +#: ../midori/midori-locationaction.c:1398 +msgid "Paste and p_roceed" +msgstr "" + +#: ../midori/midori-locationaction.c:1739 +msgid "Not verified" +msgstr "" + +#: ../midori/midori-locationaction.c:1759 +msgid "Verified and encrypted connection" +msgstr "" + +#: ../midori/midori-locationaction.c:1771 +msgid "Open, unencrypted connection" +msgstr "" + +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 +msgid "Align sidepanel to the right" +msgstr "" + +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 +msgid "Close panel" +msgstr "" + +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 +msgid "Align sidepanel to the left" +msgstr "" + +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "" + +#: ../midori/midori-websettings.c:219 +msgid "Show Homepage" +msgstr "" + +#: ../midori/midori-websettings.c:237 +msgid "Japanese (SHIFT_JIS)" +msgstr "" + +#: ../midori/midori-websettings.c:257 +msgid "New tab" +msgstr "" + +#: ../midori/midori-websettings.c:258 +msgid "New window" +msgstr "" + +#: ../midori/midori-websettings.c:259 +msgid "Current tab" +msgstr "" + +#: ../midori/midori-websettings.c:274 +msgid "Default" +msgstr "" + +#: ../midori/midori-websettings.c:275 +msgid "Icons" +msgstr "" + +#: ../midori/midori-websettings.c:276 +msgid "Small icons" +msgstr "" + +#: ../midori/midori-websettings.c:277 +msgid "Text" +msgstr "" + +#: ../midori/midori-websettings.c:278 +msgid "Icons and text" +msgstr "" + +#: ../midori/midori-websettings.c:279 +msgid "Text beside icons" +msgstr "" + +#: ../midori/midori-websettings.c:294 +msgid "Automatic (GNOME or environment)" +msgstr "" + +#: ../midori/midori-websettings.c:295 +msgid "HTTP proxy server" +msgstr "" + +#: ../midori/midori-websettings.c:296 +msgid "No proxy server" +msgstr "" + +#: ../midori/midori-websettings.c:313 +msgid "Safari" +msgstr "" + +#: ../midori/midori-websettings.c:314 +msgid "iPhone" +msgstr "" + +#: ../midori/midori-websettings.c:315 +msgid "Firefox" +msgstr "" + +#: ../midori/midori-websettings.c:316 +msgid "Internet Explorer" +msgstr "" + +#: ../midori/midori-websettings.c:400 +msgid "Remember last window size" +msgstr "" + +#: ../midori/midori-websettings.c:401 +msgid "Whether to save the last window size" +msgstr "" + +#: ../midori/midori-websettings.c:409 +msgid "Last window width" +msgstr "" + +#: ../midori/midori-websettings.c:410 +msgid "The last saved window width" +msgstr "" + +#: ../midori/midori-websettings.c:418 +msgid "Last window height" +msgstr "" + +#: ../midori/midori-websettings.c:419 +msgid "The last saved window height" +msgstr "" + +#: ../midori/midori-websettings.c:444 +msgid "Last panel position" +msgstr "" + +#: ../midori/midori-websettings.c:445 +msgid "The last saved panel position" +msgstr "" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:454 +msgid "Last panel page" +msgstr "" + +#: ../midori/midori-websettings.c:455 +msgid "The last saved panel page" +msgstr "" + +#: ../midori/midori-websettings.c:463 +msgid "Last Web search" +msgstr "" + +#: ../midori/midori-websettings.c:464 +msgid "The last saved Web search" +msgstr "" + +#: ../midori/midori-websettings.c:473 +msgid "Show Menubar" +msgstr "" + +#: ../midori/midori-websettings.c:474 +msgid "Whether to show the menubar" +msgstr "" + +#: ../midori/midori-websettings.c:482 +msgid "Show Navigationbar" +msgstr "" + +#: ../midori/midori-websettings.c:483 +msgid "Whether to show the navigationbar" +msgstr "" + +#: ../midori/midori-websettings.c:491 +msgid "Show Bookmarkbar" +msgstr "" + +#: ../midori/midori-websettings.c:492 +msgid "Whether to show the bookmarkbar" +msgstr "" + +#: ../midori/midori-websettings.c:500 +msgid "Show Panel" +msgstr "" + +#: ../midori/midori-websettings.c:501 +msgid "Whether to show the panel" +msgstr "" + +#: ../midori/midori-websettings.c:509 +msgid "Show Statusbar" +msgstr "" + +#: ../midori/midori-websettings.c:510 +msgid "Whether to show the statusbar" +msgstr "" + +#: ../midori/midori-websettings.c:519 +msgid "Toolbar Style:" +msgstr "" + +#: ../midori/midori-websettings.c:520 +msgid "The style of the toolbar" +msgstr "" + +#: ../midori/midori-websettings.c:529 +msgid "Toolbar Items" +msgstr "" + +#: ../midori/midori-websettings.c:530 +msgid "The items to show on the toolbar" +msgstr "" + +#: ../midori/midori-websettings.c:538 +msgid "Compact Sidepanel" +msgstr "" + +#: ../midori/midori-websettings.c:539 +msgid "Whether to make the sidepanel compact" +msgstr "" + +#: ../midori/midori-websettings.c:554 +msgid "Align sidepanel on the right" +msgstr "" + +#: ../midori/midori-websettings.c:555 +msgid "Whether to align the sidepanel on the right" +msgstr "" + +#: ../midori/midori-websettings.c:570 +msgid "Open panels in separate windows" +msgstr "" + +#: ../midori/midori-websettings.c:571 +msgid "Whether to always open panels in separate windows" +msgstr "" + +#: ../midori/midori-websettings.c:580 +msgid "When Midori starts:" +msgstr "" + +#: ../midori/midori-websettings.c:581 +msgid "What to do when Midori starts" +msgstr "" + +#: ../midori/midori-websettings.c:590 +msgid "Homepage:" +msgstr "" + +#: ../midori/midori-websettings.c:591 +msgid "The homepage" +msgstr "" + +#: ../midori/midori-websettings.c:606 +msgid "Show crash dialog" +msgstr "" + +#: ../midori/midori-websettings.c:607 +msgid "Show a dialog after Midori crashed" +msgstr "" + +#: ../midori/midori-websettings.c:615 +msgid "Save downloaded files to:" +msgstr "" + +#: ../midori/midori-websettings.c:616 +msgid "The folder downloaded files are saved to" +msgstr "" + +#: ../midori/midori-websettings.c:624 +msgid "Text Editor" +msgstr "" + +#: ../midori/midori-websettings.c:625 +msgid "An external text editor" +msgstr "" + +#: ../midori/midori-websettings.c:640 +msgid "News Aggregator" +msgstr "" + +#: ../midori/midori-websettings.c:641 +msgid "An external news aggregator" +msgstr "" + +#: ../midori/midori-websettings.c:649 +msgid "Location entry Search" +msgstr "" + +#: ../midori/midori-websettings.c:650 +msgid "The search to perform inside the location entry" +msgstr "" + +#: ../midori/midori-websettings.c:658 +msgid "Preferred Encoding" +msgstr "" + +#: ../midori/midori-websettings.c:659 +msgid "The preferred character encoding" +msgstr "" + +#: ../midori/midori-websettings.c:669 +msgid "Always Show Tabbar" +msgstr "" + +#: ../midori/midori-websettings.c:670 +msgid "Always show the tabbar" +msgstr "" + +#: ../midori/midori-websettings.c:683 +msgid "Close Buttons on Tabs" +msgstr "" + +#: ../midori/midori-websettings.c:684 +msgid "Whether tabs have close buttons" +msgstr "" + +#: ../midori/midori-websettings.c:709 +msgid "Open new pages in:" +msgstr "" + +#: ../midori/midori-websettings.c:710 +msgid "Where to open new pages" +msgstr "" + +#: ../midori/midori-websettings.c:719 +msgid "Middle click opens Selection" +msgstr "" + +#: ../midori/midori-websettings.c:720 +msgid "Load an address from the selection via middle click" +msgstr "" + +#: ../midori/midori-websettings.c:728 +msgid "Open tabs in the background" +msgstr "" + +#: ../midori/midori-websettings.c:729 +msgid "Whether to open new tabs in the background" +msgstr "" + +#: ../midori/midori-websettings.c:737 +msgid "Open Tabs next to Current" +msgstr "" + +#: ../midori/midori-websettings.c:738 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "" + +#: ../midori/midori-websettings.c:746 +msgid "Open popups in tabs" +msgstr "" + +#: ../midori/midori-websettings.c:747 +msgid "Whether to open popup windows in tabs" +msgstr "" + +#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 +msgid "Load images automatically" +msgstr "" + +#: ../midori/midori-websettings.c:758 +msgid "Load and display images automatically" +msgstr "" + +#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 +msgid "Enable scripts" +msgstr "" + +#: ../midori/midori-websettings.c:766 +msgid "Enable embedded scripting languages" +msgstr "" + +#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 +msgid "Enable Netscape plugins" +msgstr "" + +#: ../midori/midori-websettings.c:774 +msgid "Enable embedded Netscape plugin objects" +msgstr "" + +#: ../midori/midori-websettings.c:789 +msgid "Enable Spell Checking" +msgstr "" + +#: ../midori/midori-websettings.c:790 +msgid "Enable spell checking while typing" +msgstr "" + +#: ../midori/midori-websettings.c:796 +msgid "Enable HTML5 database support" +msgstr "" + +#: ../midori/midori-websettings.c:797 +msgid "Whether to enable HTML5 database support" +msgstr "" + +#: ../midori/midori-websettings.c:803 +msgid "Enable HTML5 local storage support" +msgstr "" + +#: ../midori/midori-websettings.c:804 +msgid "Whether to enable HTML5 local storage support" +msgstr "" + +#: ../midori/midori-websettings.c:810 +msgid "Enable offline web application cache" +msgstr "" + +#: ../midori/midori-websettings.c:811 +msgid "Whether to enable offline web application cache" +msgstr "" + +#: ../midori/midori-websettings.c:827 +msgid "Flash window on background tabs" +msgstr "" + +#: ../midori/midori-websettings.c:828 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "" + +#: ../midori/midori-websettings.c:836 +msgid "Enable WebGL support" +msgstr "" + +#: ../midori/midori-websettings.c:837 +msgid "Allow websites to use OpenGL rendering" +msgstr "" + +#: ../midori/midori-websettings.c:863 +msgid "Zoom Text and Images" +msgstr "" + +#: ../midori/midori-websettings.c:864 +msgid "Whether to zoom text and images" +msgstr "" + +#: ../midori/midori-websettings.c:879 +msgid "Find inline while typing" +msgstr "" + +#: ../midori/midori-websettings.c:880 +msgid "Whether to automatically find inline while typing" +msgstr "" + +#: ../midori/midori-websettings.c:895 +msgid "Kinetic scrolling" +msgstr "" + +#: ../midori/midori-websettings.c:896 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "" + +#: ../midori/midori-websettings.c:904 +msgid "Delete old Cookies after:" +msgstr "" + +#: ../midori/midori-websettings.c:905 +msgid "The maximum number of days to save cookies for" +msgstr "" + +#: ../midori/midori-websettings.c:921 +msgid "Only accept Cookies from sites you visit" +msgstr "" + +#: ../midori/midori-websettings.c:922 +msgid "Block cookies sent by third-party websites" +msgstr "" + +#: ../midori/midori-websettings.c:936 +msgid "Delete pages from history after:" +msgstr "" + +#: ../midori/midori-websettings.c:937 +msgid "The maximum number of days to save the history for" +msgstr "" + +#: ../midori/midori-websettings.c:952 +msgid "Proxy server" +msgstr "" + +#: ../midori/midori-websettings.c:953 +msgid "The type of proxy server to use" +msgstr "" + +#: ../midori/midori-websettings.c:962 +msgid "HTTP Proxy Server" +msgstr "" + +#: ../midori/midori-websettings.c:963 +msgid "The proxy server used for HTTP connections" +msgstr "" + +#: ../midori/midori-websettings.c:978 +msgid "Port" +msgstr "" + +#: ../midori/midori-websettings.c:979 +msgid "The proxy server port used for HTTP connections" +msgstr "" + +#: ../midori/midori-websettings.c:997 +msgid "The maximum size of cached pages on disk" +msgstr "" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:1014 +msgid "Identify as" +msgstr "" + +#: ../midori/midori-websettings.c:1015 +msgid "What to identify as to web pages" +msgstr "" + +#: ../midori/midori-websettings.c:1031 +msgid "Identification string" +msgstr "" + +#: ../midori/midori-websettings.c:1032 +msgid "The application identification string" +msgstr "" + +#: ../midori/midori-websettings.c:1048 +msgid "Preferred languages" +msgstr "" + +#: ../midori/midori-websettings.c:1049 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" + +#: ../midori/midori-websettings.c:1064 +msgid "Clear private data" +msgstr "" + +#: ../midori/midori-websettings.c:1065 +msgid "The private data selected for deletion" +msgstr "" + +#: ../midori/midori-websettings.c:1080 +msgid "Clear data" +msgstr "" + +#: ../midori/midori-websettings.c:1081 +msgid "The data selected for deletion" +msgstr "" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1130 +msgid "Strip referrer details sent to websites" +msgstr "" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1132 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "" + +#: ../midori/midori-websettings.c:1146 +msgid "Always use my font choices" +msgstr "" + +#: ../midori/midori-websettings.c:1147 +msgid "Override fonts picked by websites with user preferences" +msgstr "" + +#: ../midori/midori-view.c:1360 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "" + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Deny" +msgstr "" + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Allow" +msgstr "" + +#: ../midori/midori-view.c:1392 +#, c-format +msgid "%s wants to know your location." +msgstr "" + +#: ../midori/midori-view.c:1485 +#, c-format +msgid "Error - %s" +msgstr "" + +#: ../midori/midori-view.c:1486 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "" + +#: ../midori/midori-view.c:1488 +msgid "Try again" +msgstr "" + +#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598 +#, c-format +msgid "Send a message to %s" +msgstr "" + +#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747 +msgid "Inspect _Element" +msgstr "" + +#: ../midori/midori-view.c:2480 +msgid "Open Link in New _Tab" +msgstr "" + +#: ../midori/midori-view.c:2484 +msgid "Open Link in _Foreground Tab" +msgstr "" + +#: ../midori/midori-view.c:2485 +msgid "Open Link in _Background Tab" +msgstr "" + +#: ../midori/midori-view.c:2488 +msgid "Open Link in New _Window" +msgstr "" + +#: ../midori/midori-view.c:2491 +msgid "Open Link as Web A_pplication" +msgstr "" + +#: ../midori/midori-view.c:2496 +msgid "Copy Link de_stination" +msgstr "" + +#: ../midori/midori-view.c:2512 +msgid "Open _Image in New Tab" +msgstr "" + +#: ../midori/midori-view.c:2515 +msgid "Copy Image _Address" +msgstr "" + +#: ../midori/midori-view.c:2518 +msgid "Save I_mage" +msgstr "" + +#: ../midori/midori-view.c:2521 +msgid "Open in Image _Viewer" +msgstr "" + +#: ../midori/midori-view.c:2528 +msgid "Copy Video _Address" +msgstr "" + +#: ../midori/midori-view.c:2531 +msgid "Save _Video" +msgstr "" + +#: ../midori/midori-view.c:2531 +msgid "Download _Video" +msgstr "" + +#: ../midori/midori-view.c:2557 +msgid "Search _with" +msgstr "" + +#: ../midori/midori-view.c:2589 +msgid "_Search the Web" +msgstr "" + +#: ../midori/midori-view.c:2606 +msgid "Open Address in New _Tab" +msgstr "" + +#: ../midori/midori-view.c:2909 +msgid "Open or download file" +msgstr "" + +#: ../midori/midori-view.c:2929 +#, c-format +msgid "File Type: '%s'" +msgstr "" + +#: ../midori/midori-view.c:2931 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "" + +#: ../midori/midori-view.c:2935 +#, c-format +msgid "File Name: %s" +msgstr "" + +#: ../midori/midori-view.c:2955 +#, c-format +msgid "Open %s" +msgstr "" + +#: ../midori/midori-view.c:3576 +#, c-format +msgid "Inspect page - %s" +msgstr "" + +#: ../midori/midori-view.c:3923 +msgid "Speed Dial" +msgstr "" + +#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020 +msgid "Click to add a shortcut" +msgstr "" + +#: ../midori/midori-view.c:3925 +msgid "Enter shortcut address" +msgstr "" + +#: ../midori/midori-view.c:3926 +msgid "Enter shortcut title" +msgstr "" + +#: ../midori/midori-view.c:3927 +msgid "Are you sure you want to delete this shortcut?" +msgstr "" + +#: ../midori/midori-view.c:4089 +#, c-format +msgid "No documentation installed" +msgstr "" + +#: ../midori/midori-view.c:4165 +msgid "Midori doesn't store any personal data:" +msgstr "" + +#: ../midori/midori-view.c:4166 +msgid "No history or web cookies are being saved." +msgstr "" + +#: ../midori/midori-view.c:4167 +msgid "Extensions are disabled." +msgstr "" + +#: ../midori/midori-view.c:4168 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "" + +#: ../midori/midori-view.c:4169 +msgid "Midori prevents websites from tracking the user:" +msgstr "" + +#: ../midori/midori-view.c:4170 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "" + +#: ../midori/midori-view.c:4171 +msgid "DNS prefetching is disabled." +msgstr "" + +#: ../midori/midori-view.c:4172 +msgid "The language and timezone are not revealed to websites." +msgstr "" + +#: ../midori/midori-view.c:4173 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "" + +#: ../midori/midori-view.c:4222 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "" + +#: ../midori/midori-view.c:4278 +msgid "Page loading delayed" +msgstr "" + +#: ../midori/midori-view.c:4279 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "" + +#: ../midori/midori-view.c:4280 +msgid "Load Page" +msgstr "" + +#: ../midori/midori-view.c:4446 +msgid "Blank page" +msgstr "" + +#: ../midori/midori-view.c:4708 +msgid "_Duplicate Tab" +msgstr "" + +#: ../midori/midori-view.c:4713 +msgid "Show Tab _Label" +msgstr "" + +#: ../midori/midori-view.c:4713 +msgid "Show Tab _Icon Only" +msgstr "" + +#: ../midori/midori-view.c:4719 +msgid "Close ot_her Tabs" +msgstr "" + +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5532 +msgid "previous" +msgstr "" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5551 +msgid "next" +msgstr "" + +#: ../midori/midori-view.c:5564 +msgid "Print background images" +msgstr "" + +#: ../midori/midori-view.c:5565 +msgid "Whether background images should be printed" +msgstr "" + +#: ../midori/midori-view.c:5597 +msgid "Features" +msgstr "" + +#: ../midori/midori-preferences.c:297 +msgid "Startup" +msgstr "" + +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "" + +#: ../midori/midori-preferences.c:314 +msgid "Use current page as homepage" +msgstr "" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "" + +#: ../midori/midori-preferences.c:330 +msgid "The default font family used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:333 +msgid "The default font size used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:335 +msgid "Fixed-width Font Family" +msgstr "" + +#: ../midori/midori-preferences.c:339 +msgid "The font family used to display fixed-width text" +msgstr "" + +#: ../midori/midori-preferences.c:342 +msgid "The font size used to display fixed-width text" +msgstr "" + +#: ../midori/midori-preferences.c:344 +msgid "Minimum Font Size" +msgstr "" + +#: ../midori/midori-preferences.c:348 +msgid "The minimum font size used to display text" +msgstr "" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:359 +msgid "Behavior" +msgstr "" + +#: ../midori/midori-preferences.c:385 +msgid "Allow scripts to open popups" +msgstr "" + +#: ../midori/midori-preferences.c:386 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "" + +#. Page "Interface" +#: ../midori/midori-preferences.c:416 +msgid "Browsing" +msgstr "" + +#. Page "Network" +#: ../midori/midori-preferences.c:456 +msgid "Network" +msgstr "" + +#: ../midori/midori-preferences.c:463 +msgid "Hostname" +msgstr "" + +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "" + +#: ../midori/midori-searchaction.c:902 +msgid "Add search engine" +msgstr "" + +#: ../midori/midori-searchaction.c:902 +msgid "Edit search engine" +msgstr "" + +#: ../midori/midori-searchaction.c:931 +msgid "_Name:" +msgstr "" + +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "" + +#: ../midori/midori-searchaction.c:981 +msgid "_Icon:" +msgstr "" + +#: ../midori/midori-searchaction.c:995 +msgid "_Token:" +msgstr "" + +#: ../midori/midori-searchaction.c:1295 +msgid "Manage Search Engines" +msgstr "" + +#: ../midori/midori-searchaction.c:1395 +msgid "Use as _default" +msgstr "" + +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "" + +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "" + +#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "" + +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "" +msgstr[1] "" + +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "" +msgstr[1] "" + +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "" + +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr "" + +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr "" + +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:291 +msgid "_Inline Find:" +msgstr "" + +#: ../toolbars/midori-findbar.c:317 +msgid "Previous" +msgstr "" + +#: ../toolbars/midori-findbar.c:323 +msgid "Next" +msgstr "" + +#: ../toolbars/midori-findbar.c:327 +msgid "Match Case" +msgstr "" + +#: ../toolbars/midori-findbar.c:336 +msgid "Highlight Matches" +msgstr "" + +#: ../toolbars/midori-findbar.c:347 +msgid "Close Findbar" +msgstr "" + +#: ../toolbars/midori-transferbar.c:122 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "" + +#: ../toolbars/midori-transferbar.c:125 +msgid "Transfer completed" +msgstr "" + +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "" + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" + +#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "" + +#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 +msgid "Some files are being downloaded" +msgstr "" + +#: ../toolbars/midori-transferbar.c:377 +msgid "_Quit Midori" +msgstr "" + +#: ../toolbars/midori-transferbar.c:379 +msgid "The transfers will be cancelled if Midori quits." +msgstr "" + +#: ../panels/midori-bookmarks.c:114 +msgid "Bookmarks" +msgstr "" + +#: ../panels/midori-bookmarks.c:257 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "" + +#: ../panels/midori-bookmarks.c:435 +msgid "Edit the selected bookmark" +msgstr "" + +#: ../panels/midori-bookmarks.c:443 +msgid "Delete the selected bookmark" +msgstr "" + +#: ../panels/midori-bookmarks.c:458 +msgid "Add a new folder" +msgstr "" + +#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 +msgid "Separator" +msgstr "" + +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "" + +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "" + +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "" + +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "" +msgstr[1] "" + +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "" + +#: ../panels/midori-history.c:360 +msgid "Are you sure you want to remove all history items?" +msgstr "" + +#: ../panels/midori-history.c:407 +msgid "Bookmark the selected history item" +msgstr "" + +#: ../panels/midori-history.c:416 +msgid "Delete the selected history item" +msgstr "" + +#: ../panels/midori-history.c:424 +msgid "Clear the entire history" +msgstr "" + +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "" + +#: ../panels/midori-transfers.c:469 +msgid "Open Destination _Folder" +msgstr "" + +#: ../panels/midori-transfers.c:472 +msgid "Copy Link Loc_ation" +msgstr "" + +#: ../katze/katze-http-auth.c:210 +msgid "Authentication Required" +msgstr "" + +#: ../katze/katze-http-auth.c:226 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" + +#: ../katze/katze-http-auth.c:240 +msgid "Username" +msgstr "" + +#: ../katze/katze-http-auth.c:253 +msgid "Password" +msgstr "" + +#: ../katze/katze-http-auth.c:267 +msgid "_Remember password" +msgstr "" + +#: ../katze/katze-throbber.c:949 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:962 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:1042 +msgid "Animation frames are broken" +msgstr "" + +#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "" + +#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 +msgid "Choose file" +msgstr "" + +#: ../katze/katze-utils.c:506 +msgid "Choose folder" +msgstr "" + +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "" + +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 +#, c-format +msgid "Preferences for %s" +msgstr "" + +#: ../extensions/adblock.c:473 +msgid "Configure Advertisement filters" +msgstr "" + +#: ../extensions/adblock.c:504 +#, 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:882 +msgid "Edit rule" +msgstr "" + +#: ../extensions/adblock.c:896 +msgid "_Rule:" +msgstr "" + +#: ../extensions/adblock.c:950 +msgid "Bl_ock image" +msgstr "" + +#: ../extensions/adblock.c:955 +msgid "Bl_ock link" +msgstr "" + +#: ../extensions/adblock.c:1670 +msgid "Advertisement blocker" +msgstr "" + +#: ../extensions/adblock.c:1671 +msgid "Block advertisements according to a filter list" +msgstr "" + +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 +msgid "Userscripts" +msgstr "" + +#: ../extensions/addons.c:324 ../extensions/addons.c:683 +msgid "Userstyles" +msgstr "" + +#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "" + +#: ../extensions/addons.c:421 +#, c-format +msgid "Do you want to delete '%s'?" +msgstr "" + +#: ../extensions/addons.c:427 +msgid "Delete user script" +msgstr "" + +#: ../extensions/addons.c:428 +msgid "Delete user style" +msgstr "" + +#: ../extensions/addons.c:431 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "" + +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "" + +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "" + +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "" + +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "" + +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 +msgid "User addons" +msgstr "" + +#: ../extensions/addons.c:1826 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "" + +#: ../extensions/addons.c:1915 +msgid "Support for userscripts and userstyles" +msgstr "" + +#: ../extensions/colorful-tabs.c:201 +msgid "Colorful Tabs" +msgstr "" + +#: ../extensions/colorful-tabs.c:202 +msgid "Tint each tab distinctly" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 +msgid "Cookie Manager" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:103 +msgid "Delete All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:105 +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:120 +msgid "Expand All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:127 +msgid "Collapse All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:572 +msgid "Do you really want to delete all cookies?" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:574 +msgid "Question" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:583 +msgid "Only cookies which match the filter will be deleted." +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:671 +msgid "At the end of the session" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:680 +msgid "Yes" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:680 +msgid "No" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#, c-format +msgid "" +"Domain: %s\n" +"Cookies: %d" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 +msgid "Name" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +msgid "_Expand All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 +msgid "_Collapse All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +msgid "Filter:" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" + +#: ../extensions/cookie-manager/main.c:36 +msgid "List, view and delete cookies" +msgstr "" + +#: ../extensions/copy-tabs.c:38 +msgid "Copy Tab _Addresses" +msgstr "" + +#: ../extensions/copy-tabs.c:95 +msgid "Copy Addresses of Tabs" +msgstr "" + +#: ../extensions/copy-tabs.c:96 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "" + +#: ../extensions/feed-panel/feed-atom.c:209 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-atom.c:315 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "" + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:387 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:653 +msgid "Feeds" +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:706 +msgid "Add new feed" +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:713 +msgid "Delete feed" +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:795 +msgid "_Feeds" +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:195 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:235 +#, c-format +msgid "Unsupported feed format." +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:265 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:148 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:248 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/main.c:131 +#, c-format +msgid "Feed '%s' already exists" +msgstr "" + +#: ../extensions/feed-panel/main.c:208 +#, c-format +msgid "Error loading feed '%s'" +msgstr "" + +#: ../extensions/feed-panel/main.c:518 +msgid "Feed Panel" +msgstr "" + +#: ../extensions/feed-panel/main.c:519 +msgid "Read Atom/ RSS feeds" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:39 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "" + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:669 +msgid "Stores history of entered form data" +msgstr "" + +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#, c-format +msgid "Failed to select suggestions\n" +msgstr "" + +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "" + +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "" + +#: ../extensions/history-list.vala:569 +msgid "History List" +msgstr "" + +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "" + +#: ../extensions/mouse-gestures.c:301 +msgid "Mouse Gestures" +msgstr "" + +#: ../extensions/mouse-gestures.c:302 +msgid "Control Midori by moving the mouse" +msgstr "" + +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "" + +#: ../extensions/shortcuts.c:176 +msgid "Customize Keyboard shortcuts" +msgstr "" + +#: ../extensions/shortcuts.c:283 +msgid "Customize Sh_ortcuts..." +msgstr "" + +#: ../extensions/shortcuts.c:320 +msgid "Shortcuts" +msgstr "" + +#: ../extensions/shortcuts.c:321 +msgid "View and edit keyboard shortcuts" +msgstr "" + +#: ../extensions/status-clock.c:174 +msgid "Statusbar Clock" +msgstr "" + +#: ../extensions/status-clock.c:175 +msgid "Display date and time in the statusbar" +msgstr "" + +#: ../extensions/statusbar-features.c:131 +msgid "Images" +msgstr "" + +#: ../extensions/statusbar-features.c:140 +msgid "Scripts" +msgstr "" + +#: ../extensions/statusbar-features.c:151 +msgid "Netscape plugins" +msgstr "" + +#: ../extensions/statusbar-features.c:199 +msgid "Statusbar Features" +msgstr "" + +#: ../extensions/statusbar-features.c:200 +msgid "Easily toggle features on web pages on and off" +msgstr "" + +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 +msgid "Tab Panel" +msgstr "" + +#: ../extensions/tab-panel.c:663 +msgid "T_ab Panel" +msgstr "" + +#: ../extensions/tab-panel.c:681 +msgid "Show tabs in a vertical panel" +msgstr "" + +#: ../extensions/tabs-minimized.c:76 +msgid "Only Icons on Tabs by default" +msgstr "" + +#: ../extensions/tabs-minimized.c:77 +msgid "New tabs have no label by default" +msgstr "" + +#: ../extensions/toolbar-editor.c:393 +msgid "Customize Toolbar" +msgstr "" + +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" + +#: ../extensions/toolbar-editor.c:425 +msgid "Available Items" +msgstr "" + +#: ../extensions/toolbar-editor.c:446 +msgid "Displayed Items" +msgstr "" + +#: ../extensions/toolbar-editor.c:581 +msgid "Customize _Toolbar..." +msgstr "" + +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "" + +#: ../extensions/toolbar-editor.c:627 +msgid "Toolbar Editor" +msgstr "" + +#: ../extensions/toolbar-editor.c:628 +msgid "Easily edit the toolbar layout" +msgstr "" + +#: ../extensions/web-cache.c:463 +msgid "Cache HTTP communication on disk" +msgstr "" diff -Nru midori-0.2.8/po/ca.po midori-0.4.6/po/ca.po --- midori-0.2.8/po/ca.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/ca.po 2012-05-14 22:13:42.000000000 +0000 @@ -2,105 +2,147 @@ # Traduccions al català del paquet «midori». # 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-2010. +# Pol Ruzafa , 2011. +# Carles Muñoz Gorriz , 2009-2010, 2012. # Harald Servat , 2009. -# +# msgid "" msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-31 10:08+0000\n" -"PO-Revision-Date: 2010-08-31 16:51+0100\n" +"POT-Creation-Date: 2012-05-02 05:45+0000\n" +"PO-Revision-Date: 2012-03-31 19:16+0100\n" "Last-Translator: Carles Muñoz Gorriz \n" "Language-Team: Catalan\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: Catalan\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Language: Catalan\n" "X-Poedit-SourceCharset: utf-8\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Navegador web lleuger" +msgid "Browse the Web" +msgstr "Navega la web" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 -#: ../midori/main.c:1665 ../midori/main.c:1681 -#: ../midori/midori-websettings.c:312 +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "Internet;WWW;Explorador" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072 +#: ../midori/main.c:2086 ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Navegador web" -#: ../midori/main.c:99 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Navegació privada de Midori" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Obre una finestra de navegació privada" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164 +msgid "Private Browsing" +msgstr "Navegació privada" + +#: ../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:148 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "El valor «%s» no és vàlid per %s" -#: ../midori/main.c:155 ../midori/main.c:241 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valor de configuració «%s» no és vàlid" -#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 +#: ../midori/main.c:380 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "No s'han pogut carregar els motors de cerca. %s\n" + +#: ../midori/main.c:434 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "No s'ha pogut buidar l'historial: %s\n" + +#: ../midori/main.c:454 ../midori/main.c:581 +#: ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" msgstr "No s'ha pogut obrir la base de dades: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:424 +#: ../midori/main.c:524 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "No s'han pogut eliminar els elements antics de l'historial: %s\n" -#: ../midori/main.c:455 ../panels/midori-history.c:169 -#: ../panels/midori-history.c:199 +#: ../midori/main.c:564 ../panels/midori-history.c:232 #, c-format msgid "Failed to remove history item: %s\n" msgstr "No s'ha pogut eliminar un element de l'historial: %s\n" -#: ../midori/main.c:500 +#: ../midori/main.c:611 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "No s'han pogut desar les adreces d'interès. %s" -#: ../midori/main.c:528 +#: ../midori/main.c:633 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "No s'ha pogut desar la configuració: %s" -#: ../midori/main.c:566 +#: ../midori/main.c:668 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "No es pot desar les enginys de cerca. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:586 ../midori/main.c:609 +#: ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" msgstr "No s'han pogut desar les escombraries. %s" -#: ../midori/main.c:668 ../midori/main.c:908 +#: ../midori/main.c:746 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Extensions" + +#: ../midori/main.c:760 +msgid "Privacy" +msgstr "Privacitat" + +#: ../midori/main.c:772 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"Les galetes emmgatzemen dades d'entrada, partides desades o perfils d'usuari " +"per a fins publicitaris." + +#: ../midori/main.c:828 #, c-format msgid "The session couldn't be saved. %s" msgstr "No s'ha pogut desar la sessió. %s" -#: ../midori/main.c:852 +#: ../midori/main.c:1046 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" "No es disposa del certificat arrel. Els certificats SSL no es poden " "verificar." -#: ../midori/main.c:942 +#: ../midori/main.c:1115 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." @@ -109,256 +151,379 @@ "ocorregut repetidament, proveu una de les següents opcions per a resoldre el " "problema." -#: ../midori/main.c:957 +#: ../midori/main.c:1134 msgid "Modify _preferences" msgstr "Modificació de les _preferències" -#: ../midori/main.c:961 -msgid "Reset the last _session" -msgstr "Reiniciar la darrera _sessió" - -#: ../midori/main.c:966 +#: ../midori/main.c:1138 msgid "Disable all _extensions" msgstr "Inhabilita totes les _extensions" -#: ../midori/main.c:1206 ../midori/main.c:1952 +#: ../midori/main.c:1151 +msgid "Discard old tabs" +msgstr "Descarta pestanyes velles" + +#: ../midori/main.c:1152 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "Mostra les darreres pestanyes sense carregar-les" + +#: ../midori/main.c:1153 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "Mostra les pestanyes obertes recentment" + +#: ../midori/main.c:1400 ../midori/main.c:2464 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar la sessió: %s\n" -#: ../midori/main.c:1328 -msgid "No filename specified" -msgstr "No s'ha especificat un nom de fitxer" - -#: ../midori/main.c:1347 -msgid "An unknown error occured." -msgstr "Ha ocorregut un error desconegut." - -#: ../midori/main.c:1378 +#: ../midori/main.c:1538 #, c-format msgid "Snapshot saved to: %s\n" msgstr "S'ha desat una captura a: %s\n" -#: ../midori/main.c:1550 +#: ../midori/main.c:1951 msgid "Run ADDRESS as a web application" msgstr "Executa ADREÇA com una aplicació web" -#: ../midori/main.c:1550 +#: ../midori/main.c:1951 msgid "ADDRESS" msgstr "ADREÇA" -#: ../midori/main.c:1553 +#: ../midori/main.c:1954 msgid "Use FOLDER as configuration folder" msgstr "Empra CARPETA com a carpeta de configuració" -#: ../midori/main.c:1553 +#: ../midori/main.c:1954 msgid "FOLDER" msgstr "CARPETA" -#: ../midori/main.c:1556 +#: ../midori/main.c:1957 +msgid "Private browsing, no changes are saved" +msgstr "Navegació privada, els canvis no es desaran" + +#: ../midori/main.c:1959 msgid "Show a diagnostic dialog" msgstr "Mostra el diàleg de diagnosis" -#: ../midori/main.c:1558 +#: ../midori/main.c:1961 msgid "Run the specified filename as javascript" msgstr "Executa el fitxer especificat com a javascript" -#: ../midori/main.c:1561 +#: ../midori/main.c:1963 msgid "Take a snapshot of the specified URI" msgstr "Fes una captura de la ubicació especificada" -#: ../midori/main.c:1564 +#: ../midori/main.c:1965 msgid "Execute the specified command" msgstr "Executar la comanda especificada" -#: ../midori/main.c:1566 +#: ../midori/main.c:1967 +msgid "List available commands to execute with -e/ --execute" +msgstr "Llista de comandes disponibles per a executar amb -e/--execute" + +#: ../midori/main.c:1969 msgid "Display program version" msgstr "Mostra la versió del programa" -#: ../midori/main.c:1568 +#: ../midori/main.c:1971 msgid "Addresses" msgstr "Adreces" -#: ../midori/main.c:1570 +#: ../midori/main.c:1973 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquejar URIs segons l'expressió regular PATRÓ" -#: ../midori/main.c:1570 +#: ../midori/main.c:1973 msgid "PATTERN" msgstr "PATRÓ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1574 +#: ../midori/main.c:1977 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Reiniciar Midori després de SEGONS d'activitat" -#: ../midori/main.c:1574 +#: ../midori/main.c:1977 msgid "SECONDS" msgstr "SEGONS" -#: ../midori/main.c:1654 +#: ../midori/main.c:1980 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Redirigeix les alertes de consola a l'ARXIU especificat" + +#: ../midori/main.c:1980 +msgid "FILENAME" +msgstr "ARXIU" + +#: ../midori/main.c:2045 msgid "[Addresses]" msgstr "[adreces]" -#: ../midori/main.c:1682 +#: ../midori/main.c:2087 msgid "Please report comments, suggestions and bugs to:" msgstr "Envieu comentaris, suggeriments i informes d'error a:" -#: ../midori/main.c:1684 +#: ../midori/main.c:2089 msgid "Check for new versions at:" msgstr "Comprova si hi ha noves versions a:" -#: ../midori/main.c:1801 -msgid "The specified configuration folder is invalid." -msgstr "La carpeta de configuració especificada és invalida." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2173 +msgid "Saved logins and _passwords" +msgstr "Noms d'usuari i contra_senyes guardats" + +#: ../midori/main.c:2175 +msgid "Cookies and Website data" +msgstr "Galetes i informació de llocs web" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2179 ../midori/midori-websettings.c:996 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Memòria cau Web" + +#: ../midori/main.c:2182 +msgid "Website icons" +msgstr "Icones de llocs webs" + +#: ../midori/main.c:2288 +msgid "An unknown error occured" +msgstr "S'ha produït un error desconegut" -#: ../midori/main.c:1849 +#: ../midori/main.c:2395 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:1904 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "No s'han pogut carregar els motors de cerca. %s\n" - -#: ../midori/main.c:1925 +#: ../midori/main.c:2431 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar les adreces d'interès: %s\n" -#: ../midori/main.c:1967 +#: ../midori/main.c:2479 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "No s'han pogut carregar les escombraries: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:2492 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar l'historial: %s\n" -#: ../midori/main.c:1994 +#: ../midori/main.c:2508 msgid "The following errors occured:" msgstr "S'han produït els següents errors:" -#: ../midori/main.c:2010 +#: ../midori/main.c:2524 msgid "_Ignore" msgstr "_Ignora" -#: ../midori/midori-array.c:429 +#: ../midori/midori-app.c:1334 +msgid "_Bookmark" +msgstr "_Adreça d'interès" + +#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060 +msgid "_Bookmarks" +msgstr "_Adreces d'interès" + +#: ../midori/midori-app.c:1336 +msgid "Add Boo_kmark" +msgstr "Afegeix adreça d'_interès" + +#: ../midori/midori-app.c:1337 +msgid "_Console" +msgstr "_Consola" + +#: ../midori/midori-app.c:1338 +msgid "_Extensions" +msgstr "_Extensions" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589 +msgid "_History" +msgstr "_Historial" + +#: ../midori/midori-app.c:1340 +msgid "_Homepage" +msgstr "_Pàgina d'inici" + +#: ../midori/midori-app.c:1341 +msgid "_Userscripts" +msgstr "Scripts d'_usuari" + +#: ../midori/midori-app.c:1342 +msgid "New _Tab" +msgstr "Nova _pestanya" + +#: ../midori/midori-app.c:1343 +msgid "_Transfers" +msgstr "_Transferències" + +#: ../midori/midori-app.c:1344 +msgid "Netscape p_lugins" +msgstr "_Connectors de Netscape" + +#: ../midori/midori-app.c:1345 +msgid "_Closed Tabs" +msgstr "Pestanyes _tancades" + +#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216 +msgid "New _Window" +msgstr "Nova _finestra" + +#: ../midori/midori-app.c:1347 +msgid "New _Folder" +msgstr "Nova _carpeta" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "No s'ha trobat el fitxer." -#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 -#: ../midori/midori-array.c:496 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Document format erròniament." -#: ../midori/midori-array.c:505 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "No es reconeix el format de l'adreça d'interès." -#: ../midori/midori-array.c:719 +#: ../midori/midori-array.c:915 msgid "Writing failed." msgstr "Ha fallat l'escriptura" -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 -#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298 +#: ../midori/midori-browser.c:5307 msgid "Reload the current page" msgstr "Actualitza la pàgina actual" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 +#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304 msgid "Stop loading the current page" msgstr "Atura la càrrega d'aquesta pàgina" -#: ../midori/midori-browser.c:453 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% carregat" - -#: ../midori/midori-browser.c:491 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" msgstr "No s'ha pogut actualitzar el títol: %s\n" -#: ../midori/midori-browser.c:504 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." msgstr "Acció inesperada «%s»." -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:569 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Navegació privada)" + +#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716 +msgid "Toplevel folder" +msgstr "Carpeta de nivell superior" + +#: ../midori/midori-browser.c:774 msgid "New folder" msgstr "Nova carpeta" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:774 msgid "Edit folder" msgstr "Edita la carpeta" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "New bookmark" msgstr "Nova adreça d'interès" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "Edit bookmark" msgstr "Edita l'adreça d'interès" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:818 msgid "_Title:" msgstr "_Títol:" -#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "_Descripció:" - -#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Adreça:" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326 msgid "_Folder:" msgstr "_Carpeta:" -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 -#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 -msgid "Toplevel folder" -msgstr "Carpeta de nivell superior" - -#: ../midori/midori-browser.c:872 +#: ../midori/midori-browser.c:877 msgid "Add to _Speed Dial" -msgstr "Afegeix al _marcador ràpid" +msgstr "Afegeix al _velocímetre" -#: ../midori/midori-browser.c:885 +#: ../midori/midori-browser.c:890 msgid "Show in the tool_bar" msgstr "Mostra a la _barra d'eines" -#: ../midori/midori-browser.c:900 +#: ../midori/midori-browser.c:905 msgid "Run as _web application" msgstr "Executa com una aplicació _web" -#: ../midori/midori-browser.c:979 +#: ../midori/midori-browser.c:976 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "No es pot desar el fitxer «%s» en aquesta carpeta." + +#: ../midori/midori-browser.c:978 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "No teniu permís per a escriure en aquesta ubicació." + +#: ../midori/midori-browser.c:985 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "No hi ha prou espai lliure per descarregat «%s»." -#: ../midori/midori-browser.c:983 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "Al fitxer li cal %s però només resten %s lliures." -#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 -#: ../midori/midori-browser.c:4085 +#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395 msgid "Save file as" msgstr "Anomena i desa" -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1320 +msgid "New Window" +msgstr "Nova finestra" + +#: ../midori/midori-browser.c:1320 +msgid "A new window has been opened" +msgstr "Una nova finestra s'ha obert" + +#: ../midori/midori-browser.c:1323 +msgid "New Tab" +msgstr "Nova pestanya" + +#: ../midori/midori-browser.c:1323 +msgid "A new tab has been opened" +msgstr "S'ha obert una pestanya nova" + +#: ../midori/midori-browser.c:1358 +msgid "Error opening the image!" +msgstr "S'ha produït un error al obrir la imatge!" + +#: ../midori/midori-browser.c:1359 +msgid "Can not open selected image in a default viewer." +msgstr "No s'ha pogut obrir la imatge seleccionada en el visor per defecte." + +#: ../midori/midori-browser.c:1365 +msgid "Error downloading the image!" +msgstr "Error en descarregar la imatge!" + +#: ../midori/midori-browser.c:1366 +msgid "Can not download selected image." +msgstr "No es pot descarregar la imatge seleccionada." + +#: ../midori/midori-browser.c:1492 msgid "Save file" msgstr "Desa el fitxer" -#: ../midori/midori-browser.c:2150 +#: ../midori/midori-browser.c:2367 msgid "Open file" msgstr "Obre un fitxer" -#: ../midori/midori-browser.c:2228 +#: ../midori/midori-browser.c:2499 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -373,147 +538,141 @@ "agregador de notícies. El proper cop que cliqueu a la icona de les notícies, " "s'agregarà automàticament." -#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nou canal" -#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 -#: ../panels/midori-bookmarks.c:406 +#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "Afegeix una adreça d'interès" -#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "No s'ha pogut executar el programa extern." +#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "Buit" -#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:3467 +msgid "Toggle text cursor navigation" +msgstr "Canvia el cursor de la navegació de text" + +#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "No s'ha pogut afegir un element nou de l'historial: %s\n" -#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:734 +#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 msgid "Open all in _Tabs" msgstr "Obre-ho tot en _pestanyes" -#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 -#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Obre l'enllaç en una _pestanya nova" -#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 -#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657 +#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Obre en una _finestra nova" # Nom d'un navegador web. -#: ../midori/midori-browser.c:3931 +#: ../midori/midori-browser.c:4213 msgid "Arora" msgstr "Arora" # Nom d'un navegador web japonès -#: ../midori/midori-browser.c:3932 +#: ../midori/midori-browser.c:4214 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:4215 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:4216 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3935 +#: ../midori/midori-browser.c:4217 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3959 +#: ../midori/midori-browser.c:4218 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4239 msgid "Import bookmarks..." msgstr "Importa les adreces d'interès…" -#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372 msgid "_Import bookmarks" msgstr "_Importa les adreces d'interès" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:4253 msgid "_Application:" msgstr "_Aplicació:" -#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 -#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 -#: ../katze/katze-utils.c:696 -msgid "Custom..." -msgstr "Personalitzat…" +#: ../midori/midori-browser.c:4318 +msgid "Import from XBEL or HTML file" +msgstr "Importa d'unn fitxer XBEL o HTML" + +#: ../midori/midori-browser.c:4353 +msgid "Import from a file" +msgstr "Importar d'un fitxer" -#: ../midori/midori-browser.c:4061 +#: ../midori/midori-browser.c:4365 msgid "Failed to import bookmarks" msgstr "No s'han pogut importar les adreces d'interès" -#: ../midori/midori-browser.c:4102 +#: ../midori/midori-browser.c:4400 +msgid "XBEL Bookmarks" +msgstr "Adreces d'interès XBEL" + +#: ../midori/midori-browser.c:4405 +msgid "Netscape Bookmarks" +msgstr "Adreces d'interés Netscape" + +#: ../midori/midori-browser.c:4419 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "Midori només pot exportar a XBEL (*.xbel) i Netscape (*.html)" + +#: ../midori/midori-browser.c:4434 msgid "Failed to export bookmarks" msgstr "No s'han pogut exportar les adreces d'interès" -#: ../midori/midori-browser.c:4155 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "No s'ha pogut buidar l'historial: %s\n" - -#: ../midori/midori-browser.c:4163 -#, c-format -msgid "Failed to clear search history: %s\n" -msgstr "No s'ha pogut buidar l'historial de cerques: %s\n" - #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4270 +#: ../midori/midori-browser.c:4556 msgid "Clear Private Data" msgstr "Neteja les dades privades" -#: ../midori/midori-browser.c:4274 +#: ../midori/midori-browser.c:4560 msgid "_Clear private data" msgstr "_Neteja les dades privades" -#: ../midori/midori-browser.c:4288 +#: ../midori/midori-browser.c:4573 msgid "Clear the following data:" msgstr "Neteja les següents dades" -#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:114 -msgid "History" -msgstr "Historial" - -#: ../midori/midori-browser.c:4303 -msgid "Cookies" -msgstr "Galetes" - -#: ../midori/midori-browser.c:4308 -msgid "'Flash' Cookies" -msgstr "Galetes «Flash»" - -#: ../midori/midori-browser.c:4313 -msgid "Website icons" -msgstr "Icones de llocs webs" - -#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 -msgid "_Closed Tabs" -msgstr "Pestanyes _tancades" - -#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "Memòria cau Web" +#: ../midori/midori-browser.c:4583 +msgid "Last open _tabs" +msgstr "Mostra les darreres _pestanyes obertes" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4609 msgid "Clear private data when _quitting Midori" msgstr "Neteja les dades provades al _sortir de Midori" -#: ../midori/midori-browser.c:4472 +#: ../midori/midori-browser.c:4804 msgid "A lightweight web browser." msgstr "Un navegador de pàgines web lleuger." -#: ../midori/midori-browser.c:4474 +#: ../midori/midori-browser.c:4805 +msgid "See about:version for version info." +msgstr "Vegeu Quant a:version per a informació de la versió." + +#: ../midori/midori-browser.c:4807 msgid "" "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 " @@ -525,636 +684,490 @@ "publicat per la Free Software Foundation; ja sigui a la versió 2.1, o " "(segons la vostra tria) versió posterior." -#: ../midori/midori-browser.c:4493 +#: ../midori/midori-browser.c:4828 msgid "translator-credits" msgstr "" "Carles Muñoz Gorriz , 2009-2010.\n" "Harald Servat , 2009." -#: ../midori/midori-browser.c:4802 +#: ../midori/midori-browser.c:5214 msgid "_File" msgstr "_Fitxer" -#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 -msgid "New _Window" -msgstr "Nova _finestra" - -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:5217 msgid "Open a new window" msgstr "Obre una finestra nova" -#: ../midori/midori-browser.c:4808 +#: ../midori/midori-browser.c:5220 msgid "Open a new tab" msgstr "Obre una pestanya nova" -#: ../midori/midori-browser.c:4810 -msgid "P_rivate Browsing" -msgstr "Navegació p_rivada" - -#: ../midori/midori-browser.c:4811 -msgid "Don't save any private data while browsing" -msgstr "No desar qualsevol mena de dada privada mentre es navega" +#: ../midori/midori-browser.c:5222 +msgid "New P_rivate Browsing Window" +msgstr "Nova finestra de navegació p_rivada" -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:5226 msgid "Open a file" msgstr "Obre un fitxer" -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:5228 +msgid "_Save Page As..." +msgstr "_Desa pàgina com..." + +#: ../midori/midori-browser.c:5229 msgid "Save to a file" msgstr "Desa en un fitxer" -#: ../midori/midori-browser.c:4820 +#: ../midori/midori-browser.c:5231 msgid "Add to Speed _dial" -msgstr "Afegeix al _marcador ràpid" - -#: ../midori/midori-browser.c:4821 -msgid "Add shortcut to speed dial" -msgstr "Afegeix drecera al marcador ràpid" +msgstr "Afegeix al _velocímetre" -#: ../midori/midori-browser.c:4823 +#: ../midori/midori-browser.c:5235 msgid "Add Shortcut to the _desktop" msgstr "Afegeix drecera a l'_escriptori" -#: ../midori/midori-browser.c:4824 -msgid "Add shortcut to the desktop" -msgstr "Afegeix drecera a l'escriptori" +#: ../midori/midori-browser.c:5237 +msgid "Create _Launcher" +msgstr "Crea _Llançador" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:5241 msgid "Subscribe to News _feed" msgstr "Subscriure's a un _canal de notícies" -#: ../midori/midori-browser.c:4827 -msgid "Subscribe to this news feed" -msgstr "Subscriure's a aquest canal de notícies" - -#: ../midori/midori-browser.c:4832 +#: ../midori/midori-browser.c:5247 msgid "_Close Tab" msgstr "Tan_ca la pestanya" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:5248 msgid "Close the current tab" msgstr "Tanca la pestanya actual" -#: ../midori/midori-browser.c:4835 +#: ../midori/midori-browser.c:5250 msgid "C_lose Window" msgstr "_Tanca la finestra" -#: ../midori/midori-browser.c:4836 -msgid "Close this window" -msgstr "Tanca aquesta finestra" - -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:5254 msgid "Print the current page" msgstr "Imprimeix la pàgina actual" -#: ../midori/midori-browser.c:4842 -msgid "Quit the application" -msgstr "Surt de l'aplicació" +#: ../midori/midori-browser.c:5256 +msgid "Close a_ll Windows" +msgstr "Tanc_a totes la finestra" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:5259 msgid "_Edit" msgstr "_Edita" -#: ../midori/midori-browser.c:4848 -msgid "Undo the last modification" -msgstr "Desfés la darrera modificació" - -#: ../midori/midori-browser.c:4851 -msgid "Redo the last modification" -msgstr "Refés la darrera modifcació" - -#: ../midori/midori-browser.c:4855 -msgid "Cut the selected text" -msgstr "Talla el text seleccionat" - -#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 -msgid "Copy the selected text" -msgstr "Copia el text seleccionat al porta-retalls" - -#: ../midori/midori-browser.c:4864 -msgid "Paste text from the clipboard" -msgstr "Enganxa el text al porta-retalls" - -#: ../midori/midori-browser.c:4867 -msgid "Delete the selected text" -msgstr "Suprimeix el text seleccionat" - -#: ../midori/midori-browser.c:4870 -msgid "Select all text" -msgstr "Selecciona tot el text" +#: ../midori/midori-browser.c:5282 +msgid "_Find..." +msgstr "_Cerca…" -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:5283 msgid "Find a word or phrase in the page" msgstr "Cerca una paraula o frase a la pàgina" -#: ../midori/midori-browser.c:4875 +#: ../midori/midori-browser.c:5285 msgid "Find _Next" msgstr "Cerca el _següent" -#: ../midori/midori-browser.c:4876 -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:4878 +#: ../midori/midori-browser.c:5288 msgid "Find _Previous" msgstr "Cerca l'_anterior" -#: ../midori/midori-browser.c:4879 -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:4883 +#: ../midori/midori-browser.c:5292 msgid "Configure the application preferences" msgstr "Canvia les preferències de l'aplicació" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:5294 msgid "_View" msgstr "_Visualitza" -#: ../midori/midori-browser.c:4886 +#: ../midori/midori-browser.c:5295 msgid "_Toolbars" msgstr "Barres d'e_ines" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:5300 +msgid "Reload page without caching" +msgstr "Carrega la pàgina sense emmagatzematge en memòria cau" + +#: ../midori/midori-browser.c:5310 msgid "Increase the zoom level" msgstr "Augmenta el nivell d'ampliació" -#: ../midori/midori-browser.c:4901 +#: ../midori/midori-browser.c:5313 msgid "Decrease the zoom level" msgstr "Disminueix el nivell d'ampliació" -#: ../midori/midori-browser.c:4904 -msgid "Reset the zoom level" -msgstr "Reiniciar el nivell d'ampliació" - -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:5317 msgid "_Encoding" msgstr "_Codificació" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:5319 msgid "View So_urce" msgstr "Veure codi _font" -#: ../midori/midori-browser.c:4908 -msgid "View the source code of the page" -msgstr "Veure el codi font de la pàgina" +#: ../midori/midori-browser.c:5322 +msgid "Ca_ret Browsing" +msgstr "Navegació p_rivada" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:5326 msgid "Toggle fullscreen view" msgstr "Commuta la vista a pantalla completa" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:5328 msgid "Scroll _Left" msgstr "Desplaçament _esquerra" -#: ../midori/midori-browser.c:4915 -msgid "Scroll to the left" -msgstr "Desplaçar cap a l'esquerra" - -#: ../midori/midori-browser.c:4917 +#: ../midori/midori-browser.c:5331 msgid "Scroll _Down" msgstr "Desplaçament a_vall" -#: ../midori/midori-browser.c:4918 -msgid "Scroll down" -msgstr "Desplaçar cap avall" - -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:5334 msgid "Scroll _Up" msgstr "Desplaçament _amunt" -#: ../midori/midori-browser.c:4921 -msgid "Scroll up" -msgstr "Desplaçar cap amunt" - -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:5337 msgid "Scroll _Right" msgstr "Desplaçament _dreta" -#: ../midori/midori-browser.c:4924 -msgid "Scroll to the right" -msgstr "Desplaçament cap a la dreta" - -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:5340 msgid "_Go" msgstr "Vé_s" -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:5343 msgid "Go back to the previous page" msgstr "Torna a la pàgina anterior" -#: ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:5346 msgid "Go forward to the next page" msgstr "Avança a la pàgina següent" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4937 +#: ../midori/midori-browser.c:5350 msgid "Go to the previous sub-page" msgstr "Torna al apartat anterior de la pàgina" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:5354 msgid "Go to the next sub-page" msgstr "Avança al apartat següent de la pàgina" -#: ../midori/midori-browser.c:4944 +#: ../midori/midori-browser.c:5357 msgid "Go to your homepage" msgstr "Va a la vostre pàgina d'inici" -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:5359 msgid "Empty Trash" msgstr "Buida la paperera" -#: ../midori/midori-browser.c:4947 -msgid "Delete the contents of the trash" -msgstr "Esborra tot el contingut de la paperera" - -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:5362 msgid "Undo _Close Tab" msgstr "Desfés _tanca pestanya" -#: ../midori/midori-browser.c:4950 -msgid "Open the last closed tab" -msgstr "Obre la darrera pestanya tancada" - -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:5369 msgid "Add a new _folder" msgstr "Afegeix una _carpeta" -#: ../midori/midori-browser.c:4957 -msgid "Add a new bookmark folder" -msgstr "Afegeix una carpeta d'adreces d'interès" - -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:5375 msgid "_Export bookmarks" msgstr "_Exporta les adreces d'interès" -#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Gestiona els ginys de cerca" -#: ../midori/midori-browser.c:4966 -msgid "Add, edit and remove search engines..." -msgstr "Afegeix, edita o treu ginys de cerca…" - -#: ../midori/midori-browser.c:4969 +#: ../midori/midori-browser.c:5381 msgid "_Clear Private Data" msgstr "_Neteja les dades privades" -#: ../midori/midori-browser.c:4970 -msgid "Clear private data..." -msgstr "Neteja les dades privades…" - -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:5384 msgid "_Inspect Page" msgstr "_Inspecciona la pàgina" -#: ../midori/midori-browser.c:4975 -msgid "Inspect page details and access developer tools..." -msgstr "" -"Inspecciona els detalls de la pàgina i accedeix a les eines per " -"desenvolupadors…" - -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:5388 msgid "_Previous Tab" msgstr "_Anterior pestanya" -#: ../midori/midori-browser.c:4981 -msgid "Switch to the previous tab" -msgstr "Canvia a la pestanya anterior" - -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:5391 msgid "_Next Tab" msgstr "_Següent pestanya" -#: ../midori/midori-browser.c:4984 -msgid "Switch to the next tab" -msgstr "Canvia a la pestanya següent" +#: ../midori/midori-browser.c:5393 +msgid "Move Tab _Backward" +msgstr "Mou la Pestanya _Enrera" + +#: ../midori/midori-browser.c:5395 +msgid "_Move Tab Forward" +msgstr "_Mou la Pestanya Endavant" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:5398 msgid "Focus _Current Tab" msgstr "Enfoca la pestanya _actual" -#: ../midori/midori-browser.c:4987 -msgid "Focus the current tab" -msgstr "Enfoca la pestanya actual" - -#: ../midori/midori-browser.c:4989 -msgid "Minimize _Current Tab" -msgstr "Minimitza la pestanya _actual" - -#: ../midori/midori-browser.c:4990 -msgid "Minimize the current tab" -msgstr "Minimitza la pestanya actual" +#: ../midori/midori-browser.c:5401 +msgid "Focus _Next view" +msgstr "Enfoca la _Següent vista" + +#: ../midori/midori-browser.c:5404 +msgid "Only show the Icon of the _Current Tab" +msgstr "Mostra la icona només a la pestanya _actual" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:5407 msgid "_Duplicate Current Tab" msgstr "_Duplica la pestanya actual" -#: ../midori/midori-browser.c:4993 -msgid "Duplicate the current tab" -msgstr "Duplica la pestanya actual" - -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:5410 msgid "Close Ot_her Tabs" msgstr "Tanca la _resta de pestanyes" -#: ../midori/midori-browser.c:4996 -msgid "Close all tabs except the current tab" -msgstr "Tanca totes les pestanyes menys l'actual" - -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5413 msgid "Open last _session" msgstr "Obre la darrera _sessió" -#: ../midori/midori-browser.c:4999 -msgid "Open the tabs saved in the last session" -msgstr "Obre les pestanyes emmagatzemades a la darrera sessió" - -#: ../midori/midori-browser.c:5001 +#: ../midori/midori-browser.c:5416 msgid "_Help" msgstr "A_juda" -#: ../midori/midori-browser.c:5003 -msgid "_Contents" -msgstr "_Continguts" - -#: ../midori/midori-browser.c:5004 -msgid "Show the documentation" -msgstr "Mostra la documentació" - -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:5418 msgid "_Frequent Questions" msgstr "_Preguntes freqüents" -#: ../midori/midori-browser.c:5007 -msgid "Show the Frequently Asked Questions" -msgstr "Mostra les preguntes més freqüents" - -#: ../midori/midori-browser.c:5009 -msgid "_Report a Bug" -msgstr "Informa d'un _error" - -#: ../midori/midori-browser.c:5010 -msgid "Open Midori's bug tracker" -msgstr "Obre el sistema de seguiment d'errors de Midori" - -#: ../midori/midori-browser.c:5013 -msgid "Show information about the program" -msgstr "Mostra la informació sobre aquest programa" +#: ../midori/midori-browser.c:5421 +msgid "_Report a Problem..." +msgstr "Informa d'un _error…" -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:5433 msgid "_Menubar" msgstr "Barra de _menú" -#: ../midori/midori-browser.c:5022 -msgid "Show menubar" -msgstr "Mostra la barra de menú" - -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:5437 msgid "_Navigationbar" msgstr "Barra de _navegació" -#: ../midori/midori-browser.c:5026 -msgid "Show navigationbar" -msgstr "Mostra barra de navegació" - -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5441 msgid "Side_panel" msgstr "_Quadre lateral" -#: ../midori/midori-browser.c:5030 -msgid "Show sidepanel" -msgstr "Mostra el quadre lateral" +#: ../midori/midori-browser.c:5442 +msgid "Sidepanel" +msgstr "Quadre lateral" -#: ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:5445 msgid "_Bookmarkbar" msgstr "Barra d'_adreces d'interès" -#: ../midori/midori-browser.c:5034 -msgid "Show bookmarkbar" -msgstr "Mostra la barra d'adreces d'interès" - -#: ../midori/midori-browser.c:5037 -msgid "_Transferbar" -msgstr "Barra de _transferències" - -#: ../midori/midori-browser.c:5038 -msgid "Show transferbar" -msgstr "Mostra la barra de transferències" - -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:5449 msgid "_Statusbar" msgstr "Barra d'_estat" -#: ../midori/midori-browser.c:5042 -msgid "Show statusbar" -msgstr "Mostra la barra d'estat" - -#: ../midori/midori-browser.c:5050 +#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311 msgid "_Automatic" msgstr "_Automàtic" -#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236 msgid "Chinese (BIG5)" msgstr "Chinese Traditional (Big5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5465 msgid "Japanese (SHIFT__JIS)" msgstr "Japonès (Shift_JIS)" -#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238 msgid "Korean (EUC-KR)" msgstr "Koreà (EUC-KR)" -#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239 msgid "Russian (KOI8-R)" msgstr "Rus (KOI8-R)" -#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "Personalitzat…" + +#: ../midori/midori-browser.c:5985 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5992 msgid "_Location..." msgstr "_Ubicació…" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5994 msgid "Open a particular location" msgstr "Obre una ubicació" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:6016 msgid "_Web Search..." msgstr "Cerca _web…" -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:6018 msgid "Run a web search" msgstr "Executa una cerca web" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:6045 msgid "Reopen a previously closed tab or window" msgstr "Reobre una pestanya o finestra prèviament tancada" -#: ../midori/midori-browser.c:5659 +#: ../midori/midori-browser.c:6062 +msgid "Show the saved bookmarks" +msgstr "Mostra les adreces d'interès desades" + +#: ../midori/midori-browser.c:6079 msgid "_Tools" msgstr "E_ines" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:6095 msgid "_Window" msgstr "Fines_tra" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:6097 msgid "Show a list of all open tabs" msgstr "Mostra una llista de totes les pestanyes obertes" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:6111 msgid "_Menu" msgstr "_Menú" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:6113 msgid "Menu" msgstr "Menú" -#: ../midori/midori-browser.c:6262 +#: ../midori/midori-browser.c:6927 #, c-format msgid "Unexpected setting '%s'" msgstr "Opció inesperada «%s»" -#: ../midori/midori-locationaction.c:390 +#: ../midori/midori-extension.c:329 #, c-format -msgid "Failed to select from history\n" -msgstr "No s'ha pogut seleccionar de l'historial\n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "No s'ha pogut carregar la configuració de l'extensió «%s»: %s\n" -#: ../midori/midori-locationaction.c:474 +#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "Cercar %s" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "No s'ha pogut desar la configuració de l'extensió «%s»: %s\n" -#: ../midori/midori-locationaction.c:497 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "Cerca amb %s" -#: ../midori/midori-locationaction.c:1307 +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Cerca amb…" + +#: ../midori/midori-locationaction.c:537 #, c-format -msgid "Failed to execute database statement\n" -msgstr "No s'ha pogut executar la declaració de base de dades\n" +msgid "Failed to select from history\n" +msgstr "No s'ha pogut seleccionar de l'historial\n" + +#: ../midori/midori-locationaction.c:624 +#, c-format +msgid "Search for %s" +msgstr "Cercar %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1363 +#: ../midori/midori-locationaction.c:1398 msgid "Paste and p_roceed" msgstr "Enganxa i _procedeix" -#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 -msgid "Detach chosen panel from the window" -msgstr "Desenganxar el panell triat de la finestra" +#: ../midori/midori-locationaction.c:1739 +msgid "Not verified" +msgstr "No verificat" + +#: ../midori/midori-locationaction.c:1759 +msgid "Verified and encrypted connection" +msgstr "Verificat i connexió encriptada" + +#: ../midori/midori-locationaction.c:1771 +msgid "Open, unencrypted connection" +msgstr "Connexió oberta i sense encriptació" -#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 -#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" msgstr "Alinear el panell lateral a la dreta" -#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Tanca el quadre" -#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Alinear el panell lateral a l'esquerra" -#: ../midori/midori-panel.c:771 -msgid "Hide operating controls" -msgstr "Oculta els controls d'operació" - -#: ../midori/midori-websettings.c:200 -msgid "Show Blank page" -msgstr "Mostra pàgina en blanc" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "Mostra el velocímetre" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" msgstr "Mostra la pàgina d'inici" -#: ../midori/midori-websettings.c:202 -msgid "Show last open tabs" -msgstr "Mostra les pestanyes obertes recentment" - -#: ../midori/midori-websettings.c:204 -msgid "Show last tabs without loading" -msgstr "Mostra les darreres pestanyes sense carregar-les" - -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:237 msgid "Japanese (SHIFT_JIS)" msgstr "Japonès (Shift_JIS)" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:257 msgid "New tab" msgstr "Nova pestanya" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:258 msgid "New window" msgstr "Nova finestra" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:259 msgid "Current tab" msgstr "Pestanya actual" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:274 msgid "Default" msgstr "Per defecte" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:275 msgid "Icons" msgstr "Icones" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:276 msgid "Small icons" msgstr "Icones petites" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:277 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:278 msgid "Icons and text" msgstr "Icones i text" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:279 msgid "Text beside icons" msgstr "Text sota les icones" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:294 msgid "Automatic (GNOME or environment)" msgstr "Automàtic (GNOME o entorn)" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:295 msgid "HTTP proxy server" msgstr "Servidor intermediari de HTTP" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:296 msgid "No proxy server" msgstr "Sense servidor intermediari" -#: ../midori/midori-websettings.c:295 -msgid "All cookies" -msgstr "Totes les galetes" - -#: ../midori/midori-websettings.c:296 -msgid "Session cookies" -msgstr "Galetes de sessió" - -#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 -msgid "None" -msgstr "Cap" - #: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" @@ -1171,475 +1184,428 @@ msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:400 msgid "Remember last window size" msgstr "Recorda la mida de la darrera finestra" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:401 msgid "Whether to save the last window size" msgstr "Si voleu desar la mida de la finestra" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:409 msgid "Last window width" msgstr "Amplada de la darrera finestra" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:410 msgid "The last saved window width" msgstr "L'amplada emmagatzemada de la darrera finestra" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:418 msgid "Last window height" msgstr "Alçada de la darrera finestra" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:419 msgid "The last saved window height" msgstr "L'alçada emmagatzemada de la darrera finestra" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:444 msgid "Last panel position" msgstr "Posició del darrer panell" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:445 msgid "The last saved panel position" msgstr "La posició emmagatzemada del darrer panell" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:454 msgid "Last panel page" msgstr "Darrera pàgina del panell" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:455 msgid "The last saved panel page" msgstr "La darrera pàgina del panell emmagatzemada" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:463 msgid "Last Web search" msgstr "Darrera cerca a la Web" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:464 msgid "The last saved Web search" msgstr "La darrera cerca a la Web emmagatzemada" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:473 msgid "Show Menubar" msgstr "Mostra la barra de menú" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:474 msgid "Whether to show the menubar" msgstr "Si es mostrarà la barra de menú" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:482 msgid "Show Navigationbar" msgstr "Mostra la barra de navegació" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:483 msgid "Whether to show the navigationbar" msgstr "Si es mostrarà la barra de navegació" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:491 msgid "Show Bookmarkbar" msgstr "Mostra la barra d'adreces d'interès" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:492 msgid "Whether to show the bookmarkbar" msgstr "Si es mostra la barra d'adreces d'interès" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:500 msgid "Show Panel" msgstr "Mostra el quadre" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:501 msgid "Whether to show the panel" msgstr "Si s'ha de mostrar el panell" -#: ../midori/midori-websettings.c:485 -msgid "Show Transferbar" -msgstr "Mostra barra de fransferències" - -#: ../midori/midori-websettings.c:486 -msgid "Whether to show the transferbar" -msgstr "Si es mostrarà la barra de transferències" - -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:509 msgid "Show Statusbar" msgstr "Mostra la barra d'estat" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:510 msgid "Whether to show the statusbar" msgstr "Si es mostrarà la barra d'estat" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:519 msgid "Toolbar Style:" msgstr "Estil de la barra d'eines:" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:520 msgid "The style of the toolbar" msgstr "L'estil de la barra d'eines" -#: ../midori/midori-websettings.c:521 -msgid "Show progress in location entry" -msgstr "Mostrar el progrés a la caixa d'entrada de la localització" - -#: ../midori/midori-websettings.c:522 -msgid "Whether to show loading progress in the location entry" -msgstr "" -"Si voleu mostrar el progrés de la càrrega en la caixa d'entrada de la " -"localització" - -#: ../midori/midori-websettings.c:537 -msgid "Search engines in location completion" -msgstr "Motors de cerca per a completar la cerca" - -#: ../midori/midori-websettings.c:538 -msgid "Whether to show search engines in the location completion" -msgstr "Si es mostraran els motors de cerca a l'hora de completar la cerca" - -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:529 msgid "Toolbar Items" msgstr "Elements de la barra d'eines" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:530 msgid "The items to show on the toolbar" msgstr "Els elements que es mostraran a la barra d'eines" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:538 msgid "Compact Sidepanel" msgstr "Panell lateral compacte" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:539 msgid "Whether to make the sidepanel compact" msgstr "Si s'ha de compactar el panell lateral" -#: ../midori/midori-websettings.c:571 -msgid "Show operating controls of the panel" -msgstr "Mostrar els controls d'operació del panell" - -#: ../midori/midori-websettings.c:572 -msgid "Whether to show the operating controls of the panel" -msgstr "Si s'ha de mostrar els controls d'operació del panell" - -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:554 msgid "Align sidepanel on the right" msgstr "La barra d'estat està a la dreta" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:555 msgid "Whether to align the sidepanel on the right" msgstr "Si s'ha d'alinear el panell lateral a la dreta" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:570 msgid "Open panels in separate windows" msgstr "Obre els quadres en finestres separades" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:571 msgid "Whether to always open panels in separate windows" msgstr "Si s'ha d'obrir els quadres en finestres separades" -#: ../midori/midori-websettings.c:613 +#: ../midori/midori-websettings.c:580 msgid "When Midori starts:" msgstr "Quan Midori s'inicia:" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:581 msgid "What to do when Midori starts" msgstr "Què fer quan Midori s'iniciï" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:590 msgid "Homepage:" msgstr "Pàgina d'inici:" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:591 msgid "The homepage" msgstr "La pàgina d'inici" -#: ../midori/midori-websettings.c:639 +#: ../midori/midori-websettings.c:606 msgid "Show crash dialog" msgstr "Mostra el diàleg de fallades" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:607 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:656 -msgid "Show speed dial in new tabs" -msgstr "Mostrar el marcador ràpid a les noves pestanyes" - -#: ../midori/midori-websettings.c:657 -msgid "Show speed dial in newly opened tabs" -msgstr "Mostrar el marcatge ràpid a les noves pestanyes obertes" - -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:615 msgid "Save downloaded files to:" msgstr "Desar els fitxers descarregats a:" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:616 msgid "The folder downloaded files are saved to" msgstr "El directori on s'emmagatzemaran els fitxers descarregats" -#: ../midori/midori-websettings.c:687 -msgid "Ask for the destination folder" -msgstr "Demanar per la carpeta destí" - -#: ../midori/midori-websettings.c:688 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "Si cal demanar una carpeta destí quan es descarregui un fitxer" - -#: ../midori/midori-websettings.c:707 -msgid "Notify when a transfer has been completed" -msgstr "Informa quan una transferència hagi finalitzat" - -#: ../midori/midori-websettings.c:708 -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:720 -msgid "Download Manager" -msgstr "Gestor de descàrregues" - -#: ../midori/midori-websettings.c:721 -msgid "An external download manager" -msgstr "Un gestor de descàrregues extern" - -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:624 msgid "Text Editor" msgstr "Editor de text" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:625 msgid "An external text editor" msgstr "Un editor de text extern" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:640 msgid "News Aggregator" msgstr "Acumulador de notícies" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:641 msgid "An external news aggregator" msgstr "Un acumulador de notícies extern" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:649 msgid "Location entry Search" msgstr "Ubicació que s'ha de cercar" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:650 msgid "The search to perform inside the location entry" msgstr "La cerca a executar dins l'entrada de la localització" -#: ../midori/midori-websettings.c:763 +#: ../midori/midori-websettings.c:658 msgid "Preferred Encoding" msgstr "La codificació preferida" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:659 msgid "The preferred character encoding" msgstr "Codificació de caràcters preferida" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:669 msgid "Always Show Tabbar" msgstr "Mostra sempre la barra d'eines" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:670 msgid "Always show the tabbar" msgstr "Mostra sempre la barra des pestanyes " -#: ../midori/midori-websettings.c:783 +#: ../midori/midori-websettings.c:683 msgid "Close Buttons on Tabs" msgstr "Mostra el botó de tancar a les pestanyes" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:684 msgid "Whether tabs have close buttons" msgstr "Si les pestanyes tenen botó de tancar" -#: ../midori/midori-websettings.c:792 +#: ../midori/midori-websettings.c:709 msgid "Open new pages in:" msgstr "Obre les noves pàgines a:" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:710 msgid "Where to open new pages" msgstr "On s'han d'obrir les pàgines noves" -#: ../midori/midori-websettings.c:802 -msgid "Open external pages in:" -msgstr "Obre pàgines externes a:" - -#: ../midori/midori-websettings.c:803 -msgid "Where to open externally opened pages" -msgstr "On s'obren de forma externa les pàgines obertes" - -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:719 msgid "Middle click opens Selection" msgstr "Fer clic al botó central del ratolí obre la selecció" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:720 msgid "Load an address from the selection via middle click" msgstr "" "Carregar una adreça des de la selecció mitjançant el botó central del ratolí" -#: ../midori/midori-websettings.c:821 +#: ../midori/midori-websettings.c:728 msgid "Open tabs in the background" -msgstr "Obre pestanyes al fons" +msgstr "Obre pestanyes sense fer-les actives" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:729 msgid "Whether to open new tabs in the background" -msgstr "Si s'ha d'obrir pestanyes al fons" +msgstr "Si s'ha d'obrir pestanyes actives o inactives" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:737 msgid "Open Tabs next to Current" msgstr "Obre les pestanyes al costat de l'actual" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:738 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" "Si obrir les noves pestanyes al costat de la pestanya actual o de l'última" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:746 msgid "Open popups in tabs" msgstr "Obre els missatges emergents en pestanyes" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:747 msgid "Whether to open popup windows in tabs" msgstr "Si s'han d'obrir els missatges emergents dins pestanyes" -#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Carrega les imatges automàticament" -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:758 msgid "Load and display images automatically" msgstr "Carrega i mostra les imatges automàticament" -#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 msgid "Enable scripts" msgstr "Habilita els scripts" -#: ../midori/midori-websettings.c:859 +#: ../midori/midori-websettings.c:766 msgid "Enable embedded scripting languages" msgstr "Habilita els llenguatges d'script incrustats" -#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" msgstr "Habilita els connectors de netscape" -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:774 msgid "Enable embedded Netscape plugin objects" msgstr "Activar els objectes de connexió integrats de Netscape" -#: ../midori/midori-websettings.c:883 -msgid "Enable HTML5 database support" -msgstr "Habilita la compatibilitat amb bases de dades HTML5" +#: ../midori/midori-websettings.c:789 +msgid "Enable Spell Checking" +msgstr "Habilita el corrector ortogràfic" -#: ../midori/midori-websettings.c:884 -msgid "Whether to enable HTML5 database support" +#: ../midori/midori-websettings.c:790 +msgid "Enable spell checking while typing" +msgstr "Activa la comprovació ortogràfica mentre s'escriu" + +#: ../midori/midori-websettings.c:796 +msgid "Enable HTML5 database support" +msgstr "Habilita la compatibilitat amb bases de dades HTML5" + +#: ../midori/midori-websettings.c:797 +msgid "Whether to enable HTML5 database support" msgstr "Si s'habilitat la compatibilitat amb bases de dades HTML5" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:803 msgid "Enable HTML5 local storage support" msgstr "Habilita l'emmagatzematge local HTML5" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:804 msgid "Whether to enable HTML5 local storage support" msgstr "Si s'habilita l'emmagatzematge local HTML5" -#: ../midori/midori-websettings.c:899 +#: ../midori/midori-websettings.c:810 msgid "Enable offline web application cache" msgstr "Habilita la memòria cau d'aplicació de fora de línia" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:811 msgid "Whether to enable offline web application cache" msgstr "Si s'habilita la memòria cau d'aplicació de fora de línia" -#: ../midori/midori-websettings.c:925 +#: ../midori/midori-websettings.c:827 +msgid "Flash window on background tabs" +msgstr "Flaix a la finestra per les pestanyes inactives" + +#: ../midori/midori-websettings.c:828 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "Flaix a la finestra si s'obre una nova pestanya inactiva" + +#: ../midori/midori-websettings.c:836 +msgid "Enable WebGL support" +msgstr "Habilita la compatibilitat WebGL" + +#: ../midori/midori-websettings.c:837 +msgid "Allow websites to use OpenGL rendering" +msgstr "Permet als llocs web d'emprar la renderització OpenGL" + +#: ../midori/midori-websettings.c:863 msgid "Zoom Text and Images" msgstr "Ampliar text i imatges" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:864 msgid "Whether to zoom text and images" msgstr "Si s'han d'ampliar text i imatges" -#: ../midori/midori-websettings.c:941 +#: ../midori/midori-websettings.c:879 msgid "Find inline while typing" msgstr "Buscar en línia mentre s'escriu" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:880 msgid "Whether to automatically find inline while typing" msgstr "Si es buscarà automàticament a mesura que s'escriu" -#: ../midori/midori-websettings.c:957 +#: ../midori/midori-websettings.c:895 msgid "Kinetic scrolling" msgstr "Desplaçament cinètic" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:896 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:966 -msgid "Accept cookies" -msgstr "Accepta galetes" - -#: ../midori/midori-websettings.c:967 -msgid "What type of cookies to accept" -msgstr "Quins tipus de galetes s'accepten" - -#: ../midori/midori-websettings.c:976 -msgid "Maximum cookie age" -msgstr "Edat màxima de la galeta" +#: ../midori/midori-websettings.c:904 +msgid "Delete old Cookies after:" +msgstr "Esborrar les galetes antigues després de:" -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:905 msgid "The maximum number of days to save cookies for" msgstr "El nombre màxim de dies que es guardaran les galetes" -#: ../midori/midori-websettings.c:986 -msgid "Maximum history age" -msgstr "Edat màxima de l'historial" +#: ../midori/midori-websettings.c:921 +msgid "Only accept Cookies from sites you visit" +msgstr "Accepta només galetes de llocs que visiteu" + +#: ../midori/midori-websettings.c:922 +msgid "Block cookies sent by third-party websites" +msgstr "Bloqueja les galetes enviades per llocs webs de tercers" + +#: ../midori/midori-websettings.c:936 +msgid "Delete pages from history after:" +msgstr "Esborra les pàgines de l'historia després de:" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:937 msgid "The maximum number of days to save the history for" msgstr "Caducitat de l'historial" -#: ../midori/midori-websettings.c:995 -msgid "Remember last downloaded files" -msgstr "Recordar els darrers fitxers descarregats" - -#: ../midori/midori-websettings.c:996 -msgid "Whether the last downloaded files are saved" -msgstr "Si els darrers fitxers descarregats s'han d'emmagatzemar" - -#: ../midori/midori-websettings.c:1013 +#: ../midori/midori-websettings.c:952 msgid "Proxy server" msgstr "Servidor intermediari" -#: ../midori/midori-websettings.c:1014 +#: ../midori/midori-websettings.c:953 msgid "The type of proxy server to use" msgstr "Tipus de servidor intermediari a fer servir" -#: ../midori/midori-websettings.c:1023 +#: ../midori/midori-websettings.c:962 msgid "HTTP Proxy Server" msgstr "Servidor intermediari de HTTP" -#: ../midori/midori-websettings.c:1024 +#: ../midori/midori-websettings.c:963 msgid "The proxy server used for HTTP connections" -msgstr "El servidor proxy usat per a les connexions HTTP" +msgstr "El servidor intermediari usat per a les connexions HTTP" + +#: ../midori/midori-websettings.c:978 +msgid "Port" +msgstr "Port" + +#: ../midori/midori-websettings.c:979 +msgid "The proxy server port used for HTTP connections" +msgstr "El servidor intermediari usat per a les connexions HTTP" + +#: ../midori/midori-websettings.c:997 +msgid "The maximum size of cached pages on disk" +msgstr "La mida màximade les pàgines emmagatzemades en memòria cau al disc" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1040 +#: ../midori/midori-websettings.c:1014 msgid "Identify as" msgstr "Identifica'l com a" -#: ../midori/midori-websettings.c:1041 +#: ../midori/midori-websettings.c:1015 msgid "What to identify as to web pages" msgstr "Què identificar com a pàgines web" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1031 msgid "Identification string" msgstr "Cadena de caràcters d'identificació" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1032 msgid "The application identification string" msgstr "La cadena d'identificació d'aplicacions" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1048 msgid "Preferred languages" msgstr "Idiomes preferits" -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:1049 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1647,626 +1613,616 @@ "Un llistat separat per comes d'idiomes preferits per mostrar pàgines web " "multi-idioma, per exemple «ca», «ca,es» o «en-us;q=1.0, fr-fr;q=0.667»" -#: ../midori/midori-websettings.c:1089 +#: ../midori/midori-websettings.c:1064 msgid "Clear private data" msgstr "Esborrar dades privades" -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1065 msgid "The private data selected for deletion" msgstr "La selecció de dades privades per a esborrar" -#. 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:1227 ../midori/midori-view.c:4442 -#: ../midori/midori-view.c:4446 +#: ../midori/midori-websettings.c:1080 +msgid "Clear data" +msgstr "Neteja les dades" + +#: ../midori/midori-websettings.c:1081 +msgid "The data selected for deletion" +msgstr "La dades seleccionada per esborrar" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1130 +msgid "Strip referrer details sent to websites" +msgstr "Treu la informació de referència enviada als llocs webs" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1132 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "" +"Si la capçalera \"Referer\" hauria d'haver estat escurçada al nom del host" + +#: ../midori/midori-websettings.c:1146 +msgid "Always use my font choices" +msgstr "Empra sempre la meva selecció de tipus de lletra" + +#: ../midori/midori-websettings.c:1147 +msgid "Override fonts picked by websites with user preferences" +msgstr "" +"Sobreescriu el tipus de lletra dels llocs webs amb els de les vostres " +"preferències" + +#: ../midori/midori-view.c:1360 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s vol desar una base de dades HTML5." + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Deny" +msgstr "_Denegar" + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Allow" +msgstr "_Permetre" + +#: ../midori/midori-view.c:1392 +#, c-format +msgid "%s wants to know your location." +msgstr "%s vol saber la vostra ubicació." + +#: ../midori/midori-view.c:1485 #, c-format msgid "Error - %s" msgstr "Error - %s" -#: ../midori/midori-view.c:1228 +#: ../midori/midori-view.c:1486 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "No s'ha pogut carregar la pàgina «%s»." -#: ../midori/midori-view.c:1230 +#: ../midori/midori-view.c:1488 msgid "Try again" msgstr "Torneu-ho a provar" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1249 -#, c-format -msgid "Not found - %s" -msgstr "No s'ha trobat «%s»" - -#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 +#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598 #, c-format msgid "Send a message to %s" msgstr "Enviar un missatge a %s" -#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 +#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747 msgid "Inspect _Element" msgstr "Inspecciona l'_element" -#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2480 msgid "Open Link in New _Tab" msgstr "Obre l'enllaç en una nova _pestanya" -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2484 msgid "Open Link in _Foreground Tab" msgstr "Obre l'enllaç en una nova pestanya en primer _pla" -#: ../midori/midori-view.c:2118 +#: ../midori/midori-view.c:2485 msgid "Open Link in _Background Tab" msgstr "Obre l'enllaç en una nova pestanya _no activa" -#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2488 msgid "Open Link in New _Window" msgstr "Obre l'enllaç a una nova _finestra" -#: ../midori/midori-view.c:2124 +#: ../midori/midori-view.c:2491 msgid "Open Link as Web A_pplication" msgstr "Obre l'enllaç com si fos una _aplicació web" -#: ../midori/midori-view.c:2127 +#: ../midori/midori-view.c:2496 msgid "Copy Link de_stination" msgstr "_Copia la destinació de l'enllaç" -#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 -msgid "_Save Link destination" -msgstr "De_sa el destí de l'enllaç" - -#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 -msgid "_Download Link destination" -msgstr "_Descarrega el destí de l'enllaç" - -#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 -#: ../midori/midori-view.c:2207 -msgid "Download with Download _Manager" -msgstr "Descarrega amb el _gestor de descàrregues" - -#: ../midori/midori-view.c:2144 +#: ../midori/midori-view.c:2512 msgid "Open _Image in New Tab" msgstr "Obre la _imatge en una nova pestanya" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2515 msgid "Copy Image _Address" msgstr "Copia l'_adreça de la imatge" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2518 msgid "Save I_mage" msgstr "Desa la i_matge" -#: ../midori/midori-view.c:2151 -msgid "Download I_mage" -msgstr "Descarrega la i_matge" +#: ../midori/midori-view.c:2521 +msgid "Open in Image _Viewer" +msgstr "Obre en el visualitzador d'_imatges" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2528 msgid "Copy Video _Address" msgstr "Copia l'_adreça del vídeo" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2531 msgid "Save _Video" msgstr "Desa el _vídeo" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2531 msgid "Download _Video" msgstr "Descarrega el _vídeo" -#: ../midori/midori-view.c:2224 +#: ../midori/midori-view.c:2557 msgid "Search _with" msgstr "Cerca _amb" -#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2589 msgid "_Search the Web" msgstr "_Cerca la Web" -#: ../midori/midori-view.c:2287 +#: ../midori/midori-view.c:2606 msgid "Open Address in New _Tab" msgstr "Obre l'adreça en una nova _pestanya" -#: ../midori/midori-view.c:2591 +#: ../midori/midori-view.c:2909 msgid "Open or download file" msgstr "Obre o descarrega el fitxer" -#: ../midori/midori-view.c:2610 +#: ../midori/midori-view.c:2929 #, c-format msgid "File Type: '%s'" msgstr "Tipus de fitxer: «%s»" -#: ../midori/midori-view.c:2613 +#: ../midori/midori-view.c:2931 #, 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:2617 +#: ../midori/midori-view.c:2935 +#, c-format +msgid "File Name: %s" +msgstr "Nom de fitxer: %s" + +#: ../midori/midori-view.c:2955 #, c-format msgid "Open %s" msgstr "Obre %s" -#: ../midori/midori-view.c:3158 +#: ../midori/midori-view.c:3576 #, c-format msgid "Inspect page - %s" msgstr "Inspecciona la pàgina «%s»" -#: ../midori/midori-view.c:3439 -msgid "Speed dial" -msgstr "Marcador ràpid" +#: ../midori/midori-view.c:3923 +msgid "Speed Dial" +msgstr "Velocímetre" -#: ../midori/midori-view.c:3440 +#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020 msgid "Click to add a shortcut" msgstr "Feu clic per a afegir una drecera" -#: ../midori/midori-view.c:3441 +#: ../midori/midori-view.c:3925 msgid "Enter shortcut address" msgstr "Introduïu l'adreça de la drecera" -#: ../midori/midori-view.c:3442 +#: ../midori/midori-view.c:3926 msgid "Enter shortcut title" msgstr "Introduïu un títol per a la drecera" -#: ../midori/midori-view.c:3443 +#: ../midori/midori-view.c:3927 msgid "Are you sure you want to delete this shortcut?" msgstr "Esteu segur d'esborrar aquesta drecera?" -#: ../midori/midori-view.c:3444 -msgid "Set number of columns and rows" -msgstr "Estableix el nombre de columnes i files" +#: ../midori/midori-view.c:4089 +#, c-format +msgid "No documentation installed" +msgstr "No s'ha instaŀlat la documentació" -#: ../midori/midori-view.c:3445 -msgid "Enter number of columns and rows:" -msgstr "Introduïu el nombre de columnes i files:" +#: ../midori/midori-view.c:4165 +msgid "Midori doesn't store any personal data:" +msgstr "Midori no desa cap informació personal:" -#: ../midori/midori-view.c:3446 -msgid "Invalid input for the size of the speed dial" -msgstr "L'entrada no és vàlida per al tamany de la marcació ràpida" +#: ../midori/midori-view.c:4166 +msgid "No history or web cookies are being saved." +msgstr "No es desa ni l'historial ni les galetes." -#: ../midori/midori-view.c:3447 -msgid "Thumb size:" -msgstr "Tamany de la miniatura:" +#: ../midori/midori-view.c:4167 +msgid "Extensions are disabled." +msgstr "Les extensions estan deshabilitades." -#: ../midori/midori-view.c:3448 -msgid "Small" -msgstr "Petit" +#: ../midori/midori-view.c:4168 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "" +"Emmagatzematge HTML5, base de dades local i memòria cau d'aplicacions " +"deshabilitades." -#: ../midori/midori-view.c:3449 -msgid "Medium" -msgstr "Mitjà" +#: ../midori/midori-view.c:4169 +msgid "Midori prevents websites from tracking the user:" +msgstr "Midori evita que els llocs webs controlin l'usiari:" -#: ../midori/midori-view.c:3450 -msgid "Big" -msgstr "Gran" +#: ../midori/midori-view.c:4170 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "URLs de referència no contenen el nom de màquina." -#: ../midori/midori-view.c:3476 -#, c-format -msgid "Document cannot be displayed" -msgstr "El document no es pot mostrar" +#: ../midori/midori-view.c:4171 +msgid "DNS prefetching is disabled." +msgstr "Càrrega prèvia de DNS deshabilitada." -#: ../midori/midori-view.c:3499 -#, c-format -msgid "No documentation installed" -msgstr "No s'ha instaŀlat la documentació" +#: ../midori/midori-view.c:4172 +msgid "The language and timezone are not revealed to websites." +msgstr "L'idioma i la zona horària no són visibles als llocs webs." -#: ../midori/midori-view.c:3618 +#: ../midori/midori-view.c:4173 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "" +"El Flash i altres connectors de Netscape no es poden llistar als llocs webs." + +#: ../midori/midori-view.c:4222 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "" +"Els nombres de versió mostrats entre parèntesis mostren la versió utilitzada " +"al temps d'execució." + +#: ../midori/midori-view.c:4278 msgid "Page loading delayed" msgstr "S'ha retardat la càrrega de la pàgina" -#: ../midori/midori-view.c:3619 +#: ../midori/midori-view.c:4279 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" "S'ha retardat la càrrega degut a una fallada recent o a les preferències " "d'inici." -#: ../midori/midori-view.c:3620 +#: ../midori/midori-view.c:4280 msgid "Load Page" msgstr "Carregar pàgina" -#: ../midori/midori-view.c:3764 +#: ../midori/midori-view.c:4446 msgid "Blank page" msgstr "Pàgina en blanc" -#: ../midori/midori-view.c:4018 +#: ../midori/midori-view.c:4708 msgid "_Duplicate Tab" msgstr "_Duplica la pestanya" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4713 msgid "Show Tab _Label" msgstr "Mostra la _etiqueta a la pestanya" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4713 msgid "Show Tab _Icon Only" msgstr "Mostra només _icones a les pestanyes" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4719 msgid "Close ot_her Tabs" msgstr "Tanca la _resta de pestanyes" -#: ../midori/midori-view.c:4680 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5532 +msgid "previous" +msgstr "anterior" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5551 +msgid "next" +msgstr "següent" + +#: ../midori/midori-view.c:5564 msgid "Print background images" msgstr "Imprimeix les imatges de fons" -#: ../midori/midori-view.c:4681 +#: ../midori/midori-view.c:5565 msgid "Whether background images should be printed" msgstr "Si s'han d'imprimir les imatges de fons" -#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:5597 msgid "Features" msgstr "Característiques" -#. Page "General" -#: ../midori/midori-preferences.c:301 -msgid "General" -msgstr "General" - -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Inicialització" -#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Empra la pàgina _actual" + +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Empra la pàgina actual com a pàgina d'inici" -#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Transferències" - #. Page "Appearance" -#: ../midori/midori-preferences.c:352 -msgid "Appearance" -msgstr "Aparença" - -#: ../midori/midori-preferences.c:353 -msgid "Font settings" -msgstr "Paràmetres del tipus de lletra" - -#: ../midori/midori-preferences.c:355 -msgid "Default Font Family" -msgstr "Família de tipus de lletra per defecte" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Tipus de lletra" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Família de tipus de lletra proporcional" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:330 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:361 +#: ../midori/midori-preferences.c:333 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:363 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Família de tipus de lletra d'amplada fixa" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "La família de fonts per a mostrar text de mida fixa" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" msgstr "La mida de la font usada per a mostrar text de mida fixa" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Mida mínima del tipus de lletra" -#: ../midori/midori-preferences.c:374 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "La mida mínima del tipus de lletra emprada per mostrar text" #. Page "Behavior" -#: ../midori/midori-preferences.c:383 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Comportament" -#: ../midori/midori-preferences.c:396 -msgid "Enforce 96 dots per inch" -msgstr "Força 96 PPP" - -#: ../midori/midori-preferences.c:397 -msgid "Enforce a video dot density of 96 DPI" -msgstr "Força una densitat de punt de 96 PPP" - -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Permetre als scripts obrir finestres emergents" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Si els scripts poden obrir finestres emergents de forma automàtica" -#: ../midori/midori-preferences.c:422 -msgid "Spell Checking" -msgstr "Corrector ortogràfic" - -#: ../midori/midori-preferences.c:425 -msgid "Enable Spell Checking" -msgstr "Habilita el corrector ortogràfic" - -#: ../midori/midori-preferences.c:426 -msgid "Enable spell checking while typing" -msgstr "Activa la comprovació ortogràfica mentre s'escriu" - -#: ../midori/midori-preferences.c:428 -msgid "Spelling dictionaries:" -msgstr "Diccionaris:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:432 -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:438 -msgid "Interface" -msgstr "Interfície" - -#: ../midori/midori-preferences.c:439 -msgid "Navigationbar" -msgstr "Barra de navegació" - -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Navegant" -#. Page "Applications" -#: ../midori/midori-preferences.c:471 -msgid "Applications" -msgstr "Aplicacions" - -#: ../midori/midori-preferences.c:472 -msgid "External applications" -msgstr "Aplicacions externes" - #. Page "Network" -#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "Xarxa" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:463 msgid "Hostname" msgstr "Nom del host" -#. Page "Privacy" -#: ../midori/midori-preferences.c:514 -msgid "Privacy" -msgstr "Privacitat" - -#: ../midori/midori-preferences.c:515 -msgid "Web Cookies" -msgstr "Galetes de web" - -#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 -msgid "days" -msgstr "dies" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "MB" -#: ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Buit" - -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Afegeix giny de cerca" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Edita giny de cerca" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Nom:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Descripció:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "_Icona:" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "_Testimoni:" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "Gestiona els ginys de cerca" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "Empra'l per _defecte" -#: ../midori/sokoke.c:1303 -msgid "_Bookmark" -msgstr "_Adreça d'interès" - -#: ../midori/sokoke.c:1304 -msgid "_Bookmarks" -msgstr "_Adreces d'interès" - -#: ../midori/sokoke.c:1305 -msgid "Add Boo_kmark" -msgstr "Afegeix adreça d'_interès" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "Obrir amb" -#: ../midori/sokoke.c:1306 -msgid "_Console" -msgstr "_Consola" - -#: ../midori/sokoke.c:1307 -msgid "_Extensions" -msgstr "_Extensions" +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Seleccioneu una aplicació o ordre per obrir «%s»:" -#: ../midori/sokoke.c:1308 -msgid "_History" -msgstr "_Historial" +#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "No s'ha pogut executar el programa extern." -#: ../midori/sokoke.c:1309 -msgid "_Homepage" -msgstr "_Pàgina d'inici" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d hora" +msgstr[1] "%d hores" -#: ../midori/sokoke.c:1310 -msgid "_Userscripts" -msgstr "Scripts d'_usuari" +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minut" +msgstr[1] "%d minuts" -#: ../midori/sokoke.c:1311 -msgid "New _Tab" -msgstr "Nova _pestanya" +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d segon" +msgstr[1] "%d segons" -#: ../midori/sokoke.c:1312 -msgid "_Transfers" -msgstr "_Transferències" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s de %s" -#: ../midori/sokoke.c:1313 -msgid "Netscape p_lugins" -msgstr "_Connectors de Netscape" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr "(%s/s)" -#: ../midori/sokoke.c:1316 -msgid "New _Folder" -msgstr "Nova _carpeta" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr "-%s restants" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:201 +#: ../toolbars/midori-findbar.c:291 msgid "_Inline Find:" msgstr "Cerca en _línia:" -#: ../toolbars/midori-findbar.c:233 +#: ../toolbars/midori-findbar.c:317 msgid "Previous" msgstr "Anterior" -#: ../toolbars/midori-findbar.c:239 +#: ../toolbars/midori-findbar.c:323 msgid "Next" msgstr "Següent" -#: ../toolbars/midori-findbar.c:243 +#: ../toolbars/midori-findbar.c:327 msgid "Match Case" msgstr "Coincidència de majúscules i minúscules" -#: ../toolbars/midori-findbar.c:252 +#: ../toolbars/midori-findbar.c:336 msgid "Highlight Matches" msgstr "Ressalta les coincidències" -#: ../toolbars/midori-findbar.c:263 +#: ../toolbars/midori-findbar.c:347 msgid "Close Findbar" msgstr "Tanca la barra de cerques" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 -#, c-format -msgid "%s of %s" -msgstr "%s de %s" - -#: ../toolbars/midori-transferbar.c:123 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "S'ha descarregat el fitxer «%s»." -#: ../toolbars/midori-transferbar.c:126 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Transferència finalitzada" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "El fitxer descarregat conté errors." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"El checksum proveït a l'enllaç no coincideix. Això vol dir que l'arxiu " +"probablement està incomplet o ha sigut modificat posteriorment." + +#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Netejar-ho tot" -#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 +#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 msgid "Some files are being downloaded" msgstr "S'estan descarregant fitxers" -#: ../toolbars/midori-transferbar.c:306 +#: ../toolbars/midori-transferbar.c:377 msgid "_Quit Midori" msgstr "_Sortir de Midori" -#: ../toolbars/midori-transferbar.c:308 +#: ../toolbars/midori-transferbar.c:379 msgid "The transfers will be cancelled if Midori quits." msgstr "Les transferències es cancel·laran si se surt de Midori." -#: ../panels/midori-bookmarks.c:116 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Adreces d'interès" -#: ../panels/midori-bookmarks.c:275 +#: ../panels/midori-bookmarks.c:257 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "No s'ha pogut afegir un ítem a les adreces d'interès: %s\n" -#: ../panels/midori-bookmarks.c:414 +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "Edita l'adreça d'interès seleccionada" -#: ../panels/midori-bookmarks.c:422 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "Suprimeix l'adreça d'interès seleccionada" -#: ../panels/midori-bookmarks.c:436 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" msgstr "Afegeix una carpeta nova" -#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 +#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 msgid "Separator" msgstr "Separador" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "Consola" - -#: ../panels/midori-console.c:361 -msgid "Copy _All" -msgstr "Copia _tot" - -#: ../panels/midori-console.c:362 -msgid "Copy All" -msgstr "Copia tot" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "Historial" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Extensions" +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "Avuí" -#: ../panels/midori-history.c:146 -msgid "A week ago" -msgstr "Setmana passada" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "Ahir" -#: ../panels/midori-history.c:148 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 #, 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:151 -msgid "Today" -msgstr "Avuí" - -#: ../panels/midori-history.c:153 -msgid "Yesterday" -msgstr "Ahir" +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "Setmana passada" -#: ../panels/midori-history.c:324 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" msgstr "Voleu esborrar tots els elements de l’historial?" -#: ../panels/midori-history.c:369 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" msgstr "Afegeix l'element seleccionat de l'historial a les adreces d'interès" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" msgstr "Esborra l'element de l'historial seleccionat" -#: ../panels/midori-history.c:386 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "Buida l'historial" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Transferències" + +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" msgstr "_Obre la carpeta destí" -#: ../panels/midori-transfers.c:484 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" msgstr "Copia la _localització de l'enllaç" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Es requereix autenticació" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" @@ -2274,56 +2230,80 @@ "És necessari un nom d'usuari i una contrasenya\n" "per a obrir aquesta ubicació:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "Nom d'usuari" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "Contrasenya" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "_Recorda la contrasenya" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "La icona amb nom «%s» no s'ha pogut carregar" -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "La icona «%s» no s'ha pogut carregar" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "Els marcs d'animació no funcionen correctament" -#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 +#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propietat «%s» no és vàlida per a %s" -#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 -#: ../extensions/addons.c:119 +#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Seleccioneu fitxer" -#: ../katze/katze-utils.c:564 +#: ../katze/katze-utils.c:506 msgid "Choose folder" msgstr "Seleccioneu carpeta" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "Cap" + +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "1 hora" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "1 dia" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "1 setmana" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "1 mes" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "1 any" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Preferències per a %s" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:473 msgid "Configure Advertisement filters" msgstr "Configura els filtres de publicitat" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:504 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2332,101 +2312,130 @@ "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:587 -msgid "Configure _Advertisement filters..." -msgstr "Configura els filtres de _publicitat…" - -#: ../extensions/adblock.c:841 +#: ../extensions/adblock.c:882 msgid "Edit rule" msgstr "Edita la regla" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:896 msgid "_Rule:" msgstr "_Regla:" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:950 msgid "Bl_ock image" msgstr "Bl_oca imatge" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:955 msgid "Bl_ock link" msgstr "Bl_oca enllaç" -#: ../extensions/adblock.c:1494 +#: ../extensions/adblock.c:1670 msgid "Advertisement blocker" msgstr "Bloqueig de publicitat" -#: ../extensions/adblock.c:1495 +#: ../extensions/adblock.c:1671 msgid "Block advertisements according to a filter list" msgstr "Bloca els anuncis publicitaris segons una llista de filtres" -#: ../extensions/addons.c:130 ../extensions/addons.c:377 +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "Sembla que aquesta pàgina té un script d'usuari. El voleu instaŀlar?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "_Instalŀa l'script d'usuari" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "Sembla que aquesta pàgina té un estil d'usuari. El voleu instaŀlar?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_Instaŀla l'estil d'usuari" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "No instaŀlis" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Scripts d'usuari" -#: ../extensions/addons.c:135 ../extensions/addons.c:379 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Estils d'usuari" -#: ../extensions/addons.c:191 ../extensions/addons.c:267 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Error" -#: ../extensions/addons.c:231 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "Voleu eliminar «%s»?" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "Suprimeix l'script d'usuari" -#: ../extensions/addons.c:238 +#: ../extensions/addons.c:428 msgid "Delete user style" msgstr "Suprimeix l'estil d'usuari" -#: ../extensions/addons.c:242 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." msgstr "El fitxer «%s» s'esborrarà de forma permanent." -#: ../extensions/addons.c:1299 -#, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "No s'ha pogut desar la configuració de l'extensió «%s»: %s\n" +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "Obre en un editor de text" + +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "Obre la carpeta destí" + +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "Afegeix un nou afegitó" + +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "Suprimeix l'afegitó seleccionat" -#: ../extensions/addons.c:1300 ../extensions/addons.c:1465 +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" msgstr "Afegitons de l'usuari" -#: ../extensions/addons.c:1422 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "No es pot seguir la pista de la carpeta «%s»: %s" -#: ../extensions/addons.c:1466 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" msgstr "Adment l'ús d'scripts i estils d'usuari" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "Pestanyes de colors" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Aplica un color diferent a cadascuna de les pestanyes" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Gestor de galetes" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "Suprimeix-ho tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 +#: ../extensions/cookie-manager/cookie-manager-page.c:105 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." @@ -2434,31 +2443,31 @@ "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:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "Expansiona-ho tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "Colapsa-ho tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" msgstr "Voleu eliminar totes les galetes?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Qüestió" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." msgstr "Només s'esborraran les galetes que coincideixin amb el filtre." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "Al finalitzar la sessió" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2475,15 +2484,15 @@ "Segura: %s\n" "Expiració: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Sí" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "No" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" @@ -2492,23 +2501,23 @@ "Domini: %s\n" "Galeta: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Nom" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "_Expandeix-ho tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "_Plega-ho tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 msgid "Filter:" msgstr "Filtre:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "" "Enter a filter string to show only cookies whose name or domain field match " "the entered filter" @@ -2516,34 +2525,22 @@ "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" -msgstr "_Gestor de galetes" - -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Llista, mostra i borra galetes" -#: ../extensions/copy-tabs.c:39 +#: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" msgstr "Copia _adreces de les pestanyes" -#: ../extensions/copy-tabs.c:98 +#: ../extensions/copy-tabs.c:95 msgid "Copy Addresses of Tabs" msgstr "Copia les adreces de les pestanyes" -#: ../extensions/copy-tabs.c:99 +#: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Copia les adreces de totes les pestanyes al porta-retalls" -#: ../extensions/external-applications.vala:93 -msgid "External Applications" -msgstr "Aplicacions externes" - -#: ../extensions/external-applications.vala:94 -msgid "Associate URL schemes with external commands" -msgstr "Associar esquemes URL amb comandes externes" - #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "No s'han pogut trobar elements Atom \"entry\" en les dades XML." @@ -2553,25 +2550,25 @@ 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:398 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Darrera actualització: %s." -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "Canals" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "Afegeix un nou canal" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "Suprimeix el canal" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "_Canals" @@ -2616,187 +2613,687 @@ msgid "Error loading feed '%s'" msgstr "Error en carregar el canal «%s»" -#: ../extensions/feed-panel/main.c:520 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "Quadre de canals" -#: ../extensions/feed-panel/main.c:521 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Llegeix canals Atom/RSS" -#: ../extensions/formhistory.c:142 +#: ../extensions/formhistory/formhistory.c:39 #, 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:455 ../extensions/formhistory.c:459 +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "Historial de formularis" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Cal la contrasenya mestra per obrir\n" +"la base de dades de contrasenyes" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "Recorda la contrasenya d'aquesta pàgina?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Recorda" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "No ara" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Mai per aquesta pàgina" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "Canvia l'estat de l'historial" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "Activa o desactiva a la pestanya actual l'historial." + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "No s'ha pogut executar la comanda a la base de dades: %s\n" -#: ../extensions/formhistory.c:503 +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "Activa només l'historial amb les tecles (Ctrl+Shift+F) per pestanya" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "Omple el formulari de l'historial" + +#: ../extensions/formhistory/formhistory.c:669 msgid "Stores history of entered form data" msgstr "Emmagatzema l'historial de les dades introduïdes als formularis" -#: ../extensions/formhistory.c:507 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 #, c-format -msgid "Not available: %s" -msgstr "No disponible: %s" +msgid "Failed to select suggestions\n" +msgstr "No s'ha pogut seleccionar suggeriments\n" -#: ../extensions/formhistory.c:508 -msgid "Resource files not installed" -msgstr "Els fitxers de recursos no estan instaŀlats" +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "No hi ha pestanyes sense visitar" -#: ../extensions/formhistory.c:514 -msgid "Form history filler" -msgstr "Omple el formulari de l'historial" +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "Llista d'historial" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Comportament del tancament de pestanyes" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "No facis res" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Canvia a la darrera pestanya vista" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Canvia a la pestanya més nova" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Nova pestanya següent (Llista de l'historial)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Nova pestanya següent de l'historial" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Nova pestanya anterior (Llista de l'historial)" -#: ../extensions/history-list.vala:174 -msgid "Next Tab (History List)" -msgstr "Pestanya següent (Llista de l'historial)" - -#: ../extensions/history-list.vala:175 -msgid "Next tab from history" -msgstr "Pestanya següent de l'historial" - -#: ../extensions/history-list.vala:184 -msgid "Previous Tab (History List)" -msgstr "Pestanya anterior (Llista de l'historial)" - -#: ../extensions/history-list.vala:185 -msgid "Previous tab from history" -msgstr "Pestanya anterior de l'historial" +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Nova pestanya anterior de l'historial" -#: ../extensions/history-list.vala:245 +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Mostra la pestanya inactiva (Llistat d'historial)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Mostra la pestanya seleccionada actualment inactiva" + +#: ../extensions/history-list.vala:569 msgid "History List" msgstr "Llista de l'historial" -#: ../extensions/history-list.vala:246 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" msgstr "" -"Permet canviar de pestanya triant-la d'una llista ordenada pel darrer ús" +"Mou a la ultima pestanya utilitzada quan es canvien o tanquen pestanyes" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Gesticulacions de ratolí" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Controla Midori usant el ratolí" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 -msgid "Pageholder" -msgstr "Contenidor de la pàgina" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "Contenidor de la _pàgina" - -#: ../extensions/page-holder.c:178 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "Mantè un o múltiples pàgines obertes a les pestanyes en paraŀlel" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "Carrega la pàgina de nou o atura la càrrega" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "Configura les dreceres de teclat" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "Configura les _dreceres…" -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Dreceres" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "Mostra i edita les dreceres del teclat" -#: ../extensions/status-clock.c:176 +#: ../extensions/status-clock.c:174 msgid "Statusbar Clock" msgstr "Rellotge a la barra d'estat" -#: ../extensions/status-clock.c:177 +#: ../extensions/status-clock.c:175 msgid "Display date and time in the statusbar" msgstr "Mostrar la data i l'hora a la barra d'estat" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Imatges" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Scripts" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Connectors de Netscape" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "Característiques de la la barra d'estat" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" msgstr "Activa o desactiva fàcilment funcionalitats en planes web" -#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Quadre de pestanyes" -#: ../extensions/tab-panel.c:612 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "Quadre de _pestanyes" -#: ../extensions/tab-panel.c:629 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Mostra les pestanyes en un quadre vertical" -#: ../extensions/tabs-minimized.c:79 +#: ../extensions/tabs-minimized.c:76 msgid "Only Icons on Tabs by default" msgstr "Per defecte només icones a les pestanyes" -#: ../extensions/tabs-minimized.c:80 +#: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" msgstr "Les noves pestanyes no tenen etiqueta per defecte" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "_Personalitza la barra d'eines" -#: ../extensions/toolbar-editor.c:405 +#: ../extensions/toolbar-editor.c:409 msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " +"Select items to be displayed on the toolbar. Items can be reordered 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:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Elements disponibles" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Elements mostrats" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "Personalitza la barra d'e_ines…" -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Configura…" + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" msgstr "Editor de la barra d'eines" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" msgstr "Edita fàcilment la distribució de la barra d'eines" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "Empra el disc com a memòria cau de comunicacions HTTP" +#~ msgid "Lightweight web browser" +#~ msgstr "Navegador web lleuger" + +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "La carpeta de configuració especificada és invalida." + +#~ msgid "Cookies" +#~ msgstr "Galetes" + +#~ msgid "'Flash' Cookies" +#~ msgstr "Galetes «Flash»" + +#~ msgid "HTML5 _Databases" +#~ msgstr "_Bases de dades HTML5" + +#~ msgid "Offline Application Cache" +#~ msgstr "Memòria cau de navegació fora de línia" + +#~ msgid "No filename specified" +#~ msgstr "No s'ha especificat un nom de fitxer" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "No desar qualsevol mena de dada privada mentre es navega" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Afegeix drecera al marcador ràpid" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Afegeix drecera a l'escriptori" + +#~ msgid "Create a launcher" +#~ msgstr "Crea un llançador" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "Subscriure's a aquest canal de notícies" + +#~ msgid "Close this window" +#~ msgstr "Tanca aquesta finestra" + +#~ msgid "Close all open windows" +#~ msgstr "Tanca aquesta finestra" + +#~ msgid "Undo the last modification" +#~ msgstr "Desfés la darrera modificació" + +#~ msgid "Redo the last modification" +#~ msgstr "Refés la darrera modifcació" + +#~ msgid "Cut the selected text" +#~ msgstr "Talla el text seleccionat" + +#~ msgid "Copy the selected text" +#~ msgstr "Copia el text seleccionat al porta-retalls" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "Enganxa el text al porta-retalls" + +#~ msgid "Delete the selected text" +#~ msgstr "Suprimeix el text seleccionat" + +#~ msgid "Select all text" +#~ msgstr "Selecciona tot el text" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Cerca la següent ocurrència de la paraula o frase" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Cerca l'anterior ocurrència de la paraula o frase" + +#~ msgid "Reset the zoom level" +#~ msgstr "Reiniciar el nivell d'ampliació" + +#~ msgid "View the source code of the page" +#~ msgstr "Veure el codi font de la pàgina" + +#~ msgid "Scroll to the left" +#~ msgstr "Desplaçar cap a l'esquerra" + +#~ msgid "Scroll down" +#~ msgstr "Desplaçar cap avall" + +#~ msgid "Scroll up" +#~ msgstr "Desplaçar cap amunt" + +#~ msgid "Scroll to the right" +#~ msgstr "Desplaçament cap a la dreta" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "Esborra tot el contingut de la paperera" + +#~ msgid "Open the last closed tab" +#~ msgstr "Obre la darrera pestanya tancada" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Afegeix una carpeta d'adreces d'interès" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Afegeix, edita o treu ginys de cerca…" + +#~ msgid "Clear private data..." +#~ msgstr "Neteja les dades privades…" + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "" +#~ "Inspecciona els detalls de la pàgina i accedeix a les eines per " +#~ "desenvolupadors…" + +#~ msgid "Switch to the previous tab" +#~ msgstr "Canvia a la pestanya anterior" + +#~ msgid "Switch to the next tab" +#~ msgstr "Canvia a la pestanya següent" + +#~ msgid "Move tab behind the previous tab" +#~ msgstr "Canvia a la pestanya anterior" + +#~ msgid "Move tab in front of the next tab" +#~ msgstr "Canvia a la pestanya següent" + +#~ msgid "Focus the current tab" +#~ msgstr "Enfoca la pestanya actual" + +#~ msgid "Cycle focus between views" +#~ msgstr "Canvia l'enfocament entre les vistes" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Mostra només la icona de la pestanya actual" + +#~ msgid "Duplicate the current tab" +#~ msgstr "Duplica la pestanya actual" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Tanca totes les pestanyes menys l'actual" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Obre les pestanyes emmagatzemades a la darrera sessió" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Mostra les preguntes més freqüents" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Obre el sistema de seguiment d'errors de Midori" + +#~ msgid "Show information about the program" +#~ msgstr "Mostra la informació sobre aquest programa" + +#~ msgid "Show menubar" +#~ msgstr "Mostra la barra de menú" + +#~ msgid "Show navigationbar" +#~ msgstr "Mostra barra de navegació" + +#~ msgid "Show sidepanel" +#~ msgstr "Mostra el quadre lateral" + +#~ msgid "Show bookmarkbar" +#~ msgstr "Mostra la barra d'adreces d'interès" + +#~ msgid "Show statusbar" +#~ msgstr "Mostra la barra d'estat" + +#~ msgid "MD5-Checksum:" +#~ msgstr "MD5-Checksum:" + +#~ msgid "SHA1-Checksum:" +#~ msgstr "SHA1-Checksum:" + +#~ msgid "Set number of columns and rows" +#~ msgstr "Estableix el nombre de columnes i files" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Introduïu el nombre de columnes i files:" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "L'entrada no és vàlida per al tamany de la marcació ràpida" + +#~ msgid "Thumb size:" +#~ msgstr "Tamany de la miniatura:" + +#~ msgid "Small" +#~ msgstr "Petit" + +#~ msgid "Medium" +#~ msgstr "Mitjà" + +#~ msgid "Big" +#~ msgstr "Gran" + +#~ msgid "Not available: %s" +#~ msgstr "No disponible: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "Els fitxers de recursos no estan instaŀlats" + +#~ msgid "Reset the last _session" +#~ msgstr "Reiniciar la darrera _sessió" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% carregat" + +#~ msgid "Quit the application" +#~ msgstr "Surt de l'aplicació" + +#~ msgid "_Contents" +#~ msgstr "_Continguts" + +#~ msgid "Show the documentation" +#~ msgstr "Mostra la documentació" + +#~ msgid "_Transferbar" +#~ msgstr "Barra de _transferències" + +#~ msgid "Show transferbar" +#~ msgstr "Mostra la barra de transferències" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "No s'ha pogut executar la declaració de base de dades\n" + +#~ msgid "Show Blank page" +#~ msgstr "Mostra pàgina en blanc" + +#~ msgid "All cookies" +#~ msgstr "Totes les galetes" + +#~ msgid "Session cookies" +#~ msgstr "Galetes de sessió" + +#~ msgid "Show Transferbar" +#~ msgstr "Mostra barra de fransferències" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "Si es mostrarà la barra de transferències" + +#~ msgid "Show progress in location entry" +#~ msgstr "Mostrar el progrés a la caixa d'entrada de la localització" + +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "" +#~ "Si voleu mostrar el progrés de la càrrega en la caixa d'entrada de la " +#~ "localització" + +#~ msgid "Search engines in location completion" +#~ msgstr "Motors de cerca per a completar la cerca" + +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "Si es mostraran els motors de cerca a l'hora de completar la cerca" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "Mostrar els controls d'operació del panell" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "Si s'ha de mostrar els controls d'operació del panell" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Mostrar el marcador ràpid a les noves pestanyes" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Mostrar el marcatge ràpid a les noves pestanyes obertes" + +#~ msgid "Ask for the destination folder" +#~ msgstr "Demanar per la carpeta destí" + +#~ msgid "Whether to ask for the destination folder when downloading a file" +#~ msgstr "Si cal demanar una carpeta destí quan es descarregui un fitxer" + +#~ msgid "Whether to show a notification when a transfer has been completed" +#~ msgstr "Si es mostra una notificació quan acabi una transferència" + +#~ msgid "Download Manager" +#~ msgstr "Gestor de descàrregues" + +#~ msgid "An external download manager" +#~ msgstr "Un gestor de descàrregues extern" + +#~ msgid "Open external pages in:" +#~ msgstr "Obre pàgines externes a:" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "On s'obren de forma externa les pàgines obertes" + +#~ msgid "Accept cookies" +#~ msgstr "Accepta galetes" + +#~ msgid "What type of cookies to accept" +#~ msgstr "Quins tipus de galetes s'accepten" + +#~ msgid "Maximum cookie age" +#~ msgstr "Edat màxima de la galeta" + +#~ msgid "Maximum history age" +#~ msgstr "Edat màxima de l'historial" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Recordar els darrers fitxers descarregats" + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "Si els darrers fitxers descarregats s'han d'emmagatzemar" + +#~ msgid "Not found - %s" +#~ msgstr "No s'ha trobat «%s»" + +#~ msgid "_Save Link destination" +#~ msgstr "De_sa el destí de l'enllaç" + +#~ msgid "_Download Link destination" +#~ msgstr "_Descarrega el destí de l'enllaç" + +#~ msgid "Download with Download _Manager" +#~ msgstr "Descarrega amb el _gestor de descàrregues" + +#~ msgid "Download I_mage" +#~ msgstr "Descarrega la i_matge" + +#~ msgid "Document cannot be displayed" +#~ msgstr "El document no es pot mostrar" + +#~ msgid "General" +#~ msgstr "General" + +#~ msgid "Appearance" +#~ msgstr "Aparença" + +#~ msgid "Font settings" +#~ msgstr "Paràmetres del tipus de lletra" + +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "Força 96 PPP" + +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "Força una densitat de punt de 96 PPP" + +#~ msgid "Interface" +#~ msgstr "Interfície" + +#~ msgid "Navigationbar" +#~ msgstr "Barra de navegació" + +#~ msgid "Applications" +#~ msgstr "Aplicacions" + +#~ msgid "External applications" +#~ msgstr "Aplicacions externes" + +#~ msgid "Web Cookies" +#~ msgstr "Galetes de web" + +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "Esborrar les galetes quan sortiu de Midori" + +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "Esborrar les galetes antigues després d'una hora" + +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "Esborrar les galetes antigues després d'una setmana" + +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "Esborrar les galetes antigues després d'un mes" + +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "Esborrar les galetes antigues després d'un any" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Configura els filtres de _publicitat…" + +#~ msgid "Open target folder for selected addon" +#~ msgstr "Obre la carpeta de l'afegitó seleccionat" + +#~ msgid "Next Tab (History List)" +#~ msgstr "Pestanya següent (Llista de l'historial)" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "Pestanya anterior (Llista de l'historial)" + +#~ msgid "Previous tab from history" +#~ msgstr "Pestanya anterior de l'historial" + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "Canvia de pestanya amb Ctrl-Tab ordenades per darrer ús" + +#~ msgid "Pageholder" +#~ msgstr "Contenidor de la pàgina" + +#~ msgid "_Pageholder" +#~ msgstr "Contenidor de la _pàgina" + +#~ msgid "Keep one or multiple pages open in parallel to your tabs" +#~ msgstr "Mantè un o múltiples pàgines obertes a les pestanyes en paraŀlel" + +#~ msgid "Detach chosen panel from the window" +#~ msgstr "Desenganxar el panell triat de la finestra" + +#~ msgid "Hide operating controls" +#~ msgstr "Oculta els controls d'operació" + +#~ msgid "Spell Checking" +#~ msgstr "Corrector ortogràfic" + +#~ 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\"" + +#~ msgid "Failed to clear search history: %s\n" +#~ msgstr "No s'ha pogut buidar l'historial de cerques: %s\n" + +#~ msgid "Minimize _Current Tab" +#~ msgstr "Minimitza la pestanya _actual" + +#~ msgid "Minimize the current tab" +#~ msgstr "Minimitza la pestanya actual" + +#~ msgid "Spelling dictionaries:" +#~ msgstr "Diccionaris:" + +#~ msgid "Console" +#~ msgstr "Consola" + +#~ msgid "Copy _All" +#~ msgstr "Copia _tot" + +#~ msgid "Copy All" +#~ msgstr "Copia tot" + +#~ msgid "_Cookie Manager" +#~ msgstr "_Gestor de galetes" + +#~ msgid "External Applications" +#~ msgstr "Aplicacions externes" + +#~ msgid "Associate URL schemes with external commands" +#~ msgstr "Associar esquemes URL amb comandes externes" + #~ msgid "_Restore Tab" #~ msgstr "_Restaura la pestanya" @@ -2818,15 +3315,9 @@ #~ msgid "Reopen pages that you visited earlier" #~ msgstr "Reobre pàgines que heu visitat anteriorment" -#~ msgid "Show the saved bookmarks" -#~ msgstr "Mostra les adreces d'interès desades" - #~ msgid "Original cookies only" #~ msgstr "Només galetes originals" -#~ msgid "Accept cookies from the original website only" -#~ msgstr "Accepta només galetes del seu lloc web original" - #~ msgid "Remember last visited pages" #~ msgstr "Recordar les darreres pàgines visitades" @@ -2899,9 +3390,6 @@ #~ msgid "Tint tabs distinctly" #~ msgstr "Aplica un color diferent a les pestanyes" -#~ msgid "DNS prefetching" -#~ msgstr "Precarrega DNS" - #~ msgid "Prefetch IP addresses of hovered links" #~ msgstr "Precarrega les adreces IP dels enllaços" @@ -2929,8 +3417,5 @@ #~ 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 -Nru midori-0.2.8/po/cs.po midori-0.4.6/po/cs.po --- midori-0.2.8/po/cs.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/cs.po 2012-05-14 22:13:42.000000000 +0000 @@ -2,2425 +2,2470 @@ # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the home package. # David Stancl 2009 +# Michal Varady 2011-2012 # msgid "" msgstr "" "Project-Id-Version: midori 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-05 10:09+0000\n" -"PO-Revision-Date: 2010-05-04 08:08+0200\n" -"Last-Translator: David Štancl \n" +"POT-Creation-Date: 2012-05-14 02:09+0000\n" +"PO-Revision-Date: 2012-02-24 01:20+0100\n" +"Last-Translator: Michal Várady \n" "Language-Team: Czech < >\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: \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č" +msgid "Browse the Web" +msgstr "Prohlížet internet" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 -#: ../midori/main.c:1665 ../midori/main.c:1681 -#: ../midori/midori-websettings.c:312 +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "Internet;WWW;Explorer" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:1972 ../midori/main.c:1996 +#: ../midori/main.c:2010 ../midori/midori-websettings.c:313 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Internetový prohlížeč" -#: ../midori/main.c:99 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Midori - soukromé prohlížení" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Nové okno soukromého prohlížení" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4288 +msgid "Private Browsing" +msgstr "Soukromé prohlížení" + +#: ../midori/main.c:97 ../midori/main.c:103 #, c-format msgid "The configuration couldn't be loaded: %s\n" -msgstr "Konfigurace nemůže být načtena: %s\n" +msgstr "Konfiguraci nelze načíst: %s\n" -#: ../midori/main.c:148 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" -msgstr "Hodnota '%s' je pro %s špatná" +msgstr "Hodnota '%s' je pro %s neplatná" -#: ../midori/main.c:155 ../midori/main.c:241 +#: ../midori/main.c:156 ../midori/main.c:260 #, c-format msgid "Invalid configuration value '%s'" -msgstr "Nesprávná hodnota '%s' v konfiguraci" +msgstr "Neplatná hodnota '%s' konfigurace" + +#: ../midori/main.c:381 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Vyhledávací nástroje nelze načíst.%s\n" + +#: ../midori/main.c:435 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Nepodařilo se smazat historii: %s\n" -#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 +#: ../midori/main.c:455 ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" msgstr "Nepodařilo se otevřít databázi: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:424 +#: ../midori/main.c:525 #, 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:455 ../panels/midori-history.c:169 -#: ../panels/midori-history.c:199 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Nepodařilo se odstranit položku historie: %s\n" - -#: ../midori/main.c:500 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Záložky nemohou být uloženy. %s" - -#: ../midori/main.c:528 +#: ../midori/main.c:547 #, c-format msgid "The configuration couldn't be saved. %s" -msgstr "Konfigurace nemůže být uložena. %s" +msgstr "Konfiguraci nelze uložit. %s" -#: ../midori/main.c:566 +#: ../midori/main.c:582 #, c-format msgid "The search engines couldn't be saved. %s" -msgstr "Vyhledávací nástroj nemůže být uložen. %s" +msgstr "Vyhledávací nástroj nelze uložit. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:586 ../midori/main.c:609 +#: ../midori/main.c:619 #, c-format msgid "The trash couldn't be saved. %s" -msgstr "Seznam zavřených karet nemůže být uložen. %s" +msgstr "Seznam zavřených karet nelze uložit. %s" + +#: ../midori/main.c:660 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Rozšíření" + +#: ../midori/main.c:674 +msgid "Privacy" +msgstr "Soukromí" + +#: ../midori/main.c:686 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"V cookies se ukládají přihlašovací údaje, stavy her nebo uživatelská data " +"pro reklamní účely." -#: ../midori/main.c:668 ../midori/main.c:908 +#: ../midori/main.c:742 #, c-format msgid "The session couldn't be saved. %s" -msgstr "Sezení nemůže být uloženo. %s" +msgstr "Relaci nelze uložit. %s" -#: ../midori/main.c:852 -msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "Nejsou k dispozici žádné kořenové certifikáty. SSL certifikáty nemohou být ověřovány." +#: ../midori/main.c:960 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" +"Nejsou k dispozici žádné kořenové certifikáty. SSL certifikáty nelze ověřit." -#: ../midori/main.c:942 -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:1036 +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 "" +"Aplikace Midori zřejmě minule nebyla řádně ukončena. V případě opakujících " +"se potíží použijte k jejich odstranění následující možnosti." -#: ../midori/main.c:957 +#: ../midori/main.c:1055 msgid "Modify _preferences" msgstr "Změnit _nastavení" -#: ../midori/main.c:961 -msgid "Reset the last _session" -msgstr "Vymazat poslední _sezení" - -#: ../midori/main.c:966 +#: ../midori/main.c:1059 msgid "Disable all _extensions" msgstr "Zakázat všechna _rozšíření" -#: ../midori/main.c:1206 ../midori/main.c:1952 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "Sezení nemůže být načteno: %s\n" +#: ../midori/main.c:1072 +msgid "Discard old tabs" +msgstr "Zahodit staré karty" + +#: ../midori/main.c:1073 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "zobrazit naposledy otevřené karty bez načtení" -#: ../midori/main.c:1328 -msgid "No filename specified" -msgstr "Nebyl zadán název souboru" +#: ../midori/main.c:1074 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "zobrazit naposledy otevřené karty" -#: ../midori/main.c:1347 -msgid "An unknown error occured." -msgstr "Nastala neznámá chyba." +#: ../midori/main.c:1321 ../midori/main.c:2399 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Relaci nelze načíst: %s\n" -#: ../midori/main.c:1378 +#: ../midori/main.c:1459 #, c-format msgid "Snapshot saved to: %s\n" -msgstr "Snímek uložen do %s\n" +msgstr "Snímek uložen do: %s\n" -#: ../midori/main.c:1550 +#: ../midori/main.c:1875 msgid "Run ADDRESS as a web application" -msgstr "Spustit ADRESA jako webovou aplikaci" +msgstr "Spustit řetězec ADRESA jako webovou aplikaci" -#: ../midori/main.c:1550 +#: ../midori/main.c:1875 msgid "ADDRESS" msgstr "ADRESA" -#: ../midori/main.c:1553 +#: ../midori/main.c:1878 msgid "Use FOLDER as configuration folder" -msgstr "Použít SLOŽKA jako místo pro uložení konfigurace" +msgstr "Použít řetězec SLOŽKA jako složku konfigurace" -#: ../midori/main.c:1553 +#: ../midori/main.c:1878 msgid "FOLDER" msgstr "SLOŽKA" -#: ../midori/main.c:1556 +#: ../midori/main.c:1881 +msgid "Private browsing, no changes are saved" +msgstr "Soukromé prohlížení, bez uložení změn" + +#: ../midori/main.c:1883 msgid "Show a diagnostic dialog" -msgstr "Zobrazit dialog po pádu" +msgstr "Zobrazit diagnostické dialogové okno" -#: ../midori/main.c:1558 +#: ../midori/main.c:1885 msgid "Run the specified filename as javascript" -msgstr "Spustit jako javascript" +msgstr "Spustit zadaný soubor jako javascript" -#: ../midori/main.c:1561 +#: ../midori/main.c:1887 msgid "Take a snapshot of the specified URI" -msgstr "Získat snímek požadovaného URI" +msgstr "Získat snímek zadané adresy URI" -#: ../midori/main.c:1564 +#: ../midori/main.c:1889 msgid "Execute the specified command" -msgstr "Spustit vybraný příkaz" +msgstr "Spustit zadaný příkaz" -#: ../midori/main.c:1566 +#: ../midori/main.c:1891 +msgid "List available commands to execute with -e/ --execute" +msgstr "Seznam dostupných příkazů spustitelných s parametrem -e / --execute" + +#: ../midori/main.c:1893 msgid "Display program version" msgstr "Zobrazit verzi programu" -#: ../midori/main.c:1568 +#: ../midori/main.c:1895 msgid "Addresses" msgstr "Adresy" -#: ../midori/main.c:1570 +#: ../midori/main.c:1897 msgid "Block URIs according to regular expression PATTERN" -msgstr "Blokovat adresy (URI) pomocí regulárního výrazu REGVÝRAZ" +msgstr "Blokovat adresy URI pomocí regulárního výrazu REGVÝRAZ" -#: ../midori/main.c:1570 +#: ../midori/main.c:1897 msgid "PATTERN" msgstr "REGVÝRAZ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1574 +#: ../midori/main.c:1901 msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "Restartovat Midori po VTEŘINY vteřin neaktivity" +msgstr "Restartovat aplikaci Midori po SEKUNDY sekund neaktivity" -#: ../midori/main.c:1574 +#: ../midori/main.c:1901 msgid "SECONDS" -msgstr "VTEŘINY" +msgstr "SEKUNDY" + +#: ../midori/main.c:1904 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Přesměruje varování z konzoly do souboru SOUBOR" + +#: ../midori/main.c:1904 +msgid "FILENAME" +msgstr "SOUBOR" -#: ../midori/main.c:1654 +#: ../midori/main.c:1969 msgid "[Addresses]" msgstr "[Adresy]" -#: ../midori/main.c:1682 +#: ../midori/main.c:2011 msgid "Please report comments, suggestions and bugs to:" -msgstr "Komentáře, požadavky a chyby posílejte na:" +msgstr "Komentáře, požadavky a hlášení o chybách posílejte na:" -#: ../midori/main.c:1684 +#: ../midori/main.c:2013 msgid "Check for new versions at:" -msgstr "Zkontrolujte, zda není nová verze na " +msgstr "Zjistěte dostupnost nové verze na:" -#: ../midori/main.c:1801 -msgid "The specified configuration folder is invalid." -msgstr "Vybraný konfigurační adresář je neplatný." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2108 +msgid "Saved logins and _passwords" +msgstr "Uložené _přihlašovací údaje" + +#: ../midori/main.c:2110 +msgid "Cookies and Website data" +msgstr "Cookies a data stránek" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2114 ../midori/midori-websettings.c:997 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Mezipaměť stránek" -#: ../midori/main.c:1849 -msgid "An instance of Midori is already running but not responding.\n" -msgstr "Midori sice již běží, ale neodpovídá.\n" +#: ../midori/main.c:2117 +msgid "Website icons" +msgstr "Ikony webových stránek" -#: ../midori/main.c:1904 -#, 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:2223 +msgid "An unknown error occured" +msgstr "Došlo k neznámé chybě" + +#: ../midori/main.c:2330 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Instance aplikace Midori je již spuštěna, ale neodpovídá.\n" -#: ../midori/main.c:1925 +#: ../midori/main.c:2366 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" -msgstr "Záložky nemohou být načteny: %s\n" +msgstr "Záložky nelze načíst: %s\n" -#: ../midori/main.c:1967 +#: ../midori/main.c:2414 #, c-format msgid "The trash couldn't be loaded: %s\n" -msgstr "Zavřené karty nemohou být načteny: %s\n" +msgstr "Zavřené karty nelze načíst: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:2427 #, c-format msgid "The history couldn't be loaded: %s\n" -msgstr "Historie nemůže být načtena: %s\n" +msgstr "Historii nelze načíst: %s\n" -#: ../midori/main.c:1994 +#: ../midori/main.c:2443 msgid "The following errors occured:" msgstr "Došlo k následujícím chybám:" -#: ../midori/main.c:2010 +#: ../midori/main.c:2459 msgid "_Ignore" msgstr "_Ignorovat" -#: ../midori/midori-array.c:429 +#: ../midori/midori-app.c:1339 +msgid "_Bookmark" +msgstr "_Záložky" + +#: ../midori/midori-app.c:1340 ../midori/midori-browser.c:6066 +msgid "_Bookmarks" +msgstr "_Záložky" + +#: ../midori/midori-app.c:1341 +msgid "Add Boo_kmark" +msgstr "_Přidat záložku" + +#: ../midori/midori-app.c:1342 +msgid "_Console" +msgstr "_Konzola" + +#: ../midori/midori-app.c:1343 +msgid "_Extensions" +msgstr "_Rozšíření" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1344 ../midori/midori-browser.c:4591 +msgid "_History" +msgstr "_Historie" + +#: ../midori/midori-app.c:1345 +msgid "_Homepage" +msgstr "_Domovská stránka" + +#: ../midori/midori-app.c:1346 +msgid "_Userscripts" +msgstr "_Uživatelské skripty" + +#: ../midori/midori-app.c:1347 +msgid "New _Tab" +msgstr "Nová _karta" + +#: ../midori/midori-app.c:1348 +msgid "_Transfers" +msgstr "_Přenosy" + +#: ../midori/midori-app.c:1349 +msgid "Netscape p_lugins" +msgstr "Zásuvné moduly ap_likace Netscape" + +#: ../midori/midori-app.c:1350 +msgid "_Closed Tabs" +msgstr "_Zavřené karty" + +#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5218 +msgid "New _Window" +msgstr "Nové _okno" + +#: ../midori/midori-app.c:1352 +msgid "New _Folder" +msgstr "Nová _složka" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "Soubor nebyl nalezen." -#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 -#: ../midori/midori-array.c:496 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Nesprávný formát dokumentu." -#: ../midori/midori-array.c:505 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "Neznámý formát záložek." -#: ../midori/midori-array.c:719 +#: ../midori/midori-array.c:915 msgid "Writing failed." -msgstr "Nepodařilo se zapsat." +msgstr "Zápis se nezdařil." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 -#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5300 +#: ../midori/midori-browser.c:5309 msgid "Reload the current page" -msgstr "Znovu načíst stránku" +msgstr "Znovu načíst tuto stránku" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 +#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5306 msgid "Stop loading the current page" -msgstr "Zastavit načítání stránky" - -#: ../midori/midori-browser.c:453 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% načteno" +msgstr "Zastavit načítání této stránky" -#: ../midori/midori-browser.c:491 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" -msgstr "Nepodařilo se zaktualizovat titulek: %s\n" +msgstr "Nepodařilo se aktualizovat titulek: %s\n" -#: ../midori/midori-browser.c:504 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." msgstr "Neočekávaná akce '%s'." -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:569 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Soukromé prohlížení)" + +#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716 +msgid "Toplevel folder" +msgstr "Složka nejvyšší úrovně" + +#: ../midori/midori-browser.c:774 msgid "New folder" -msgstr "Nový adresář" +msgstr "Nová složka" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:774 msgid "Edit folder" -msgstr "Upravit adresář" +msgstr "Upravit složku" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "New bookmark" msgstr "Nová záložka" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "Edit bookmark" msgstr "Upravit záložku" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:818 msgid "_Title:" msgstr "_Nadpis:" -#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "_Popis:" - -#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4328 msgid "_Folder:" -msgstr "_Adresář:" - -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 -#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 -msgid "Toplevel folder" -msgstr "Hlavní adresář" +msgstr "Složk_a:" -#: ../midori/midori-browser.c:872 +#: ../midori/midori-browser.c:877 msgid "Add to _Speed Dial" -msgstr "Přidat do rychlého _přístupu" +msgstr "Přidat do _rychlého přístupu" -#: ../midori/midori-browser.c:885 +#: ../midori/midori-browser.c:890 msgid "Show in the tool_bar" -msgstr "Zobrazit v _nástrojové liště" +msgstr "Zobrazit v panelu _nástrojů" -#: ../midori/midori-browser.c:900 +#: ../midori/midori-browser.c:905 msgid "Run as _web application" msgstr "Spustit jako _webovou aplikaci" -#: ../midori/midori-browser.c:979 +#: ../midori/midori-browser.c:976 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Soubor \"%s\" nelze uložit do této složky." + +#: ../midori/midori-browser.c:978 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Nemáte oprávnění k zápisu do tohoto umístění." + +#: ../midori/midori-browser.c:985 #, c-format msgid "There is not enough free space to download \"%s\"." -msgstr "Není dost místa pro stažení \"%s\"." +msgstr "Ke stažení \"%s\" není k dispozici dostatek místa." -#: ../midori/midori-browser.c:983 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." -msgstr "Požadováno je %s, ale k dispozici jen %s." +msgstr "Požaduje se %s, ale k dispozici je pouze %s." -#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 -#: ../midori/midori-browser.c:4085 +#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4397 msgid "Save file as" msgstr "Uložit soubor jako" -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1320 +msgid "New Window" +msgstr "Nové okno" + +#: ../midori/midori-browser.c:1320 +msgid "A new window has been opened" +msgstr "Bylo otevřeno nové okno" + +#: ../midori/midori-browser.c:1323 +msgid "New Tab" +msgstr "Nová karta" + +#: ../midori/midori-browser.c:1323 +msgid "A new tab has been opened" +msgstr "Byla otevřena nová karta" + +#: ../midori/midori-browser.c:1358 +msgid "Error opening the image!" +msgstr "Chyba při otevírání obrázku!" + +#: ../midori/midori-browser.c:1359 +msgid "Can not open selected image in a default viewer." +msgstr "Vybraný obrázek nelze otevřít ve výchozím prohlížeči obrázků." + +#: ../midori/midori-browser.c:1365 +msgid "Error downloading the image!" +msgstr "Chyba při stahování obrázku." + +#: ../midori/midori-browser.c:1366 +msgid "Can not download selected image." +msgstr "Vybraný obrázek se nepodařilo stáhnout." + +#: ../midori/midori-browser.c:1492 msgid "Save file" msgstr "Uložit soubor" -#: ../midori/midori-browser.c:2150 +#: ../midori/midori-browser.c:2367 msgid "Open file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:2228 +#: ../midori/midori-browser.c:2499 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." -msgstr "Když použijete výše uvedenou adresu, otevře se agregátor zpráv (čtečka RSS). Obvykle je v něm položka menu nebo tlačítko \"Nový kanál\" (nebo s podobným názvem). Další možností je změna nastavení Midori (Upravit -> Nastavení -> záložka Aplikace, položka Čtečka RSS). Příští kliknutí na ikonu RSS přidá kanál přímo do čtečky." +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr "" +"Použijete-li výše uvedenou adresu URI, otevře se agregátor zpráv (čtečka " +"RSS). Obvykle se v něm nachází položka nabídky nebo tlačítko \"Nový kanál" +"\" (nebo s podobným názvem). Další možností je změna nastavení aplikace " +"Midori (Upravit -> Nastavení -> záložka Aplikace, položka Čtečka RSS). " +"Dalším kliknutím na ikonu RSS přidáte kanál přímo do čtečky." -#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nový kanál" -#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 -#: ../panels/midori-bookmarks.c:406 +#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5369 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "Přidat novou záložku" -#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "Nemohu spustit externí program." +#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "Prázdné" + +#: ../midori/midori-browser.c:3469 +msgid "Toggle text cursor navigation" +msgstr "Přepíná navigaci pomocí kurzoru" -#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:3784 ../midori/midori-browser.c:5759 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nepodařilo se vložit novou položku historie: %s\n" -#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:734 +#: ../midori/midori-browser.c:4116 ../panels/midori-bookmarks.c:745 +#: ../panels/midori-history.c:803 msgid "Open all in _Tabs" msgstr "Otevřít všechny v _kartách" -#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 -#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4123 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Otevřít v nové _kartě" -#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 -#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4126 ../midori/midori-view.c:2688 +#: ../midori/midori-view.c:4848 ../panels/midori-bookmarks.c:753 +#: ../panels/midori-history.c:811 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Otevřít v novém _okně" -#: ../midori/midori-browser.c:3931 +#: ../midori/midori-browser.c:4215 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3932 +#: ../midori/midori-browser.c:4216 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:4217 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:4218 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3935 +#: ../midori/midori-browser.c:4219 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3959 +#: ../midori/midori-browser.c:4220 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4241 msgid "Import bookmarks..." msgstr "Importovat záložky..." -#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4244 ../midori/midori-browser.c:5374 msgid "_Import bookmarks" msgstr "_Importovat záložky" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:4255 msgid "_Application:" msgstr "_Aplikace:" -#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 -#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 -#: ../katze/katze-utils.c:696 -msgid "Custom..." -msgstr "Vlastní..." +#: ../midori/midori-browser.c:4320 +msgid "Import from XBEL or HTML file" +msgstr "Importovat ze souboru typu XBEL, nebo HTML" + +#: ../midori/midori-browser.c:4355 +msgid "Import from a file" +msgstr "Importovat ze souboru" -#: ../midori/midori-browser.c:4061 +#: ../midori/midori-browser.c:4367 msgid "Failed to import bookmarks" msgstr "Nepodařilo se naimportovat záložky" -#: ../midori/midori-browser.c:4102 -msgid "Failed to export bookmarks" -msgstr "Nepodařilo se exportovat záložky" +#: ../midori/midori-browser.c:4402 +msgid "XBEL Bookmarks" +msgstr "Záložky ve formátu XBEL" + +#: ../midori/midori-browser.c:4407 +msgid "Netscape Bookmarks" +msgstr "Záložky z aplikace Netscape" -#: ../midori/midori-browser.c:4155 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "Nepodařilo se smazat historii: %s\n" +#: ../midori/midori-browser.c:4421 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "" +"Z aplikace Midori lze exportovat záložky pouze ve formátech XBEL (*.xbel) a " +"Netscape (*.html)" -#: ../midori/midori-browser.c:4163 -#, c-format -msgid "Failed to clear search history: %s\n" -msgstr "Nepodařilo se smazat historii hledání: %s\n" +#: ../midori/midori-browser.c:4436 +msgid "Failed to export bookmarks" +msgstr "Nepodařilo se exportovat záložky" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4270 +#: ../midori/midori-browser.c:4558 msgid "Clear Private Data" msgstr "Vymazat osobní data" -#: ../midori/midori-browser.c:4274 +#: ../midori/midori-browser.c:4562 msgid "_Clear private data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:4288 +#: ../midori/midori-browser.c:4575 msgid "Clear the following data:" msgstr "Vymazat následující data:" -#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:114 -msgid "History" -msgstr "Historie" - -#: ../midori/midori-browser.c:4303 -msgid "Cookies" -msgstr "cookies" - -#: ../midori/midori-browser.c:4308 -msgid "'Flash' Cookies" -msgstr "cookies z flashe" - -#: ../midori/midori-browser.c:4313 -msgid "Website icons" -msgstr "Ikony stránek" - -#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 -msgid "_Closed Tabs" -msgstr "_Zavřené karty" - -#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "Keš stránek" +#: ../midori/midori-browser.c:4585 +msgid "Last open _tabs" +msgstr "Naposledy otevřené _karty" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4611 msgid "Clear private data when _quitting Midori" -msgstr "_Vymazat osobní data při ukončení Midori" +msgstr "Vymazat _osobní data při ukončení aplikace Midori" -#: ../midori/midori-browser.c:4472 +#: ../midori/midori-browser.c:4806 msgid "A lightweight web browser." msgstr "Odlehčený internetový prohlížeč." -#: ../midori/midori-browser.c:4474 -msgid "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." -msgstr "Tato knihovna je svobodný software; můžete ji distribuovat anebo měnit podle práv GNU Lesser General Public License jak byla publikována Free Software Foundation; ať už verze 2.1, nebo (podle uvážení) jakékoliv pozdější verze." +#: ../midori/midori-browser.c:4807 +msgid "See about:version for version info." +msgstr "about:version zobrazí informace o verzi" + +#: ../midori/midori-browser.c:4809 +msgid "" +"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." +msgstr "" +"Tato knihovna je svobodný software; můžete ji distribuovat anebo měnit podle " +"práv GNU Lesser General Public License jak byla publikována Free Software " +"Foundation; ať už verze 2.1, nebo (podle uvážení) jakékoliv pozdější verze." -#: ../midori/midori-browser.c:4493 +#: ../midori/midori-browser.c:4830 msgid "translator-credits" -msgstr "David Štancl " +msgstr "" +"David Štancl \n" +"Michal Várady " -#: ../midori/midori-browser.c:4802 +#: ../midori/midori-browser.c:5216 msgid "_File" msgstr "_Soubor" -#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 -msgid "New _Window" -msgstr "Nové _okno" - -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:5219 msgid "Open a new window" msgstr "Otevřít nové okno" -#: ../midori/midori-browser.c:4808 +#: ../midori/midori-browser.c:5222 msgid "Open a new tab" msgstr "Otevřít novou kartu" -#: ../midori/midori-browser.c:4810 -msgid "P_rivate Browsing" -msgstr "Sou_kromé prohlížení" - -#: ../midori/midori-browser.c:4811 -msgid "Don't save any private data while browsing" -msgstr "Neukládat při prohlížení žádná data" +#: ../midori/midori-browser.c:5224 +msgid "New P_rivate Browsing Window" +msgstr "Nové okno souk_romého prohlížení" -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:5228 msgid "Open a file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:5230 +msgid "_Save Page As..." +msgstr "Uložit stránku j_ako..." + +#: ../midori/midori-browser.c:5231 msgid "Save to a file" msgstr "Uložit do souboru" -#: ../midori/midori-browser.c:4820 +#: ../midori/midori-browser.c:5233 msgid "Add to Speed _dial" msgstr "Přidat do rychlého _přístupu" -#: ../midori/midori-browser.c:4821 -msgid "Add shortcut to speed dial" -msgstr "Přidá záložku do rychlého přístupu" - -#: ../midori/midori-browser.c:4823 +#: ../midori/midori-browser.c:5237 msgid "Add Shortcut to the _desktop" msgstr "Přidat záložku na _plochu" -#: ../midori/midori-browser.c:4824 -msgid "Add shortcut to the desktop" -msgstr "Přidá záložku na plochu" +#: ../midori/midori-browser.c:5239 +msgid "Create _Launcher" +msgstr "Vytvořit _spouštěč" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:5243 msgid "Subscribe to News _feed" -msgstr "Přidat _kanál" +msgstr "Přihlásit se k odběru _kanálu" -#: ../midori/midori-browser.c:4827 -msgid "Subscribe to this news feed" -msgstr "Přidá tento kanál do odebíraných kanálů" - -#: ../midori/midori-browser.c:4832 +#: ../midori/midori-browser.c:5249 msgid "_Close Tab" msgstr "_Zavřít kartu" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:5250 msgid "Close the current tab" msgstr "Zavřít aktivní kartu" -#: ../midori/midori-browser.c:4835 +#: ../midori/midori-browser.c:5252 msgid "C_lose Window" -msgstr "Za_vřít okno" - -#: ../midori/midori-browser.c:4836 -msgid "Close this window" -msgstr "Zavřít toto okno" +msgstr "Z_avřít okno" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:5256 msgid "Print the current page" -msgstr "Vytisknout aktuální stránku" +msgstr "Vytisknout tuto stránku" -#: ../midori/midori-browser.c:4842 -msgid "Quit the application" -msgstr "Ukončit aplikaci" +#: ../midori/midori-browser.c:5258 +msgid "Close a_ll Windows" +msgstr "Zavřít _všechna okna" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:5261 msgid "_Edit" msgstr "_Upravit" -#: ../midori/midori-browser.c:4848 -msgid "Undo the last modification" -msgstr "Vrátit zpět poslední změnu" - -#: ../midori/midori-browser.c:4851 -msgid "Redo the last modification" -msgstr "Vrátit poslední změnu" - -#: ../midori/midori-browser.c:4855 -msgid "Cut the selected text" -msgstr "Vystříhnout vybraný text" - -#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 -msgid "Copy the selected text" -msgstr "Zkopírovat vybraný text" - -#: ../midori/midori-browser.c:4864 -msgid "Paste text from the clipboard" -msgstr "Vložit text ze schránky" - -#: ../midori/midori-browser.c:4867 -msgid "Delete the selected text" -msgstr "Smazat vybraný text" - -#: ../midori/midori-browser.c:4870 -msgid "Select all text" -msgstr "Vybrat vše" +#: ../midori/midori-browser.c:5284 +msgid "_Find..." +msgstr "Na_jít..." -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:5285 msgid "Find a word or phrase in the page" msgstr "Najít slovo nebo frázi na stránce" -#: ../midori/midori-browser.c:4875 +#: ../midori/midori-browser.c:5287 msgid "Find _Next" msgstr "Najít _další" -#: ../midori/midori-browser.c:4876 -msgid "Find the next occurrence of a word or phrase" -msgstr "Najít další výskyt slova nebo fráze" - -#: ../midori/midori-browser.c:4878 +#: ../midori/midori-browser.c:5290 msgid "Find _Previous" msgstr "Najít _předchozí" -#: ../midori/midori-browser.c:4879 -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:4883 +#: ../midori/midori-browser.c:5294 msgid "Configure the application preferences" msgstr "Změnit nastavení aplikace" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:5296 msgid "_View" msgstr "_Zobrazit" -#: ../midori/midori-browser.c:4886 +#: ../midori/midori-browser.c:5297 msgid "_Toolbars" -msgstr "_Lišty" +msgstr "Pane_ly nástrojů" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:5302 +msgid "Reload page without caching" +msgstr "Znovu načíst stránku bez použití mezipaměti" + +#: ../midori/midori-browser.c:5312 msgid "Increase the zoom level" msgstr "Přiblížit" -#: ../midori/midori-browser.c:4901 +#: ../midori/midori-browser.c:5315 msgid "Decrease the zoom level" msgstr "Oddálit" -#: ../midori/midori-browser.c:4904 -msgid "Reset the zoom level" -msgstr "Nastavit původní přiblížení" - -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:5319 msgid "_Encoding" msgstr "_Kódování" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:5321 msgid "View So_urce" -msgstr "Zobrazit zdrojový _kód" +msgstr "Zobrazit zdro_jový kód" -#: ../midori/midori-browser.c:4908 -msgid "View the source code of the page" -msgstr "Zobrazí zdrojový kód stránky" +#: ../midori/midori-browser.c:5324 +msgid "Ca_ret Browsing" +msgstr "Prohlížení ku_rzorem" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:5328 msgid "Toggle fullscreen view" msgstr "Přepnout zobrazení na celou obrazovku" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:5330 msgid "Scroll _Left" -msgstr "Rolovat v_levo" +msgstr "Posunout v_levo" -#: ../midori/midori-browser.c:4915 -msgid "Scroll to the left" -msgstr "Posunout pohled vlevo" - -#: ../midori/midori-browser.c:4917 +#: ../midori/midori-browser.c:5333 msgid "Scroll _Down" -msgstr "Rolovat _dolů" - -#: ../midori/midori-browser.c:4918 -msgid "Scroll down" -msgstr "Posunout pohled dolů" +msgstr "Posunout _dolů" -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:5336 msgid "Scroll _Up" -msgstr "Rolovat nahor_u" +msgstr "Posunout nahor_u" -#: ../midori/midori-browser.c:4921 -msgid "Scroll up" -msgstr "Posunout pohled nahoru" - -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:5339 msgid "Scroll _Right" -msgstr "Rolovat vp_ravo" - -#: ../midori/midori-browser.c:4924 -msgid "Scroll to the right" -msgstr "Posunout pohled vpravo" +msgstr "Posunout vp_ravo" -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:5342 msgid "_Go" msgstr "_Přejít" -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:5345 msgid "Go back to the previous page" msgstr "Přejít zpět (na předchozí stránku)" -#: ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:5348 msgid "Go forward to the next page" msgstr "Přejít vpřed (na následující stránku)" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4937 +#: ../midori/midori-browser.c:5352 msgid "Go to the previous sub-page" msgstr "Přejít na předchozí podstránku" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:5356 msgid "Go to the next sub-page" msgstr "Přejít na následující podstránku" -#: ../midori/midori-browser.c:4944 +#: ../midori/midori-browser.c:5359 msgid "Go to your homepage" msgstr "Přejít na domovskou stránku" -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:5361 msgid "Empty Trash" msgstr "Vyprázdnit seznam zavřených karet" -#: ../midori/midori-browser.c:4947 -msgid "Delete the contents of the trash" -msgstr "Vymaže seznam zavřených karet" - -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:5364 msgid "Undo _Close Tab" -msgstr "Vrátit _zavření karty" - -#: ../midori/midori-browser.c:4950 -msgid "Open the last closed tab" -msgstr "Otevře naposledy zavřenou kartu" +msgstr "_Znovu otevřít zavřenou kartu" -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:5371 msgid "Add a new _folder" msgstr "Přidat novou _složku" -#: ../midori/midori-browser.c:4957 -msgid "Add a new bookmark folder" -msgstr "Přidá novou složku do záložek" - -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:5377 msgid "_Export bookmarks" msgstr "_Exportovat záložky" -#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" -msgstr "Nastavit _vyhledávací nástroje" - -#: ../midori/midori-browser.c:4966 -msgid "Add, edit and remove search engines..." -msgstr "Přidává, upravuje a maže vyhledávací nástroje..." +msgstr "Nastavit vy_hledávací nástroje" -#: ../midori/midori-browser.c:4969 +#: ../midori/midori-browser.c:5383 msgid "_Clear Private Data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:4970 -msgid "Clear private data..." -msgstr "Vymaže osobní data..." - -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:5386 msgid "_Inspect Page" msgstr "Pro_zkoumat stránku" -#: ../midori/midori-browser.c:4975 -msgid "Inspect page details and access developer tools..." -msgstr "Zobrazí stránku ve vývojářském nástroji..." - -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:5390 msgid "_Previous Tab" msgstr "_Předchozí karta" -#: ../midori/midori-browser.c:4981 -msgid "Switch to the previous tab" -msgstr "Přepnout na předchozí kartu" - -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:5393 msgid "_Next Tab" msgstr "_Další karta" -#: ../midori/midori-browser.c:4984 -msgid "Switch to the next tab" -msgstr "Přepnout na další kartu" +#: ../midori/midori-browser.c:5395 +msgid "Move Tab _Backward" +msgstr "Přesunout kartu v_zad" + +#: ../midori/midori-browser.c:5397 +msgid "_Move Tab Forward" +msgstr "Přesunout kartu v_před" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:5400 msgid "Focus _Current Tab" -msgstr "Zaměřit _aktuální kartu" - -#: ../midori/midori-browser.c:4987 -msgid "Focus the current tab" -msgstr "Zaměří aktuální kartu" +msgstr "_Přepnout kurzor na tuto kartu" -#: ../midori/midori-browser.c:4989 -msgid "Minimize _Current Tab" -msgstr "Minimalizovat _aktuální kartu" +#: ../midori/midori-browser.c:5403 +msgid "Focus _Next view" +msgstr "Přepnout na _další" -#: ../midori/midori-browser.c:4990 -msgid "Minimize the current tab" -msgstr "Minimalizuje aktuální kartu" +#: ../midori/midori-browser.c:5406 +msgid "Only show the Icon of the _Current Tab" +msgstr "Zobrazit pouze ikonu a_ktuální karty" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:5409 msgid "_Duplicate Current Tab" msgstr "Z_dvojit aktuální kartu" -#: ../midori/midori-browser.c:4993 -msgid "Duplicate the current tab" -msgstr "Obsah aktuální karty otevře v nové kartě" - -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:5412 msgid "Close Ot_her Tabs" msgstr "_Zavřít ostatní karty" -#: ../midori/midori-browser.c:4996 -msgid "Close all tabs except the current tab" -msgstr "Zavře všechny karty kromě aktuální" - -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5415 msgid "Open last _session" -msgstr "Otevřít poslední _sezení" +msgstr "Otevřít poslední _relaci" -#: ../midori/midori-browser.c:4999 -msgid "Open the tabs saved in the last session" -msgstr "Otevře karty uložené při posledním sezení" - -#: ../midori/midori-browser.c:5001 +#: ../midori/midori-browser.c:5418 msgid "_Help" msgstr "_Nápověda" -#: ../midori/midori-browser.c:5003 -msgid "_Contents" -msgstr "_Obsah" - -#: ../midori/midori-browser.c:5004 -msgid "Show the documentation" -msgstr "Zobrazit dokumentaci" - -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:5420 msgid "_Frequent Questions" msgstr "Časté _otázky" -#: ../midori/midori-browser.c:5007 -msgid "Show the Frequently Asked Questions" -msgstr "Zobrazí často kladené otázky (FAQ)" - -#: ../midori/midori-browser.c:5009 -msgid "_Report a Bug" -msgstr "Ohlásit chy_bu" - -#: ../midori/midori-browser.c:5010 -msgid "Open Midori's bug tracker" -msgstr "Otevře stránku pro hlášení chyb" - -#: ../midori/midori-browser.c:5013 -msgid "Show information about the program" -msgstr "Zobrazí informace o programu" +#: ../midori/midori-browser.c:5423 +msgid "_Report a Problem..." +msgstr "Ohlásit chy_bu..." -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:5435 msgid "_Menubar" msgstr "_Nabídka" -#: ../midori/midori-browser.c:5022 -msgid "Show menubar" -msgstr "Zobrazit nabídku" - -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:5439 msgid "_Navigationbar" -msgstr "_Navigační lišta" - -#: ../midori/midori-browser.c:5026 -msgid "Show navigationbar" -msgstr "Zobrazit navigační lištu" +msgstr "_Navigační panel" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5443 msgid "Side_panel" -msgstr "Boční _panel" +msgstr "Postranní _panel" -#: ../midori/midori-browser.c:5030 -msgid "Show sidepanel" -msgstr "Zobrazit boční panel" +#: ../midori/midori-browser.c:5444 +msgid "Sidepanel" +msgstr "Postranní panel" -#: ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:5447 msgid "_Bookmarkbar" -msgstr "Lišta _záložek" +msgstr "Panel _záložek" -#: ../midori/midori-browser.c:5034 -msgid "Show bookmarkbar" -msgstr "Zobrazit lištu se záložkami" - -#: ../midori/midori-browser.c:5037 -msgid "_Transferbar" -msgstr "Stav _přenosu" - -#: ../midori/midori-browser.c:5038 -msgid "Show transferbar" -msgstr "Zobrazit stav přenosu dat" - -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:5451 msgid "_Statusbar" -msgstr "_Stavová lišta" - -#: ../midori/midori-browser.c:5042 -msgid "Show statusbar" -msgstr "Zobrazit stavovou lištu" +msgstr "_Stavový panel" -#: ../midori/midori-browser.c:5050 +#: ../midori/midori-browser.c:5460 ../midori/midori-websettings.c:312 msgid "_Automatic" msgstr "_Automatické" -#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 -msgid "Chinese (BIG5)" -msgstr "Čínské (BIG5)" +#: ../midori/midori-browser.c:5463 ../midori/midori-websettings.c:236 +msgid "Chinese Traditional (BIG5)" +msgstr "Čínské tradiční (BIG5)" + +#: ../midori/midori-browser.c:5466 ../midori/midori-websettings.c:237 +msgid "Chinese Simplified (GB18030)" +msgstr "Čínské zjednodušené (GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5470 msgid "Japanese (SHIFT__JIS)" msgstr "Japonské (SHIFT__JIS)" -#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5473 ../midori/midori-websettings.c:239 msgid "Korean (EUC-KR)" msgstr "Korejské (EUC-KR)" -#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5476 ../midori/midori-websettings.c:240 msgid "Russian (KOI8-R)" msgstr "Ruské (KOI8-R)" -#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5479 ../midori/midori-websettings.c:241 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5482 ../midori/midori-websettings.c:242 msgid "Western (ISO-8859-1)" msgstr "Západní (ISO-8859-1)" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5485 ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:318 ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "Vlastní..." + +#: ../midori/midori-browser.c:5991 msgid "_Separator" msgstr "_Oddělovač" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5998 msgid "_Location..." msgstr "U_místění..." -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:6000 msgid "Open a particular location" -msgstr "Otevřít umístění" +msgstr "Otevřít konkrétní umístění" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:6022 msgid "_Web Search..." msgstr "_Hledat na webu..." -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:6024 msgid "Run a web search" msgstr "Spustí vyhledávání na webu" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:6051 msgid "Reopen a previously closed tab or window" msgstr "Znovu otevřít zavřenou kartu nebo okno" -#: ../midori/midori-browser.c:5659 +#: ../midori/midori-browser.c:6068 +msgid "Show the saved bookmarks" +msgstr "Zobrazit uložené záložky" + +#: ../midori/midori-browser.c:6085 msgid "_Tools" msgstr "Ná_stroje" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:6101 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:6103 msgid "Show a list of all open tabs" msgstr "Zobrazit seznam všech otevřených karet" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:6117 msgid "_Menu" msgstr "_Nabídka" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:6119 msgid "Menu" msgstr "Nabídka" -#: ../midori/midori-browser.c:6262 +#: ../midori/midori-browser.c:6933 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekávané nastavení '%s'" -#: ../midori/midori-locationaction.c:390 +#: ../midori/midori-extension.c:329 #, c-format -msgid "Failed to select from history\n" -msgstr "Nepodařilo se načíst údaje z historie\n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "Nastavení rozšíření '%s' nelze načíst: %s\n" -#: ../midori/midori-locationaction.c:474 +#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "Vyhledat %s" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Nastavení rozšíření '%s' nelze uložit: %s\n" -#: ../midori/midori-locationaction.c:497 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "Hledat %s" -#: ../midori/midori-locationaction.c:1307 +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Hledat pomocí..." + +#: ../midori/midori-locationaction.c:537 +#, c-format +msgid "Failed to select from history\n" +msgstr "Nepodařilo se načíst údaje z historie\n" + +#: ../midori/midori-locationaction.c:624 #, c-format -msgid "Failed to execute database statement\n" -msgstr "Nepodařilo se spustit databázový příkaz\n" +msgid "Search for %s" +msgstr "Vyhledat %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1363 +#: ../midori/midori-locationaction.c:1398 msgid "Paste and p_roceed" msgstr "Vložit a s_pustit" -#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 -msgid "Detach chosen panel from the window" -msgstr "Oddělit vybraný panel od okna" +#: ../midori/midori-locationaction.c:1739 +msgid "Not verified" +msgstr "Neověřené spojení" + +#: ../midori/midori-locationaction.c:1759 +msgid "Verified and encrypted connection" +msgstr "Ověřené a šifrované spojení" + +#: ../midori/midori-locationaction.c:1771 +msgid "Open, unencrypted connection" +msgstr "Ověřené, nešifrované spojení" -#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 -#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" -msgstr "Umístit boční panel vpravo" +msgstr "Umístit postranní panel vpravo" -#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Zavřít panel" -#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" -msgstr "Umístit boční panel vlevo" +msgstr "Umístit postranní panel vlevo" -#: ../midori/midori-panel.c:771 -msgid "Hide operating controls" -msgstr "Schovat ovládací prvky" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "zobrazit rychlý přístup" -#: ../midori/midori-websettings.c:200 -msgid "Show Blank page" -msgstr "zobrazit prázdnou stránku" - -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" msgstr "zobrazit domovskou stránku" -#: ../midori/midori-websettings.c:202 -msgid "Show last open tabs" -msgstr "zobrazit naposledy otevřené karty" - -#: ../midori/midori-websettings.c:204 -msgid "Show last tabs without loading" -msgstr "zobrazit naposledy otevřené karty bez načtení" - -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:238 msgid "Japanese (SHIFT_JIS)" msgstr "Japonské (SHIFT_JIS)" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:258 msgid "New tab" msgstr "nové kartě" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:259 msgid "New window" msgstr "novém okně" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:260 msgid "Current tab" msgstr "aktuální kartě" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:275 msgid "Default" msgstr "výchozí" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:276 msgid "Icons" msgstr "ikony" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:277 msgid "Small icons" msgstr "malé ikony" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:278 msgid "Text" msgstr "text" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:279 msgid "Icons and text" msgstr "ikony a text" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:280 msgid "Text beside icons" msgstr "text pod ikonami" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:295 msgid "Automatic (GNOME or environment)" msgstr "automaticky (GNOME, nebo jiné prostředí)" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:296 msgid "HTTP proxy server" -msgstr "HTTP proxy server" +msgstr "server proxy HTTP" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:297 msgid "No proxy server" -msgstr "žádný" - -#: ../midori/midori-websettings.c:295 -msgid "All cookies" -msgstr "všechna cookies" - -#: ../midori/midori-websettings.c:296 -msgid "Session cookies" -msgstr "cookies sezení" - -#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 -msgid "None" -msgstr "žádná" +msgstr "žádný server proxy" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:314 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:315 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:316 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:317 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:401 msgid "Remember last window size" msgstr "Pamatovat si velikost okna" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:402 msgid "Whether to save the last window size" -msgstr "Ukládat rozměry okna?" +msgstr "Určuje, zda se budou ukládat rozměry okna" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:410 msgid "Last window width" -msgstr "Šířka okna" +msgstr "Poslední šířka okna" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:411 msgid "The last saved window width" msgstr "Naposledy uložená šířka okna" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:419 msgid "Last window height" -msgstr "Výška okna" +msgstr "Poslední výška okna" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:420 msgid "The last saved window height" msgstr "Naposledy uložená výška okna" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:445 msgid "Last panel position" msgstr "Poslední pozice panelu" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:446 msgid "The last saved panel position" -msgstr "Uložená poslední pozice panelu" +msgstr "Naposledy uložená pozice panelu" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:455 msgid "Last panel page" -msgstr "Poslední otevřená stránka" +msgstr "Poslední stránka panelu" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:456 msgid "The last saved panel page" -msgstr "Uložená stránka" +msgstr "Naposledy uložená stránka panelu" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:464 msgid "Last Web search" -msgstr "Rychlé hledání na webu" +msgstr "Poslední hledání na webu" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:465 msgid "The last saved Web search" -msgstr "Uložené poslední vyhledávání na webu" +msgstr "Poslední uložené vyhledávání na webu" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:474 msgid "Show Menubar" -msgstr "Zobrazit nabídku" +msgstr "Zobrazit panel nabídky" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:475 msgid "Whether to show the menubar" -msgstr "Zobrazit nabídku?" +msgstr "Určuje, zda se bude zobrazovat panel nabídky" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:483 msgid "Show Navigationbar" -msgstr "Zobrazit vyhledávání" +msgstr "Zobrazit panel vyhledávání" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:484 msgid "Whether to show the navigationbar" -msgstr "Zobrazit lištu vyhledávání?" +msgstr "Určuje, zda se bude zobrazovat panel vyhledávání" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:492 msgid "Show Bookmarkbar" msgstr "Zobrazit záložky" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:493 msgid "Whether to show the bookmarkbar" -msgstr "Zobrazit lištu se záložkami?" +msgstr "Určuje, zda se bude zobrazovat panel záložek" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:501 msgid "Show Panel" msgstr "Zobrazit panel" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:502 msgid "Whether to show the panel" -msgstr "Zobrazit panel?" - -#: ../midori/midori-websettings.c:485 -msgid "Show Transferbar" -msgstr "Zobrazit stav přenosu" +msgstr "Určuje, zda se bude zobrazovat panel" -#: ../midori/midori-websettings.c:486 -msgid "Whether to show the transferbar" -msgstr "Zobrazit stav přenosu?" - -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:510 msgid "Show Statusbar" msgstr "Zobrazit stavový řádek" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:511 msgid "Whether to show the statusbar" -msgstr "Zobrazit stavový řádek?" +msgstr "Určuje, zda se bude zobrazovat panel stavu" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:520 msgid "Toolbar Style:" -msgstr "Styl lišty:" - -#: ../midori/midori-websettings.c:505 -msgid "The style of the toolbar" -msgstr "Nastaví styl lišty (zobrazení textu a ikon)." +msgstr "Styl panelu nástrojů:" #: ../midori/midori-websettings.c:521 -msgid "Show progress in location entry" -msgstr "Zobrazit průběh v řádku adresy" - -#: ../midori/midori-websettings.c:522 -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:537 -msgid "Search engines in location completion" -msgstr "Zobrazovat výsledky hledání při zadávání adresy" - -#: ../midori/midori-websettings.c:538 -msgid "Whether to show search engines in the location completion" -msgstr "Zobrazovat výsledky vyhledávání při zadávání adresy?" +msgid "The style of the toolbar" +msgstr "Styl panelu nástrojů" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:530 msgid "Toolbar Items" -msgstr "Položky nástrojové lišty" +msgstr "Položky panelu nástrojů" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:531 msgid "The items to show on the toolbar" -msgstr "Položky, které se budou zobrazovat na nástrojové liště" +msgstr "Položky zobrazované na panelu nástrojů" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:539 msgid "Compact Sidepanel" -msgstr "Kompaktní boční panel" +msgstr "Kompaktní postranní panel" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:540 msgid "Whether to make the sidepanel compact" -msgstr "Má se zobrazit boční panel kompaktně?" - -#: ../midori/midori-websettings.c:571 -msgid "Show operating controls of the panel" -msgstr "Zobrazí seznam nástrojů" - -#: ../midori/midori-websettings.c:572 -msgid "Whether to show the operating controls of the panel" -msgstr "Zda zobrazovat seznam nástrojů" +msgstr "Určuje, zda bude postranní panel zobrazen ve zjednodušené podobě" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:555 msgid "Align sidepanel on the right" -msgstr "Umístit boční panel vpravo" +msgstr "Umístit postranní panel vpravo" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:556 msgid "Whether to align the sidepanel on the right" -msgstr "Přesunout boční panel na opačnou stranu" +msgstr "Určuje, zda bude postranní panel umístěn napravo" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:571 msgid "Open panels in separate windows" -msgstr "Otvírat panely v samostatných oknech" +msgstr "Otevírat panely v samostatných oknech" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:572 msgid "Whether to always open panels in separate windows" -msgstr "Zda vždy otevřít panel v samostatné okno" +msgstr "Určuje, zda se budou panely vždy otevírat v samostatných oknech" -#: ../midori/midori-websettings.c:613 +#: ../midori/midori-websettings.c:581 msgid "When Midori starts:" -msgstr "Když Midori nastartuje:" +msgstr "Po spuštění aplikace Midori:" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:582 msgid "What to do when Midori starts" -msgstr "Co udělat, když je Midori spuštěno" +msgstr "Co se stane po spuštění aplikace Midori" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:591 msgid "Homepage:" msgstr "Domovská stránka:" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:592 msgid "The homepage" msgstr "Domovská stránka" -#: ../midori/midori-websettings.c:639 +#: ../midori/midori-websettings.c:607 msgid "Show crash dialog" msgstr "Zobrazit dialog po pádu" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:608 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:656 -msgid "Show speed dial in new tabs" -msgstr "Zobrazit obsah rychlého přístupu v kartách" - -#: ../midori/midori-websettings.c:657 -msgid "Show speed dial in newly opened tabs" -msgstr "Zobrazí obsah rychlého přístupu v nově otevřených kartách" +msgstr "Zobrazit dialog po pádu aplikace Midori" -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:616 msgid "Save downloaded files to:" msgstr "Ukládat stažené soubory do:" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:617 msgid "The folder downloaded files are saved to" -msgstr "Kam se budou ukládat stažené soubory" - -#: ../midori/midori-websettings.c:687 -msgid "Ask for the destination folder" -msgstr "Zeptat se na cílovou složku" - -#: ../midori/midori-websettings.c:688 -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:707 -msgid "Notify when a transfer has been completed" -msgstr "Upozornit na dokončení přenosu" - -#: ../midori/midori-websettings.c:708 -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:720 -msgid "Download Manager" -msgstr "Správce stahování" - -#: ../midori/midori-websettings.c:721 -msgid "An external download manager" -msgstr "Externí program pro stahování" +msgstr "Složka, do níž se budou ukládat stažené soubory" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:625 msgid "Text Editor" msgstr "Textový editor" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:626 msgid "An external text editor" msgstr "Externí textový editor" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:641 msgid "News Aggregator" msgstr "Čtečka RSS" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:642 msgid "An external news aggregator" msgstr "Externí čtečka zpráv RSS" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:650 msgid "Location entry Search" msgstr "Vyhledávání v adresním řádku" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:651 msgid "The search to perform inside the location entry" msgstr "Vyhledávání použité v řádku s adresou" -#: ../midori/midori-websettings.c:763 +#: ../midori/midori-websettings.c:659 msgid "Preferred Encoding" -msgstr "Preferované kódování" +msgstr "Upřednostňované kódování" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:660 msgid "The preferred character encoding" -msgstr "Preferované kódování stránek" +msgstr "Upřednostňované kódování stránek" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:670 msgid "Always Show Tabbar" -msgstr "Vždy zobrazovat karty" +msgstr "Vždy zobrazit panel karet" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:671 msgid "Always show the tabbar" -msgstr "Zobrazit karty, i když je jen jedna?" +msgstr "Vždy zobrazit panel karet" -#: ../midori/midori-websettings.c:783 +#: ../midori/midori-websettings.c:684 msgid "Close Buttons on Tabs" msgstr "Ikona zavření karty" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:685 msgid "Whether tabs have close buttons" -msgstr "Zobrazovat ikonu pro zavření karty?" +msgstr "Určuje, zda budou na kartách přítomna tlačítka pro jejich zavření" -#: ../midori/midori-websettings.c:792 +#: ../midori/midori-websettings.c:710 msgid "Open new pages in:" msgstr "Nové stránky otevírat v:" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:711 msgid "Where to open new pages" msgstr "Kde se budou otevírat nové stránky" -#: ../midori/midori-websettings.c:802 -msgid "Open external pages in:" -msgstr "Externí stránky otevírat v:" - -#: ../midori/midori-websettings.c:803 -msgid "Where to open externally opened pages" -msgstr "Kde se budou otevírat externí stránky" - -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:720 msgid "Middle click opens Selection" -msgstr "Kliknutím prostř. tlačítka otevřít vybraný text" +msgstr "Kliknutí prostředního tlačítka otevře vybraný text" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:721 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" +msgstr "Prostřední tlačítko myši otevře adresu obsaženou ve vybraném textu" -#: ../midori/midori-websettings.c:821 +#: ../midori/midori-websettings.c:729 msgid "Open tabs in the background" msgstr "Otevírat karty na pozadí" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:730 msgid "Whether to open new tabs in the background" -msgstr "Karty se otevírají na pozadí" +msgstr "Určuje, zda se budou nové karty otevírat na pozadí" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:738 msgid "Open Tabs next to Current" msgstr "Otevřít kartu vedle aktivní" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:739 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Nová karta se otevře vedle aktivní" +msgstr "" +"Určuje, zda se budou nové karty otevírat vedle aktivní nebo vedle poslední " +"karty" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:747 msgid "Open popups in tabs" msgstr "Otevírat vyskakovací okna v kartách" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:748 msgid "Whether to open popup windows in tabs" -msgstr "Vyskakovací okno se otevře v nové kartě" +msgstr "Určuje, zda se vyskakovací okno otevře v kartě" -#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:758 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Automaticky načítat obrázky" -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:759 msgid "Load and display images automatically" msgstr "Automaticky načítat a zobrazovat obrázky" -#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:766 ../extensions/statusbar-features.c:143 msgid "Enable scripts" msgstr "Povolit skripty" -#: ../midori/midori-websettings.c:859 +#: ../midori/midori-websettings.c:767 msgid "Enable embedded scripting languages" msgstr "Povolit vložené skriptové jazyky" -#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:774 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" -msgstr "Povolit pluginy z Netscape (Mozilly)" +msgstr "Povolit zásuvné moduly aplikace Netscape" -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:775 msgid "Enable embedded Netscape plugin objects" -msgstr "Povolit pluginové objekty prohlížeče Netscape (Mozilla)" +msgstr "Povolit objekty zásuvných modulů aplikace Netscape" + +#: ../midori/midori-websettings.c:790 +msgid "Enable Spell Checking" +msgstr "Povolit kontrolu pravopisu" -#: ../midori/midori-websettings.c:883 +#: ../midori/midori-websettings.c:791 +msgid "Enable spell checking while typing" +msgstr "Povolit kontrolu pravopisu při psaní" + +#: ../midori/midori-websettings.c:797 msgid "Enable HTML5 database support" -msgstr "Povolit HTML5 databázi" +msgstr "Povolit podporu databází HTML5" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:798 msgid "Whether to enable HTML5 database support" -msgstr "Zda povolit HTML5 databázi" +msgstr "Určuje, zda bude povolena podpora databází v jazyku HTML5" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:804 msgid "Enable HTML5 local storage support" msgstr "Povolit místní úložiště pro HTML5" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:805 msgid "Whether to enable HTML5 local storage support" -msgstr "Zda povolit místní úložiště dat pro HTML5" +msgstr "Určuje, zda budou povolena místní úložiště v jazyku HTML5" -#: ../midori/midori-websettings.c:899 +#: ../midori/midori-websettings.c:811 msgid "Enable offline web application cache" -msgstr "Povolit cache pro offline aplikace" +msgstr "Povolit mezipaměť pro offline aplikace" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:812 msgid "Whether to enable offline web application cache" -msgstr "Zda povolit používání cache pro offline aplikace" +msgstr "Určuje, zda bude povoleno používání mezipaměti pro offline aplikace" + +#: ../midori/midori-websettings.c:828 +msgid "Flash window on background tabs" +msgstr "Blikání okna při otevření karty na pozadí" + +#: ../midori/midori-websettings.c:829 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "Okno prohlížeče blikne při otevření nové karty na pozadí" -#: ../midori/midori-websettings.c:925 +#: ../midori/midori-websettings.c:837 +msgid "Enable WebGL support" +msgstr "Povolit podporu WebGL" + +#: ../midori/midori-websettings.c:838 +msgid "Allow websites to use OpenGL rendering" +msgstr "Umožnit webovým stránkám použití vykreslování pomocí knihovny OpenGL" + +#: ../midori/midori-websettings.c:864 msgid "Zoom Text and Images" msgstr "Zvětšovat text i obrázky" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:865 msgid "Whether to zoom text and images" -msgstr "Při přibližování zvětšovat text i obrázky?" +msgstr "Určuje, zda se bude měnit velikost textu i obrázků" -#: ../midori/midori-websettings.c:941 +#: ../midori/midori-websettings.c:880 msgid "Find inline while typing" msgstr "Hledat při psaní" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:881 msgid "Whether to automatically find inline while typing" -msgstr "Při psaní hledat text?" +msgstr "Určuje, zda se v textu bude automaticky vyhledávat během psaní" -#: ../midori/midori-websettings.c:957 +#: ../midori/midori-websettings.c:896 msgid "Kinetic scrolling" -msgstr "Kinetické rolování" +msgstr "Kinetické posouvání" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:897 msgid "Whether scrolling should kinetically move according to speed" -msgstr "Zda naklápěním zařízení rolovat" - -#: ../midori/midori-websettings.c:966 -msgid "Accept cookies" -msgstr "Přijímat cookies:" +msgstr "Určuje, zda bude posouvání ovlivněno rychloistí" -#: ../midori/midori-websettings.c:967 -msgid "What type of cookies to accept" -msgstr "Který typ cookies přijímat" +#: ../midori/midori-websettings.c:905 +msgid "Delete old Cookies after:" +msgstr "Smazat stará cookies po:" -#: ../midori/midori-websettings.c:976 -msgid "Maximum cookie age" -msgstr "Maximální stáří cookies" - -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:906 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:986 -msgid "Maximum history age" -msgstr "Maximální délka historie" +#: ../midori/midori-websettings.c:922 +msgid "Only accept Cookies from sites you visit" +msgstr "Přijímat cookies pouze z navštívených stránek" + +#: ../midori/midori-websettings.c:923 +msgid "Block cookies sent by third-party websites" +msgstr "Blokovat cookies z jiných stránek" + +#: ../midori/midori-websettings.c:937 +msgid "Delete pages from history after:" +msgstr "Smazat stránky z historie po:" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:938 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:995 -msgid "Remember last downloaded files" -msgstr "Pamatovat si naposledy stahované soubory" - -#: ../midori/midori-websettings.c:996 -msgid "Whether the last downloaded files are saved" -msgstr "Pamatovat si seznam souborů, které byly stahovány?" +msgstr "" +"Maximální počet dní, po které se bude uchovávat historie navštívených stránek" -#: ../midori/midori-websettings.c:1013 +#: ../midori/midori-websettings.c:953 msgid "Proxy server" -msgstr "Proxy server" +msgstr "Server proxy" -#: ../midori/midori-websettings.c:1014 +#: ../midori/midori-websettings.c:954 msgid "The type of proxy server to use" -msgstr "Jaký typ proxy serveru chcete použít" +msgstr "Jaký typ serveru proxy chcete použít" -#: ../midori/midori-websettings.c:1023 +#: ../midori/midori-websettings.c:963 msgid "HTTP Proxy Server" -msgstr "HTTP proxy server" +msgstr "Serverproxy HTTP" -#: ../midori/midori-websettings.c:1024 +#: ../midori/midori-websettings.c:964 msgid "The proxy server used for HTTP connections" -msgstr "Proxy server, který bude použit pro HTTP spojení" +msgstr "Server proxy, který bude použit pro spojení HTTP" + +#: ../midori/midori-websettings.c:979 +msgid "Port" +msgstr "Port" + +#: ../midori/midori-websettings.c:980 +msgid "The proxy server port used for HTTP connections" +msgstr "Port serveru proxy, který bude použit pro spojení HTTP" + +#: ../midori/midori-websettings.c:998 +msgid "The maximum size of cached pages on disk" +msgstr "Maximální velikost diskové mezipaměti stránek" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1040 +#: ../midori/midori-websettings.c:1015 msgid "Identify as" msgstr "Hlásit se jako" -#: ../midori/midori-websettings.c:1041 +#: ../midori/midori-websettings.c:1016 msgid "What to identify as to web pages" -msgstr "Jak se hlásit webovým stránkám" +msgstr "Určuje, jak se bude aplikace identifikovat webovým stránkám" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1032 msgid "Identification string" msgstr "Identifikační řetězec" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1033 msgid "The application identification string" msgstr "Identifikační řetězec aplikace" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1049 msgid "Preferred languages" -msgstr "Preferované jazyky" +msgstr "Upřednostňované jazyky" -#: ../midori/midori-websettings.c:1074 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "Čárkou oddělený seznam jazyků pro vícejazyčné weby, např. \"cs\", \"cs,en\", nebo \"cs-cs;q=1.0, en-en;q=0.667\"" +#: ../midori/midori-websettings.c:1050 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"Čárkou oddělený seznam jazyků pro vícejazyčné weby, např. \"cs\", \"cs,en\", " +"nebo \"cs-cs;q=1.0, en-en;q=0.667\"" -#: ../midori/midori-websettings.c:1089 +#: ../midori/midori-websettings.c:1065 msgid "Clear private data" -msgstr "_Vymazat osobní data" +msgstr "Vymazat osobní údaje" -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1066 msgid "The private data selected for deletion" -msgstr "Osobní data byla označena ke smazání" +msgstr "Osobní údaje byly označeny ke smazání" -#. 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:1227 ../midori/midori-view.c:4442 -#: ../midori/midori-view.c:4446 +#: ../midori/midori-websettings.c:1081 +msgid "Clear data" +msgstr "Vymazat údaje" + +#: ../midori/midori-websettings.c:1082 +msgid "The data selected for deletion" +msgstr "Údaje označené pro vymazání" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1131 +msgid "Strip referrer details sent to websites" +msgstr "Odstranit detaily o referující adrese při odesílání" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1133 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "" +"Určuje, zda bude referenční hlavička \"Referer\" zkrácena na pouhý název " +"hostitele" + +#: ../midori/midori-websettings.c:1147 +msgid "Always use my font choices" +msgstr "Vždy použít mnou zvolená písma" + +#: ../midori/midori-websettings.c:1148 +msgid "Override fonts picked by websites with user preferences" +msgstr "Vybraná písma se použijí vždy bez ohledu na požadavky stránky" + +#: ../midori/midori-view.c:1375 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s chce uložit data do databáze HTML5." + +#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1411 +msgid "_Deny" +msgstr "_Zakázat" + +#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1411 +msgid "_Allow" +msgstr "_Povolit" + +#: ../midori/midori-view.c:1407 +#, c-format +msgid "%s wants to know your location." +msgstr "%s chce zjistit vaši polohu." + +#: ../midori/midori-view.c:1500 #, c-format msgid "Error - %s" msgstr "Chyba - %s" -#: ../midori/midori-view.c:1228 +#: ../midori/midori-view.c:1501 #, c-format msgid "The page '%s' couldn't be loaded." -msgstr "Stránka '%s' nemůže být načtena." +msgstr "Stránku '%s' nelze načíst." -#: ../midori/midori-view.c:1230 +#: ../midori/midori-view.c:1503 msgid "Try again" msgstr "Zkusit znovu" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1249 -#, c-format -msgid "Not found - %s" -msgstr "Nenalezeno - %s" - -#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 +#: ../midori/midori-view.c:1701 ../midori/midori-view.c:2623 #, c-format msgid "Send a message to %s" -msgstr "Poslat %s zprávu" +msgstr "Poslat zprávu pro %s" -#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 +#: ../midori/midori-view.c:2453 ../midori/midori-view.c:2779 msgid "Inspect _Element" -msgstr "Prozkoumat _prvek" +msgstr "Prozkouma_t prvek" -#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2505 msgid "Open Link in New _Tab" msgstr "Otevřít odkaz v nové _kartě" -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2509 msgid "Open Link in _Foreground Tab" msgstr "Otevřít odkaz v nové kartě a _zobrazit ji" -#: ../midori/midori-view.c:2118 +#: ../midori/midori-view.c:2510 msgid "Open Link in _Background Tab" msgstr "Otevřít odkaz v nové kartě na _pozadí" -#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2513 msgid "Open Link in New _Window" msgstr "Otevřít odkaz v novém _okně" -#: ../midori/midori-view.c:2124 +#: ../midori/midori-view.c:2516 msgid "Open Link as Web A_pplication" msgstr "Otevřít odkaz jako _webovou aplikaci" -#: ../midori/midori-view.c:2127 +#: ../midori/midori-view.c:2521 msgid "Copy Link de_stination" msgstr "Zkopírovat _cíl odkazu" -#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 -msgid "_Save Link destination" -msgstr "_Uložit odkaz" - -#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 -msgid "_Download Link destination" -msgstr "_Stáhnout odkaz" - -#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 -#: ../midori/midori-view.c:2207 -msgid "Download with Download _Manager" -msgstr "Stáhnout za použití Download _manageru" - -#: ../midori/midori-view.c:2144 +#: ../midori/midori-view.c:2537 msgid "Open _Image in New Tab" msgstr "Otevřít _obrázek v nové kartě" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2540 msgid "Copy Image _Address" msgstr "Zkopírovat _adresu obrázku" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2543 msgid "Save I_mage" msgstr "Uložit o_brázek" -#: ../midori/midori-view.c:2151 -msgid "Download I_mage" -msgstr "Stáhnout o_brázek" +#: ../midori/midori-view.c:2546 +msgid "Open in Image _Viewer" +msgstr "Otevřít v prohlížeči _obrázků" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2553 msgid "Copy Video _Address" msgstr "Zkopírovat _adresu videa" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2556 msgid "Save _Video" msgstr "Uložit _video" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2556 msgid "Download _Video" msgstr "Stáhnout _video" -#: ../midori/midori-view.c:2224 +#: ../midori/midori-view.c:2582 msgid "Search _with" -msgstr "Hledat _s" +msgstr "Hledat _pomocí" -#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2614 msgid "_Search the Web" msgstr "_Hledat na webu" -#: ../midori/midori-view.c:2287 +#: ../midori/midori-view.c:2631 msgid "Open Address in New _Tab" msgstr "Otevřít adresu v nové _kartě" -#: ../midori/midori-view.c:2591 +#: ../midori/midori-view.c:2684 +msgid "Open _Frame in New Tab" +msgstr "Otevřít _rám v nové kartě" + +#: ../midori/midori-view.c:2988 msgid "Open or download file" msgstr "Otevřít nebo stáhnout soubor" -#: ../midori/midori-view.c:2610 +#: ../midori/midori-view.c:3008 #, c-format msgid "File Type: '%s'" msgstr "Typ souboru: '%s'" -#: ../midori/midori-view.c:2613 +#: ../midori/midori-view.c:3010 #, 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:2617 +#: ../midori/midori-view.c:3014 +#, c-format +msgid "File Name: %s" +msgstr "Název souboru: %s" + +#: ../midori/midori-view.c:3041 #, c-format msgid "Open %s" msgstr "Otevřít %s" -#: ../midori/midori-view.c:3158 +#: ../midori/midori-view.c:3700 #, c-format msgid "Inspect page - %s" msgstr "Prohlížení stránky - %s" -#: ../midori/midori-view.c:3439 -msgid "Speed dial" +#: ../midori/midori-view.c:4047 +msgid "Speed Dial" msgstr "Rychlý přístup" -#: ../midori/midori-view.c:3440 +#: ../midori/midori-view.c:4048 ../midori/midori-view.c:4144 msgid "Click to add a shortcut" -msgstr "Záložku přidáte kliknutím" +msgstr "Kliknutím přidáte záložku " -#: ../midori/midori-view.c:3441 +#: ../midori/midori-view.c:4049 msgid "Enter shortcut address" msgstr "Vložte adresu záložky" -#: ../midori/midori-view.c:3442 +#: ../midori/midori-view.c:4050 msgid "Enter shortcut title" msgstr "Vložte název záložky" -#: ../midori/midori-view.c:3443 +#: ../midori/midori-view.c:4051 msgid "Are you sure you want to delete this shortcut?" msgstr "Opravdu chcete smazat tuto záložku?" -#: ../midori/midori-view.c:3444 -msgid "Set number of columns and rows" -msgstr "Změnit počet sloupců a řádků" - -#: ../midori/midori-view.c:3445 -msgid "Enter number of columns and rows:" -msgstr "Vložte počet sloupců a řádků:" - -#: ../midori/midori-view.c:3446 -msgid "Invalid input for the size of the speed dial" -msgstr "Nesprávná hodnota velikosti rychlého přístupu" - -#: ../midori/midori-view.c:3447 -msgid "Thumb size:" -msgstr "Velikost náhledů:" - -#: ../midori/midori-view.c:3448 -msgid "Small" -msgstr "malá" - -#: ../midori/midori-view.c:3449 -msgid "Medium" -msgstr "střední" - -#: ../midori/midori-view.c:3450 -msgid "Big" -msgstr "velká" - -#: ../midori/midori-view.c:3476 -#, c-format -msgid "Document cannot be displayed" -msgstr "Dokument nemůže být zobrazen" - -#: ../midori/midori-view.c:3499 +#: ../midori/midori-view.c:4213 #, c-format msgid "No documentation installed" msgstr "Dokumentace není nainstalována" -#: ../midori/midori-view.c:3618 +#: ../midori/midori-view.c:4289 +msgid "Midori doesn't store any personal data:" +msgstr "Aplikace Midori neukládá žádné osobní údaje:" + +#: ../midori/midori-view.c:4290 +msgid "No history or web cookies are being saved." +msgstr "Neukládá se historie, ani cookies." + +#: ../midori/midori-view.c:4291 +msgid "Extensions are disabled." +msgstr "Rozšíření jsou zakázána." + +#: ../midori/midori-view.c:4292 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "Zakázáno úložiště HTML5, lokální databáze a aplikační mezipaměťi." + +#: ../midori/midori-view.c:4293 +msgid "Midori prevents websites from tracking the user:" +msgstr "Aplikace Midori zabraňuje webovým stránkám sledovat uživatele:" + +#: ../midori/midori-view.c:4294 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "Adresy URL referentů jsou zkráceny na pouhý název hostitele." + +#: ../midori/midori-view.c:4295 +msgid "DNS prefetching is disabled." +msgstr "Přednačítání DNS záznamů je zakázáno." + +#: ../midori/midori-view.c:4296 +msgid "The language and timezone are not revealed to websites." +msgstr "Stránkám nejsou poskytovány údaje o jazyku a časovém pásmu." + +#: ../midori/midori-view.c:4297 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "" +"Stránky nemohou získat seznam zásuvných modulů Flash ani modulů aplikace " +"Netscape." + +#: ../midori/midori-view.c:4370 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "Čísla verzí v závorce jsou verze použité při běhu programu." + +#: ../midori/midori-view.c:4422 msgid "Page loading delayed" msgstr "Načítání stránky pozdrženo" -#: ../midori/midori-view.c:3619 +#: ../midori/midori-view.c:4423 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "Načtení stránky bylo pozdrženo kvůli pádu aplikace, nebo protože je to tak nastaveno." +msgstr "" +"Načtení stránky bylo pozdrženo kvůli nedávnému pádu aplikace, nebo kvůli " +"nastavení po spuštění." -#: ../midori/midori-view.c:3620 +#: ../midori/midori-view.c:4424 msgid "Load Page" msgstr "Načíst stránku" -#: ../midori/midori-view.c:3764 +#: ../midori/midori-view.c:4590 msgid "Blank page" msgstr "Prázdná stránka" -#: ../midori/midori-view.c:4018 +#: ../midori/midori-view.c:4852 msgid "_Duplicate Tab" msgstr "Z_dvojit kartu" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4857 msgid "Show Tab _Label" msgstr "Zobrazit _popisek karty" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4857 msgid "Show Tab _Icon Only" msgstr "Zobrazit jen _ikonu karty" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4863 msgid "Close ot_her Tabs" msgstr "_Zavřít ostatní karty" -#: ../midori/midori-view.c:4680 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5676 +msgid "previous" +msgstr "předchozí" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5695 +msgid "next" +msgstr "následující" + +#: ../midori/midori-view.c:5708 msgid "Print background images" msgstr "Tisknout obrázky na pozadí" -#: ../midori/midori-view.c:4681 +#: ../midori/midori-view.c:5709 msgid "Whether background images should be printed" -msgstr "Mají být obrázky na pozadí tištěny?" +msgstr "Určuje, zda se vytisknou obrázky na pozadí" -#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:5741 msgid "Features" msgstr "Rozšíření" -#. Page "General" -#: ../midori/midori-preferences.c:301 -msgid "General" -msgstr "Obecné" - -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Při spuštění" -#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Použít _stávající stránku" + +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Použít stávající stránku jako domovskou" -#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Přenosy" - #. Page "Appearance" -#: ../midori/midori-preferences.c:352 -msgid "Appearance" -msgstr "Vzhled" - -#: ../midori/midori-preferences.c:353 -msgid "Font settings" -msgstr "Nastavení písma" - -#: ../midori/midori-preferences.c:355 -msgid "Default Font Family" -msgstr "Výchozí font" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Písma" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Proporcionální písmo" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" -msgstr "Výchozí font pro zobrazení textu" +msgstr "Výchozí písmo pro zobrazení textu" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" -msgstr "Velikost textu" +msgstr "Výchozí velikost písma pro zobrazení textu" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" -msgstr "Výchozí font písma se stejnou šířkou" +msgstr "Neproporcionální písmo" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:339 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" +msgstr "Písmo pro zobrazení textu se stejnou šířkou písmen" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:342 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" +msgstr "Velikost písma pro zobrazení textu se stejnou šířkou písmen" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" -msgstr "Minimální velikost textu" +msgstr "Minimální velikost písma" -#: ../midori/midori-preferences.c:374 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" -msgstr "Minimální velikost textu, která se použije pro zobrazení" +msgstr "Minimální velikost fontu použitého pro zobrazení" #. Page "Behavior" -#: ../midori/midori-preferences.c:383 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Chování" -#: ../midori/midori-preferences.c:396 -msgid "Enforce 96 dots per inch" -msgstr "Vnutit rozlišení 96 bodů/palec" - -#: ../midori/midori-preferences.c:397 -msgid "Enforce a video dot density of 96 DPI" -msgstr "Vnutit rozlišení obrazu 96 bodů na palec" - -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Povolit skriptům otevírat vyskakovací okna" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "Jestli skripty (JavaScript) mohou otevírat vyskakovací okna (popup okna)" - -#: ../midori/midori-preferences.c:422 -msgid "Spell Checking" -msgstr "Kontrola pravopisu" - -#: ../midori/midori-preferences.c:425 -msgid "Enable Spell Checking" -msgstr "Povolit kontrolu pravopisu" - -#: ../midori/midori-preferences.c:426 -msgid "Enable spell checking while typing" -msgstr "Povolit kontrolu pravopisu při psaní" - -#: ../midori/midori-preferences.c:428 -msgid "Spelling dictionaries:" -msgstr "Slovníky pro kontrolu pravopisu:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:432 -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\"" +msgstr "" +"Určuje, zda bude skriptům povoleno automaticky otevírat vyskakovací okna" #. Page "Interface" -#: ../midori/midori-preferences.c:438 -msgid "Interface" -msgstr "Rozhraní" - -#: ../midori/midori-preferences.c:439 -msgid "Navigationbar" -msgstr "Navigační lišta" - -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Prohlížení" -#. Page "Applications" -#: ../midori/midori-preferences.c:471 -msgid "Applications" -msgstr "Aplikace" - -#: ../midori/midori-preferences.c:472 -msgid "External applications" -msgstr "Externí aplikace" - #. Page "Network" -#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "Síť" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:463 msgid "Hostname" -msgstr "Počítač" +msgstr "Název hostitele" -#. Page "Privacy" -#: ../midori/midori-preferences.c:514 -msgid "Privacy" -msgstr "Soukromí" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "MB" -#: ../midori/midori-preferences.c:515 -msgid "Web Cookies" -msgstr "Web cookies" - -#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 -msgid "days" -msgstr "dny" - -#: ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Prázdné" - -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Přidat vyhledávací nástroj" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Upravit vyhledávací nástroj" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Název:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Popis:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "_Ikona:" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "_Zkratka:" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" -msgstr "Upravit vyhledávací nástroje" +msgstr "Spravovat vyhledávací nástroje" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "Použít jako _výchozí" -#: ../midori/sokoke.c:1303 -msgid "_Bookmark" -msgstr "_Záložky" - -#: ../midori/sokoke.c:1304 -msgid "_Bookmarks" -msgstr "_Záložky" - -#: ../midori/sokoke.c:1305 -msgid "Add Boo_kmark" -msgstr "_Přidat záložku" - -#: ../midori/sokoke.c:1306 -msgid "_Console" -msgstr "_Konzola" - -#: ../midori/sokoke.c:1307 -msgid "_Extensions" -msgstr "_Rozšíření" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "Otevřít s" -#: ../midori/sokoke.c:1308 -msgid "_History" -msgstr "_Historie" - -#: ../midori/sokoke.c:1309 -msgid "_Homepage" -msgstr "_Domovská stránka" +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Vyberte aplikaci, nebo příkaz k otevření \"%s\":" -#: ../midori/sokoke.c:1310 -msgid "_Userscripts" -msgstr "_Uživatelské skripty" +#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "Nelze spustit externí program." -#: ../midori/sokoke.c:1311 -msgid "New _Tab" -msgstr "Nová _karta" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d hodina" +msgstr[1] "%d hodiny" +msgstr[2] "%d hodin" + +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minuta" +msgstr[1] "%d minuty" +msgstr[2] "%d minut" + +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d sekunda" +msgstr[1] "%d sekundy" +msgstr[2] "%d sekund" -#: ../midori/sokoke.c:1312 -msgid "_Transfers" -msgstr "_Přenosy" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s z %s" -#: ../midori/sokoke.c:1313 -msgid "Netscape p_lugins" -msgstr "Netscape p_luginy" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "? B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr "(%s/s)" -#: ../midori/sokoke.c:1316 -msgid "New _Folder" -msgstr "Nová _složka" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr "- zbývá %s" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:201 +#: ../toolbars/midori-findbar.c:291 msgid "_Inline Find:" msgstr "_Rychlé hledání" -#: ../toolbars/midori-findbar.c:233 +#: ../toolbars/midori-findbar.c:317 msgid "Previous" msgstr "Předchozí" -#: ../toolbars/midori-findbar.c:239 +#: ../toolbars/midori-findbar.c:323 msgid "Next" msgstr "Následující" -#: ../toolbars/midori-findbar.c:243 +#: ../toolbars/midori-findbar.c:327 msgid "Match Case" -msgstr "Rozlišovat velikost" +msgstr "Rozlišovat velikost písmen" -#: ../toolbars/midori-findbar.c:252 +#: ../toolbars/midori-findbar.c:336 msgid "Highlight Matches" msgstr "Zvýraznit nalezené" -#: ../toolbars/midori-findbar.c:263 +#: ../toolbars/midori-findbar.c:347 msgid "Close Findbar" -msgstr "Zavřít vyhledávací lištu" +msgstr "Zavřít panel hledání" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 -#, c-format -msgid "%s of %s" -msgstr "%s z %s" - -#: ../toolbars/midori-transferbar.c:123 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "Soubor %s byl stažen." -#: ../toolbars/midori-transferbar.c:126 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Přenos dokončen" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "Stažený soubor obsahuje chyby." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"Kontrolní součet poskytovaný ke stahovanému souboru se neshoduje. To " +"znamená, že stažený soubor pravděpodobně není celý nebo byl pozměněn." + +#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Smazat vše" -#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 +#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 msgid "Some files are being downloaded" -msgstr "Ještě se stahují nějaké soubory." +msgstr "Některé soubory se stále stahují" -#: ../toolbars/midori-transferbar.c:306 +#: ../toolbars/midori-transferbar.c:377 msgid "_Quit Midori" -msgstr "U_končit Midori" +msgstr "U_končit aplikaci Midori" -#: ../toolbars/midori-transferbar.c:308 +#: ../toolbars/midori-transferbar.c:379 msgid "The transfers will be cancelled if Midori quits." -msgstr "Jestliže bude Midori ukončeno, stahování se stornuje." +msgstr "Pokud bude aplikace Midori ukončena, stahování se stornuje." -#: ../panels/midori-bookmarks.c:116 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Záložky" -#: ../panels/midori-bookmarks.c:275 +#: ../panels/midori-bookmarks.c:257 #, c-format msgid "Failed to add bookmark item: %s\n" -msgstr "Záložku se nepodařilo přidat: %s\n" +msgstr "Přidání záložky se nezdařilo: %s\n" -#: ../panels/midori-bookmarks.c:414 +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "Upravit vybranou záložku" -#: ../panels/midori-bookmarks.c:422 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "Smazat vybranou záložku" -#: ../panels/midori-bookmarks.c:436 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" -msgstr "Přidat složku" +msgstr "Přidat novou složku" -#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 +#: ../panels/midori-bookmarks.c:594 ../panels/midori-history.c:635 msgid "Separator" msgstr "Oddělovač" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "Konzola" - -#: ../panels/midori-console.c:361 -msgid "Copy _All" -msgstr "Kopírovat _vše" - -#: ../panels/midori-console.c:362 -msgid "Copy All" -msgstr "Kopírovat vše" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "Historie" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Rozšíření" +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "Dnes" -#: ../panels/midori-history.c:146 -msgid "A week ago" -msgstr "Před týdnem" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "Včera" -#: ../panels/midori-history.c:148 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 #, c-format msgid "%d day ago" msgid_plural "%d days ago" -msgstr[0] "Před %d dny" +msgstr[0] "Před %d dnem" msgstr[1] "Před %d dny" msgstr[2] "Před %d dny" -#: ../panels/midori-history.c:151 -msgid "Today" -msgstr "Dnes" +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "Před týdnem" -#: ../panels/midori-history.c:153 -msgid "Yesterday" -msgstr "Včera" +#: ../panels/midori-history.c:232 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Nepodařilo se odstranit položku historie: %s\n" -#: ../panels/midori-history.c:324 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" msgstr "Opravdu chcete smazat všechny položky historie?" -#: ../panels/midori-history.c:369 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" -msgstr "Zazáložkovat vybranou položku historie" +msgstr "Uložit vybranou položku historie do záložek" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" msgstr "Smazat vybranou položku historie" -#: ../panels/midori-history.c:386 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "Smazat celou historii" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Přenosy" + +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" msgstr "Otevřít cílovou _složku" -#: ../panels/midori-transfers.c:484 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" -msgstr "Kopírovat umís_tění" +msgstr "Kopírovat umís_tění odkazu" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Vyžadována autentikace" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 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:" +msgstr "" +"Pro otevření tohoto umístění je vyžadováno\n" +"jméno a heslo:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" -msgstr "Jméno" +msgstr "Jméno uživatele" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "Heslo" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "Zapamatovat si _heslo" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "Ikona '%s' nemůže být načtena" +msgstr "Ikonu '%s' nelze načíst" -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "Uložená ikona '%s' nemůže být načtena" +msgstr "Uloženou ikonu '%s' nelze načíst" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "Snímky animace jsou porušené" -#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 +#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Vlastnost '%s' je pro %s neplatná" -#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 -#: ../extensions/addons.c:119 +#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" -msgstr "Vybrat soubor" +msgstr "Zvolit soubor" -#: ../katze/katze-utils.c:564 +#: ../katze/katze-utils.c:506 msgid "Choose folder" -msgstr "Vybrat adresář" +msgstr "Zvolit složku" + +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "není" + +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "1 hodině" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "1 dni" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "1 týdnu" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "1 měsíci" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "1 roce" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Nastavení pro %s" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:473 msgid "Configure Advertisement filters" msgstr "Nastavení filtrů blokování reklamy" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:504 #, 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:587 -msgid "Configure _Advertisement filters..." -msgstr "_Blokování reklamy" +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 " +"tlačítko \"Přidat\" ji přidáte do seznamu. Více připravených filtrů " +"naleznete na adrese %s." -#: ../extensions/adblock.c:841 +#: ../extensions/adblock.c:882 msgid "Edit rule" msgstr "Upravit pravidlo" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:896 msgid "_Rule:" msgstr "P_ravidlo:" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:950 msgid "Bl_ock image" msgstr "Bl_okovat obrázek" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:955 msgid "Bl_ock link" msgstr "Bl_okovat odkaz" -#: ../extensions/adblock.c:1494 +#: ../extensions/adblock.c:1670 msgid "Advertisement blocker" msgstr "Blokování reklamy" -#: ../extensions/adblock.c:1495 +#: ../extensions/adblock.c:1671 msgid "Block advertisements according to a filter list" -msgstr "Blokuje reklamu podle filtrů" +msgstr "Blokuvat reklamu podle seznamu filtrů" -#: ../extensions/addons.c:130 ../extensions/addons.c:490 +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "Tato stránka obsahuje uživatelský skript. Chcete jej nainstalovat?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "_Instalovat uživatelský skript" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "Tato stránka obsahuje uživatelský styl. Chcete jej nainstalovat?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_Instalovat uživatelský styl" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Neinstalovat" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Uživatelské skripty" -#: ../extensions/addons.c:135 ../extensions/addons.c:492 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Uživatelské styly" -#: ../extensions/addons.c:191 ../extensions/addons.c:267 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Chyba" -#: ../extensions/addons.c:231 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "Chcete smazat %s?" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "Smazat uživatelský skript" -#: ../extensions/addons.c:238 +#: ../extensions/addons.c:428 msgid "Delete user style" -msgstr "Smazat uživatelův styl" +msgstr "Smazat uživatelský styl" -#: ../extensions/addons.c:242 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." msgstr "Soubor %s bude smazán." -#: ../extensions/addons.c:377 ../extensions/addons.c:454 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "Otevřít v textovém editoru" -#: ../extensions/addons.c:379 ../extensions/addons.c:463 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Otevřít cílovou složku" -#: ../extensions/addons.c:445 +#: ../extensions/addons.c:638 msgid "Add new addon" -msgstr "Přidat nový plugin" - -#: ../extensions/addons.c:472 -msgid "Open target folder for selected addon" -msgstr "Otevřít cílový adresář vybraného pluginu" +msgstr "Přidat nový zásuvný přídavek" -#: ../extensions/addons.c:473 +#: ../extensions/addons.c:664 msgid "Remove selected addon" -msgstr "Odstranit vybraný plugin" +msgstr "Odstranit vybraný přídavek" -#: ../extensions/addons.c:1420 -#, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "Nastavení rozšíření '%s' nemůže být uloženo: %s\n" - -#: ../extensions/addons.c:1421 ../extensions/addons.c:1586 +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" -msgstr "Uživatelova rozšíření" +msgstr "Uživatelské přídavky" -#: ../extensions/addons.c:1543 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" -msgstr "Nemohu sledovat složku '%s': %s" +msgstr "Nelze sledovat složku '%s': %s" -#: ../extensions/addons.c:1587 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" -msgstr "Podpora pro userscripts a userstyles." +msgstr "Podpora uživatelských skriptů a stylů." -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" -msgstr "Obarvené karty" +msgstr "Barevné karty" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Obarvit každou kartu zvlášť" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Správce cookies" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "Smazat vše" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 -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:105 +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:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "Rozbalit vše" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "Sbalit vše" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" msgstr "Opravdu chcete smazat všechna cookies?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Dotaz" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." msgstr "Budou smazána cookies, která odpovídají filtračnímu řetězci." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" -msgstr "Na konci sezení" +msgstr "Na konci relace" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2437,15 +2482,15 @@ "Zabezpečené: %s\n" "Vyprší: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Ano" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "Ne" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" @@ -2454,89 +2499,81 @@ "Doména: %s\n" "Cookies: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Název" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "Rozbalit _vše" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "_Sbalit vše" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 msgid "Filter:" msgstr "Filtr:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 -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" -msgstr "Správce _cookies" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +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:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" -msgstr "Seznam, detaily a mazání cookies" +msgstr "Seznam, prohlížení a mazání cookies" -#: ../extensions/copy-tabs.c:39 +#: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" msgstr "Zkopírovat _adresu karty" -#: ../extensions/copy-tabs.c:98 +#: ../extensions/copy-tabs.c:95 msgid "Copy Addresses of Tabs" msgstr "Zkopírovat adresy z karet" -#: ../extensions/copy-tabs.c:99 +#: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" -msgstr "Zkopíruje adresy všech karet do schránky" - -#: ../extensions/external-applications.vala:93 -msgid "External Applications" -msgstr "Externí aplikace" - -#: ../extensions/external-applications.vala:94 -msgid "Associate URL schemes with external commands" -msgstr "Spojuje URL schémata s externími příkazy" +msgstr "Zkopíruje do schránky adresy ze všech karet" #: ../extensions/feed-panel/feed-atom.c:209 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." +msgstr "Chyba při hledání vyžadované položky \"entry\" v datech XML." #: ../extensions/feed-panel/feed-atom.c:315 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." +msgstr "Chyba při hledání vyžadované položky \"feed\" v datech XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Poslední aktualizace: %s." -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "Kanály" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "Přidat nový kanál" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "Smazat kanál" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "_Kanály" #: ../extensions/feed-panel/feed-parse.c:195 #, 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." +msgstr "Nalezení kořenového elementu v datech XML se nezdařilo." #: ../extensions/feed-panel/feed-parse.c:235 #, c-format @@ -2546,11 +2583,11 @@ #: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" -msgstr "Nepodařilo se načíst XML kanál: %s" +msgstr "Nepodařilo se zpracovat kanál XML: %s" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "Nepodařilo se najít element \"channel\" v RSS XML datech." +msgstr "Nepodařilo se najít element \"channel\" v datech RSS XML." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." @@ -2558,197 +2595,703 @@ #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "Nepodařilo se najít požadovaný element \"item\" v XML datech." +msgstr "Nepodařilo se najít požadovaný element RSS \"item\" v datech XML." #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "Nepodařilo se najít požadovaný element \"channel\" v XML datech." +msgstr "Nepodařilo se najít požadovaný element RSS \"channel\" v datech XML." #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" -msgstr "Kanál '%s' byl již přidán" +msgstr "Kanál '%s' již existuje" #: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Chyba při načítání kanálu '%s'" -#: ../extensions/feed-panel/main.c:520 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "Panel kanálů" -#: ../extensions/feed-panel/main.c:521 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Čte Atom/RSS kanály" -#: ../extensions/formhistory.c:142 +#: ../extensions/formhistory/formhistory.c:39 #, 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:455 ../extensions/formhistory.c:459 +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "Historie formuláře" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Pro otevření databáze hesel je\n" +"zapotřebí zadat hlavní heslo" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "Zapamatovat si heslo na této stránce?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Ano" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "Nyní ne" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Nikdy pro tuto stránku" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "Přepnout stav historie formulářových dat" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "Zapnout, nebo vypnout historii formulářových dat pro aktivní kartu" + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Nepodařilo se spustit databázový příkaz: %s\n" -#: ../extensions/formhistory.c:503 +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "Pamatování formulářové historie zapnout pomocí kláves (Ctrl+Shitf+F)" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "Ukládání hodnot ve formuláři" + +#: ../extensions/formhistory/formhistory.c:669 msgid "Stores history of entered form data" -msgstr "Ukládat historii hodnot vložených do formuláře" +msgstr "Ukládá historii dat vložených do formulářů" -#: ../extensions/formhistory.c:507 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 #, c-format -msgid "Not available: %s" -msgstr "Není k dispozici: %s" +msgid "Failed to select suggestions\n" +msgstr "Nepodařilo se vybrat návrh\n" -#: ../extensions/formhistory.c:508 -msgid "Resource files not installed" -msgstr "Nejsou nainstalovány soubory se zdrojem" +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Žádné nenavštívené karty" -#: ../extensions/formhistory.c:514 -msgid "Form history filler" -msgstr "Ukládání hodnot ve formuláři" +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "Historie" -#: ../extensions/history-list.vala:174 -msgid "Next Tab (History List)" -msgstr "Další karta (v historii)" - -#: ../extensions/history-list.vala:175 -msgid "Next tab from history" -msgstr "Zvolí další kartu z historie" - -#: ../extensions/history-list.vala:184 -msgid "Previous Tab (History List)" -msgstr "Předchozí karta (v historii)" - -#: ../extensions/history-list.vala:185 -msgid "Previous tab from history" -msgstr "Zvolí předchozí kartu z historie" +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Při zavření karty" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "nedělat nic" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "přepnout na poslední prohlíženou kartu" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "přepnout na naposledy přidanou kartu" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Další nová karta (v historii)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Zvolí další novou kartu z historie" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Předchozí nová karta (v seznamu historie)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Zvolí předchozí novou kartu z historie" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Zobrazit kartu na pozadí (Seznam historie)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Zobrazí vybranou kartu na pozadí" -#: ../extensions/history-list.vala:245 +#: ../extensions/history-list.vala:569 msgid "History List" -msgstr "Historie" +msgstr "Seznam historie" -#: ../extensions/history-list.vala:246 -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/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "Při přepínání nebo zavírání karet přesunout do naposledy použitých" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Gesta myší" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" -msgstr "Ovládat Midori pomocí myši" +msgstr "Ovládat aplikaci Midori pomocí myši" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 -msgid "Pageholder" -msgstr "Uchovávání stránek" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -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:109 +msgid "Reload page or stop loading" +msgstr "Znovu načíst stránku, nebo načítání zastavit" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" -msgstr "Nastavení klávesových zkratek" +msgstr "Přizpůsobení klávesových zkratek" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." -msgstr "Nastavení klávesových _zkratek..." +msgstr "Přizpůsobení klávesových _zkratek..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" -msgstr "Zkratky" +msgstr "Klávesové zkratky" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "Zobrazí a umožní změnu klávesových zkratek" -#: ../extensions/status-clock.c:176 +#: ../extensions/status-clock.c:174 msgid "Statusbar Clock" msgstr "Hodiny ve stavovém řádku" -#: ../extensions/status-clock.c:177 +#: ../extensions/status-clock.c:175 msgid "Display date and time in the statusbar" msgstr "Zobrazuje datum a čas ve stavovém řádku" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Obrázky" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Uživatelské skripty" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" -msgstr "Netscape pluginy" +msgstr "Zásuvné moduly aplikace Netscape" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "Rozšíření stavové lišty" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 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:569 ../extensions/tab-panel.c:628 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Panel karet" -#: ../extensions/tab-panel.c:612 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "Panel _karet" -#: ../extensions/tab-panel.c:629 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" -msgstr "Zobrazí karty ve vertikálním panelu" +msgstr "Zobrazí karty ve svislém panelu" -#: ../extensions/tabs-minimized.c:79 +#: ../extensions/tabs-minimized.c:76 msgid "Only Icons on Tabs by default" -msgstr "Na kartách zobrazovat jen ikony" +msgstr "Ve výchozím stavu na kartách zobrazovat pouze ikony " -#: ../extensions/tabs-minimized.c:80 +#: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" -msgstr "Nové karty nebudou mít popisek" +msgstr "Nové karty nebudou mít ve výchozím stavu popisek" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" -msgstr "Upravit lištu" +msgstr "Upravit panel nástrojů" -#: ../extensions/toolbar-editor.c:405 -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:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"Vybrané položky se zobrazí na panelu nástrojů. Změnu pořadí položek " +"provedete přetažením." -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Dostupné položky" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Zobrazené položky" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." -msgstr "Upravit _lištu..." +msgstr "Upravit pane_l nástrojů..." + +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Vlastní..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" -msgstr "Editor lišty" +msgstr "Editor panelu nástrojů" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" -msgstr "Umožňuje jednoduše změnit lištu" +msgstr "Umožňuje jednoduše změnit rozvržení panelu nástrojů" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" -msgstr "Kešuje (ukládá) HTTP komunikaci na disk" +msgstr "Ukládá komunikaci HTTP do diskové mezipaměti" + +#~ msgid "The bookmarks couldn't be saved. %s" +#~ msgstr "Záložky nelze uložit. %s" + +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "Vybraná složka konfigurace je neplatná." + +#~ msgid "Cookies" +#~ msgstr "Cookies" + +#~ msgid "'Flash' Cookies" +#~ msgstr "Cookies modulu Flash" + +#~ msgid "HTML5 _Databases" +#~ msgstr "_Databáze HTML5 " + +#~ msgid "Offline Application Cache" +#~ msgstr "Mezipaměť pro offline aplikace" + +#~ msgid "Lightweight web browser" +#~ msgstr "Odlehčený prohlížeč" + +#~ msgid "Not available: %s" +#~ msgstr "Není k dispozici: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "Nejsou nainstalovány soubory se zdrojem" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "Neukládat při prohlížení žádná data" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Přidá záložku do rychlého přístupu" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Přidá záložku na plochu" + +#~ msgid "Create a launcher" +#~ msgstr "Vytvořit spouštěč" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "Přidá tento kanál do odebíraných kanálů" + +#~ msgid "Close this window" +#~ msgstr "Zavřít toto okno" + +#~ msgid "Close all open windows" +#~ msgstr "Zavře všechna okna" + +#~ msgid "Undo the last modification" +#~ msgstr "Vrátit zpět poslední změnu" + +#~ msgid "Redo the last modification" +#~ msgstr "Vrátit poslední změnu" + +#~ msgid "Cut the selected text" +#~ msgstr "Vystříhnout vybraný text" + +#~ msgid "Copy the selected text" +#~ msgstr "Zkopírovat vybraný text" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "Vložit text ze schránky" + +#~ msgid "Delete the selected text" +#~ msgstr "Smazat vybraný text" + +#~ msgid "Select all text" +#~ msgstr "Vybrat vše" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Najít další výskyt slova nebo fráze" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Najít předchozí výskyt slova nebo fráze" + +#~ msgid "Reset the zoom level" +#~ msgstr "Nastavit původní přiblížení" + +#~ msgid "View the source code of the page" +#~ msgstr "Zobrazí zdrojový kód stránky" + +#~ msgid "Scroll to the left" +#~ msgstr "Posunout pohled vlevo" + +#~ msgid "Scroll down" +#~ msgstr "Posunout pohled dolů" + +#~ msgid "Scroll up" +#~ msgstr "Posunout pohled nahoru" + +#~ msgid "Scroll to the right" +#~ msgstr "Posunout pohled vpravo" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "Vymaže seznam zavřených karet" + +#~ msgid "Open the last closed tab" +#~ msgstr "Otevře naposledy zavřenou kartu" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Přidá novou složku do záložek" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Přidává, upravuje a maže vyhledávací nástroje..." + +#~ msgid "Clear private data..." +#~ msgstr "Vymaže osobní data..." + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "Zobrazí stránku ve vývojářském nástroji..." + +#~ msgid "Switch to the previous tab" +#~ msgstr "Přepnout na předchozí kartu" + +#~ msgid "Switch to the next tab" +#~ msgstr "Přepnout na další kartu" + +#~ msgid "Move tab behind the previous tab" +#~ msgstr "Přesune kartu za předchozí" + +#~ msgid "Move tab in front of the next tab" +#~ msgstr "Přesune kartu před následující" + +#~ msgid "Focus the current tab" +#~ msgstr "Zaměří aktuální kartu" + +#~ msgid "Cycle focus between views" +#~ msgstr "Přepnout na další pohled v pořadí" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Zobrazit pouze ikonu aktuální karty" + +#~ msgid "Duplicate the current tab" +#~ msgstr "Obsah aktuální karty otevře v nové kartě" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Zavře všechny karty kromě aktuální" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Otevře karty uložené při posledním sezení" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Zobrazí často kladené otázky (FAQ)" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Otevře stránku pro hlášení chyb" + +#~ msgid "Show information about the program" +#~ msgstr "Zobrazí informace o programu" + +#~ msgid "Show menubar" +#~ msgstr "Zobrazit nabídku" + +#~ msgid "Show navigationbar" +#~ msgstr "Zobrazit navigační lištu" + +#~ msgid "Show sidepanel" +#~ msgstr "Zobrazit boční panel" + +#~ msgid "Show bookmarkbar" +#~ msgstr "Zobrazit lištu se záložkami" + +#~ msgid "Show statusbar" +#~ msgstr "Zobrazit stavovou lištu" + +#~ msgid "MD5-Checksum:" +#~ msgstr "Kontrolní součet MD5:" + +#~ msgid "SHA1-Checksum:" +#~ msgstr "Kontrolní součet SHA1:" + +#~ msgid "No filename specified" +#~ msgstr "Nebyl zadán název souboru" + +#~ msgid "Set number of columns and rows" +#~ msgstr "Změnit počet sloupců a řádků" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Vložte počet sloupců a řádků:" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "Nesprávná hodnota velikosti rychlého přístupu" + +#~ msgid "Thumb size:" +#~ msgstr "Velikost náhledů:" + +#~ msgid "Small" +#~ msgstr "malá" + +#~ msgid "Medium" +#~ msgstr "střední" + +#~ msgid "Big" +#~ msgstr "velká" + +#~ msgid "Reset the last _session" +#~ msgstr "Vymazat poslední _sezení" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "_Blokování reklamy" + +#~ msgid "Not found - %s" +#~ msgstr "Nenalezeno - %s" + +#~ msgid "Document cannot be displayed" +#~ msgstr "Dokument nemůže být zobrazen" + +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "Vnutit rozlišení 96 bodů/palec" + +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "Vnutit rozlišení obrazu 96 bodů na palec" + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "Přepnout karty seřazené podle posledního použití pomocí Ctrl+Tab" + +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "Smazat stará cookies po hodině" + +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "Smazat stará cookies po týdnu" + +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "Smazat stará cookies po měsíci" + +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "Smazat stará cookies po roce" + +#~ msgid "All cookies" +#~ msgstr "všechna cookies" + +#~ msgid "Session cookies" +#~ msgstr "cookies sezení" + +#~ msgid "Show Transferbar" +#~ msgstr "Zobrazit stav přenosu" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "Zobrazit stav přenosu?" + +#~ msgid "Search engines in location completion" +#~ msgstr "Zobrazovat výsledky hledání při zadávání adresy" + +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "Zobrazovat výsledky vyhledávání při zadávání adresy?" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "Zobrazí seznam nástrojů" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "Zda zobrazovat seznam nástrojů" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Zobrazit obsah rychlého přístupu v kartách" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Zobrazí obsah rychlého přístupu v nově otevřených kartách" + +#~ msgid "Download Manager" +#~ msgstr "Správce stahování" + +#~ msgid "An external download manager" +#~ msgstr "Externí program pro stahování" + +#~ msgid "Open external pages in:" +#~ msgstr "Externí stránky otevírat v:" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "Kde se budou otevírat externí stránky" + +#~ msgid "Accept cookies" +#~ msgstr "Přijímat cookies:" + +#~ msgid "What type of cookies to accept" +#~ msgstr "Který typ cookies přijímat" + +#~ msgid "Maximum cookie age" +#~ msgstr "Maximální stáří cookies" + +#~ msgid "Maximum history age" +#~ msgstr "Maximální délka historie" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Pamatovat si naposledy stahované soubory" + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "Pamatovat si seznam souborů, které byly stahovány?" + +#~ msgid "Appearance" +#~ msgstr "Vzhled" + +#~ msgid "Applications" +#~ msgstr "Aplikace" + +#~ msgid "Web Cookies" +#~ msgstr "Web cookies" + +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "_Vymazat cookies při ukončení Midori" + +#~ msgid "General" +#~ msgstr "Obecné" + +#~ msgid "Font settings" +#~ msgstr "Nastavení písma" + +#~ msgid "Interface" +#~ msgstr "Rozhraní" + +#~ msgid "Navigationbar" +#~ msgstr "Navigační lišta" + +#~ msgid "Next Tab (History List)" +#~ msgstr "Další karta (v historii)" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "Předchozí karta (v historii)" + +#~ msgid "Previous tab from history" +#~ msgstr "Zvolí předchozí kartu z historie" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "Nepodařilo se spustit databázový příkaz\n" + +#~ msgid "%s of %s, %s/s" +#~ msgstr "%s z %s, %s/s" + +#~ msgid "Open target folder for selected addon" +#~ msgstr "Otevřít cílový adresář vybraného pluginu" + +#~ msgid "Download with Download _Manager" +#~ msgstr "Stáhnout za použití Download _manageru" + +#~ msgid "External applications" +#~ msgstr "Externí aplikace" + +#~ msgid "Pageholder" +#~ msgstr "Uchovávání stránek" + +#~ msgid "_Pageholder" +#~ msgstr "_Uchovávání stránek" + +#~ 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" + +#~ msgid "Quit the application" +#~ msgstr "Ukončit aplikaci" + +#~ msgid "Show Blank page" +#~ msgstr "zobrazit prázdnou stránku" + +#~ msgid "_Contents" +#~ msgstr "_Obsah" + +#~ msgid "Show the documentation" +#~ msgstr "Zobrazit dokumentaci" + +#~ msgid "_Save Link destination" +#~ msgstr "_Uložit odkaz" + +#~ msgid "_Download Link destination" +#~ msgstr "_Stáhnout odkaz" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% načteno" + +#~ msgid "_Transferbar" +#~ msgstr "Stav _přenosu" + +#~ msgid "Show transferbar" +#~ msgstr "Zobrazit stav přenosu dat" + +#~ msgid "Show progress in location entry" +#~ msgstr "Zobrazit průběh v řádku adresy" + +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "Zobrazovat průběh načítání v řádku s adresou?" + +#~ msgid "Ask for the destination folder" +#~ msgstr "Zeptat se na cílovou složku" + +#~ msgid "Whether to ask for the destination folder when downloading a file" +#~ msgstr "Zda se ptát, kam se bude ukládat" + +#~ msgid "Whether to show a notification when a transfer has been completed" +#~ msgstr "Zda zobrazit upozornění při dokončení přenosu" + +#~ msgid "Download I_mage" +#~ msgstr "Stáhnout o_brázek" + +#~ msgid "Failed to clear search history: %s\n" +#~ msgstr "Nepodařilo se smazat historii hledání: %s\n" + +#~ msgid "Detach chosen panel from the window" +#~ msgstr "Oddělit vybraný panel od okna" + +#~ msgid "Hide operating controls" +#~ msgstr "Schovat ovládací prvky" + +#~ msgid "Spell Checking" +#~ msgstr "Kontrola pravopisu" + +#~ 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\"" + +#~ msgid "Minimize _Current Tab" +#~ msgstr "Minimalizovat _aktuální kartu" + +#~ msgid "Minimize the current tab" +#~ msgstr "Minimalizuje aktuální kartu" + +#~ msgid "External Applications" +#~ msgstr "Externí aplikace" + +#~ msgid "Associate URL schemes with external commands" +#~ msgstr "Spojuje URL schémata s externími příkazy" + +#~ msgid "Spelling dictionaries:" +#~ msgstr "Slovníky pro kontrolu pravopisu:" + +#~ msgid "Console" +#~ msgstr "Konzola" + +#~ msgid "Copy _All" +#~ msgstr "Kopírovat _vše" + +#~ msgid "Copy All" +#~ msgstr "Kopírovat vše" + +#~ msgid "_Cookie Manager" +#~ msgstr "Správce _cookies" #~ msgid "" #~ "Do you really want to remove '%s'?\n" @@ -2771,7 +3314,8 @@ #~ msgid "Erroneous clock time" #~ msgstr "Chyba v nastavení času" -#~ msgid "The clock time lies in the past. Please check the current date and time." +#~ 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." #~ msgid "Minimize new Tabs" @@ -2789,9 +3333,6 @@ #~ msgid "Original cookies only" #~ msgstr "Původní" -#~ msgid "Accept cookies from the original website only" -#~ msgstr "Z původní stránky" - #~ msgid "Remember last visited pages" #~ msgstr "Pamatovat si naposledy navštívené stránky" @@ -2801,12 +3342,10 @@ #~ msgid "Detect proxy server automatically" #~ msgstr "Zjistit proxy server automaticky" -#~ msgid "Whether to detect the proxy server automatically from the environment" +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" #~ msgstr "Zjistit nastavení proxy serveru automaticky (podle prostředí)?" -#~ msgid "Show the saved bookmarks" -#~ msgstr "Zobrazit uložené záložky" - #~ msgid "Set number of shortcuts" #~ msgstr "Změnit počet záložek" @@ -2819,8 +3358,11 @@ #~ msgid "Open Image in New Wi_ndow" #~ msgstr "Otevřít _obrázek v novém okně" -#~ 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." +#~ 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." #~ msgid "Not available on this platform" #~ msgstr "Není k dispozici" @@ -2837,9 +3379,6 @@ #~ msgid "Spell checking languages:" #~ msgstr "Jazyk(y) kontroly pravopisu" -#~ msgid "DNS prefetching" -#~ msgstr "Přednačítání DNS záznamů" - #~ msgid "Prefetch IP addresses of hovered links" #~ msgstr "Zjistit IP adresu odkazů" @@ -2879,9 +3418,6 @@ #~ 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í" @@ -2894,12 +3430,6 @@ #~ 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í" diff -Nru midori-0.2.8/po/da.po midori-0.4.6/po/da.po --- midori-0.2.8/po/da.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/da.po 2012-05-14 22:13:42.000000000 +0000 @@ -2,499 +2,673 @@ # Copyright (C) 2010 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Per Kongstad , 2009, 10. +# Morten Juhl-Johansen Zölde-Fejér , 2011 +# msgid "" msgstr "" "Project-Id-Version: midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 16:08+0000\n" +"POT-Creation-Date: 2012-05-12 07:21+0000\n" "PO-Revision-Date: 2010-02-20 00:37+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: da\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Poedit-Language: Danish\n" "X-Poedit-Country: Denmark\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Letvægtig webbrowser" +msgid "Browse the Web" +msgstr "Gennemse internettet" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 -#: ../midori/main.c:1665 ../midori/main.c:1681 -#: ../midori/midori-websettings.c:312 +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "Internet;WWW;Stifinder" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:1962 ../midori/main.c:1986 +#: ../midori/main.c:2000 ../midori/midori-websettings.c:313 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Webbrowser" -#: ../midori/main.c:99 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Midori Privat browsing" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Åbn nyt vindue til privat browsing" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4172 +msgid "Private Browsing" +msgstr "Privat browsing" + +#: ../midori/main.c:97 ../midori/main.c:103 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Indstillingen kunne ikke indlæses: %s\n" -#: ../midori/main.c:148 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Værdien '%s' er ikke gyldig til %s" -#: ../midori/main.c:155 ../midori/main.c:241 +#: ../midori/main.c:156 ../midori/main.c:260 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ugyldig indstillingsværdi '%s'" -#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 +#: ../midori/main.c:381 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Søgemaskinerne kunne ikke indlæses. %s\n" + +#: ../midori/main.c:435 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Kunne ikke fjerne historik: %s\n" + +#: ../midori/main.c:455 ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" msgstr "Kunne ikke åbne databasen: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:424 +#: ../midori/main.c:525 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Kunne ikke fjerne gamle historikelementer: %s\n" -#: ../midori/main.c:455 ../panels/midori-history.c:169 -#: ../panels/midori-history.c:199 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Kunne ikke fjerne historikelementet: %s\n" - -#: ../midori/main.c:500 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Bogmærkerne kunne ikke gemmes. %s" - -#: ../midori/main.c:528 +#: ../midori/main.c:547 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Indstillingen kunne ikke gemmes. %s" -#: ../midori/main.c:566 +#: ../midori/main.c:582 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Søgemaskinerne kunne ikke gemmes. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:586 ../midori/main.c:609 +#: ../midori/main.c:619 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Papirkurven kunne ikke fyldes. %s" -#: ../midori/main.c:668 ../midori/main.c:908 +#: ../midori/main.c:660 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Udvidelser" + +#: ../midori/main.c:674 +msgid "Privacy" +msgstr "Beskyttelse af privatliv" + +#: ../midori/main.c:686 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"Cookies gemmer loginddata, gemte spil eller brugerprofiler for " +"marketingsformål" + +#: ../midori/main.c:742 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sessionen kunne ikke gemmes. %s" -#: ../midori/main.c:852 -msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "Ingen rodcertifikatfil er tilgængelig. SSL certifikater kan ikke verificeres." - -#: ../midori/main.c:942 -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:960 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" +"Ingen rodcertifikatfil er tilgængelig. SSL certifikater kan ikke verificeres." + +#: ../midori/main.c:1029 +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:957 +#: ../midori/main.c:1048 msgid "Modify _preferences" msgstr "Ændre _indstillinger" -#: ../midori/main.c:961 -msgid "Reset the last _session" -msgstr "Nulstil den sidste _session" - -#: ../midori/main.c:966 +#: ../midori/main.c:1052 msgid "Disable all _extensions" msgstr "Slå alle _udvidelser fra" -#: ../midori/main.c:1206 ../midori/main.c:1952 +#: ../midori/main.c:1065 +msgid "Discard old tabs" +msgstr "Kassér gamle faneblade" + +#: ../midori/main.c:1066 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "Vis sidste faneblad uden at indlæse" + +#: ../midori/main.c:1067 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "Vis sidste åbne faneblade" + +#: ../midori/main.c:1314 ../midori/main.c:2378 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sessionen kunne ikke indlæses: %s\n" -#: ../midori/main.c:1328 -msgid "No filename specified" -msgstr "Intet filnavn angivet" - -#: ../midori/main.c:1347 -msgid "An unknown error occured." -msgstr "En ukendt fejl opstod." - -#: ../midori/main.c:1378 +#: ../midori/main.c:1452 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Øjebliksbillede gem til: %s\n" -#: ../midori/main.c:1550 +#: ../midori/main.c:1865 msgid "Run ADDRESS as a web application" msgstr "Kør ADRESSE som et webprogram" -#: ../midori/main.c:1550 +#: ../midori/main.c:1865 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1553 +#: ../midori/main.c:1868 msgid "Use FOLDER as configuration folder" msgstr "Brug MAPPE som en indstillingsmappe" -#: ../midori/main.c:1553 +#: ../midori/main.c:1868 msgid "FOLDER" msgstr "MAPPE" -#: ../midori/main.c:1556 +#: ../midori/main.c:1871 +msgid "Private browsing, no changes are saved" +msgstr "Privat browsing. Ingen ændringer bliver gemt" + +#: ../midori/main.c:1873 msgid "Show a diagnostic dialog" msgstr "Vis en nedbrudsdialog" -#: ../midori/main.c:1558 +#: ../midori/main.c:1875 msgid "Run the specified filename as javascript" msgstr "Kør det angivne filnavn som javascript" -#: ../midori/main.c:1561 +#: ../midori/main.c:1877 msgid "Take a snapshot of the specified URI" msgstr "Tag et øjebliksbillede at det angivne URI" -#: ../midori/main.c:1564 +#: ../midori/main.c:1879 msgid "Execute the specified command" msgstr "Kør den angivne kommando" -#: ../midori/main.c:1566 +#: ../midori/main.c:1881 +msgid "List available commands to execute with -e/ --execute" +msgstr "Vis tilgængelige kommandoer for kør med -e/ --execute" + +#: ../midori/main.c:1883 msgid "Display program version" msgstr "Vis programversion" -#: ../midori/main.c:1568 +#: ../midori/main.c:1885 msgid "Addresses" msgstr "Adresser" -#: ../midori/main.c:1570 +#: ../midori/main.c:1887 msgid "Block URIs according to regular expression PATTERN" msgstr "Blokér URI'er i overensstemmelse med regulære udtryks-MØNSTRE" -#: ../midori/main.c:1570 +#: ../midori/main.c:1887 msgid "PATTERN" msgstr "MØNSTRE" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1574 +#: ../midori/main.c:1891 msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "" +msgstr "Nulstil Midori efter SECONDS sekunders inaktivitet" -#: ../midori/main.c:1574 +#: ../midori/main.c:1891 msgid "SECONDS" msgstr "SEKUNDER" -#: ../midori/main.c:1654 +#: ../midori/main.c:1894 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Videresender konsoladvarsler til det angivne FILENAME" + +#: ../midori/main.c:1894 +msgid "FILENAME" +msgstr "FILENAME" + +#: ../midori/main.c:1959 msgid "[Addresses]" msgstr "[Adresser]" -#: ../midori/main.c:1682 +#: ../midori/main.c:2001 msgid "Please report comments, suggestions and bugs to:" msgstr "Rapportér venligst kommentarer, forslag og fejl til:" -#: ../midori/main.c:1684 +#: ../midori/main.c:2003 msgid "Check for new versions at:" msgstr "Tjek for nye versioner hos:" -#: ../midori/main.c:1801 -msgid "The specified configuration folder is invalid." -msgstr "Den angivne indstillingsmappe er ikke gyldig." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2087 +msgid "Saved logins and _passwords" +msgstr "Gemte logins og _adgangskoder" + +#: ../midori/main.c:2089 +msgid "Cookies and Website data" +msgstr "Cookies og websideinformation" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2093 ../midori/midori-websettings.c:997 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Webcache" + +#: ../midori/main.c:2096 +msgid "Website icons" +msgstr "Webstedikoner" + +#: ../midori/main.c:2202 +msgid "An unknown error occured" +msgstr "En ukendt fejl opstod" -#: ../midori/main.c:1849 +#: ../midori/main.c:2309 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:1904 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "Søgemaskinerne kunne ikke indlæses. %s\n" - -#: ../midori/main.c:1925 +#: ../midori/main.c:2345 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Bogmærkerne kunne ikke indlæses: %s\n" -#: ../midori/main.c:1967 +#: ../midori/main.c:2393 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Papirkurven kunne ikke indlæses: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:2406 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historikken kunne ikke indlæses: %s\n" -#: ../midori/main.c:1994 +#: ../midori/main.c:2422 msgid "The following errors occured:" msgstr "De følgende fejl opstod:" -#: ../midori/main.c:2010 +#: ../midori/main.c:2438 msgid "_Ignore" msgstr "_Ignorér" -#: ../midori/midori-array.c:429 +#: ../midori/midori-app.c:1339 +msgid "_Bookmark" +msgstr "_Bogmærke" + +#: ../midori/midori-app.c:1340 ../midori/midori-browser.c:6066 +msgid "_Bookmarks" +msgstr "_Bogmærker" + +#: ../midori/midori-app.c:1341 +msgid "Add Boo_kmark" +msgstr "_Tilføj bogmærke" + +#: ../midori/midori-app.c:1342 +msgid "_Console" +msgstr "_Konsol" + +#: ../midori/midori-app.c:1343 +msgid "_Extensions" +msgstr "_Udvidelser" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1344 ../midori/midori-browser.c:4591 +msgid "_History" +msgstr "Hi_storik" + +#: ../midori/midori-app.c:1345 +msgid "_Homepage" +msgstr "_Hjemmeside" + +#: ../midori/midori-app.c:1346 +msgid "_Userscripts" +msgstr "Brugerskri_pter" + +#: ../midori/midori-app.c:1347 +msgid "New _Tab" +msgstr "Nyt _faneblad" + +#: ../midori/midori-app.c:1348 +msgid "_Transfers" +msgstr "_Overførsler" + +#: ../midori/midori-app.c:1349 +msgid "Netscape p_lugins" +msgstr "Netscape-u_dvidelsesmoduler" + +#: ../midori/midori-app.c:1350 +msgid "_Closed Tabs" +msgstr "_Luk faneblade" + +#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5218 +msgid "New _Window" +msgstr "Nyt _vindue" + +#: ../midori/midori-app.c:1352 +msgid "New _Folder" +msgstr "Ny __mappe" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "Fil blev ikke fundet." -#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 -#: ../midori/midori-array.c:496 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Misdannet dokument." -#: ../midori/midori-array.c:505 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "Ukendt bogmærkeformat." -#: ../midori/midori-array.c:719 +#: ../midori/midori-array.c:915 msgid "Writing failed." msgstr "Skrivning fejlede." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 -#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5300 +#: ../midori/midori-browser.c:5309 msgid "Reload the current page" msgstr "Genindlæs den nuværende side" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 +#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5306 msgid "Stop loading the current page" msgstr "Stop indlæsning af nuværende side" -#: ../midori/midori-browser.c:453 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% indlæst" - -#: ../midori/midori-browser.c:491 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" msgstr "Kunne ikke opdatere titel: %s\n" -#: ../midori/midori-browser.c:504 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." msgstr "Uventet handling '%s'." -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:569 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Privat browsing)" + +#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716 +msgid "Toplevel folder" +msgstr "Øverste mappe" + +#: ../midori/midori-browser.c:774 msgid "New folder" msgstr "Ny mappe" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:774 msgid "Edit folder" msgstr "Redigér mappe" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "New bookmark" msgstr "Nyt bogmærke" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "Edit bookmark" msgstr "Redigér bogmærke" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:818 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "_Beskrivelse:" - -#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4328 msgid "_Folder:" msgstr "_Mappe:" -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 -#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 -msgid "Toplevel folder" -msgstr "Øverste mappe" - -#: ../midori/midori-browser.c:872 +#: ../midori/midori-browser.c:877 msgid "Add to _Speed Dial" msgstr "Tilføj til hurtig_opkald" -#: ../midori/midori-browser.c:885 +#: ../midori/midori-browser.c:890 msgid "Show in the tool_bar" msgstr "Vis på vær_ktøjsbjælken" -#: ../midori/midori-browser.c:900 +#: ../midori/midori-browser.c:905 msgid "Run as _web application" msgstr "Kør so_m et webprogram" -#: ../midori/midori-browser.c:979 +#: ../midori/midori-browser.c:976 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Filen \"%s\" kan ikke gemmes i denne mapp." + +#: ../midori/midori-browser.c:978 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Du har ikke skriverettigheder til dette sted." + +#: ../midori/midori-browser.c:985 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Der er ikke tilstrækkelig fri plads til at hente \"%s\"." -#: ../midori/midori-browser.c:983 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "Filen behøver %s men der er kun %s fri plads" -#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 -#: ../midori/midori-browser.c:4085 +#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4397 msgid "Save file as" msgstr "Gem fil som" -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1320 +msgid "New Window" +msgstr "Nyt vindue" + +#: ../midori/midori-browser.c:1320 +msgid "A new window has been opened" +msgstr "Et nyt vindue er blevet åbnet" + +#: ../midori/midori-browser.c:1323 +msgid "New Tab" +msgstr "Nyt faneblad" + +#: ../midori/midori-browser.c:1323 +msgid "A new tab has been opened" +msgstr "Et nyt faneblad er blevet åbnet" + +#: ../midori/midori-browser.c:1358 +msgid "Error opening the image!" +msgstr "Fejl ved åbning af billedet!" + +#: ../midori/midori-browser.c:1359 +msgid "Can not open selected image in a default viewer." +msgstr "Kan ikke åbne billedet i standardfremviser." + +#: ../midori/midori-browser.c:1365 +msgid "Error downloading the image!" +msgstr "Fejl ved hentning af billedet!" + +#: ../midori/midori-browser.c:1366 +msgid "Can not download selected image." +msgstr "Kan ikke hente valgte billede." + +#: ../midori/midori-browser.c:1492 msgid "Save file" msgstr "Gem fil" -#: ../midori/midori-browser.c:2150 +#: ../midori/midori-browser.c:2367 msgid "Open file" msgstr "Åbn fil" -#: ../midori/midori-browser.c:2228 +#: ../midori/midori-browser.c:2499 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." msgstr "" +"For at bruge ovenstående adresse skal du bruge en nyhedslæser. Der er gerne " +"en menu eller knap med \"Nyt abonnement\", \"Nyt nyhedsfeed\" eller " +"lignende.\n" +"Alternativt kan man gå til Indstillinger, Programmer i Midori og vælge en " +"nyhedslæser. Næste kan man trykker på ikonet med nyhedsfeed, vil det " +"automatisk blive tilføjet." -#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nyt feed" -#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 -#: ../panels/midori-bookmarks.c:406 +#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5369 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "Tilføj et nyt bogmærke" -#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "Kunne ikke køre eksternt program." +#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "Tom" -#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:3469 +msgid "Toggle text cursor navigation" +msgstr "Slå cursorbaseret navigation til og fra" + +#: ../midori/midori-browser.c:3784 ../midori/midori-browser.c:5759 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Kunne ikke indsætte nyt historikelement: %s\n" -#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:734 +#: ../midori/midori-browser.c:4116 ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 msgid "Open all in _Tabs" msgstr "Åbn alt i _faneblade" -#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 -#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4123 ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Åbn i nyt _faneblad" -#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 -#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4126 ../midori/midori-view.c:2661 +#: ../midori/midori-view.c:4712 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Åbn i nyt _vindue" -#: ../midori/midori-browser.c:3931 +#: ../midori/midori-browser.c:4215 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3932 +#: ../midori/midori-browser.c:4216 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:4217 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:4218 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3935 +#: ../midori/midori-browser.c:4219 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3959 +#: ../midori/midori-browser.c:4220 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4241 msgid "Import bookmarks..." msgstr "Importér bogmærker..." -#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4244 ../midori/midori-browser.c:5374 msgid "_Import bookmarks" msgstr "_Importér bogmærker" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:4255 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 -#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 -#: ../katze/katze-utils.c:696 -msgid "Custom..." -msgstr "Tilpasset..." +#: ../midori/midori-browser.c:4320 +msgid "Import from XBEL or HTML file" +msgstr "Importér fra XBEL- eller HTML-fil" + +#: ../midori/midori-browser.c:4355 +msgid "Import from a file" +msgstr "Importér fra en fil" -#: ../midori/midori-browser.c:4061 +#: ../midori/midori-browser.c:4367 msgid "Failed to import bookmarks" msgstr "Kunne ikke importere bogmærker" -#: ../midori/midori-browser.c:4102 +#: ../midori/midori-browser.c:4402 +msgid "XBEL Bookmarks" +msgstr "XBEL bogmærker" + +#: ../midori/midori-browser.c:4407 +msgid "Netscape Bookmarks" +msgstr "Netscape bogmærker" + +#: ../midori/midori-browser.c:4421 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "Midori kan kun eksportere til XBEL (*.xbel) og Netscape (*.html)" + +#: ../midori/midori-browser.c:4436 msgid "Failed to export bookmarks" msgstr "Kunne ikke eksportere bogmærker" -#: ../midori/midori-browser.c:4155 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "Kunne ikke fjerne historik: %s\n" - -#: ../midori/midori-browser.c:4163 -#, c-format -msgid "Failed to clear search history: %s\n" -msgstr "Kunne ikke fjerne søgehistorik: %s\n" - #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4270 +#: ../midori/midori-browser.c:4558 msgid "Clear Private Data" msgstr "Ryd private data" -#: ../midori/midori-browser.c:4274 +#: ../midori/midori-browser.c:4562 msgid "_Clear private data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:4288 +#: ../midori/midori-browser.c:4575 msgid "Clear the following data:" msgstr "Ryd de følgende data:" -#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:114 -msgid "History" -msgstr "Historik" - -#: ../midori/midori-browser.c:4303 -msgid "Cookies" -msgstr "Cookies" - -#: ../midori/midori-browser.c:4308 -msgid "'Flash' Cookies" -msgstr "'Flash' cookies" - -#: ../midori/midori-browser.c:4313 -msgid "Website icons" -msgstr "Webstedikoner" - -#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 -msgid "_Closed Tabs" -msgstr "_Luk faneblade" - -#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "Webcache" +#: ../midori/midori-browser.c:4585 +msgid "Last open _tabs" +msgstr "Sidste åbne _faneblade" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4611 msgid "Clear private data when _quitting Midori" msgstr "_Ryd private data når Midori afsluttes" -#: ../midori/midori-browser.c:4472 +#: ../midori/midori-browser.c:4806 msgid "A lightweight web browser." msgstr "En letvægt-webbrowser." -#: ../midori/midori-browser.c:4474 -msgid "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." -msgstr "Dette bibliotek er åbent programmel: Du kan frit gendistribuere det og/eller ændre det i overensstemmelse med GNU Lesser General Public License som publiceret af Free Software Foundation: Enten version 2.1 af licensen eller (dit frie valg) en senere version." +#: ../midori/midori-browser.c:4807 +msgid "See about:version for version info." +msgstr "Se about:version for versionsinfo." + +#: ../midori/midori-browser.c:4809 +msgid "" +"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." +msgstr "" +"Dette bibliotek er åbent programmel: Du kan frit gendistribuere det og/eller " +"ændre det i overensstemmelse med GNU Lesser General Public License som " +"publiceret af Free Software Foundation: Enten version 2.1 af licensen eller " +"(dit frie valg) en senere version." -#: ../midori/midori-browser.c:4493 +#: ../midori/midori-browser.c:4830 msgid "translator-credits" msgstr "" "Per Kongstad \n" @@ -502,1725 +676,1541 @@ "Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk" -#: ../midori/midori-browser.c:4802 +#: ../midori/midori-browser.c:5216 msgid "_File" msgstr "_Fil" -#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 -msgid "New _Window" -msgstr "Nyt _vindue" - -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:5219 msgid "Open a new window" msgstr "Åbn et nyt vindue" -#: ../midori/midori-browser.c:4808 +#: ../midori/midori-browser.c:5222 msgid "Open a new tab" msgstr "Åbn et nyt faneblad" -#: ../midori/midori-browser.c:4810 -msgid "P_rivate Browsing" -msgstr "P_rivat browsing" - -#: ../midori/midori-browser.c:4811 -msgid "Don't save any private data while browsing" -msgstr "Undlad at gemme private data under browsing" +#: ../midori/midori-browser.c:5224 +msgid "New P_rivate Browsing Window" +msgstr "Nyt vindue til p_rivat browsing" -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:5228 msgid "Open a file" msgstr "Åbn en fil" -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:5230 +msgid "_Save Page As..." +msgstr "Gem side _som..." + +#: ../midori/midori-browser.c:5231 msgid "Save to a file" msgstr "Gem til en fil" -#: ../midori/midori-browser.c:4820 +#: ../midori/midori-browser.c:5233 msgid "Add to Speed _dial" msgstr "Tilføj til hurtig_opkald" -#: ../midori/midori-browser.c:4821 -msgid "Add shortcut to speed dial" -msgstr "Tilføj genvej til hurtigopkald" - -#: ../midori/midori-browser.c:4823 +#: ../midori/midori-browser.c:5237 msgid "Add Shortcut to the _desktop" msgstr "Tilføj genvej til _skrivebordet" -#: ../midori/midori-browser.c:4824 -msgid "Add shortcut to the desktop" -msgstr "Tilføj genvej til skrivebordet" +#: ../midori/midori-browser.c:5239 +msgid "Create _Launcher" +msgstr "Opret _opstarter" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:5243 msgid "Subscribe to News _feed" msgstr "Abonnér på _nyhedskilder" -#: ../midori/midori-browser.c:4827 -msgid "Subscribe to this news feed" -msgstr "Abonnér på denne nyhedskilde" - -#: ../midori/midori-browser.c:4832 +#: ../midori/midori-browser.c:5249 msgid "_Close Tab" msgstr "_Luk faneblad" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:5250 msgid "Close the current tab" msgstr "Luk nuværende faneblad" -#: ../midori/midori-browser.c:4835 +#: ../midori/midori-browser.c:5252 msgid "C_lose Window" msgstr "Lu_k vinduet" -#: ../midori/midori-browser.c:4836 -msgid "Close this window" -msgstr "Luk dette vindue" - -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:5256 msgid "Print the current page" msgstr "Udskriv nuværende side" -#: ../midori/midori-browser.c:4842 -msgid "Quit the application" -msgstr "Afslut programmet" +#: ../midori/midori-browser.c:5258 +msgid "Close a_ll Windows" +msgstr "Luk a_lle vinduer" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:5261 msgid "_Edit" msgstr "_Redigér" -#: ../midori/midori-browser.c:4848 -msgid "Undo the last modification" -msgstr "Fortryd den sidste ændring" - -#: ../midori/midori-browser.c:4851 -msgid "Redo the last modification" -msgstr "Gentag den sidste ændring" - -#: ../midori/midori-browser.c:4855 -msgid "Cut the selected text" -msgstr "Udklip markeret tekst" - -#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 -msgid "Copy the selected text" -msgstr "Kopiér markeret tekst" - -#: ../midori/midori-browser.c:4864 -msgid "Paste text from the clipboard" -msgstr "Indsæt tekst fra klippebordet" - -#: ../midori/midori-browser.c:4867 -msgid "Delete the selected text" -msgstr "Slet markeret tekst" - -#: ../midori/midori-browser.c:4870 -msgid "Select all text" -msgstr "Markér hele teksten" +#: ../midori/midori-browser.c:5284 +msgid "_Find..." +msgstr "_Find..." -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:5285 msgid "Find a word or phrase in the page" msgstr "Find et ord eller sætning på siden" -#: ../midori/midori-browser.c:4875 +#: ../midori/midori-browser.c:5287 msgid "Find _Next" msgstr "Find _næste" -#: ../midori/midori-browser.c:4876 -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:4878 +#: ../midori/midori-browser.c:5290 msgid "Find _Previous" msgstr "Find _forrige" -#: ../midori/midori-browser.c:4879 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Find forrige forekomst af et ord eller sætning" - -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:5294 msgid "Configure the application preferences" msgstr "Indstil programindstillingerne" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:5296 msgid "_View" msgstr "_Vis" -#: ../midori/midori-browser.c:4886 +#: ../midori/midori-browser.c:5297 msgid "_Toolbars" msgstr "_Værktøjsbjælker" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:5302 +msgid "Reload page without caching" +msgstr "Genindlæs side uden caching" + +#: ../midori/midori-browser.c:5312 msgid "Increase the zoom level" msgstr "Forøg forstørrelsesniveauet" -#: ../midori/midori-browser.c:4901 +#: ../midori/midori-browser.c:5315 msgid "Decrease the zoom level" msgstr "Formindsk forstørrelsesniveauet" -#: ../midori/midori-browser.c:4904 -msgid "Reset the zoom level" -msgstr "Nulstil forstørrelsesniveauet" - -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:5319 msgid "_Encoding" msgstr "_Kodning" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:5321 msgid "View So_urce" msgstr "Vis _kilde" -#: ../midori/midori-browser.c:4908 -msgid "View the source code of the page" -msgstr "Vis kildekode for siden" +#: ../midori/midori-browser.c:5324 +msgid "Ca_ret Browsing" +msgstr "Ca_ret browsing" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:5328 msgid "Toggle fullscreen view" msgstr "Slå fuldskærmstilstande til/fra" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:5330 msgid "Scroll _Left" msgstr "Rul til _venstre" -#: ../midori/midori-browser.c:4915 -msgid "Scroll to the left" -msgstr "Rul til venstre" - -#: ../midori/midori-browser.c:4917 +#: ../midori/midori-browser.c:5333 msgid "Scroll _Down" msgstr "Rul _ned" -#: ../midori/midori-browser.c:4918 -msgid "Scroll down" -msgstr "Rul ned" - -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:5336 msgid "Scroll _Up" msgstr "Rul _op" -#: ../midori/midori-browser.c:4921 -msgid "Scroll up" -msgstr "Rul op" - -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:5339 msgid "Scroll _Right" msgstr "Rul til _højre" -#: ../midori/midori-browser.c:4924 -msgid "Scroll to the right" -msgstr "Rul til højre" - -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:5342 msgid "_Go" msgstr "_Gå til" -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:5345 msgid "Go back to the previous page" msgstr "Gå til forrige side" -#: ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:5348 msgid "Go forward to the next page" msgstr "Gå til næste side" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4937 +#: ../midori/midori-browser.c:5352 msgid "Go to the previous sub-page" msgstr "Gå til den forrige uderside" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:5356 msgid "Go to the next sub-page" msgstr "Gå til den næste underside" -#: ../midori/midori-browser.c:4944 +#: ../midori/midori-browser.c:5359 msgid "Go to your homepage" msgstr "Gå til din hjemmeside" -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:5361 msgid "Empty Trash" msgstr "Tøm papirkurven" -#: ../midori/midori-browser.c:4947 -msgid "Delete the contents of the trash" -msgstr "Slet indhold af papirkurven" - -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:5364 msgid "Undo _Close Tab" msgstr "Fortryd lu_k faneblad" -#: ../midori/midori-browser.c:4950 -msgid "Open the last closed tab" -msgstr "Åbn sidste lukkede faneblad" - -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:5371 msgid "Add a new _folder" msgstr "Tilføj en ny _mappe" -#: ../midori/midori-browser.c:4957 -msgid "Add a new bookmark folder" -msgstr "Tilføj en ny bogmærkemappe" - -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:5377 msgid "_Export bookmarks" msgstr "_Eksportér bogmærker" -#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Håndtér søgemaskiner" -#: ../midori/midori-browser.c:4966 -msgid "Add, edit and remove search engines..." -msgstr "Tilføj, redigér og fjern søgemaskiner..." - -#: ../midori/midori-browser.c:4969 +#: ../midori/midori-browser.c:5383 msgid "_Clear Private Data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:4970 -msgid "Clear private data..." -msgstr "Ryd private data..." - -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:5386 msgid "_Inspect Page" msgstr "_Undersøg side" -#: ../midori/midori-browser.c:4975 -msgid "Inspect page details and access developer tools..." -msgstr "Undersøg sidedetaljerne and tilgå udviklerværktøjerne..." - -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:5390 msgid "_Previous Tab" msgstr "_Forrige faneblad" -#: ../midori/midori-browser.c:4981 -msgid "Switch to the previous tab" -msgstr "Skift til det forrige faneblad" - -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:5393 msgid "_Next Tab" msgstr "_Næste faneblad" -#: ../midori/midori-browser.c:4984 -msgid "Switch to the next tab" -msgstr "Skift til det næste faneblad" +#: ../midori/midori-browser.c:5395 +msgid "Move Tab _Backward" +msgstr "Flyt faneblad _tilbage" + +#: ../midori/midori-browser.c:5397 +msgid "_Move Tab Forward" +msgstr "Flyt faneblad _frem" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:5400 msgid "Focus _Current Tab" msgstr "Fokus på _nuværende faneblad" -#: ../midori/midori-browser.c:4987 -msgid "Focus the current tab" -msgstr "Fokus på det nuværende faneblad" - -#: ../midori/midori-browser.c:4989 -msgid "Minimize _Current Tab" -msgstr "_Minimér nuværede faneblade" - -#: ../midori/midori-browser.c:4990 -msgid "Minimize the current tab" -msgstr "Minimér nuværende faneblad" +#: ../midori/midori-browser.c:5403 +msgid "Focus _Next view" +msgstr "Fokus _næste visning" + +#: ../midori/midori-browser.c:5406 +msgid "Only show the Icon of the _Current Tab" +msgstr "Vis kun ikonet for _nuværende faneblad" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:5409 msgid "_Duplicate Current Tab" msgstr "_Dublér nuværende faneblad" -#: ../midori/midori-browser.c:4993 -msgid "Duplicate the current tab" -msgstr "Dublér nuværende faneblad" - -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:5412 msgid "Close Ot_her Tabs" msgstr "Luk a_ndre faneblade" -#: ../midori/midori-browser.c:4996 -msgid "Close all tabs except the current tab" -msgstr "Luk alle faneblade undtaget nuværende faneblad" - -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5415 msgid "Open last _session" msgstr "Åbn den sidste _session" -#: ../midori/midori-browser.c:4999 -msgid "Open the tabs saved in the last session" -msgstr "Åbn faneblade gemt i den sidste session" - -#: ../midori/midori-browser.c:5001 +#: ../midori/midori-browser.c:5418 msgid "_Help" msgstr "_Hjælp" -#: ../midori/midori-browser.c:5003 -msgid "_Contents" -msgstr "_Indhold" - -#: ../midori/midori-browser.c:5004 -msgid "Show the documentation" -msgstr "Vis dokumentationen" - -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:5420 msgid "_Frequent Questions" msgstr "_Ofte stillede spørgsmål" -#: ../midori/midori-browser.c:5007 -msgid "Show the Frequently Asked Questions" -msgstr "Vis ofte stillede spørgsmål" - -#: ../midori/midori-browser.c:5009 -msgid "_Report a Bug" -msgstr "_Rapportér en fejl" - -#: ../midori/midori-browser.c:5010 -msgid "Open Midori's bug tracker" -msgstr "Åbn Midoris fejlsystem" - -#: ../midori/midori-browser.c:5013 -msgid "Show information about the program" -msgstr "Vis information om dette program" +#: ../midori/midori-browser.c:5423 +msgid "_Report a Problem..." +msgstr "_Rapportér en fejl..." -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:5435 msgid "_Menubar" msgstr "_Menubjælke" -#: ../midori/midori-browser.c:5022 -msgid "Show menubar" -msgstr "Vis menubjælke" - -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:5439 msgid "_Navigationbar" msgstr "_Navigeringsbjælke" -#: ../midori/midori-browser.c:5026 -msgid "Show navigationbar" -msgstr "Vis navigeringsbjælke" - -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5443 msgid "Side_panel" msgstr "Side_panel" -#: ../midori/midori-browser.c:5030 -msgid "Show sidepanel" -msgstr "Vis sidepanel" +#: ../midori/midori-browser.c:5444 +msgid "Sidepanel" +msgstr "Sidepanel" -#: ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:5447 msgid "_Bookmarkbar" msgstr "_Bogmærkebjælke" -#: ../midori/midori-browser.c:5034 -msgid "Show bookmarkbar" -msgstr "Vis bogmærkebjælke" - -#: ../midori/midori-browser.c:5037 -msgid "_Transferbar" -msgstr "_Overførselsstatus" - -#: ../midori/midori-browser.c:5038 -msgid "Show transferbar" -msgstr "Vis overførselsstatus" - -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:5451 msgid "_Statusbar" msgstr "_Statusbjælke" -#: ../midori/midori-browser.c:5042 -msgid "Show statusbar" -msgstr "Vis statusbjælke" - -#: ../midori/midori-browser.c:5050 +#: ../midori/midori-browser.c:5460 ../midori/midori-websettings.c:312 msgid "_Automatic" msgstr "_Automatisk" -#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 -msgid "Chinese (BIG5)" -msgstr "Kinesisk (BIG5)" +#: ../midori/midori-browser.c:5463 ../midori/midori-websettings.c:236 +msgid "Chinese Traditional (BIG5)" +msgstr "Traditionel kinesisk (BIG5)" + +#: ../midori/midori-browser.c:5466 ../midori/midori-websettings.c:237 +msgid "Chinese Simplified (GB18030)" +msgstr "Simpelt kinesisk (GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5470 msgid "Japanese (SHIFT__JIS)" msgstr "Japansk (SHIFT__JIS)" -#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5473 ../midori/midori-websettings.c:239 msgid "Korean (EUC-KR)" msgstr "Koreansk (EUC-KR)" -#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5476 ../midori/midori-websettings.c:240 msgid "Russian (KOI8-R)" msgstr "Russisk (KOI8-R)" -#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5479 ../midori/midori-websettings.c:241 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5482 ../midori/midori-websettings.c:242 msgid "Western (ISO-8859-1)" msgstr "Vestlig (ISO-8859-1)" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5485 ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:318 ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "Tilpasset..." + +#: ../midori/midori-browser.c:5991 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5998 msgid "_Location..." msgstr "_Sted..." -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:6000 msgid "Open a particular location" msgstr "Åbn et særligt sted" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:6022 msgid "_Web Search..." msgstr "_Websøgning..." -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:6024 msgid "Run a web search" msgstr "Kør en websøgnig" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:6051 msgid "Reopen a previously closed tab or window" msgstr "Genåbn et tidligere lukket faneblad eller vindue" -#: ../midori/midori-browser.c:5659 +#: ../midori/midori-browser.c:6068 +msgid "Show the saved bookmarks" +msgstr "Vis de gemte bogmærker" + +#: ../midori/midori-browser.c:6085 msgid "_Tools" msgstr "Værk_tøjer" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:6101 msgid "_Window" msgstr "Vin_due" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:6103 msgid "Show a list of all open tabs" msgstr "Vis en liste med alle åbne faneblade" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:6117 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:6119 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:6262 +#: ../midori/midori-browser.c:6933 #, c-format msgid "Unexpected setting '%s'" msgstr "Uventet indstilling '%s'" -#: ../midori/midori-locationaction.c:390 +#: ../midori/midori-extension.c:329 #, c-format -msgid "Failed to select from history\n" -msgstr "Kunne ikke vælge fra historik\n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "Indstillingen af udvidelsesmodulet '%s' kunne ikke indlæses: %s\n" -#: ../midori/midori-locationaction.c:474 +#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "Søg efter %s" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Indstillingen af udvidelsesmodulet '%s' kunne ikke gemmes: %s\n" -#: ../midori/midori-locationaction.c:497 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "Søg med %s" -#: ../midori/midori-locationaction.c:1307 +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Søg med..." + +#: ../midori/midori-locationaction.c:537 +#, c-format +msgid "Failed to select from history\n" +msgstr "Kunne ikke vælge fra historik\n" + +#: ../midori/midori-locationaction.c:624 #, c-format -msgid "Failed to execute database statement\n" -msgstr "Kunne ikke køre databaseudtryk\n" +msgid "Search for %s" +msgstr "Søg efter %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1363 +#: ../midori/midori-locationaction.c:1398 msgid "Paste and p_roceed" msgstr "Indsæt og f_ortsæt" -#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 -msgid "Detach chosen panel from the window" -msgstr "Frigør valgte panel fra vinduet" +#: ../midori/midori-locationaction.c:1739 +msgid "Not verified" +msgstr "Ikke bekræftet" + +#: ../midori/midori-locationaction.c:1759 +msgid "Verified and encrypted connection" +msgstr "Bekræftet og kodet forbindelse" + +#: ../midori/midori-locationaction.c:1771 +msgid "Open, unencrypted connection" +msgstr "Åben og ukrypteret forbindelse" -#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 -#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" msgstr "Opstil sidepanel til højre" -#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Luk panel" -#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Opstil sidepanel til venstre" -#: ../midori/midori-panel.c:771 -msgid "Hide operating controls" -msgstr "Skjul handlingskontroller" - -#: ../midori/midori-websettings.c:200 -msgid "Show Blank page" -msgstr "Vis blank side" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "Vis hurtigopkald" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" msgstr "Vis hjemmeside" -#: ../midori/midori-websettings.c:202 -msgid "Show last open tabs" -msgstr "Vis sidste åbne faneblade" - -#: ../midori/midori-websettings.c:204 -msgid "Show last tabs without loading" -msgstr "Vis sidste faneblad uden at indlæse" - -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:238 msgid "Japanese (SHIFT_JIS)" msgstr "Japansk (SHIFT_JIS)" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:258 msgid "New tab" msgstr "Nyt faneblad" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:259 msgid "New window" msgstr "Nyt vindue" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:260 msgid "Current tab" msgstr "Nuværende faneblad" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:275 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:276 msgid "Icons" msgstr "Ikoner" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:277 msgid "Small icons" msgstr "Små ikoner" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:278 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:279 msgid "Icons and text" msgstr "Ikoner og tekst" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:280 msgid "Text beside icons" msgstr "Tekst ved siden af ikoner" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:295 msgid "Automatic (GNOME or environment)" msgstr "Automatisk (GNOME eller miljø)" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:296 msgid "HTTP proxy server" msgstr "HTTP-proxyserver" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:297 msgid "No proxy server" msgstr "Ingen proxyserver" -#: ../midori/midori-websettings.c:295 -msgid "All cookies" -msgstr "Alle cookies" - -#: ../midori/midori-websettings.c:296 -msgid "Session cookies" -msgstr "Session-cookies" - -#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 -msgid "None" -msgstr "Ingen" - -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:314 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:315 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:316 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:317 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:401 msgid "Remember last window size" msgstr "Husk sidste vinduesstørrelse" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:402 msgid "Whether to save the last window size" msgstr "Skal sidste vinduesstørrelse gemmes" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:410 msgid "Last window width" msgstr "Sidste vinduesbredde" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:411 msgid "The last saved window width" msgstr "Sidste gemte vinduesbredde" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:419 msgid "Last window height" msgstr "Sidste vindueshøjde" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:420 msgid "The last saved window height" msgstr "Sidste gemte vindueshøjde" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:445 msgid "Last panel position" msgstr "Sidste panelplacering" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:446 msgid "The last saved panel position" msgstr "Sidste gemte panelplacering" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:455 msgid "Last panel page" msgstr "Sidste panelside" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:456 msgid "The last saved panel page" msgstr "Sidste gemte panelside" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:464 msgid "Last Web search" msgstr "Sidste websøgning" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:465 msgid "The last saved Web search" msgstr "Den sidste gemte websøgning" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:474 msgid "Show Menubar" msgstr "Vis menubjælke" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:475 msgid "Whether to show the menubar" msgstr "Om menubjælke vises" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:483 msgid "Show Navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:484 msgid "Whether to show the navigationbar" msgstr "Om navigeringsbjælke vises" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:492 msgid "Show Bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:493 msgid "Whether to show the bookmarkbar" msgstr "Om bogmærkebjælke vises" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:501 msgid "Show Panel" msgstr "Vis panel" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:502 msgid "Whether to show the panel" msgstr "Om panel vises" -#: ../midori/midori-websettings.c:485 -msgid "Show Transferbar" -msgstr "Vis overførselsstatus" - -#: ../midori/midori-websettings.c:486 -msgid "Whether to show the transferbar" -msgstr "Om overførselsstatus skal vises" - -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:510 msgid "Show Statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:511 msgid "Whether to show the statusbar" msgstr "Om statusbjælke vises" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:520 msgid "Toolbar Style:" msgstr "Værktøjsbjælkestil:" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:521 msgid "The style of the toolbar" msgstr "Stilen for værktøjsbjælke" -#: ../midori/midori-websettings.c:521 -msgid "Show progress in location entry" -msgstr "Vis fremgang i placeringindgang" - -#: ../midori/midori-websettings.c:522 -msgid "Whether to show loading progress in the location entry" -msgstr "Om visning af indlæsningsfremgang i placeringsindgang" - -#: ../midori/midori-websettings.c:537 -msgid "Search engines in location completion" -msgstr "Vis søgemaskiner i adresseudfyldelse" - -#: ../midori/midori-websettings.c:538 -msgid "Whether to show search engines in the location completion" -msgstr "Om søgemaskiner skal vises i adresseudfyldelsen" - -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:530 msgid "Toolbar Items" msgstr "Værktøjsbjælkes elementer" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:531 msgid "The items to show on the toolbar" msgstr "Elementer der vises på værktøjsbjælken" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:539 msgid "Compact Sidepanel" msgstr "Kompakt sidepanel" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:540 msgid "Whether to make the sidepanel compact" msgstr "Om sidepanelet skal være kompakt" -#: ../midori/midori-websettings.c:571 -msgid "Show operating controls of the panel" -msgstr "Vis handlingskontroller til panelet" - -#: ../midori/midori-websettings.c:572 -msgid "Whether to show the operating controls of the panel" -msgstr "Om handlingskontroller til panelet skal vises" - -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:555 msgid "Align sidepanel on the right" msgstr "Opstil sidepanel til højre" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:556 msgid "Whether to align the sidepanel on the right" msgstr "Om sidepanelet skal være opstilles til højre" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:571 msgid "Open panels in separate windows" msgstr "Åbn paneler i separate vinduer" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:572 msgid "Whether to always open panels in separate windows" msgstr "Om paneler altid skal åbnes i separate vinduer" -#: ../midori/midori-websettings.c:613 +#: ../midori/midori-websettings.c:581 msgid "When Midori starts:" msgstr "Når Midori starter:" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:582 msgid "What to do when Midori starts" msgstr "Hvad der skal ske når Midori startes" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:591 msgid "Homepage:" msgstr "Hjemmeside:" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:592 msgid "The homepage" msgstr "Hjemmesiden" -#: ../midori/midori-websettings.c:639 +#: ../midori/midori-websettings.c:607 msgid "Show crash dialog" msgstr "Vis nedbrudsdialog" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:608 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:656 -msgid "Show speed dial in new tabs" -msgstr "Vis hurtigopkald i nye faneblade" - -#: ../midori/midori-websettings.c:657 -msgid "Show speed dial in newly opened tabs" -msgstr "Vis hurtigopkald i nyligt åbnede faneblade" - -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:616 msgid "Save downloaded files to:" msgstr "Gem hentede filer til:" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:617 msgid "The folder downloaded files are saved to" msgstr "Mappen hvor nedhentede filer skal gemmes" -#: ../midori/midori-websettings.c:687 -msgid "Ask for the destination folder" -msgstr "Spørg om målmappen" - -#: ../midori/midori-websettings.c:688 -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:707 -msgid "Notify when a transfer has been completed" -msgstr "Påmindelse når en overførsel er gennemført" - -#: ../midori/midori-websettings.c:708 -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:720 -msgid "Download Manager" -msgstr "Håndtering af hentning" - -#: ../midori/midori-websettings.c:721 -msgid "An external download manager" -msgstr "En ekstern håndtering for nedhentning" - -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:625 msgid "Text Editor" msgstr "Tekstbehandler" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:626 msgid "An external text editor" msgstr "En ekstern tekstbehandler" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:641 msgid "News Aggregator" msgstr "Nyhedssamler" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:642 msgid "An external news aggregator" msgstr "En ekstern nyhedssamler" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:650 msgid "Location entry Search" msgstr "Søg for stedindgang" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:651 msgid "The search to perform inside the location entry" msgstr "Søgningen som skal foretages i placeringsindgang" -#: ../midori/midori-websettings.c:763 +#: ../midori/midori-websettings.c:659 msgid "Preferred Encoding" msgstr "Foretrukne tegnsæt" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:660 msgid "The preferred character encoding" msgstr "Foretrukne tegnsæt" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:670 msgid "Always Show Tabbar" msgstr "Vis altid fanebladsbjælke" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:671 msgid "Always show the tabbar" msgstr "Vis altid fanebladsbjælken" -#: ../midori/midori-websettings.c:783 +#: ../midori/midori-websettings.c:684 msgid "Close Buttons on Tabs" msgstr "Lukkeknapper på faneblade" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:685 msgid "Whether tabs have close buttons" msgstr "Om faneblade har lukkeknapper" -#: ../midori/midori-websettings.c:792 +#: ../midori/midori-websettings.c:710 msgid "Open new pages in:" msgstr "Åbn nye sider i:" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:711 msgid "Where to open new pages" msgstr "Hvor skal nye sider åbnes" -#: ../midori/midori-websettings.c:802 -msgid "Open external pages in:" -msgstr "Åbn eksterne sider i:" - -#: ../midori/midori-websettings.c:803 -msgid "Where to open externally opened pages" -msgstr "Hvor skal eksterne sider åbnes" - -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:720 msgid "Middle click opens Selection" msgstr "Midterklik åbner for markering" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:721 msgid "Load an address from the selection via middle click" msgstr "Indlæs en adresse fra markeringen med midterklik" -#: ../midori/midori-websettings.c:821 +#: ../midori/midori-websettings.c:729 msgid "Open tabs in the background" msgstr "Åbn faneblade i baggrunden" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:730 msgid "Whether to open new tabs in the background" msgstr "Om nye faneblade skal åbnes i baggrunden" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:738 msgid "Open Tabs next to Current" msgstr "Åbn faneblad ved siden af nuværende" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:739 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" +msgstr "" +"Om åbning af faneblade skal ske ved siden af nuværende eller efter sidste " +"faneblad" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:747 msgid "Open popups in tabs" msgstr "Åbn pop op i faneblade" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:748 msgid "Whether to open popup windows in tabs" msgstr "Om pop op-vinduer skal åbnes i faneblade" -#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:758 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Indlæs billeder automatisk" -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:759 msgid "Load and display images automatically" msgstr "Indlæs og vis billeder automatisk" -#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:766 ../extensions/statusbar-features.c:143 msgid "Enable scripts" msgstr "Brug skripter" -#: ../midori/midori-websettings.c:859 +#: ../midori/midori-websettings.c:767 msgid "Enable embedded scripting languages" msgstr "Slå indlejret skriptsprog til" -#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:774 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" msgstr "Slå Netscape-udvidelsesmoduler til" -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:775 msgid "Enable embedded Netscape plugin objects" msgstr "Slå indlejrede Netscape-udvidelsesobjekter til" -#: ../midori/midori-websettings.c:883 +#: ../midori/midori-websettings.c:790 +msgid "Enable Spell Checking" +msgstr "Slå stavekontrol til" + +#: ../midori/midori-websettings.c:791 +msgid "Enable spell checking while typing" +msgstr "Slå stavekontrol til mens du taster" + +#: ../midori/midori-websettings.c:797 msgid "Enable HTML5 database support" msgstr "Slå HTML5 databaseunderstøttelse til" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:798 msgid "Whether to enable HTML5 database support" msgstr "Om understøttelse af database til HTML5 skal slås til" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:804 msgid "Enable HTML5 local storage support" msgstr "Slå understøttelse af lokal lagring af HTML5 til" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:805 msgid "Whether to enable HTML5 local storage support" msgstr "Om understøttelse af lokal lagring af HTML5 skal slås til" -#: ../midori/midori-websettings.c:899 +#: ../midori/midori-websettings.c:811 msgid "Enable offline web application cache" msgstr "Slå ikke forbundet webprograms mellemlager til" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:812 msgid "Whether to enable offline web application cache" msgstr "Om ikke forbundet webprograms mellemlager skal slås til" -#: ../midori/midori-websettings.c:925 +#: ../midori/midori-websettings.c:828 +msgid "Flash window on background tabs" +msgstr "Lad vindue på baggrundsfaneblade blinke" + +#: ../midori/midori-websettings.c:829 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "Lad browservinduet blinke hvis et nyt faneblad blev åbnet i baggrunden" + +#: ../midori/midori-websettings.c:837 +msgid "Enable WebGL support" +msgstr "Slå WebGL databaseunderstøttelse til" + +#: ../midori/midori-websettings.c:838 +msgid "Allow websites to use OpenGL rendering" +msgstr "Tillad netsider at bruge OpenGL-rendering" + +#: ../midori/midori-websettings.c:864 msgid "Zoom Text and Images" msgstr "Zoom tekst og billeder" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:865 msgid "Whether to zoom text and images" msgstr "Om zoom af tekst og billeder" -#: ../midori/midori-websettings.c:941 +#: ../midori/midori-websettings.c:880 msgid "Find inline while typing" msgstr "Find indlejret mens du taster" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:881 msgid "Whether to automatically find inline while typing" msgstr "Om indlejret skal findes automatisk, mens du taster" -#: ../midori/midori-websettings.c:957 +#: ../midori/midori-websettings.c:896 msgid "Kinetic scrolling" msgstr "Bevægelsesrulning" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:897 msgid "Whether scrolling should kinetically move according to speed" msgstr "Om rulning skal ske med bevægelseshastighed eller ej" -#: ../midori/midori-websettings.c:966 -msgid "Accept cookies" -msgstr "Tillad cookies" - -#: ../midori/midori-websettings.c:967 -msgid "What type of cookies to accept" -msgstr "Hvilke typer af cookes skal tillades" - -#: ../midori/midori-websettings.c:976 -msgid "Maximum cookie age" -msgstr "Maksimal cookie-levetid" +#: ../midori/midori-websettings.c:905 +msgid "Delete old Cookies after:" +msgstr "Slet gamle cookies efter:" -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:906 msgid "The maximum number of days to save cookies for" msgstr "Maksimal antal dage cookies skal gemmes" -#: ../midori/midori-websettings.c:986 -msgid "Maximum history age" -msgstr "Maksimal historik-levetid" +#: ../midori/midori-websettings.c:922 +msgid "Only accept Cookies from sites you visit" +msgstr "Tillad kun cookies fra sider du besøger" + +#: ../midori/midori-websettings.c:923 +msgid "Block cookies sent by third-party websites" +msgstr "Blokér cookies send fra trejdepartsider" + +#: ../midori/midori-websettings.c:937 +msgid "Delete pages from history after:" +msgstr "Slet sider fra historik efter:" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:938 msgid "The maximum number of days to save the history for" msgstr "Maksimale antal dage som historik skal gemmes" -#: ../midori/midori-websettings.c:995 -msgid "Remember last downloaded files" -msgstr "Husk sidste hentede filer" - -#: ../midori/midori-websettings.c:996 -msgid "Whether the last downloaded files are saved" -msgstr "Om sidste hentede filer skal gemmes" - -#: ../midori/midori-websettings.c:1013 +#: ../midori/midori-websettings.c:953 msgid "Proxy server" msgstr "Proxyserver" -#: ../midori/midori-websettings.c:1014 +#: ../midori/midori-websettings.c:954 msgid "The type of proxy server to use" msgstr "Proxyservertypen som skal bruges" -#: ../midori/midori-websettings.c:1023 +#: ../midori/midori-websettings.c:963 msgid "HTTP Proxy Server" msgstr "HTTP-proxyserver" -#: ../midori/midori-websettings.c:1024 +#: ../midori/midori-websettings.c:964 msgid "The proxy server used for HTTP connections" msgstr "Proxyserveren som bruges til HTTP-forbindelser" +#: ../midori/midori-websettings.c:979 +msgid "Port" +msgstr "Port" + +#: ../midori/midori-websettings.c:980 +msgid "The proxy server port used for HTTP connections" +msgstr "Porten på proxyserveren som bruges til HTTP-forbindelser" + +#: ../midori/midori-websettings.c:998 +msgid "The maximum size of cached pages on disk" +msgstr "Den maksimale størrelse af cache-sider på disken" + #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1040 +#: ../midori/midori-websettings.c:1015 msgid "Identify as" msgstr "Identificér som" -#: ../midori/midori-websettings.c:1041 +#: ../midori/midori-websettings.c:1016 msgid "What to identify as to web pages" msgstr "Hvad skal genkendes som web-sider" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1032 msgid "Identification string" msgstr "Identifikationsstreng" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1033 msgid "The application identification string" msgstr "Programmets identifikationsstreng" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1049 msgid "Preferred languages" msgstr "Foretrukne sprog" -#: ../midori/midori-websettings.c:1074 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "En kommaadskilt liste af foretrukne sprog for rendering af flersprogssider, eksempelvis \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +#: ../midori/midori-websettings.c:1050 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"En kommaadskilt liste af foretrukne sprog for rendering af flersprogssider, " +"eksempelvis \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1089 +#: ../midori/midori-websettings.c:1065 msgid "Clear private data" msgstr "Ryd private data" -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1066 msgid "The private data selected for deletion" msgstr "De private data valgt til sletning" -#. 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:1227 ../midori/midori-view.c:4442 -#: ../midori/midori-view.c:4446 +#: ../midori/midori-websettings.c:1081 +msgid "Clear data" +msgstr "Ryd data" + +#: ../midori/midori-websettings.c:1082 +msgid "The data selected for deletion" +msgstr "Data valgt til sletning" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1131 +msgid "Strip referrer details sent to websites" +msgstr "Fjern referrer-oplysninger sendt til netsider" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1133 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Hvorvidt \"Referer\"-headeren skal beskæres til værtsnavnet" + +#: ../midori/midori-websettings.c:1147 +msgid "Always use my font choices" +msgstr "Brug altid mit valg af fonte" + +#: ../midori/midori-websettings.c:1148 +msgid "Override fonts picked by websites with user preferences" +msgstr "Brug mine fonte fremfor fonte fra internetsider" + +#: ../midori/midori-view.c:1363 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s ønsker at gemme en HTML5-database." + +#: ../midori/midori-view.c:1367 ../midori/midori-view.c:1399 +msgid "_Deny" +msgstr "_Afvis" + +#: ../midori/midori-view.c:1367 ../midori/midori-view.c:1399 +msgid "_Allow" +msgstr "_Tillad" + +#: ../midori/midori-view.c:1395 +#, c-format +msgid "%s wants to know your location." +msgstr "%s ønsker at kende dit sted." + +#: ../midori/midori-view.c:1488 #, c-format msgid "Error - %s" msgstr "Fejl - %s" -#: ../midori/midori-view.c:1228 +#: ../midori/midori-view.c:1489 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Siden '%s' kunne ikke indlæses." -#: ../midori/midori-view.c:1230 +#: ../midori/midori-view.c:1491 msgid "Try again" msgstr "Prøv igen" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1249 -#, c-format -msgid "Not found - %s" -msgstr "Ikke fundet - %s" - -#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 +#: ../midori/midori-view.c:1689 ../midori/midori-view.c:2602 #, c-format msgid "Send a message to %s" msgstr "Send en besked til %s" -#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 +#: ../midori/midori-view.c:2432 ../midori/midori-view.c:2752 msgid "Inspect _Element" msgstr "Undersøg _element" -#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2484 msgid "Open Link in New _Tab" msgstr "Åbn henvisning i nyt _faneblad" -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2488 msgid "Open Link in _Foreground Tab" msgstr "Åbn henvisning i _fanebladet i forgrunden" -#: ../midori/midori-view.c:2118 +#: ../midori/midori-view.c:2489 msgid "Open Link in _Background Tab" msgstr "Åbn henvisning i _faneblad i baggrunden" -#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2492 msgid "Open Link in New _Window" msgstr "Åbn henvisning i nyt _vindue" -#: ../midori/midori-view.c:2124 +#: ../midori/midori-view.c:2495 msgid "Open Link as Web A_pplication" msgstr "Åbn henvisning som et _webprogram" -#: ../midori/midori-view.c:2127 +#: ../midori/midori-view.c:2500 msgid "Copy Link de_stination" msgstr "Kopiér _henvisningsdestination" -#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 -msgid "_Save Link destination" -msgstr "_Gem henvisningsadresse" - -#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 -msgid "_Download Link destination" -msgstr "_Hent henvisningsadressen" - -#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 -#: ../midori/midori-view.c:2207 -msgid "Download with Download _Manager" -msgstr "Hent med nedhentnings_håndtering" - -#: ../midori/midori-view.c:2144 +#: ../midori/midori-view.c:2516 msgid "Open _Image in New Tab" msgstr "Åbn _billede i nyt faneblad" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2519 msgid "Copy Image _Address" msgstr "Kopiér billed_adresse" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2522 msgid "Save I_mage" msgstr "Gem _billede" -#: ../midori/midori-view.c:2151 -msgid "Download I_mage" -msgstr "Hent bi_llede" +#: ../midori/midori-view.c:2525 +msgid "Open in Image _Viewer" +msgstr "Åbn i Image_Viewer" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2532 msgid "Copy Video _Address" msgstr "Kopiér vide_oadresse" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2535 msgid "Save _Video" msgstr "Gem _video" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2535 msgid "Download _Video" msgstr "Hent _video" -#: ../midori/midori-view.c:2224 +#: ../midori/midori-view.c:2561 msgid "Search _with" msgstr "Søg _med" -#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2593 msgid "_Search the Web" msgstr "_Søg internettet" -#: ../midori/midori-view.c:2287 +#: ../midori/midori-view.c:2610 msgid "Open Address in New _Tab" msgstr "Åbn adresse i nyt _faneblad" -#: ../midori/midori-view.c:2591 +#: ../midori/midori-view.c:2917 msgid "Open or download file" msgstr "Åbn eller hent fil" -#: ../midori/midori-view.c:2610 +#: ../midori/midori-view.c:2937 #, c-format msgid "File Type: '%s'" msgstr "Filtype: '%s'" -#: ../midori/midori-view.c:2613 +#: ../midori/midori-view.c:2939 #, 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:2617 +#: ../midori/midori-view.c:2943 +#, c-format +msgid "File Name: %s" +msgstr "Filnavn: %s" + +#: ../midori/midori-view.c:2963 #, c-format msgid "Open %s" msgstr "Åbn %s" -#: ../midori/midori-view.c:3158 +#: ../midori/midori-view.c:3584 #, c-format msgid "Inspect page - %s" msgstr "Undersøg side - %s" -#: ../midori/midori-view.c:3439 -msgid "Speed dial" +#: ../midori/midori-view.c:3931 +msgid "Speed Dial" msgstr "Hurtigopkald" -#: ../midori/midori-view.c:3440 +#: ../midori/midori-view.c:3932 ../midori/midori-view.c:4028 msgid "Click to add a shortcut" msgstr "Klik for at tilføje en genvej" -#: ../midori/midori-view.c:3441 +#: ../midori/midori-view.c:3933 msgid "Enter shortcut address" msgstr "Tast genvejsadresse" -#: ../midori/midori-view.c:3442 +#: ../midori/midori-view.c:3934 msgid "Enter shortcut title" msgstr "Tast en genvejstitel" -#: ../midori/midori-view.c:3443 +#: ../midori/midori-view.c:3935 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:3444 -msgid "Set number of columns and rows" -msgstr "Indstil antal af kolonner og rækker" - -#: ../midori/midori-view.c:3445 -msgid "Enter number of columns and rows:" -msgstr "Angiv antal kolonner og rækker:" - -#: ../midori/midori-view.c:3446 -msgid "Invalid input for the size of the speed dial" -msgstr "Ugyldig inddata af størrelsen til hurtigopringing." - -#: ../midori/midori-view.c:3447 -msgid "Thumb size:" -msgstr "Miniaturestørrelse:" +#: ../midori/midori-view.c:4097 +#, c-format +msgid "No documentation installed" +msgstr "Ingen dokumentation installeret" -#: ../midori/midori-view.c:3448 -msgid "Small" -msgstr "Små" +#: ../midori/midori-view.c:4173 +msgid "Midori doesn't store any personal data:" +msgstr "Midori gemmer ikke nogen personlige data:" + +#: ../midori/midori-view.c:4174 +msgid "No history or web cookies are being saved." +msgstr "Ingen historik eller internet-cookies bliver gemt." + +#: ../midori/midori-view.c:4175 +msgid "Extensions are disabled." +msgstr "Udvidelser er slået fra." -#: ../midori/midori-view.c:3449 -msgid "Medium" -msgstr "Mellem" +#: ../midori/midori-view.c:4176 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "" +"HTML5 opbevaring, lokale databaser og programmellemlagringer er slået fra." -#: ../midori/midori-view.c:3450 -msgid "Big" -msgstr "Stor" +#: ../midori/midori-view.c:4177 +msgid "Midori prevents websites from tracking the user:" +msgstr "Midori beskytter mod netsiders sporing' af brugere:" + +#: ../midori/midori-view.c:4178 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "Referende URL-er er forkortet til værtsnavnet." + +#: ../midori/midori-view.c:4179 +msgid "DNS prefetching is disabled." +msgstr "Hent på forhånd DNS er slået fra." + +#: ../midori/midori-view.c:4180 +msgid "The language and timezone are not revealed to websites." +msgstr "Sprogindstillingen og tidzone bliver ikke oplyst til internetsider." -#: ../midori/midori-view.c:3476 -#, c-format -msgid "Document cannot be displayed" -msgstr "Dokument kan ikke vises" +#: ../midori/midori-view.c:4181 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "" +"Flash og andre Netscape udvidelsesmoduler kan ikke blive oplistet af " +"internetsider." -#: ../midori/midori-view.c:3499 -#, c-format -msgid "No documentation installed" -msgstr "Ingen dokumentation installeret" +#: ../midori/midori-view.c:4230 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "Versionsnumre i parenteser viser versionen brugt under kørsel." -#: ../midori/midori-view.c:3618 +#: ../midori/midori-view.c:4286 msgid "Page loading delayed" msgstr "Forsinket sideindlæsning" -#: ../midori/midori-view.c:3619 +#: ../midori/midori-view.c:4287 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "Indlæsning forsinket pga. et nyligt sammenbrud eller startopindstillinger." +msgstr "" +"Indlæsning forsinket pga. et nyligt sammenbrud eller startopindstillinger." -#: ../midori/midori-view.c:3620 +#: ../midori/midori-view.c:4288 msgid "Load Page" msgstr "Indlæs side" -#: ../midori/midori-view.c:3764 +#: ../midori/midori-view.c:4454 msgid "Blank page" msgstr "Blank side" -#: ../midori/midori-view.c:4018 +#: ../midori/midori-view.c:4716 msgid "_Duplicate Tab" msgstr "_Dublér faneblad" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4721 msgid "Show Tab _Label" msgstr "Vis faneblad_titel" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4721 msgid "Show Tab _Icon Only" msgstr "Vis kun faneblad_ikon" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4727 msgid "Close ot_her Tabs" msgstr "Luk a_ndre faneblade" -#: ../midori/midori-view.c:4680 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5540 +msgid "previous" +msgstr "forrige" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5559 +msgid "next" +msgstr "næste" + +#: ../midori/midori-view.c:5572 msgid "Print background images" msgstr "Udskriv baggrundsbilleder" -#: ../midori/midori-view.c:4681 +#: ../midori/midori-view.c:5573 msgid "Whether background images should be printed" msgstr "Om baggrundsbilleder skal udskrives" -#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:5605 msgid "Features" msgstr "Funktionalitet" -#. Page "General" -#: ../midori/midori-preferences.c:301 -msgid "General" -msgstr "Generel" - -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Opstart" -#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Anvend _nuværende side" + +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Brug nuværende side som hjemmeside" -#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Overførsler" - #. Page "Appearance" -#: ../midori/midori-preferences.c:352 -msgid "Appearance" -msgstr "Udseende" - -#: ../midori/midori-preferences.c:353 -msgid "Font settings" -msgstr "Indstillinger for skrifttype" - -#: ../midori/midori-preferences.c:355 -msgid "Default Font Family" -msgstr "Standard for skrifttypefamilie" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Skrifttyper" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Proportionel skrifttypefamilie" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "Standard skrifttype til visning af tekst" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "Størrelse af standardskriftstype er brugt til at vise tekst" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Fastbredde skrifttype" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "Skrifttypen til visning af fastbredde tekst" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" msgstr "Skrifttypen til visning af tekst med fastbredde" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Minimal skriftstørrelse" -#: ../midori/midori-preferences.c:374 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "Minimum størrelse af skrifttype til at vise tekst" #. Page "Behavior" -#: ../midori/midori-preferences.c:383 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Opførsel" -#: ../midori/midori-preferences.c:396 -msgid "Enforce 96 dots per inch" -msgstr "Gennemtving 96 dots per tomme" - -#: ../midori/midori-preferences.c:397 -msgid "Enforce a video dot density of 96 DPI" -msgstr "Gennemtving tæthed af videopunkt på 96 DPI" - -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Tillad skripter at åbne pop op." -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Om skripter er tilladt at åbne pop opvinduer automatisk" -#: ../midori/midori-preferences.c:422 -msgid "Spell Checking" -msgstr "Stavekontrol" - -#: ../midori/midori-preferences.c:425 -msgid "Enable Spell Checking" -msgstr "Slå stavekontrol til" - -#: ../midori/midori-preferences.c:426 -msgid "Enable spell checking while typing" -msgstr "Slå stavekontrol til mens du taster" - -#: ../midori/midori-preferences.c:428 -msgid "Spelling dictionaries:" -msgstr "Stavekontroller:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:432 -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:438 -msgid "Interface" -msgstr "Grænseflade" - -#: ../midori/midori-preferences.c:439 -msgid "Navigationbar" -msgstr "Navigeringsbjælke" - -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Browsing" -#. Page "Applications" -#: ../midori/midori-preferences.c:471 -msgid "Applications" -msgstr "Programmer" - -#: ../midori/midori-preferences.c:472 -msgid "External applications" -msgstr "Eksterne programmer" - #. Page "Network" -#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "Netværk" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:463 msgid "Hostname" msgstr "Værtsnavn" -#. Page "Privacy" -#: ../midori/midori-preferences.c:514 -msgid "Privacy" -msgstr "Beskyttelse af privatliv" - -#: ../midori/midori-preferences.c:515 -msgid "Web Cookies" -msgstr "Web-cookies" - -#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 -msgid "days" -msgstr "dage" - -#: ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Tom" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "MB" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Tilføj søgemaskine" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Redigér søgemaskine" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Navn:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Beskrivelse:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "_Ikon:" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "_Symbol:" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "Håndtér søgemaskiner" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "Brug som _standard" -#: ../midori/sokoke.c:1303 -msgid "_Bookmark" -msgstr "_Bogmærke" - -#: ../midori/sokoke.c:1304 -msgid "_Bookmarks" -msgstr "_Bogmærker" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "Åbn med" -#: ../midori/sokoke.c:1305 -msgid "Add Boo_kmark" -msgstr "_Tilføj bogmærke" - -#: ../midori/sokoke.c:1306 -msgid "_Console" -msgstr "_Konsol" - -#: ../midori/sokoke.c:1307 -msgid "_Extensions" -msgstr "_Udvidelser" +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Vælg et program eller en kommando til at åbne \"%s\":" -#: ../midori/sokoke.c:1308 -msgid "_History" -msgstr "Hi_storik" +#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "Kunne ikke køre eksternt program." -#: ../midori/sokoke.c:1309 -msgid "_Homepage" -msgstr "_Hjemmeside" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d time" +msgstr[1] "%d timer" -#: ../midori/sokoke.c:1310 -msgid "_Userscripts" -msgstr "Brugerskri_pter" +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minut" +msgstr[1] "%d minutter" -#: ../midori/sokoke.c:1311 -msgid "New _Tab" -msgstr "Nyt _faneblad" +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d sekund" +msgstr[1] "%d sekunder" -#: ../midori/sokoke.c:1312 -msgid "_Transfers" -msgstr "_Overførsler" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s af %s" -#: ../midori/sokoke.c:1313 -msgid "Netscape p_lugins" -msgstr "Netscape-u_dvidelsesmoduler" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr "(%s/s)" -#: ../midori/sokoke.c:1316 -msgid "New _Folder" -msgstr "Ny __mappe" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr " - %s tilbage" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:201 +#: ../toolbars/midori-findbar.c:291 msgid "_Inline Find:" msgstr "_Indlejret søgning:" -#: ../toolbars/midori-findbar.c:233 +#: ../toolbars/midori-findbar.c:317 msgid "Previous" msgstr "Forrige" -#: ../toolbars/midori-findbar.c:239 +#: ../toolbars/midori-findbar.c:323 msgid "Next" msgstr "Næste" -#: ../toolbars/midori-findbar.c:243 +#: ../toolbars/midori-findbar.c:327 msgid "Match Case" msgstr "Versalfølsom" -#: ../toolbars/midori-findbar.c:252 +#: ../toolbars/midori-findbar.c:336 msgid "Highlight Matches" msgstr "Fremhæv fundne" -#: ../toolbars/midori-findbar.c:263 +#: ../toolbars/midori-findbar.c:347 msgid "Close Findbar" msgstr "Luk søgebjælke" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 -#, c-format -msgid "%s of %s" -msgstr "%s af %s" - -#: ../toolbars/midori-transferbar.c:123 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "Filen '%s' er blevet hentet." -#: ../toolbars/midori-transferbar.c:126 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Overførsel gennemført" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "Den hentede fil indeholder fejl." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"Checksummen opgivet med linket stemmer ikke. Dette betyder, at filen " +"formentligt er ufuldendt eller blev modificeret efterfølgende." + +#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Ryd alle" -#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 +#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 msgid "Some files are being downloaded" msgstr "Nogle filer bliver overført" -#: ../toolbars/midori-transferbar.c:306 +#: ../toolbars/midori-transferbar.c:377 msgid "_Quit Midori" msgstr "_Afslut Midori" -#: ../toolbars/midori-transferbar.c:308 +#: ../toolbars/midori-transferbar.c:379 msgid "The transfers will be cancelled if Midori quits." msgstr "Overførslen vil blive afbrudt hvis Midori afsluttes." -#: ../panels/midori-bookmarks.c:116 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Bogmærker" -#: ../panels/midori-bookmarks.c:275 +#: ../panels/midori-bookmarks.c:257 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Kunne ikke tilføje historikelementet: %s\n" -#: ../panels/midori-bookmarks.c:414 +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "Redigér det valgte bogmærke" -#: ../panels/midori-bookmarks.c:422 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "Slet det valgte bogmærke" -#: ../panels/midori-bookmarks.c:436 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" msgstr "Tilføj en ny mappe" -#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 +#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 msgid "Separator" msgstr "Separator" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "Konsol" - -#: ../panels/midori-console.c:361 -msgid "Copy _All" -msgstr "Kopiér _alt" - -#: ../panels/midori-console.c:362 -msgid "Copy All" -msgstr "Kopiér alt" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "Historik" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Udvidelser" +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "I dag" -#: ../panels/midori-history.c:146 -msgid "A week ago" -msgstr "For en uge siden" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "I går" -#: ../panels/midori-history.c:148 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 #, 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:151 -msgid "Today" -msgstr "I dag" +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "For en uge siden" -#: ../panels/midori-history.c:153 -msgid "Yesterday" -msgstr "I går" +#: ../panels/midori-history.c:232 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Kunne ikke fjerne historikelementet: %s\n" -#: ../panels/midori-history.c:324 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" msgstr "Er du sikker på, at du ønsker at fjerne alle historikelementer?" -#: ../panels/midori-history.c:369 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" msgstr "Bogmærk det valgte historikelement" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" msgstr "Slet det valgte historikelement" -#: ../panels/midori-history.c:386 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "Ryd hele historikken" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Overførsler" + +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" msgstr "Åbn mål_mappen" -#: ../panels/midori-transfers.c:484 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" msgstr "Kopiér henvisnings_sted" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Godkendelse påkrævet" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" @@ -2228,203 +2218,249 @@ "Et brugernavn samt en adgangskode er påkrævet\n" "for at åbne dette sted:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "Brugernavn" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "Adgangskode" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "_Husk adgangskode" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Angivet ikon '%s' blev ikke indlæst" -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Lagerikon '%s' kunne ikke indlæses" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "Animeringsrammer er ødelagt" -#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 +#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Egenskab '%s' er ikke gyldig for %s" -#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 -#: ../extensions/addons.c:119 +#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Vælg fil" -#: ../katze/katze-utils.c:564 +#: ../katze/katze-utils.c:506 msgid "Choose folder" msgstr "Vælg mappe" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "Ingen" + +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "1 time" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "1 dag" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "1 uge" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "1 måned" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "1 år" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Indstillinger for %s" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:473 msgid "Configure Advertisement filters" msgstr "Indstil reklamefiltre" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:504 #, 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:587 -msgid "Configure _Advertisement filters..." -msgstr "Indstil _reklamefiltre..." +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:841 +#: ../extensions/adblock.c:882 msgid "Edit rule" msgstr "Redigér regel" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:896 msgid "_Rule:" msgstr "_Regel:" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:950 msgid "Bl_ock image" msgstr "Bl_okér billede" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:955 msgid "Bl_ock link" msgstr "Bl_okér henvisning" -#: ../extensions/adblock.c:1494 +#: ../extensions/adblock.c:1670 msgid "Advertisement blocker" msgstr "Blokering af reklamer" -#: ../extensions/adblock.c:1495 +#: ../extensions/adblock.c:1671 msgid "Block advertisements according to a filter list" msgstr "Blokér reklamer i henhold til en filterliste" -#: ../extensions/addons.c:130 ../extensions/addons.c:490 +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "" +"Denne side indeholder tilsyneladende et bruger-script. Ønsker du at " +"installere det?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "_Installér brugerskript" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "" +"Denne side indeholder tilsyneladende en bruger-stil. Ønsker du at installere " +"den?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_Installér brugerstil" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Undlad at installere" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Brugerskripter" -#: ../extensions/addons.c:135 ../extensions/addons.c:492 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Brugerstile" -#: ../extensions/addons.c:191 ../extensions/addons.c:267 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Fejl" -#: ../extensions/addons.c:231 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "Er du sikker på du vil slette '%s'?" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "Slet brugerskript" -#: ../extensions/addons.c:238 +#: ../extensions/addons.c:428 msgid "Delete user style" msgstr "Slet brugerstil" -#: ../extensions/addons.c:242 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." msgstr "Filen %s vil blive slettet for bestandigt." -#: ../extensions/addons.c:377 ../extensions/addons.c:454 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "Åbn i tekstbehandler" -#: ../extensions/addons.c:379 ../extensions/addons.c:463 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Åbn målmappen" -#: ../extensions/addons.c:445 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "Tilføj nye moduler" -#: ../extensions/addons.c:472 -msgid "Open target folder for selected addon" -msgstr "Åbn målmappen for valgte modul" - -#: ../extensions/addons.c:473 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "Fjern valgte modul" -#: ../extensions/addons.c:1420 -#, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "Indstillingen af udvidelsesmodulet '%s' kunne ikke gemmes: %s\n" - -#: ../extensions/addons.c:1421 ../extensions/addons.c:1586 +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" msgstr "Brugers udvidelsesmoduler" -#: ../extensions/addons.c:1543 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Kan ikke overvåge mappe '%s': %s" -#: ../extensions/addons.c:1587 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" msgstr "Understøttelse af brugerskripter og brugerstile" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "Farvefulde faneblade" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Ton hvert faneblad tydeligt" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Cookiehåndtering" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "Slet alle" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 -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." +#: ../extensions/cookie-manager/cookie-manager-page.c:105 +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." -#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "Udfold alle" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "Fold alle" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" msgstr "Er du sikker på, at du ønsker at fjerne alle cookies?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Spørgsmål" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." -msgstr "Kun cookies, som passer med den indtastede filterstreng, bliver slettet." +msgstr "" +"Kun cookies, som passer med den indtastede filterstreng, bliver slettet." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "Ved afslutningen af sessionen" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2441,15 +2477,15 @@ "Sikker: %s\n" "Udløber: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Ja" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "Nej" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" @@ -2458,54 +2494,46 @@ "Domæne: %s\n" "Cookies: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Navn" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "_Udfold alle" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "_Fold alle" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 msgid "Filter:" msgstr "Filter:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "Indtast en filterstreng for at vise kun cookies hvis navn eller domænefelt passer til det indtastede filter" - -#: ../extensions/cookie-manager/main.c:40 -msgid "_Cookie Manager" -msgstr "_Cookiehåndtering" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Indtast en filterstreng for at vise kun cookies hvis navn eller domænefelt " +"passer til det indtastede filter" -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Vis, gennemse og slet cookies" -#: ../extensions/copy-tabs.c:39 +#: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" msgstr "Kopiér faneblad_adresser" -#: ../extensions/copy-tabs.c:98 +#: ../extensions/copy-tabs.c:95 msgid "Copy Addresses of Tabs" msgstr "Kopiér adresser af faneblade" -#: ../extensions/copy-tabs.c:99 +#: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Kopiér adresser af alle fanblade til udklipsholder" -#: ../extensions/external-applications.vala:93 -msgid "External Applications" -msgstr "Eksterne programmer" - -#: ../extensions/external-applications.vala:94 -msgid "Associate URL schemes with external commands" -msgstr "Knyt URL-skemaer til eksterne kommandoer" - #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Kunne ikke finde anmodede Atom \"post\"-elementerne i XML-data." @@ -2515,25 +2543,25 @@ msgstr "Kunne ikke finde anmodede Atom \"feed\"-elementerne i XML-data." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Sidst opdateret: %s." -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "Feeds" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "Tilføj nyt feed" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "Slet feed" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "_Feeds" @@ -2578,182 +2606,675 @@ msgid "Error loading feed '%s'" msgstr "Fejl ved indlæsning af feed '%s'" -#: ../extensions/feed-panel/main.c:520 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "Feed-panel" -#: ../extensions/feed-panel/main.c:521 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Læs Atom-/ RSS-feeds" -#: ../extensions/formhistory.c:142 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" msgstr "Kunne ikke tilføje formularværdien: %s\n" -#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "Formularrhistorik" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Et brugernavn samt en adgangskode er påkrævet\n" +"for at åbne dette sted:" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "Husk adgangskode til denne side?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Husk" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "Ikke nu" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Aldrig til denne side" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "Skift mellem tilstande for formularhistorik" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "Slå til/fra formularhistorik for nuværende faneblad" + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Kunne ikke køre databaseudtryk: %s\n" -#: ../extensions/formhistory.c:503 +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" +"slå formularhistorik til kun ved hjælp af hurtigtaster (Ctrl+Shift+F) per " +"faneblad" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "Historikfylder til formular" + +#: ../extensions/formhistory/formhistory.c:669 msgid "Stores history of entered form data" msgstr "Gem historikken af indtastede formulardata" -#: ../extensions/formhistory.c:507 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 #, c-format -msgid "Not available: %s" -msgstr "Ikke tilgængelig: %s" +msgid "Failed to select suggestions\n" +msgstr "Kunne ikke vælge forslag\n" -#: ../extensions/formhistory.c:508 -msgid "Resource files not installed" -msgstr "Resourcefiler er ikke installeret" +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Der er ingen ubesøgte faneblade" -#: ../extensions/formhistory.c:514 -msgid "Form history filler" -msgstr "Historikfylder til formular" +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "Historikliste" -#: ../extensions/history-list.vala:174 -msgid "Next Tab (History List)" -msgstr "Næste faneblad (historikliste)" - -#: ../extensions/history-list.vala:175 -msgid "Next tab from history" -msgstr "Næste faneblad fra historik" - -#: ../extensions/history-list.vala:184 -msgid "Previous Tab (History List)" -msgstr "Sidste faneblad (historikliste)" - -#: ../extensions/history-list.vala:185 -msgid "Previous tab from history" -msgstr "Sidste faneblad fra historik" +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Ved lukning af faneblade" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Gør intet" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Skift til senest viste faneblad" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Skift til nyeste faneblad" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Næste nye faneblad (historikliste)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Næste nye faneblad fra historik" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Forrige nye faneblad (historikliste)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Forrige nye faneblad fra historik" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Vis faneblad i baggrunden (Historik)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Vis det nuværende valgte faneblad i baggrunden" -#: ../extensions/history-list.vala:245 +#: ../extensions/history-list.vala:569 msgid "History List" msgstr "Historikliste" -#: ../extensions/history-list.vala:246 -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/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "Gå til senest brugte faneblad ved skift eller lukning" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Musebevægelser" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Styr Midori ved at flytte 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/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:109 +msgid "Reload page or stop loading" +msgstr "Genindlæs side eller stop indlæsning" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "Tilpas tastaturgenveje" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "Tilpas gen_veje..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Genveje" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "Vis og redigér tastaturgenveje" -#: ../extensions/status-clock.c:176 +#: ../extensions/status-clock.c:174 msgid "Statusbar Clock" msgstr "Statusbjælkens ur" -#: ../extensions/status-clock.c:177 +#: ../extensions/status-clock.c:175 msgid "Display date and time in the statusbar" msgstr "Vis dato og tid på statusbjælken" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Billeder" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Skripter" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Netscape-udvidelsesmoduler" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "Status funktioner" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" msgstr "Slå nemt netsiders funktioner til/fra" -#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Fanebladpanel" -#: ../extensions/tab-panel.c:612 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "Faneblad_panel" -#: ../extensions/tab-panel.c:629 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Vis faneblade i et lodret panel" -#: ../extensions/tabs-minimized.c:79 +#: ../extensions/tabs-minimized.c:76 msgid "Only Icons on Tabs by default" msgstr "Kun ikoner på faneblade som standard" -#: ../extensions/tabs-minimized.c:80 +#: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" msgstr "Nye faneblade har ingen titel som standard" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Tilpas værktøjsbjælke" -#: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "Vælg elementer til visning på værktøjsbjælken. Rækkefølge af elementerne kan ændres med træk og slip." +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"Vælg elementer til visning på værktøjsbjælken. Rækkefølge af elementerne kan " +"ændres med træk og slip." -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Tilgængelige elementer" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Viste elementer" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "Tilpas _værktøjsbjælke..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Tilpasset..." + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" msgstr "Redigering af værktøjsbjælke" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" msgstr "Redigér nemt layout af værktøjsbjælken" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "Cache HTTP-kommunikation på disk" +#~ msgid "The bookmarks couldn't be saved. %s" +#~ msgstr "Bogmærkerne kunne ikke gemmes. %s" + +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "Den angivne indstillingsmappe er ikke gyldig." + +#~ msgid "Cookies" +#~ msgstr "Cookies" + +#~ msgid "'Flash' Cookies" +#~ msgstr "'Flash' cookies" + +#~ msgid "HTML5 _Databases" +#~ msgstr "HTML5-databaser" + +#~ msgid "Offline Application Cache" +#~ msgstr "Ikke tilsluttet program-cache" + +#~ msgid "Lightweight web browser" +#~ msgstr "Letvægtig webbrowser" + +#~ msgid "Not available: %s" +#~ msgstr "Ikke tilgængelig: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "Resourcefiler er ikke installeret" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "Undlad at gemme private data under browsing" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Tilføj genvej til hurtigopkald" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Tilføj genvej til skrivebordet" + +#~ msgid "Create a launcher" +#~ msgstr "Opret en opstarter" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "Abonnér på denne nyhedskilde" + +#~ msgid "Close this window" +#~ msgstr "Luk dette vindue" + +#~ msgid "Close all open windows" +#~ msgstr "Luk alle åbne vinduer" + +#~ msgid "Undo the last modification" +#~ msgstr "Fortryd den sidste ændring" + +#~ msgid "Redo the last modification" +#~ msgstr "Gentag den sidste ændring" + +#~ msgid "Cut the selected text" +#~ msgstr "Udklip markeret tekst" + +#~ msgid "Copy the selected text" +#~ msgstr "Kopiér markeret tekst" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "Indsæt tekst fra klippebordet" + +#~ msgid "Delete the selected text" +#~ msgstr "Slet markeret tekst" + +#~ msgid "Select all text" +#~ msgstr "Markér hele teksten" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Find næste forekomst af et ord eller sætning" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Find forrige forekomst af et ord eller sætning" + +#~ msgid "Reset the zoom level" +#~ msgstr "Nulstil forstørrelsesniveauet" + +#~ msgid "View the source code of the page" +#~ msgstr "Vis kildekode for siden" + +#~ msgid "Scroll to the left" +#~ msgstr "Rul til venstre" + +#~ msgid "Scroll down" +#~ msgstr "Rul ned" + +#~ msgid "Scroll up" +#~ msgstr "Rul op" + +#~ msgid "Scroll to the right" +#~ msgstr "Rul til højre" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "Slet indhold af papirkurven" + +#~ msgid "Open the last closed tab" +#~ msgstr "Åbn sidste lukkede faneblad" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Tilføj en ny bogmærkemappe" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Tilføj, redigér og fjern søgemaskiner..." + +#~ msgid "Clear private data..." +#~ msgstr "Ryd private data..." + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "Undersøg sidedetaljerne and tilgå udviklerværktøjerne..." + +#~ msgid "Switch to the previous tab" +#~ msgstr "Skift til det forrige faneblad" + +#~ msgid "Switch to the next tab" +#~ msgstr "Skift til det næste faneblad" + +#~ msgid "Move tab behind the previous tab" +#~ msgstr "Flyt faneblad bag det forrige faneblad" + +#~ msgid "Move tab in front of the next tab" +#~ msgstr "Flyt faneblad foran det næste faneblad" + +#~ msgid "Focus the current tab" +#~ msgstr "Fokus på det nuværende faneblad" + +#~ msgid "Cycle focus between views" +#~ msgstr "Cirkuler fokus mellem visninger" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Vis kun ikonet til det nuværende faneblad" + +#~ msgid "Duplicate the current tab" +#~ msgstr "Dublér nuværende faneblad" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Luk alle faneblade undtaget nuværende faneblad" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Åbn faneblade gemt i den sidste session" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Vis ofte stillede spørgsmål" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Åbn Midoris fejlsystem" + +#~ msgid "Show information about the program" +#~ msgstr "Vis information om dette program" + +#~ msgid "Show menubar" +#~ msgstr "Vis menubjælke" + +#~ msgid "Show navigationbar" +#~ msgstr "Vis navigeringsbjælke" + +#~ msgid "Show sidepanel" +#~ msgstr "Vis sidepanel" + +#~ msgid "Show bookmarkbar" +#~ msgstr "Vis bogmærkebjælke" + +#~ msgid "Show statusbar" +#~ msgstr "Vis statusbjælke" + +#~ msgid "MD5-Checksum:" +#~ msgstr "MD5-kontrolsum:" + +#~ msgid "SHA1-Checksum:" +#~ msgstr "SHA1-kontrolsum:" + +#~ msgid "No filename specified" +#~ msgstr "Intet filnavn angivet" + +#~ msgid "Set number of columns and rows" +#~ msgstr "Indstil antal af kolonner og rækker" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Angiv antal kolonner og rækker:" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "Ugyldig inddata af størrelsen til hurtigopringing." + +#~ msgid "Thumb size:" +#~ msgstr "Miniaturestørrelse:" + +#~ msgid "Small" +#~ msgstr "Små" + +#~ msgid "Medium" +#~ msgstr "Mellem" + +#~ msgid "Big" +#~ msgstr "Stor" + +#~ msgid "Reset the last _session" +#~ msgstr "Nulstil den sidste _session" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Indstil _reklamefiltre..." + +#~ msgid "Not found - %s" +#~ msgstr "Ikke fundet - %s" + +#~ msgid "Document cannot be displayed" +#~ msgstr "Dokument kan ikke vises" + +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "Gennemtving 96 dots per tomme" + +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "Gennemtving tæthed af videopunkt på 96 DPI" + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "Skifter faneblade med Ctrl+Tab sorteret efter senest anvendte" + +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "Slet gamle cookies efter 1 time" + +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "Slet gamle cookies efter 1 uge" + +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "Slet gamle cookies efter 1 måned" + +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "Slet gamle cookies efter 1 år" + +#~ msgid "All cookies" +#~ msgstr "Alle cookies" + +#~ msgid "Session cookies" +#~ msgstr "Session-cookies" + +#~ msgid "Show Transferbar" +#~ msgstr "Vis overførselsstatus" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "Om overførselsstatus skal vises" + +#~ msgid "Search engines in location completion" +#~ msgstr "Vis søgemaskiner i adresseudfyldelse" + +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "Om søgemaskiner skal vises i adresseudfyldelsen" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "Vis handlingskontroller til panelet" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "Om handlingskontroller til panelet skal vises" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Vis hurtigopkald i nye faneblade" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Vis hurtigopkald i nyligt åbnede faneblade" + +#~ msgid "Download Manager" +#~ msgstr "Håndtering af hentning" + +#~ msgid "An external download manager" +#~ msgstr "En ekstern håndtering for nedhentning" + +#~ msgid "Open external pages in:" +#~ msgstr "Åbn eksterne sider i:" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "Hvor skal eksterne sider åbnes" + +#~ msgid "Accept cookies" +#~ msgstr "Tillad cookies" + +#~ msgid "What type of cookies to accept" +#~ msgstr "Hvilke typer af cookes skal tillades" + +#~ msgid "Maximum cookie age" +#~ msgstr "Maksimal cookie-levetid" + +#~ msgid "Maximum history age" +#~ msgstr "Maksimal historik-levetid" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Husk sidste hentede filer" + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "Om sidste hentede filer skal gemmes" + +#~ msgid "Appearance" +#~ msgstr "Udseende" + +#~ msgid "Applications" +#~ msgstr "Programmer" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% indlæst" + +#~ msgid "Failed to clear search history: %s\n" +#~ msgstr "Kunne ikke fjerne søgehistorik: %s\n" + +#~ msgid "Quit the application" +#~ msgstr "Afslut programmet" + +#~ msgid "Minimize _Current Tab" +#~ msgstr "_Minimér nuværede faneblade" + +#~ msgid "Minimize the current tab" +#~ msgstr "Minimér nuværende faneblad" + +#~ msgid "_Contents" +#~ msgstr "_Indhold" + +#~ msgid "Show the documentation" +#~ msgstr "Vis dokumentationen" + +#~ msgid "_Transferbar" +#~ msgstr "_Overførselsstatus" + +#~ msgid "Show transferbar" +#~ msgstr "Vis overførselsstatus" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "Kunne ikke køre databaseudtryk\n" + +#~ msgid "Detach chosen panel from the window" +#~ msgstr "Frigør valgte panel fra vinduet" + +#~ msgid "Hide operating controls" +#~ msgstr "Skjul handlingskontroller" + +#~ msgid "Show Blank page" +#~ msgstr "Vis blank side" + +#~ msgid "Show progress in location entry" +#~ msgstr "Vis fremgang i placeringindgang" + +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "Om visning af indlæsningsfremgang i placeringsindgang" + +#~ msgid "Ask for the destination folder" +#~ msgstr "Spørg om målmappen" + +#~ 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" + +#~ 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" + +#~ msgid "_Save Link destination" +#~ msgstr "_Gem henvisningsadresse" + +#~ msgid "_Download Link destination" +#~ msgstr "_Hent henvisningsadressen" + +#~ msgid "Download with Download _Manager" +#~ msgstr "Hent med nedhentnings_håndtering" + +#~ msgid "Download I_mage" +#~ msgstr "Hent bi_llede" + +#~ msgid "General" +#~ msgstr "Generel" + +#~ msgid "Font settings" +#~ msgstr "Indstillinger for skrifttype" + +#~ msgid "Spell Checking" +#~ msgstr "Stavekontrol" + +#~ msgid "Spelling dictionaries:" +#~ msgstr "Stavekontroller:" + +#~ 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\"" + +#~ msgid "Interface" +#~ msgstr "Grænseflade" + +#~ msgid "Navigationbar" +#~ msgstr "Navigeringsbjælke" + +#~ msgid "External applications" +#~ msgstr "Eksterne programmer" + +#~ msgid "Web Cookies" +#~ msgstr "Web-cookies" + +#~ msgid "Console" +#~ msgstr "Konsol" + +#~ msgid "Copy _All" +#~ msgstr "Kopiér _alt" + +#~ msgid "Copy All" +#~ msgstr "Kopiér alt" + +#~ msgid "Open target folder for selected addon" +#~ msgstr "Åbn målmappen for valgte modul" + +#~ msgid "_Cookie Manager" +#~ msgstr "_Cookiehåndtering" + +#~ msgid "External Applications" +#~ msgstr "Eksterne programmer" + +#~ msgid "Associate URL schemes with external commands" +#~ msgstr "Knyt URL-skemaer til eksterne kommandoer" + +#~ msgid "Pageholder" +#~ msgstr "Sideholder" + +#~ msgid "_Pageholder" +#~ msgstr "_Sideholder" + +#~ msgid "Keep one or multiple pages open in parallel to your tabs" +#~ msgstr "Hold en eller flere sider åbne parallelt med dine faneblade" + #~ msgid "" #~ "Do you really want to remove '%s'?\n" #~ "\n" @@ -2775,7 +3296,8 @@ #~ msgid "Erroneous clock time" #~ msgstr "Fejlagtig tid" -#~ msgid "The clock time lies in the past. Please check the current date and time." +#~ 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." #~ msgid "Minimize new Tabs" @@ -2790,15 +3312,9 @@ #~ msgid "Reopen pages that you visited earlier" #~ msgstr "Genåbn sider som du tidligere har besøgt" -#~ msgid "Show the saved bookmarks" -#~ msgstr "Vis de gemte bogmærker" - #~ msgid "Original cookies only" #~ msgstr "Kun for originale cookies" -#~ msgid "Accept cookies from the original website only" -#~ msgstr "Tillad kun cookies fra original websted" - #~ msgid "Remember last visited pages" #~ msgstr "Husk sidste besøgte sider" @@ -2808,7 +3324,8 @@ #~ msgid "Detect proxy server automatically" #~ msgstr "Genkend automatisk proxyserver" -#~ msgid "Whether to detect the proxy server automatically from the environment" +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" #~ msgstr "Om proxyserveren genkendes automatisk fra miljøet" #~ msgid "Set number of shortcuts" @@ -2817,8 +3334,10 @@ #~ msgid "Enter number of shortcuts:" #~ msgstr "Angiv antal af genveje:" -#~ 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." +#~ 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." #~ msgid "Open _Link" #~ msgstr "Åbn _henvisning" @@ -2859,9 +3378,6 @@ #~ msgid "Tint tabs distinctly" #~ msgstr "Ton faneblade tydeligt" -#~ msgid "DNS prefetching" -#~ msgstr "Hent på forhånd DNS" - #~ msgid "Prefetch IP addresses of hovered links" #~ msgstr "Hent på forhånd IP-adresser på henvisninger som musen holdes over" @@ -2889,9 +3405,6 @@ #~ 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" @@ -2901,9 +3414,6 @@ #~ msgid "Quickly jump to a word or phrase" #~ msgstr "Hop hurtigt til et ord eller sætning" -#~ msgid "Last open pages" -#~ msgstr "Sidste åbne sider" - #~ msgid "Both" #~ msgstr "Begge" @@ -2919,9 +3429,6 @@ #~ 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" diff -Nru midori-0.2.8/po/de.po midori-0.4.6/po/de.po --- midori-0.2.8/po/de.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/de.po 2012-05-14 22:13:42.000000000 +0000 @@ -3,101 +3,144 @@ # This file is distributed under the same license as the midori package. # Enrico Tröger 2008 # Christian Dywan 2008-2010 -# +# msgid "" msgstr "" -"Project-Id-Version: midori 0.2.7\n" +"Project-Id-Version: midori 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-06 02:55+0200\n" +"POT-Creation-Date: 2012-04-25 11:18+0000\n" "PO-Revision-Date: 2009-04-30 00:15+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" -"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Schlanker Internetbetrachter" +#, fuzzy +msgid "Browse the Web" +msgstr "Im Internet surfen" + +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "Internet;WWW;Explorer;Browser" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 -#: ../midori/main.c:1665 ../midori/main.c:1681 -#: ../midori/midori-websettings.c:312 +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072 +#: ../midori/main.c:2086 ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Internetbetrachter" -#: ../midori/main.c:99 +#: ../data/midori-private.desktop.in.h:1 +#, fuzzy +msgid "Midori Private Browsing" +msgstr "Privates Surfen" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Neues Fenster zum privaten Surfen öffnen" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164 +msgid "Private Browsing" +msgstr "Privat surfen" + +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Die Konfiguration konnte nicht geladen werden: %s\n" -#: ../midori/main.c:148 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wert »%s« ist ungültig für %s" -#: ../midori/main.c:155 ../midori/main.c:241 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ungültiger Einstellungswert »%s«" -#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 +#: ../midori/main.c:380 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n" + +#: ../midori/main.c:434 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Verlauf konnte nicht geleert werden: %s\n" + +#: ../midori/main.c:454 ../midori/main.c:581 +#: ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" msgstr "Datenbank konnte nicht geöffnet werden: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:424 +#: ../midori/main.c:524 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:455 ../panels/midori-history.c:169 -#: ../panels/midori-history.c:199 +#: ../midori/main.c:564 ../panels/midori-history.c:232 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:500 +#: ../midori/main.c:611 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht gespeichert werden. %s" -#: ../midori/main.c:528 +#: ../midori/main.c:633 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht gespeichert werden. %s" -#: ../midori/main.c:566 +#: ../midori/main.c:668 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht gespeichert werden. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:586 ../midori/main.c:609 +#: ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht gespeichert werden. %s" -#: ../midori/main.c:668 ../midori/main.c:908 +#: ../midori/main.c:746 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Erweiterungen" + +#: ../midori/main.c:760 +msgid "Privacy" +msgstr "Privatsphäre" + +#: ../midori/main.c:772 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"Cookies sind Profildateien, die Anmeldedaten, Spielstände oder " +"Benutzerprofile zu Werbezwecken speichern." + +#: ../midori/main.c:828 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht gespeichert werden. %s" -#: ../midori/main.c:852 +#: ../midori/main.c:1046 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" "Es ist kein Stammzertifikat verfügbar. SSL-Zertifikate können nicht " "überprüft werden." -#: ../midori/main.c:942 +#: ../midori/main.c:1115 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." @@ -105,256 +148,381 @@ "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:957 +#: ../midori/main.c:1134 msgid "Modify _preferences" msgstr "_Einstellungen bearbeiten" -#: ../midori/main.c:961 -msgid "Reset the last _session" -msgstr "Die letzte _Sitzung zurücksetzen" - -#: ../midori/main.c:966 +#: ../midori/main.c:1138 msgid "Disable all _extensions" msgstr "Alle Er_weiterungen ausschalten" -#: ../midori/main.c:1206 ../midori/main.c:1952 +#: ../midori/main.c:1151 +msgid "Discard old tabs" +msgstr "Alte Reiter verwerfen" + +#: ../midori/main.c:1152 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "Letzte Reiter zeigen ohne sie zu laden" + +#: ../midori/main.c:1153 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "Zuletzt geöffnete Reiter anzeigen" + +#: ../midori/main.c:1400 ../midori/main.c:2464 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1328 -msgid "No filename specified" -msgstr "Kein Dateiname angegeben" - -#: ../midori/main.c:1347 -msgid "An unknown error occured." -msgstr "Ein unbekannter Fehler ist aufgetreten." - -#: ../midori/main.c:1378 +#: ../midori/main.c:1538 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Schnappschuss gespeichert: %s\n" -#: ../midori/main.c:1550 +#: ../midori/main.c:1951 msgid "Run ADDRESS as a web application" msgstr "ADRESSE als Internetanwendung starten" -#: ../midori/main.c:1550 +#: ../midori/main.c:1951 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1553 +#: ../midori/main.c:1954 msgid "Use FOLDER as configuration folder" msgstr "ORDNER als Konfigurationsordner benutzen" -#: ../midori/main.c:1553 +#: ../midori/main.c:1954 msgid "FOLDER" msgstr "ORDNER" -#: ../midori/main.c:1556 +#: ../midori/main.c:1957 +msgid "Private browsing, no changes are saved" +msgstr "Privat surfen, Änderungen werden nicht gespeichert" + +#: ../midori/main.c:1959 msgid "Show a diagnostic dialog" msgstr "Diagnosedialog anzeigen" -#: ../midori/main.c:1558 +#: ../midori/main.c:1961 msgid "Run the specified filename as javascript" msgstr "Angegebenen Dateinamen als Javaskript ausführen" -#: ../midori/main.c:1561 +#: ../midori/main.c:1963 msgid "Take a snapshot of the specified URI" msgstr "Schnappschuss der angegebenen URI aufnehmen" -#: ../midori/main.c:1564 +#: ../midori/main.c:1965 msgid "Execute the specified command" msgstr "Den angegebenen Befehl ausführen" -#: ../midori/main.c:1566 +#: ../midori/main.c:1967 +msgid "List available commands to execute with -e/ --execute" +msgstr "Alle Befehle auflisten, die mit -e/ --execute ausgeführt werden können" + +#: ../midori/main.c:1969 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:1568 +#: ../midori/main.c:1971 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1570 +#: ../midori/main.c:1973 msgid "Block URIs according to regular expression PATTERN" msgstr "URIs anhand des regulären Ausdrucks MUSTER blockieren" -#: ../midori/main.c:1570 +#: ../midori/main.c:1973 msgid "PATTERN" msgstr "MUSTER" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1574 +#: ../midori/main.c:1977 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Midori nach SEKUNDEN Sekunden Untätigkeit zurücksetzen" -#: ../midori/main.c:1574 +#: ../midori/main.c:1977 msgid "SECONDS" msgstr "SEKUNDEN" -#: ../midori/main.c:1654 +#: ../midori/main.c:1980 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Konsolenwarnungen in DATEINAME umleiten" + +#: ../midori/main.c:1980 +msgid "FILENAME" +msgstr "Dateiname" + +#: ../midori/main.c:2045 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/main.c:1682 +#: ../midori/main.c:2087 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:1684 +#: ../midori/main.c:2089 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:1801 -msgid "The specified configuration folder is invalid." -msgstr "Der angegebene Konfigurationsordner konnte nicht geladen werden." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2173 +msgid "Saved logins and _passwords" +msgstr "Gespeicherte Anmeldungen und Passwörter" + +#: ../midori/main.c:2175 +#, fuzzy +msgid "Cookies and Website data" +msgstr "Cookies und Webseitendaten" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2179 ../midori/midori-websettings.c:996 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Zwischenspeicher" + +#: ../midori/main.c:2182 +msgid "Website icons" +msgstr "Symbole von Internetseiten" + +#: ../midori/main.c:2288 +msgid "An unknown error occured" +msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/main.c:1849 +#: ../midori/main.c:2395 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:1904 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n" - -#: ../midori/main.c:1925 +#: ../midori/main.c:2431 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:1967 +#: ../midori/main.c:2479 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:2492 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1994 +#: ../midori/main.c:2508 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:2010 +#: ../midori/main.c:2524 msgid "_Ignore" msgstr "_Ignorieren" -#: ../midori/midori-array.c:429 +#: ../midori/midori-app.c:1334 +msgid "_Bookmark" +msgstr "_Lesezeichen" + +#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060 +msgid "_Bookmarks" +msgstr "_Lesezeichen" + +#: ../midori/midori-app.c:1336 +msgid "Add Boo_kmark" +msgstr "Lesezeichen _hinzufügen" + +#: ../midori/midori-app.c:1337 +msgid "_Console" +msgstr "_Konsole" + +#: ../midori/midori-app.c:1338 +msgid "_Extensions" +msgstr "_Erweiterungen" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589 +msgid "_History" +msgstr "_Verlauf" + +#: ../midori/midori-app.c:1340 +msgid "_Homepage" +msgstr "_Startseite" + +#: ../midori/midori-app.c:1341 +msgid "_Userscripts" +msgstr "_Benutzerskripte" + +#: ../midori/midori-app.c:1342 +msgid "New _Tab" +msgstr "Neuer _Reiter" + +#: ../midori/midori-app.c:1343 +msgid "_Transfers" +msgstr "Über_tragungen" + +#: ../midori/midori-app.c:1344 +msgid "Netscape p_lugins" +msgstr "Netscape-Module" + +#: ../midori/midori-app.c:1345 +msgid "_Closed Tabs" +msgstr "Ges_chlossene Reiter" + +#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216 +msgid "New _Window" +msgstr "Neues _Fenster" + +#: ../midori/midori-app.c:1347 +msgid "New _Folder" +msgstr "Neuer _Ordner" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "Datei nicht gefunden." -#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 -#: ../midori/midori-array.c:496 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Fehlerhaftes Dokument" -#: ../midori/midori-array.c:505 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "Unbekanntes Lesezeichenformat." -#: ../midori/midori-array.c:719 +#: ../midori/midori-array.c:915 msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 -#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298 +#: ../midori/midori-browser.c:5307 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 +#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:453 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% geladen" - -#: ../midori/midori-browser.c:491 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" msgstr "Titel konnte nicht aktualisiert werden: %s\n" -#: ../midori/midori-browser.c:504 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion »%s«." -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:569 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Privat surfen)" + +#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716 +msgid "Toplevel folder" +msgstr "Oberster Ordner" + +#: ../midori/midori-browser.c:774 msgid "New folder" msgstr "Neuer Ordner" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:774 msgid "Edit folder" msgstr "Ordner bearbeiten" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:818 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "_Beschreibung:" - -#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 -#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 -msgid "Toplevel folder" -msgstr "Oberster Ordner" - -#: ../midori/midori-browser.c:872 +#: ../midori/midori-browser.c:877 msgid "Add to _Speed Dial" msgstr "Zu Schnell_wahl hinzufügen" -#: ../midori/midori-browser.c:885 +#: ../midori/midori-browser.c:890 msgid "Show in the tool_bar" msgstr "In der Werkzeug_leiste anzeigen" -#: ../midori/midori-browser.c:900 +#: ../midori/midori-browser.c:905 msgid "Run as _web application" msgstr "Als _Internetanwendung starten" -#: ../midori/midori-browser.c:979 +#: ../midori/midori-browser.c:976 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Die Datei «%s» kann in diesem Ornder nicht gespeichert werden." + +#: ../midori/midori-browser.c:978 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Sie haben an diesem Ort keine Schreibberechtigung." + +#: ../midori/midori-browser.c:985 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Der freie Speichersplatz reicht nicht aus, um «%s» herunterzuladen." -#: ../midori/midori-browser.c:983 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "Die Datei benötigt %s, aber nur %s sind übrig." -#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 -#: ../midori/midori-browser.c:4085 +#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1320 +msgid "New Window" +msgstr "Neues Fenster" + +#: ../midori/midori-browser.c:1320 +msgid "A new window has been opened" +msgstr "Ein neues Fenster wurde geöffnet" + +#: ../midori/midori-browser.c:1323 +msgid "New Tab" +msgstr "Neuer Reiter" + +#: ../midori/midori-browser.c:1323 +msgid "A new tab has been opened" +msgstr "Ein neuer Reiter wurde geöffnet" + +#: ../midori/midori-browser.c:1358 +msgid "Error opening the image!" +msgstr "Fehler beim Öffnen des Bildes!" + +#: ../midori/midori-browser.c:1359 +msgid "Can not open selected image in a default viewer." +msgstr "" +"Das ausgewählte Bild kann nicht im Standardbildbetrachter geöffnet werden." + +#: ../midori/midori-browser.c:1365 +msgid "Error downloading the image!" +msgstr "Fehler beim Laden des Bildes!" + +#: ../midori/midori-browser.c:1366 +msgid "Can not download selected image." +msgstr "Das Bild kann nicht heruntergeladen werden" + +#: ../midori/midori-browser.c:1492 msgid "Save file" msgstr "Datei speichern" -#: ../midori/midori-browser.c:2150 +#: ../midori/midori-browser.c:2367 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2228 +#: ../midori/midori-browser.c:2499 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -363,151 +531,145 @@ "automatically." msgstr "" "Verwenden Sie einen Nachrichtenaggregator um diese URI zu benutzen. Dort " -"findet sich meist ein Menü oder eine Schaltfläche »Neues Abo«, " -"»Neue Nachrichtenquelle« oder ähnlich.\n" -"Alternativ können Sie auch unter Einstellungen > Anwendungen in Midori " -"einen Nachrichtenaggregator auswählen. Dann wird beim nächsten Klick auf " -"das Symbol für Nachrichtenquellen die Addresse automatisch hinzugefügt." +"findet sich meist ein Menü oder eine Schaltfläche »Neues Abo«, »Neue " +"Nachrichtenquelle« oder ähnlich.\n" +"Alternativ können Sie auch unter Einstellungen > Anwendungen in Midori einen " +"Nachrichtenaggregator auswählen. Dann wird beim nächsten Klick auf das " +"Symbol für Nachrichtenquellen die Addresse automatisch hinzugefügt." -#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Neue Nachrichtenquelle" -#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 -#: ../panels/midori-bookmarks.c:406 +#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "Konnte externes Programm nicht ausführen." +#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "Leer" -#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:3467 +msgid "Toggle text cursor navigation" +msgstr "Navigation mit Textmarke einschalten" + +#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Verlaufseintrag konnte nicht hinzugefügt werden: %s\n" -#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:737 +#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 msgid "Open all in _Tabs" msgstr "Alle in neuen _Reitern öffnen" -#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 -#: ../panels/midori-history.c:743 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 -#: ../panels/midori-history.c:745 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657 +#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:3931 +#: ../midori/midori-browser.c:4213 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3932 +#: ../midori/midori-browser.c:4214 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:4215 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:4216 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3935 +#: ../midori/midori-browser.c:4217 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3959 +#: ../midori/midori-browser.c:4218 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4239 msgid "Import bookmarks..." msgstr "Lesezeichen importieren..." -#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372 msgid "_Import bookmarks" msgstr "Lesezeichen _importieren" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:4253 msgid "_Application:" msgstr "_Anwendung:" -#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 -#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 -#: ../katze/katze-utils.c:696 -msgid "Custom..." -msgstr "Benutzerdefiniert…" +#: ../midori/midori-browser.c:4318 +msgid "Import from XBEL or HTML file" +msgstr "Aus einer XBEL- oder HTML-Datei importieren" + +#: ../midori/midori-browser.c:4353 +msgid "Import from a file" +msgstr "Aus einer Datei importieren" -#: ../midori/midori-browser.c:4061 +#: ../midori/midori-browser.c:4365 msgid "Failed to import bookmarks" msgstr "Fehler beim Importieren der Lesezeichen" -#: ../midori/midori-browser.c:4102 +#: ../midori/midori-browser.c:4400 +msgid "XBEL Bookmarks" +msgstr "XBEL-Lesezeichen" + +#: ../midori/midori-browser.c:4405 +msgid "Netscape Bookmarks" +msgstr "Netscape-Lesezeichen" + +#: ../midori/midori-browser.c:4419 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "Midori kann nur zu XBEL (*.xbel) oder Netscape (*.html) exportieren" + +#: ../midori/midori-browser.c:4434 msgid "Failed to export bookmarks" msgstr "Fehler beim Exportieren der Lesezeichen" -#: ../midori/midori-browser.c:4155 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "Verlauf konnte nicht geleert werden: %s\n" - -#: ../midori/midori-browser.c:4163 -#, c-format -msgid "Failed to clear search history: %s\n" -msgstr "Suchverlauf konnte nicht geleert werden: %s\n" - #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4270 +#: ../midori/midori-browser.c:4556 msgid "Clear Private Data" msgstr "Private Daten löschen" -#: ../midori/midori-browser.c:4274 +#: ../midori/midori-browser.c:4560 msgid "_Clear private data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:4288 +#: ../midori/midori-browser.c:4573 msgid "Clear the following data:" msgstr "Folgende Daten löschen:" -#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:114 -msgid "History" -msgstr "Verlauf" - -#: ../midori/midori-browser.c:4303 -msgid "Cookies" -msgstr "Benutzerprofile/ Cookies" - -#: ../midori/midori-browser.c:4308 -msgid "'Flash' Cookies" -msgstr "»Flash« Cookies" - -#: ../midori/midori-browser.c:4313 -msgid "Website icons" -msgstr "Symbole von Internetseiten" - -#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 -msgid "_Closed Tabs" -msgstr "Ges_chlossene Reiter" - -#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "Zwischenspeicher" +#: ../midori/midori-browser.c:4583 +msgid "Last open _tabs" +msgstr "_Zuletzt geöffnete Seiten" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4609 msgid "Clear private data when _quitting Midori" msgstr "Private Daten beim _Beenden von Midori löschen" -#: ../midori/midori-browser.c:4472 +#: ../midori/midori-browser.c:4804 msgid "A lightweight web browser." msgstr "Ein schlanker Internetbetrachter." -#: ../midori/midori-browser.c:4474 +#: ../midori/midori-browser.c:4805 +msgid "See about:version for version info." +msgstr "Siehe about:version für Versionsinformationen." + +#: ../midori/midori-browser.c:4807 msgid "" "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 " @@ -519,634 +681,493 @@ "veröffentlicht, weitergeben und/ oder modifizieren, entweder gemäß Version " "2.1 der Lizenz oder (wahlweise) jeder späteren Version." -#: ../midori/midori-browser.c:4493 +#: ../midori/midori-browser.c:4828 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:4802 +#: ../midori/midori-browser.c:5214 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 -msgid "New _Window" -msgstr "Neues _Fenster" - -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:5217 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:4808 +#: ../midori/midori-browser.c:5220 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:4810 -msgid "P_rivate Browsing" -msgstr "_Privat navigieren" - -#: ../midori/midori-browser.c:4811 -msgid "Don't save any private data while browsing" -msgstr "Keinerlei private Daten während des Navigierens speichern" +#: ../midori/midori-browser.c:5222 +msgid "New P_rivate Browsing Window" +msgstr "Neues Fenster zum _privaten Surfen" -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:5226 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:5228 +msgid "_Save Page As..." +msgstr "_Seite speichern unter…" + +#: ../midori/midori-browser.c:5229 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:4820 +#: ../midori/midori-browser.c:5231 msgid "Add to Speed _dial" msgstr "Zu Schnell_wahl hinzufügen" -#: ../midori/midori-browser.c:4821 -msgid "Add shortcut to speed dial" -msgstr "Eine Verknüpfung zur Schnellwahl hinzufügen" - -#: ../midori/midori-browser.c:4823 +#: ../midori/midori-browser.c:5235 msgid "Add Shortcut to the _desktop" msgstr "Verknüpfung auf dem _Schreibtisch" -#: ../midori/midori-browser.c:4824 -msgid "Add shortcut to the desktop" -msgstr "Eine Verknüpfung auf dem Schreibtisch hinzufügen" +#: ../midori/midori-browser.c:5237 +msgid "Create _Launcher" +msgstr "_Starter erstellen" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:5241 msgid "Subscribe to News _feed" msgstr "Nachrichten_quelle abonnieren" -#: ../midori/midori-browser.c:4827 -msgid "Subscribe to this news feed" -msgstr "Diese Nachrichtenquelle abonnieren" - -#: ../midori/midori-browser.c:4832 +#: ../midori/midori-browser.c:5247 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:5248 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:4835 +#: ../midori/midori-browser.c:5250 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:4836 -msgid "Close this window" -msgstr "Dieses Fenster schließen" - -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:5254 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:4842 -msgid "Quit the application" -msgstr "Programm beenden" +#: ../midori/midori-browser.c:5256 +msgid "Close a_ll Windows" +msgstr "_Alle Fenster schließen" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:5259 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:4848 -msgid "Undo the last modification" -msgstr "Letzte Änderung rückgängig machen" - -#: ../midori/midori-browser.c:4851 -msgid "Redo the last modification" -msgstr "Die letzte Ä_nderung rückgängig machen" - -#: ../midori/midori-browser.c:4855 -msgid "Cut the selected text" -msgstr "Markierten Text ausschneiden" - -#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 -msgid "Copy the selected text" -msgstr "Markierten Text kopieren" - -#: ../midori/midori-browser.c:4864 -msgid "Paste text from the clipboard" -msgstr "Text aus der Zwischenablage einfügen" - -#: ../midori/midori-browser.c:4867 -msgid "Delete the selected text" -msgstr "Markierten Text löschen" - -#: ../midori/midori-browser.c:4870 -msgid "Select all text" -msgstr "Gesamten Text auswählen" +#: ../midori/midori-browser.c:5282 +msgid "_Find..." +msgstr "_Suchen…" -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:5283 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:4875 +#: ../midori/midori-browser.c:5285 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:4876 -msgid "Find the next occurrence of a word or phrase" -msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" - -#: ../midori/midori-browser.c:4878 +#: ../midori/midori-browser.c:5288 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:4879 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" - -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:5292 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:5294 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:4886 +#: ../midori/midori-browser.c:5295 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:5300 +msgid "Reload page without caching" +msgstr "Seite ohne Zwischenspeicher neu laden" + +#: ../midori/midori-browser.c:5310 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:4901 +#: ../midori/midori-browser.c:5313 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:4904 -msgid "Reset the zoom level" -msgstr "Setzte die Vergrößerungsstufe zurück" - -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:5317 msgid "_Encoding" msgstr "_Zeichensatz" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:5319 msgid "View So_urce" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:4908 -msgid "View the source code of the page" -msgstr "Zeige den Quelltext der Seite an" +#: ../midori/midori-browser.c:5322 +msgid "Ca_ret Browsing" +msgstr "Navigation mit Textmarke" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:5326 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:5328 msgid "Scroll _Left" msgstr "Nach _links rollen" -#: ../midori/midori-browser.c:4915 -msgid "Scroll to the left" -msgstr "Nach links rollen" - -#: ../midori/midori-browser.c:4917 +#: ../midori/midori-browser.c:5331 msgid "Scroll _Down" msgstr "_Herunter rollen" -#: ../midori/midori-browser.c:4918 -msgid "Scroll down" -msgstr "Herunter rollen" - -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:5334 msgid "Scroll _Up" msgstr "H_och rollen" -#: ../midori/midori-browser.c:4921 -msgid "Scroll up" -msgstr "Hoch rollen" - -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:5337 msgid "Scroll _Right" msgstr "Nach _rechts rollen" -#: ../midori/midori-browser.c:4924 -msgid "Scroll to the right" -msgstr "Nach rechts rollen" - -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:5340 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:5343 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:5346 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4937 +#: ../midori/midori-browser.c:5350 msgid "Go to the previous sub-page" msgstr "Gehe zur voherigen Unterseite zurück" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:5354 msgid "Go to the next sub-page" msgstr "Gehe weiter zur nächsten Unterseite" -#: ../midori/midori-browser.c:4944 +#: ../midori/midori-browser.c:5357 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:5359 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:4947 -msgid "Delete the contents of the trash" -msgstr "Inhalt des Papierkorbs löschen" - -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:5362 msgid "Undo _Close Tab" msgstr "Reiter _zurückholen" -#: ../midori/midori-browser.c:4950 -msgid "Open the last closed tab" -msgstr "Zuletzt geschlossenen Reiter öffnen" - -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:5369 msgid "Add a new _folder" msgstr "Einen neuen _Ordner hinzufügen" -#: ../midori/midori-browser.c:4957 -msgid "Add a new bookmark folder" -msgstr "Einen neuen Lesezeichenordner hinzufügen" - -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:5375 msgid "_Export bookmarks" msgstr "Lesezeichen _exportieren" -#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:4966 -msgid "Add, edit and remove search engines..." -msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" - -#: ../midori/midori-browser.c:4969 +#: ../midori/midori-browser.c:5381 msgid "_Clear Private Data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:4970 -msgid "Clear private data..." -msgstr "Private Daten löschen..." - -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:5384 msgid "_Inspect Page" msgstr "Seite _untersuchen" -#: ../midori/midori-browser.c:4975 -msgid "Inspect page details and access developer tools..." -msgstr "Einzelheiten der Seite untersuchen und Entwicklerwerkzeuge benutzen..." - -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:5388 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:4981 -msgid "Switch to the previous tab" -msgstr "Zum voherigen Reiter wechseln" - -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:5391 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:4984 -msgid "Switch to the next tab" -msgstr "Zum nächsten Reiter wechseln" +#: ../midori/midori-browser.c:5393 +msgid "Move Tab _Backward" +msgstr "Reiter _zurück schieben" + +#: ../midori/midori-browser.c:5395 +msgid "_Move Tab Forward" +msgstr "Reiter v_orwärts schieben" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:5398 msgid "Focus _Current Tab" msgstr "_Aktuellen Reiter fokusieren" -#: ../midori/midori-browser.c:4987 -msgid "Focus the current tab" -msgstr "Den aktuellen Reiter fokussieren" - -#: ../midori/midori-browser.c:4989 -msgid "Minimize _Current Tab" -msgstr "Aktuellen Reiter _Minimieren" - -#: ../midori/midori-browser.c:4990 -msgid "Minimize the current tab" -msgstr "Den aktuellen Reiter minimieren" +#: ../midori/midori-browser.c:5401 +msgid "Focus _Next view" +msgstr "_Nächste Ansicht foussieren" + +#: ../midori/midori-browser.c:5404 +msgid "Only show the Icon of the _Current Tab" +msgstr "Nur das Symbol des _aktuellen Reiters anziegen" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:5407 msgid "_Duplicate Current Tab" msgstr "Aktuellen Reiter _verdoppeln" -#: ../midori/midori-browser.c:4993 -msgid "Duplicate the current tab" -msgstr "Den aktuellen Reiter verdoppeln" - -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:5410 msgid "Close Ot_her Tabs" msgstr "Ande_re Reiter schließen" -#: ../midori/midori-browser.c:4996 -msgid "Close all tabs except the current tab" -msgstr "Alle Reiter, bis auf den aktuellen Reiter schließen" - -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5413 msgid "Open last _session" msgstr "Die letzte _Sitzung öffnen" -#: ../midori/midori-browser.c:4999 -msgid "Open the tabs saved in the last session" -msgstr "In der letzten Sitzung geöffnete Reiter öffnen" - -#: ../midori/midori-browser.c:5001 +#: ../midori/midori-browser.c:5416 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:5003 -msgid "_Contents" -msgstr "_Inhalt" - -#: ../midori/midori-browser.c:5004 -msgid "Show the documentation" -msgstr "Zeige die Dokumentation" - -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:5418 msgid "_Frequent Questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:5007 -msgid "Show the Frequently Asked Questions" -msgstr "Häufig gestellte Fragen anzeigen" - -#: ../midori/midori-browser.c:5009 -msgid "_Report a Bug" -msgstr "Fehler _berichten" - -#: ../midori/midori-browser.c:5010 -msgid "Open Midori's bug tracker" -msgstr "Midoris Fehlerverfolgung öffnen" - -#: ../midori/midori-browser.c:5013 -msgid "Show information about the program" -msgstr "Zeige Informationen über das Programm" +#: ../midori/midori-browser.c:5421 +msgid "_Report a Problem..." +msgstr "Einen Fehler _melden..." -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:5433 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:5022 -msgid "Show menubar" -msgstr "Menüleiste anzeigen" - -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:5437 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:5026 -msgid "Show navigationbar" -msgstr "Navigationsleiste anzeigen" - -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5441 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:5030 -msgid "Show sidepanel" -msgstr "Seitenleiste anzeigen" +#: ../midori/midori-browser.c:5442 +msgid "Sidepanel" +msgstr "Seitenleiste" -#: ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:5445 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:5034 -msgid "Show bookmarkbar" -msgstr "Lesezeichenleiste anzeigen" - -#: ../midori/midori-browser.c:5037 -msgid "_Transferbar" -msgstr "_Übertragungsleiste" - -#: ../midori/midori-browser.c:5038 -msgid "Show transferbar" -msgstr "Übertragungsleiste anzeigen" - -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:5449 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:5042 -msgid "Show statusbar" -msgstr "Statusleiste anzeigen" - -#: ../midori/midori-browser.c:5050 +#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311 msgid "_Automatic" msgstr "_Automatisch" -#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5465 msgid "Japanese (SHIFT__JIS)" msgstr "Japanisch (SHIFT__JIS)" -#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238 msgid "Korean (EUC-KR)" msgstr "Koreanisch (EUC-KR)" -#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "Benutzerdefiniert…" + +#: ../midori/midori-browser.c:5985 msgid "_Separator" msgstr "_Trennlinie" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5992 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5994 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:6016 msgid "_Web Search..." msgstr "Im _Netz suchen…" -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:6018 msgid "Run a web search" msgstr "Starte eine Suche im Netz" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:6045 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:5659 +#: ../midori/midori-browser.c:6062 +msgid "Show the saved bookmarks" +msgstr "Die gespeicherten Lesezeichen anzeigen" + +#: ../midori/midori-browser.c:6079 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:6095 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:6097 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:6111 msgid "_Menu" msgstr "_Menü" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:6113 msgid "Menu" msgstr "Menü" -#: ../midori/midori-browser.c:6262 +#: ../midori/midori-browser.c:6927 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" -#: ../midori/midori-locationaction.c:390 +#: ../midori/midori-extension.c:329 #, c-format -msgid "Failed to select from history\n" -msgstr "Auswahl aus Verlauf schlug fehl\n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "" +"Die Konfiguration der Erweiterung »%s« konnte nicht geladen werden: %s\n" -#: ../midori/midori-locationaction.c:474 +#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "Nach %s suchen" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "" +"Die Konfiguration der Erweiterung »%s« konnte nicht gespeichert werden: %s\n" -#: ../midori/midori-locationaction.c:497 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "Suchen mit %s" -#: ../midori/midori-locationaction.c:1306 +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Suchen mit …" + +#: ../midori/midori-locationaction.c:537 +#, c-format +msgid "Failed to select from history\n" +msgstr "Auswahl aus Verlauf schlug fehl\n" + +#: ../midori/midori-locationaction.c:624 #, c-format -msgid "Failed to execute database statement\n" -msgstr "Datenbankabfrage konnte nicht ausgeführt werden\n" +msgid "Search for %s" +msgstr "Nach %s suchen" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1362 +#: ../midori/midori-locationaction.c:1398 msgid "Paste and p_roceed" msgstr "Einfügen und _fortfahren" -#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 -msgid "Detach chosen panel from the window" -msgstr "Gewählte Leiste vom Fenster ablösen" +#: ../midori/midori-locationaction.c:1739 +msgid "Not verified" +msgstr "Nicht überprüft" + +#: ../midori/midori-locationaction.c:1759 +msgid "Verified and encrypted connection" +msgstr "Überprüfte und verschlüsselte Verbindung" + +#: ../midori/midori-locationaction.c:1771 +#, fuzzy +msgid "Open, unencrypted connection" +msgstr "Offene, unverschlüsselte Verbindung" -#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 -#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" msgstr "Seitenleiste rechts anordnen" -#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Seitenleiste links anordnen" -#: ../midori/midori-panel.c:771 -msgid "Hide operating controls" -msgstr "Bedienelemente anzeigen" - -#: ../midori/midori-websettings.c:200 -msgid "Show Blank page" -msgstr "Leere Seite anzeigen" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "Schnellwahl anzeigen" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" msgstr "Startseite anzeigen" -#: ../midori/midori-websettings.c:202 -msgid "Show last open tabs" -msgstr "Zuletzt geöffnete Reiter anzeigen" - -#: ../midori/midori-websettings.c:204 -msgid "Show last tabs without loading" -msgstr "Letzte Reiter zeigen ohne sie zu laden" - -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:237 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:257 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:258 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:259 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:274 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:275 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:276 msgid "Small icons" msgstr "Kleine Symbole" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:277 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:278 msgid "Icons and text" msgstr "Symbole und Text" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:279 msgid "Text beside icons" msgstr "Text neben Symbolen" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:294 msgid "Automatic (GNOME or environment)" msgstr "Automatisch (GNOME oder Umgebung)" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:295 msgid "HTTP proxy server" msgstr "HTTP-Zwischenrechner" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:296 msgid "No proxy server" msgstr "Kein Zwischenrechner" -#: ../midori/midori-websettings.c:295 -msgid "All cookies" -msgstr "Alle Profildateien" - -#: ../midori/midori-websettings.c:296 -msgid "Session cookies" -msgstr "Sitzungsprofile" - -#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 -msgid "None" -msgstr "Keine" - #: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" @@ -1163,471 +1184,427 @@ msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:400 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:401 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:409 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:410 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:418 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:419 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:444 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:445 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:454 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:455 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:463 msgid "Last Web search" msgstr "Letzte Suche im Netz" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:464 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Suche im Netz" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:473 msgid "Show Menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:474 msgid "Whether to show the menubar" msgstr "Die Menüleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:482 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:483 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:491 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:492 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:500 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:501 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:485 -msgid "Show Transferbar" -msgstr "Übertragungsleiste anzeigen" - -#: ../midori/midori-websettings.c:486 -msgid "Whether to show the transferbar" -msgstr "Die Übertragungsleiste anzeigen oder verbergen" - -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:509 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:510 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:519 msgid "Toolbar Style:" msgstr "Werkzeugleistenstil:" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:520 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:521 -msgid "Show progress in location entry" -msgstr "Fortschritt im Adressfeld anzeigen" - -#: ../midori/midori-websettings.c:522 -msgid "Whether to show loading progress in the location entry" -msgstr "Aktuellen Ladefortschritt im Adressfeld anzeigen" - -#: ../midori/midori-websettings.c:537 -msgid "Search engines in location completion" -msgstr "Suchmaschinen in Vervollständigung" - -#: ../midori/midori-websettings.c:538 -msgid "Whether to show search engines in the location completion" -msgstr "Verfügbare Suchmaschinen in der Adressvervollständigung anzeigen" - -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:529 msgid "Toolbar Items" msgstr "Werkzeugleistenelemente" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:530 msgid "The items to show on the toolbar" msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:538 msgid "Compact Sidepanel" msgstr "Kompakte Seitenleiste" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:539 msgid "Whether to make the sidepanel compact" msgstr "Die Seitenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:571 -msgid "Show operating controls of the panel" -msgstr "Bedienelemente der Leiste anzeigen" - -#: ../midori/midori-websettings.c:572 -msgid "Whether to show the operating controls of the panel" -msgstr "Die Bedienelemente der Leiste anzeigen oder verbergen" - -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:554 msgid "Align sidepanel on the right" msgstr "Seitenleiste rechts anordnen" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:555 msgid "Whether to align the sidepanel on the right" msgstr "Die Seitenleiste auf der rechten Seite anordnen" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:570 msgid "Open panels in separate windows" msgstr "Leisten in eigenen Fenstern öffnen" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:571 msgid "Whether to always open panels in separate windows" msgstr "Ob Seitenleisten immer in eigenen Fenstern geöffnet werden sollen" -#: ../midori/midori-websettings.c:613 +#: ../midori/midori-websettings.c:580 msgid "When Midori starts:" msgstr "Beim Starten von Midori:" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:581 msgid "What to do when Midori starts" msgstr "Was beim Starten von Midori passieren soll" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:590 msgid "Homepage:" msgstr "Startseite:" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:591 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:639 +#: ../midori/midori-websettings.c:606 msgid "Show crash dialog" msgstr "Absturzdialog anzeigen" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:607 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:656 -msgid "Show speed dial in new tabs" -msgstr "Schnellwahl in neuen Reitern anzeigen" - -#: ../midori/midori-websettings.c:657 -msgid "Show speed dial in newly opened tabs" -msgstr "Schnellwahl in neu geöffneten Reitern anzeigen" - -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:615 msgid "Save downloaded files to:" msgstr "Heruntergeladene Dateien speichern:" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:616 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../midori/midori-websettings.c:687 -msgid "Ask for the destination folder" -msgstr "Nach dem Zielordner fragen" - -#: ../midori/midori-websettings.c:688 -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:707 -msgid "Notify when a transfer has been completed" -msgstr "Benachrichtigen bei Abschluss der Übertragung" +#: ../midori/midori-websettings.c:624 +msgid "Text Editor" +msgstr "Texteditor" -#: ../midori/midori-websettings.c:708 -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:720 -msgid "Download Manager" -msgstr "Übertragungsmanager" - -#: ../midori/midori-websettings.c:721 -msgid "An external download manager" -msgstr "Ein externer Übertragungsmanager" - -#: ../midori/midori-websettings.c:729 -msgid "Text Editor" -msgstr "Texteditor" - -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:625 msgid "An external text editor" msgstr "Ein externer Texteditor" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:640 msgid "News Aggregator" msgstr "Nachrichtenaggregator" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:641 msgid "An external news aggregator" msgstr "Ein externer Nachrichtenaggregator" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:649 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:650 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../midori/midori-websettings.c:763 +#: ../midori/midori-websettings.c:658 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:659 msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:669 msgid "Always Show Tabbar" msgstr "Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:670 msgid "Always show the tabbar" msgstr "Die Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:783 +#: ../midori/midori-websettings.c:683 msgid "Close Buttons on Tabs" msgstr "Schließenschaltflächen auf Reitern" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:684 msgid "Whether tabs have close buttons" msgstr "Schließenschaltflächen auf Reitern anzeigen oder verbergen" -#: ../midori/midori-websettings.c:792 +#: ../midori/midori-websettings.c:709 msgid "Open new pages in:" msgstr "Öffne neue Seiten in:" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:710 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../midori/midori-websettings.c:802 -msgid "Open external pages in:" -msgstr "Öffne Seiten von außerhalb in:" - -#: ../midori/midori-websettings.c:803 -msgid "Where to open externally opened pages" -msgstr "Wo Seiten von außerhalb geöffnet werden sollen" - -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:719 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:720 msgid "Load an address from the selection via middle click" msgstr "Lade eine markierte Adresse mit der mittleren Maustaste" -#: ../midori/midori-websettings.c:821 +#: ../midori/midori-websettings.c:728 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:729 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:737 msgid "Open Tabs next to Current" msgstr "Reiter neben aktuellem öffnen" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:738 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:839 +#: ../midori/midori-websettings.c:746 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:747 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Bilder automatisch laden" -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:758 msgid "Load and display images automatically" msgstr "Bilder automatisch laden und anzeigen" -#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 msgid "Enable scripts" msgstr "Skripte einschalten" -#: ../midori/midori-websettings.c:859 +#: ../midori/midori-websettings.c:766 msgid "Enable embedded scripting languages" msgstr "Eingebettete Skriptsprachen einschalten" -#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" msgstr "Netscape-Module einschalten" -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:774 msgid "Enable embedded Netscape plugin objects" msgstr "Eingebettete Netscape-Module einschalten" -#: ../midori/midori-websettings.c:883 +#: ../midori/midori-websettings.c:789 +msgid "Enable Spell Checking" +msgstr "Rechtschreibprüfung einschalten" + +#: ../midori/midori-websettings.c:790 +msgid "Enable spell checking while typing" +msgstr "Rechtschreibprüfung beim Eintippen einschalten" + +#: ../midori/midori-websettings.c:796 msgid "Enable HTML5 database support" msgstr "HTML5-Datenbanken einschalten" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:797 msgid "Whether to enable HTML5 database support" msgstr "Unterstützung für HTML5-Datenbank einschalten" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:803 msgid "Enable HTML5 local storage support" msgstr "HTML5-Lokalspeicher einschalten" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:804 msgid "Whether to enable HTML5 local storage support" msgstr "Unterstützung für HTML5-Lokalspeicher einschalten" -#: ../midori/midori-websettings.c:899 +#: ../midori/midori-websettings.c:810 msgid "Enable offline web application cache" msgstr "HTML5-Anwendungsspeicher einschalten" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:811 msgid "Whether to enable offline web application cache" msgstr "HTML5-Zwischenspeicher für Internetanwendungen einschalten" -#: ../midori/midori-websettings.c:925 +#: ../midori/midori-websettings.c:827 +msgid "Flash window on background tabs" +msgstr "Fenster bei Hintergrund-Reitern blinken lassen" + +#: ../midori/midori-websettings.c:828 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "" +"Browserfenster blinken lassen, wenn ein neuer Reiter im Hintergrund geöffnet " +"wurde" + +#: ../midori/midori-websettings.c:836 +msgid "Enable WebGL support" +msgstr "WebGL-Unterstützung einschalten" + +#: ../midori/midori-websettings.c:837 +msgid "Allow websites to use OpenGL rendering" +msgstr "Internetseiten erlauben, OpenGL zur Darstellung zu benutzen" + +#: ../midori/midori-websettings.c:863 msgid "Zoom Text and Images" msgstr "Text und Bilder vergrößern" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:864 msgid "Whether to zoom text and images" msgstr "Ob Text und Bilder gleichermaßen vergrößert werden sollen" -#: ../midori/midori-websettings.c:941 +#: ../midori/midori-websettings.c:879 msgid "Find inline while typing" msgstr "Inkrementelle Suche beim Eintippen" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:880 msgid "Whether to automatically find inline while typing" msgstr "Ob die inkrementelle Suche automatisch beim Eintippen starten soll" -#: ../midori/midori-websettings.c:957 +#: ../midori/midori-websettings.c:895 msgid "Kinetic scrolling" msgstr "Sanfter Bildlauf" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:896 msgid "Whether scrolling should kinetically move according to speed" msgstr "Ob der Bildlauf sanft schneller und langsamer wird" -#: ../midori/midori-websettings.c:966 -msgid "Accept cookies" -msgstr "Cookies annehmen" - -#: ../midori/midori-websettings.c:967 -msgid "What type of cookies to accept" -msgstr "Welche Art von Profildateien (Cookies) angenommen werden" - -#: ../midori/midori-websettings.c:976 -msgid "Maximum cookie age" -msgstr "Maximales Alter von Cookiedaten" +#: ../midori/midori-websettings.c:904 +msgid "Delete old Cookies after:" +msgstr "Alte Cookies löschen nach:" -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:905 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:986 -msgid "Maximum history age" -msgstr "Maximales Verlaufsalter" +#: ../midori/midori-websettings.c:921 +msgid "Only accept Cookies from sites you visit" +msgstr "Nur Cookies von Seiten annehmen, die ich besuche" + +#: ../midori/midori-websettings.c:922 +msgid "Block cookies sent by third-party websites" +msgstr "Cookies von Drittanbietern blockieren" + +#: ../midori/midori-websettings.c:936 +msgid "Delete pages from history after:" +msgstr "Seiten aus dem Verlauf löschen nach:" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:937 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gespeichert wird" -#: ../midori/midori-websettings.c:995 -msgid "Remember last downloaded files" -msgstr "Zuletzt heruntergeladene Dateien merken" - -#: ../midori/midori-websettings.c:996 -msgid "Whether the last downloaded files are saved" -msgstr "Die zuletzt heruntegeladenen Dateien speichern" - -#: ../midori/midori-websettings.c:1013 +#: ../midori/midori-websettings.c:952 msgid "Proxy server" -msgstr "Zwischenrechner (Proxy)" +msgstr "Proxy-Server" -#: ../midori/midori-websettings.c:1014 +#: ../midori/midori-websettings.c:953 msgid "The type of proxy server to use" msgstr "Die Art des zu verwendenden Zwischenrechners" -#: ../midori/midori-websettings.c:1023 +#: ../midori/midori-websettings.c:962 msgid "HTTP Proxy Server" msgstr "HTTP-Zwischenrechner" -#: ../midori/midori-websettings.c:1024 +#: ../midori/midori-websettings.c:963 msgid "The proxy server used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" +#: ../midori/midori-websettings.c:978 +msgid "Port" +msgstr "Port" + +#: ../midori/midori-websettings.c:979 +msgid "The proxy server port used for HTTP connections" +msgstr "Der Port des Zwischenrechners für HTTP-Verbindungen" + +#: ../midori/midori-websettings.c:997 +msgid "The maximum size of cached pages on disk" +msgstr "Die maximale Größe zwischengespeicherter Seiten auf der Festplatte" + #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1040 +#: ../midori/midori-websettings.c:1014 msgid "Identify as" msgstr "Ausgeben als" -#: ../midori/midori-websettings.c:1041 +#: ../midori/midori-websettings.c:1015 msgid "What to identify as to web pages" msgstr "Wie gegenüber Seiten im Internet identifiziert werden soll" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1031 msgid "Identification string" msgstr "Identifikationskennung" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1032 msgid "The application identification string" msgstr "Die Identifikationskennung der Anwedung" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1048 msgid "Preferred languages" msgstr "Bevorzugte Sprachen" -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:1049 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1636,624 +1613,615 @@ "Darstellung mehrsprachiger Internetseiten benutzt wird, zum Beispiel »de«, " "»ru,nl« oder »en-us;q=1.0, fr-fr;q=0.667«" -#: ../midori/midori-websettings.c:1089 +#: ../midori/midori-websettings.c:1064 msgid "Clear private data" msgstr "Private Daten löschen" -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1065 msgid "The private data selected for deletion" msgstr "Zum Löschen ausgewählte private Daten" -#. 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:1227 ../midori/midori-view.c:4442 -#: ../midori/midori-view.c:4446 +#: ../midori/midori-websettings.c:1080 +msgid "Clear data" +msgstr "Daten löschen" + +#: ../midori/midori-websettings.c:1081 +msgid "The data selected for deletion" +msgstr "Zum Löschen ausgewählte Daten" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1130 +msgid "Strip referrer details sent to websites" +msgstr "Herkunftsdetails beim Seitenwechsel kürzen" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1132 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Ob die »Referer«-Kopfzeile auf den Rechnernamen verkürzt werden soll" + +#: ../midori/midori-websettings.c:1146 +msgid "Always use my font choices" +msgstr "Immer meine Schriften benutzen" + +#: ../midori/midori-websettings.c:1147 +msgid "Override fonts picked by websites with user preferences" +msgstr "" +"Schriftarten auf Internetseiten mit Benutzereinstellungen überschreiben" + +#: ../midori/midori-view.c:1360 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s möchte eine HTML5-Datenbank speichern." + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Deny" +msgstr "_Verweigern" + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Allow" +msgstr "_Zulassen" + +#: ../midori/midori-view.c:1392 +#, c-format +msgid "%s wants to know your location." +msgstr "%s möchte Ihren Standort wissen." + +#: ../midori/midori-view.c:1485 #, c-format msgid "Error - %s" msgstr "Fehler - %s" -#: ../midori/midori-view.c:1228 +#: ../midori/midori-view.c:1486 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Die Seite »%s« konnte nicht geladen werden." -#: ../midori/midori-view.c:1230 +#: ../midori/midori-view.c:1488 msgid "Try again" msgstr "Erneut versuchen" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1249 -#, c-format -msgid "Not found - %s" -msgstr "Nicht gefunden - %s" - -#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 +#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598 #, c-format msgid "Send a message to %s" msgstr "Nachricht an %s schicken" -#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 +#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747 msgid "Inspect _Element" msgstr "Element _untersuchen" -#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2480 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2484 msgid "Open Link in _Foreground Tab" msgstr "Verweis in _Vordergrund-Reiter öffnen" -#: ../midori/midori-view.c:2118 +#: ../midori/midori-view.c:2485 msgid "Open Link in _Background Tab" msgstr "Verweis in _Hintergrund-Reiter öffnen" -#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2488 msgid "Open Link in New _Window" msgstr "Verweis in neuem _Fenster öffnen" -#: ../midori/midori-view.c:2124 +#: ../midori/midori-view.c:2491 msgid "Open Link as Web A_pplication" msgstr "Verweis als _Internetanwendung öffnen" -#: ../midori/midori-view.c:2127 +#: ../midori/midori-view.c:2496 msgid "Copy Link de_stination" msgstr "Verweisziel k_opieren" -#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 -msgid "_Save Link destination" -msgstr "Verweisziel _speichern" - -#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 -msgid "_Download Link destination" -msgstr "Verweisziel herunter_laden" - -#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 -#: ../midori/midori-view.c:2207 -msgid "Download with Download _Manager" -msgstr "Mit Übertragungs_manager herunterladen" - -#: ../midori/midori-view.c:2144 +#: ../midori/midori-view.c:2512 msgid "Open _Image in New Tab" msgstr "_Bild in neuem Reiter öffnen" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2515 msgid "Copy Image _Address" msgstr "Bild_adresse kopieren" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2518 msgid "Save I_mage" msgstr "Bi_ld speichern" -#: ../midori/midori-view.c:2151 -msgid "Download I_mage" -msgstr "Bild herunterla_den" +#: ../midori/midori-view.c:2521 +msgid "Open in Image _Viewer" +msgstr "In _Bildbetrachter öffnen" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2528 msgid "Copy Video _Address" msgstr "Video_adresse kopieren" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2531 msgid "Save _Video" msgstr "_Video speichern" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2531 msgid "Download _Video" msgstr "_Video herunterladen" -#: ../midori/midori-view.c:2224 +#: ../midori/midori-view.c:2557 msgid "Search _with" msgstr "Suchen _mit" -#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2589 msgid "_Search the Web" msgstr "Im Netz _suchen" -#: ../midori/midori-view.c:2287 +#: ../midori/midori-view.c:2606 msgid "Open Address in New _Tab" msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:2591 +#: ../midori/midori-view.c:2909 msgid "Open or download file" msgstr "Datei öffnen oder herunterladen" -#: ../midori/midori-view.c:2610 +#: ../midori/midori-view.c:2929 #, c-format msgid "File Type: '%s'" msgstr "Dateityp: »%s«" -#: ../midori/midori-view.c:2613 +#: ../midori/midori-view.c:2931 #, 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:2617 +#: ../midori/midori-view.c:2935 +#, c-format +msgid "File Name: %s" +msgstr "Dateiname: %s" + +#: ../midori/midori-view.c:2955 #, c-format msgid "Open %s" msgstr "%s öffnen" -#: ../midori/midori-view.c:3158 +#: ../midori/midori-view.c:3576 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:3439 -msgid "Speed dial" +#: ../midori/midori-view.c:3923 +msgid "Speed Dial" msgstr "Schnellwahl" -#: ../midori/midori-view.c:3440 +#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020 msgid "Click to add a shortcut" msgstr "Klicken um eine Verknüpfung hinzuzufügen" -#: ../midori/midori-view.c:3441 +#: ../midori/midori-view.c:3925 msgid "Enter shortcut address" msgstr "Ziel der Verknüpfung eingeben" -#: ../midori/midori-view.c:3442 +#: ../midori/midori-view.c:3926 msgid "Enter shortcut title" msgstr "Titel der Verknüpfung eingeben" -#: ../midori/midori-view.c:3443 +#: ../midori/midori-view.c:3927 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:3444 -msgid "Set number of columns and rows" -msgstr "Anzahl Spalten und Zeilen ändern" +#: ../midori/midori-view.c:4089 +#, c-format +msgid "No documentation installed" +msgstr "Keine Dokumentation installiert" -#: ../midori/midori-view.c:3445 -msgid "Enter number of columns and rows:" -msgstr "Anzahl an Spalten und Zeilen eingeben:" +#: ../midori/midori-view.c:4165 +msgid "Midori doesn't store any personal data:" +msgstr "Midori speichert keine persönlichen Daten:" -#: ../midori/midori-view.c:3446 -msgid "Invalid input for the size of the speed dial" -msgstr "Ungültige Eingabe für die Größe der Schnellwahl" +#: ../midori/midori-view.c:4166 +msgid "No history or web cookies are being saved." +msgstr "Es werden weder Chronik noch Web-Cookies gespeichert." -#: ../midori/midori-view.c:3447 -msgid "Thumb size:" -msgstr "Vorschaubildgröße:" +#: ../midori/midori-view.c:4167 +msgid "Extensions are disabled." +msgstr "Erweiterungen sind deaktiviert." -#: ../midori/midori-view.c:3448 -msgid "Small" -msgstr "Klein" +#: ../midori/midori-view.c:4168 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "" +"HTML5-Speicher, lokale Datenbank und Anwendungszwischenspeicher sind " +"deaktiviert." -#: ../midori/midori-view.c:3449 -msgid "Medium" -msgstr "Mittel" +#: ../midori/midori-view.c:4169 +msgid "Midori prevents websites from tracking the user:" +msgstr "Midori verhindert, dass Webseiten ihre Nutzer verfolgen." -#: ../midori/midori-view.c:3450 -msgid "Big" -msgstr "Groß" +#: ../midori/midori-view.c:4170 +#, fuzzy +msgid "Referrer URLs are stripped down to the hostname." +msgstr "" +"Weiterleitende URLs werden bis hintunter auf den Rechnernamen aufgelöst." -#: ../midori/midori-view.c:3476 -#, c-format -msgid "Document cannot be displayed" -msgstr "Dokument kann nicht angezeigt werden" +#: ../midori/midori-view.c:4171 +msgid "DNS prefetching is disabled." +msgstr "DNS-Auflösung im Voraus ist deaktiviert." -#: ../midori/midori-view.c:3499 -#, c-format -msgid "No documentation installed" -msgstr "Keine Dokumentation installiert" +#: ../midori/midori-view.c:4172 +msgid "The language and timezone are not revealed to websites." +msgstr "" +"Die Sprach- und Zeitzoneneinstellungen werden Webseiten nicht verraten." -#: ../midori/midori-view.c:3618 +#: ../midori/midori-view.c:4173 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "" +"Flash und andere Netscape-Erweiterungen können nicht durch Websites " +"aufgelistet werden." + +#: ../midori/midori-view.c:4222 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "Versionsnummern in Klammern geben Versionen zur Laufzeit an." + +#: ../midori/midori-view.c:4278 msgid "Page loading delayed" msgstr "Laden der Seite verzögert" -#: ../midori/midori-view.c:3619 +#: ../midori/midori-view.c:4279 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Laden der Seite wegen eines Absturzes oder Einstellung verzögert" -#: ../midori/midori-view.c:3620 +#: ../midori/midori-view.c:4280 msgid "Load Page" msgstr "Seite laden" -#: ../midori/midori-view.c:3764 +#: ../midori/midori-view.c:4446 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-view.c:4018 +#: ../midori/midori-view.c:4708 msgid "_Duplicate Tab" msgstr "Reiter _verdoppeln" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4713 msgid "Show Tab _Label" msgstr "Reiterleiste anzeigen" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4713 msgid "Show Tab _Icon Only" msgstr "Nur Reiter_symbol anzeigen" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4719 msgid "Close ot_her Tabs" msgstr "Ande_re Reiter schließen" -#: ../midori/midori-view.c:4680 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5532 +msgid "previous" +msgstr "vorige" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5551 +msgid "next" +msgstr "nächste" + +#: ../midori/midori-view.c:5564 msgid "Print background images" msgstr "Hintergrundbilder drucken" -#: ../midori/midori-view.c:4681 +#: ../midori/midori-view.c:5565 msgid "Whether background images should be printed" msgstr "Sollen Hintergrundbilder gedruckt werden oder nicht" -#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:5597 msgid "Features" msgstr "Inhalte" -#. Page "General" -#: ../midori/midori-preferences.c:301 -msgid "General" -msgstr "Allgemein" - -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Programmstart" -#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "_Aktuelle Seite benutzen" + +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Aktuelle Seite als Startseite benutzen" -#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Übertragungen" - #. Page "Appearance" -#: ../midori/midori-preferences.c:352 -msgid "Appearance" -msgstr "Erscheinungsbild" - -#: ../midori/midori-preferences.c:353 -msgid "Font settings" -msgstr "Schrifteinstellungen" - -#: ../midori/midori-preferences.c:355 -msgid "Default Font Family" -msgstr "Standardschriftart" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Schriften" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Proportionale Schriftart" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "Die Standardschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "Die Standardschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Dicktengleiche Schriftart" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "Die Schriftart, in der dicktengleicher Text angezeigt wird" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" msgstr "Die Schriftgröße, in der dicktengleicher Text angezeigt wird" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Mindestschriftgröße" -#: ../midori/midori-preferences.c:374 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "Die Mindestschriftgröße, in der Text angezeigt wird" #. Page "Behavior" -#: ../midori/midori-preferences.c:383 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Verhalten" -#: ../midori/midori-preferences.c:396 -msgid "Enforce 96 dots per inch" -msgstr "96 Punkte pro Zoll erzwingen" - -#: ../midori/midori-preferences.c:397 -msgid "Enforce a video dot density of 96 DPI" -msgstr "Eine Punktdichte von 96 DPI erzwingen" - -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Skripte können Aufklappfenster öffnen" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Skripte können selbstständig neue Fenster öffnen" -#: ../midori/midori-preferences.c:422 -msgid "Spell Checking" -msgstr "Rechtschreibprüfung" - -#: ../midori/midori-preferences.c:425 -msgid "Enable Spell Checking" -msgstr "Rechtschreibprüfung einschalten" - -#: ../midori/midori-preferences.c:426 -msgid "Enable spell checking while typing" -msgstr "Rechtschreibprüfung beim Eintippen einschalten" - -#: ../midori/midori-preferences.c:428 -msgid "Spelling dictionaries:" -msgstr "Rechtschreibwörterbücher" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:432 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" -msgstr "" -"Eine durch Kommas getrennte Liste von Sprachen, die für die " -"Rechtschreibprüfung benutzt werden sollen, zum Beispiel »en_GB,de_DE«" - #. Page "Interface" -#: ../midori/midori-preferences.c:438 -msgid "Interface" -msgstr "Oberfläche" - -#: ../midori/midori-preferences.c:439 -msgid "Navigationbar" -msgstr "Navigationsleiste" - -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Navigation" -#. Page "Applications" -#: ../midori/midori-preferences.c:471 -msgid "Applications" -msgstr "Anwendungen" - -#: ../midori/midori-preferences.c:472 -msgid "External applications" -msgstr "Externe Anwendungen" - #. Page "Network" -#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "Netzwerk" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:463 msgid "Hostname" msgstr "Rechnername" -#. Page "Privacy" -#: ../midori/midori-preferences.c:514 -msgid "Privacy" -msgstr "Privatsphäre" - -#: ../midori/midori-preferences.c:515 -msgid "Web Cookies" -msgstr "Benutzerprofile" - -#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 -msgid "days" -msgstr "Tage" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "MB" -#: ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Leer" - -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Suchmaschine hinzufügen" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Suchmaschine bearbeiten" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Name:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Beschreibung:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "_Symbol:" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "_Kürzel:" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "Suchmaschinen verwalten" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "Als _Standard" -#: ../midori/sokoke.c:1303 -msgid "_Bookmark" -msgstr "_Lesezeichen" - -#: ../midori/sokoke.c:1304 -msgid "_Bookmarks" -msgstr "_Lesezeichen" - -#: ../midori/sokoke.c:1305 -msgid "Add Boo_kmark" -msgstr "Lesezeichen _hinzufügen" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "Öffnen mit" -#: ../midori/sokoke.c:1306 -msgid "_Console" -msgstr "_Konsole" - -#: ../midori/sokoke.c:1307 -msgid "_Extensions" -msgstr "_Erweiterungen" +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Anwendung oder Befehl zum Öffnen von »%s« wählen:" -#: ../midori/sokoke.c:1308 -msgid "_History" -msgstr "_Verlauf" +#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "Konnte externes Programm nicht ausführen." -#: ../midori/sokoke.c:1309 -msgid "_Homepage" -msgstr "_Startseite" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d Stunde" +msgstr[1] "%d Stunden" -#: ../midori/sokoke.c:1310 -msgid "_Userscripts" -msgstr "_Benutzerskripte" +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d Minute" +msgstr[1] "%d Minuten" -#: ../midori/sokoke.c:1311 -msgid "New _Tab" -msgstr "Neuer _Reiter" +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d Sekunde" +msgstr[1] "%d Sekunden" -#: ../midori/sokoke.c:1312 -msgid "_Transfers" -msgstr "Über_tragungen" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s von %s" -#: ../midori/sokoke.c:1313 -msgid "Netscape p_lugins" -msgstr "Netscape-Module" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/sokoke.c:1316 -msgid "New _Folder" -msgstr "Neuer _Ordner" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr " - %s verbleibend" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:201 +#: ../toolbars/midori-findbar.c:291 msgid "_Inline Find:" msgstr "_Inkrementelle Suche:" -#: ../toolbars/midori-findbar.c:233 +#: ../toolbars/midori-findbar.c:317 msgid "Previous" msgstr "Zurück" -#: ../toolbars/midori-findbar.c:239 +#: ../toolbars/midori-findbar.c:323 msgid "Next" msgstr "Weiter" -#: ../toolbars/midori-findbar.c:243 +#: ../toolbars/midori-findbar.c:327 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../toolbars/midori-findbar.c:252 +#: ../toolbars/midori-findbar.c:336 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../toolbars/midori-findbar.c:263 +#: ../toolbars/midori-findbar.c:347 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 -#, c-format -msgid "%s of %s" -msgstr "%s von %s" - -#: ../toolbars/midori-transferbar.c:123 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "Die Datei »%s« wurde heruntergeladen." -#: ../toolbars/midori-transferbar.c:126 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Übertragung abgeschlossen" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "Die heruntergeladene Datei ist fehlerhaft." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"Die im Verweis enthaltene Prüfsumme stimmt nicht überein. Das bedeutet " +"normalerweise, dass die Datei unvollständig ist oder im Nachhinein verändert " +"wurde." + +#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Alle entfernen" -#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 +#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 msgid "Some files are being downloaded" msgstr "Einige Dateien werden gerade heruntergeladen." -#: ../toolbars/midori-transferbar.c:306 +#: ../toolbars/midori-transferbar.c:377 msgid "_Quit Midori" msgstr "Midori _beenden" -#: ../toolbars/midori-transferbar.c:308 +#: ../toolbars/midori-transferbar.c:379 msgid "The transfers will be cancelled if Midori quits." msgstr "Die Übertragungen werden abgebrochen wenn Midori beendet wird." -#: ../panels/midori-bookmarks.c:116 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Lesezeichen" -#: ../panels/midori-bookmarks.c:275 +#: ../panels/midori-bookmarks.c:257 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Lesezeichen konnte nicht hinzugefügt werden: %s\n" -#: ../panels/midori-bookmarks.c:414 +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "Markiertes Lesezeichen bearbeiten" -#: ../panels/midori-bookmarks.c:422 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "Markiertes Lesezeichen löschen" -#: ../panels/midori-bookmarks.c:436 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" msgstr "Einen neuen Ordner hinzufügen" -#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:572 +#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 msgid "Separator" msgstr "Trennlinie" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "Konsole" - -#: ../panels/midori-console.c:361 -msgid "Copy _All" -msgstr "_Alle kopieren" - -#: ../panels/midori-console.c:362 -msgid "Copy All" -msgstr "Alle kopieren" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "Verlauf" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Erweiterungen" +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "Heute" -#: ../panels/midori-history.c:146 -msgid "A week ago" -msgstr "Vor einer Woche" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "Gestern" -#: ../panels/midori-history.c:148 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 #, 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:151 -msgid "Today" -msgstr "Heute" - -#: ../panels/midori-history.c:153 -msgid "Yesterday" -msgstr "Gestern" +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "Vor einer Woche" -#: ../panels/midori-history.c:324 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" msgstr "Sind Sie sicher, dass alle Verlaufseinträge entfernt werden sollen?" -#: ../panels/midori-history.c:369 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" msgstr "Lesezeichen für ausgewählten Verlaufseintrag hinzufügen" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" msgstr "Ausgewählten Verlaufseintrag löschen" -#: ../panels/midori-history.c:386 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "Den gesamten Verlauf löschen" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Übertragungen" + +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" msgstr "Zielordner ö_ffnen" -#: ../panels/midori-transfers.c:484 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" msgstr "Verweisziel ko_pieren" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Authentifizierung erforderlich" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" @@ -2261,56 +2229,80 @@ "Ein Benutzername und ein Kennwort\n" "werden zum Öffnen dieses Ortes benötigt:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "Benutzername" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "Kennwort" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "Kennwort _merken" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Das benannte Symbol »%s« konnte nicht geladen werden" -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Das Bestandssymbol »%s« konnte nicht geladen werden" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "Animationsbilder sind fehlerhaft" -#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 +#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschaft »%s« ist ungültig für %s" -#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 -#: ../extensions/addons.c:119 +#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Datei wählen" -#: ../katze/katze-utils.c:564 +#: ../katze/katze-utils.c:506 msgid "Choose folder" msgstr "Dateispeicherordner auswählen" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "Keine" + +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "1 Stunde" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "1 Tag" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "1 Woche" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "1 Monat" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "1 Jahr" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Einstellungen für %s" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:473 msgid "Configure Advertisement filters" msgstr "Werbefilter einstellen" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:504 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2320,122 +2312,132 @@ "ein und klicken Sie »Hinzufügen« um sie zur Liste hinzuzufügen. Weitere " "Listen finden Sie auf %s." -#: ../extensions/adblock.c:587 -msgid "Configure _Advertisement filters..." -msgstr "Werbefilter einstellen..." - -#: ../extensions/adblock.c:841 +#: ../extensions/adblock.c:882 msgid "Edit rule" msgstr "Regel bearbeiten" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:896 msgid "_Rule:" msgstr "_Regel:" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:950 msgid "Bl_ock image" msgstr "Bild bloc_kieren" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:955 msgid "Bl_ock link" msgstr "Verweis blo_ckieren" -#: ../extensions/adblock.c:1494 +#: ../extensions/adblock.c:1670 msgid "Advertisement blocker" msgstr "Werbeblocker" -#: ../extensions/adblock.c:1495 +#: ../extensions/adblock.c:1671 msgid "Block advertisements according to a filter list" msgstr "Werbung an Hand einer Filterliste blockieren" -#: ../extensions/addons.c:130 ../extensions/addons.c:490 +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "" +"Diese Seite enthält ein Benutzerskript. Möchten Sie dieses installieren?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "Benutzerskript _installieren" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "" +"Diese Seite enthält einen Benutzerstil. Möchten Sie diesen installieren?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "Benutzerstil _installieren" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Nicht installieren" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Benutzerskripte" -#: ../extensions/addons.c:135 ../extensions/addons.c:492 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Benutzerstile" -#: ../extensions/addons.c:191 ../extensions/addons.c:267 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Fehler" -#: ../extensions/addons.c:231 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "Soll »%s« gelöscht werden?" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "Benutzerskript löschen" -#: ../extensions/addons.c:238 +#: ../extensions/addons.c:428 msgid "Delete user style" msgstr "Benutzerstil löschen" -#: ../extensions/addons.c:242 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." msgstr "Die Datei »%s« wird endgültig gelöscht." -#: ../extensions/addons.c:377 ../extensions/addons.c:454 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "In Texteditor öffnen" -#: ../extensions/addons.c:379 ../extensions/addons.c:463 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Zielordner öffnen" -#: ../extensions/addons.c:445 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "Eine neue Erweiterung hinzufügen" -#: ../extensions/addons.c:472 -msgid "Open target folder for selected addon" -msgstr "Zielordner für die ausgewählte Erweiterung öffnen" - -#: ../extensions/addons.c:473 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "Ausgewählte Erweiterung löschen" -#: ../extensions/addons.c:1420 -#, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "" -"Die Konfiguration der Erweiterung »%s« konnte nicht gespeichert werden: %s\n" - -#: ../extensions/addons.c:1421 ../extensions/addons.c:1586 +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" msgstr "Benutzererweiterungen" -#: ../extensions/addons.c:1543 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Der Ordner »%s« kann nicht überwacht werden: %s" -#: ../extensions/addons.c:1587 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" msgstr "Unterstützung für Benutzerskripte und -stile" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "Farbige Reiter" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Alle Reiter unterschiedlich einfärben" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Cookieverwaltung" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "Alle löschen" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 +#: ../extensions/cookie-manager/cookie-manager-page.c:105 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." @@ -2443,32 +2445,32 @@ "Sichtbare Profildateien löschen. Wenn ein Filter gesetzt ist werden nur jene " "Einträge gelöscht, die auf den Filter passen" -#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "Alle ausklappen" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "Alle einklappen" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" msgstr "Sind Sie sicher, dass alle Profildateien entfernt werden sollen?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Frage" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." msgstr "" "Nur Profildateien, die auf den eingegebenen Filter passen, werden gelöscht." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "Am Ende der Sitzung" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2485,15 +2487,15 @@ "Sicher: %s\n" "Verfällt: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Ja" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "Nein" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" @@ -2502,23 +2504,23 @@ "Domäne: %s\n" "Profildateien: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Name" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "Alle _ausklappen" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "Alle _einklappen" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 msgid "Filter:" msgstr "Filter:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "" "Enter a filter string to show only cookies whose name or domain field match " "the entered filter" @@ -2526,34 +2528,22 @@ "Gib einen Filter ein, um nur Profildateien anzuzeigen, deren Name oder " "Domöne auf den eingegebenen Filter passt." -#: ../extensions/cookie-manager/main.c:40 -msgid "_Cookie Manager" -msgstr "_Cookieverwaltung" - -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Profildateien auflisten, anzeigen und löschen" -#: ../extensions/copy-tabs.c:39 +#: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" msgstr "_Adressen aller Reiter kopieren" -#: ../extensions/copy-tabs.c:98 +#: ../extensions/copy-tabs.c:95 msgid "Copy Addresses of Tabs" msgstr "Adressen aller Reiter kopieren" -#: ../extensions/copy-tabs.c:99 +#: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Die Adressen aller Reiter in die Zwischenablage kopieren" -#: ../extensions/external-applications.vala:93 -msgid "External Applications" -msgstr "Externe Anwendungen" - -#: ../extensions/external-applications.vala:94 -msgid "Associate URL schemes with external commands" -msgstr "URL-Schemata mit Anwendungen verknüpfen" - #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "" @@ -2565,25 +2555,25 @@ "Die für Atom benötigten \"feed\"-Elemente wurden im XML nicht gefunden." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Zuletzt aktualisiert: %s." -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "Nachrichtenquellen" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "Eine neue Nachrichtenquelle hinzufügen" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "Nachrichtenquelle löschen" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "_Nachrichtenquellen (Feeds)" @@ -2630,187 +2620,693 @@ msgid "Error loading feed '%s'" msgstr "Fehler beim Laden der Nachrichtenquelle »%s«" -#: ../extensions/feed-panel/main.c:520 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "Nachrichtenquellenleiste" -#: ../extensions/feed-panel/main.c:521 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Atom-/ RSS-Quellen (Feeds) lesen" -#: ../extensions/formhistory.c:142 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" msgstr "Formularfeld konnte nicht hinzugefügt werden: %s\n" -#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "Chronik bilden" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Ein Benutzername und ein Kennwort\n" +"werden zum Öffnen dieses Ortes benötigt:" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "Passwort auf dieser Seite merken?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Merken" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "Jetzt nicht" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Niemals für diese Seite" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "Seiten aus dem Verlauf löschen nach:" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "" +"Speichern von Formulardaten für den aktuellen Reiter aktivieren oder " +"deaktivieren" + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n" -#: ../extensions/formhistory.c:503 +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" +"Speichern von Formuardaten pro Reiter nur per Tastenkombination (Strg+Shirt" +"+F)" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "Formularvervollständigung" + +#: ../extensions/formhistory/formhistory.c:669 msgid "Stores history of entered form data" msgstr "Speichert zuvor eingegebene Formulareingaben" -#: ../extensions/formhistory.c:507 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 #, c-format -msgid "Not available: %s" -msgstr "Nicht verfügbar: %s" +msgid "Failed to select suggestions\n" +msgstr "Vervollständigung schlug fehl\n" -#: ../extensions/formhistory.c:508 -msgid "Resource files not installed" -msgstr "Konfigurationsdateien nicht installiert" +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Keine unbesuchten Reiter vorhanden." -#: ../extensions/formhistory.c:514 -msgid "Form history filler" -msgstr "Formularvervollständigung" +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "Verlaufsliste" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Verhalten beim Schließen von Reitern" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Nichts tun" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Zum letzten Reiter wechseln" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Zum nächsten neuen Reiter wechseln" -#: ../extensions/history-list.vala:174 -msgid "Next Tab (History List)" -msgstr "Nächster Reiter (Verlaufsgestützte Liste)" - -#: ../extensions/history-list.vala:175 -msgid "Next tab from history" -msgstr "Nächster Reiter aus dem Verlauf" - -#: ../extensions/history-list.vala:184 -msgid "Previous Tab (History List)" -msgstr "Voheriger Reiter (Verlaufsgestützte Liste)" - -#: ../extensions/history-list.vala:185 -msgid "Previous tab from history" -msgstr "Voheriger Reiter aus dem Verlauf" +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Nächster neuer Reiter (Verlaufsgestützte Liste)" -#: ../extensions/history-list.vala:245 +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Nächster neuer Reiter aus dem Verlauf" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Voheriger neuer Reiter (Verlaufsgestützte Liste)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Voheriger neuer Reiter aus dem Verlauf" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Reiter in Hintergrund anzeigen (Verlaufsliste)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Aktuell ausgewählten Reiter im Hintergrund anzeigen" + +#: ../extensions/history-list.vala:569 msgid "History List" msgstr "Verlaufsgestützte Liste" -#: ../extensions/history-list.vala:246 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Reiter anhand einer nach Nutzung sortierten Liste wechseln" +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "" +"Beim Wechseln oder Schließen von Reitern zum zuletzt genutzten Reiter " +"wechseln" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Mausgesten" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Steuere Midori durch Bewegen der Maus" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 -msgid "Pageholder" -msgstr "Seitenhalter" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "_Seitenhalter" - -#: ../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:109 +msgid "Reload page or stop loading" +msgstr "Seite neu laden oder laden abbrechen" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "Tastaturkürzel anpassen" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "Tastaturkürzel anpassen..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Tastaturkürzel" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "Tastaturkürzel ansehen und bearbeiten" -#: ../extensions/status-clock.c:176 +#: ../extensions/status-clock.c:174 msgid "Statusbar Clock" -msgstr "Uhr in der Statusbar" +msgstr "Uhr in der Statusleiste" -#: ../extensions/status-clock.c:177 +#: ../extensions/status-clock.c:175 msgid "Display date and time in the statusbar" -msgstr "Datum und Zeit in der Statusbar anzeigen" +msgstr "Datum und Zeit in der Statusleiste anzeigen" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Bilder" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Skripte" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Netscape-Module" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "Funktionen in der Statusleiste" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" msgstr "Funktionen auf Internetseiten leicht an- und abstellen" -#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Reiterleiste" -#: ../extensions/tab-panel.c:612 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "_Reiterleiste" -#: ../extensions/tab-panel.c:629 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Reiter in einer senkrechten Leiste anzeigen" -#: ../extensions/tabs-minimized.c:79 +#: ../extensions/tabs-minimized.c:76 msgid "Only Icons on Tabs by default" msgstr "Nur Symbole in Reitern anzeigen" -#: ../extensions/tabs-minimized.c:80 +#: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" msgstr "Neue Reiter haben keine Beschriftung" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Werkzeugleiste anpassen" -#: ../extensions/toolbar-editor.c:405 +#: ../extensions/toolbar-editor.c:409 msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " +"Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" "Wähle Elemente, die in der Werkzeugleiste erscheinen sollen. Elemente lassen " "sich durch Ziehen und Ablegen ordnen." -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Verfügbare Elemente" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Angezeigte Elemente" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "_Werkzeugleiste anpassen..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Anpassen…" + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" msgstr "Werkzeugleisteneditor" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" msgstr "Werkzeugleisten leicht anpassen" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern" -#, fuzzy +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "Der angegebene Konfigurationsordner konnte nicht geladen werden." + +#~ msgid "Cookies" +#~ msgstr "Benutzerprofile/ Cookies" + +#~ msgid "'Flash' Cookies" +#~ msgstr "»Flash« Cookies" + +#~ msgid "HTML5 _Databases" +#~ msgstr "HTML5-_Datenbanken" + +#~ msgid "Offline Application Cache" +#~ msgstr "HTML5-Anwendungsspeicher" + +#~ msgid "Lightweight web browser" +#~ msgstr "Schlanker Internetbetrachter" + +#~ msgid "Not available: %s" +#~ msgstr "Nicht verfügbar: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "Konfigurationsdateien nicht installiert" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "Keinerlei private Daten während des Surfens speichern" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Eine Verknüpfung zur Schnellwahl hinzufügen" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Eine Verknüpfung auf dem Schreibtisch hinzufügen" + +#~ msgid "Create a launcher" +#~ msgstr "Starter erstellen" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "Diese Nachrichtenquelle abonnieren" + +#~ msgid "Close this window" +#~ msgstr "Dieses Fenster schließen" + +#~ msgid "Close all open windows" +#~ msgstr "Alle offenen Fenster schließen" + +#~ msgid "Undo the last modification" +#~ msgstr "Letzte Änderung rückgängig machen" + +#~ msgid "Redo the last modification" +#~ msgstr "Die letzte Ä_nderung rückgängig machen" + +#~ msgid "Cut the selected text" +#~ msgstr "Markierten Text ausschneiden" + +#~ msgid "Copy the selected text" +#~ msgstr "Markierten Text kopieren" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "Text aus der Zwischenablage einfügen" + +#~ msgid "Delete the selected text" +#~ msgstr "Markierten Text löschen" + +#~ msgid "Select all text" +#~ msgstr "Gesamten Text auswählen" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" + +#~ msgid "Reset the zoom level" +#~ msgstr "Setzte die Vergrößerungsstufe zurück" + +#~ msgid "View the source code of the page" +#~ msgstr "Zeige den Quelltext der Seite an" + +#~ msgid "Scroll to the left" +#~ msgstr "Nach links rollen" + +#~ msgid "Scroll down" +#~ msgstr "Herunter rollen" + +#~ msgid "Scroll up" +#~ msgstr "Hoch rollen" + +#~ msgid "Scroll to the right" +#~ msgstr "Nach rechts rollen" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "Inhalt des Papierkorbs löschen" + +#~ msgid "Open the last closed tab" +#~ msgstr "Zuletzt geschlossenen Reiter öffnen" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Einen neuen Lesezeichenordner hinzufügen" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" + +#~ msgid "Clear private data..." +#~ msgstr "Private Daten löschen..." + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "" +#~ "Einzelheiten der Seite untersuchen und Entwicklerwerkzeuge benutzen..." + +#~ msgid "Switch to the previous tab" +#~ msgstr "Zum voherigen Reiter wechseln" + +#~ msgid "Switch to the next tab" +#~ msgstr "Zum nächsten Reiter wechseln" + +#~ msgid "Move tab behind the previous tab" +#~ msgstr "Reiter hinter den voherigen schieben" + +#~ msgid "Move tab in front of the next tab" +#~ msgstr "Reiter vor den nächsten schieben" + +#~ msgid "Focus the current tab" +#~ msgstr "Den aktuellen Reiter fokussieren" + +#~ msgid "Cycle focus between views" +#~ msgstr "Fokus zwischen Ansichten wechseln" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Nur das Symbol des aktuellen Reiters anzeigen" + +#~ msgid "Duplicate the current tab" +#~ msgstr "Den aktuellen Reiter verdoppeln" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Alle Reiter, bis auf den aktuellen Reiter schließen" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "In der letzten Sitzung geöffnete Reiter öffnen" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Häufig gestellte Fragen anzeigen" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Midoris Fehlerverfolgung öffnen" + +#~ msgid "Show information about the program" +#~ msgstr "Zeige Informationen über das Programm" + +#~ msgid "Show menubar" +#~ msgstr "Menüleiste anzeigen" + +#~ msgid "Show navigationbar" +#~ msgstr "Navigationsleiste anzeigen" + +#~ msgid "Show sidepanel" +#~ msgstr "Seitenleiste anzeigen" + +#~ msgid "Show bookmarkbar" +#~ msgstr "Lesezeichenleiste anzeigen" + +#~ msgid "Show statusbar" +#~ msgstr "Statusleiste anzeigen" + +#~ msgid "MD5-Checksum:" +#~ msgstr "MD5-Prüfsumme:" + +#~ msgid "SHA1-Checksum:" +#~ msgstr "SHA1-Prüfsumme:" + +#~ msgid "No filename specified" +#~ msgstr "Kein Dateiname angegeben" + +#~ msgid "Set number of columns and rows" +#~ msgstr "Anzahl Spalten und Zeilen ändern" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Anzahl an Spalten und Zeilen eingeben:" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "Ungültige Eingabe für die Größe der Schnellwahl" + +#~ msgid "Thumb size:" +#~ msgstr "Vorschaubildgröße:" + +#~ msgid "Small" +#~ msgstr "Klein" + +#~ msgid "Medium" +#~ msgstr "Mittel" + +#~ msgid "Big" +#~ msgstr "Groß" + +#~ msgid "Reset the last _session" +#~ msgstr "Die letzte _Sitzung zurücksetzen" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Werbefilter einstellen..." + +#~ msgid "Not found - %s" +#~ msgstr "Nicht gefunden - %s" + +#~ msgid "Document cannot be displayed" +#~ msgstr "Dokument kann nicht angezeigt werden" + +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "96 Punkte pro Zoll erzwingen" + +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "Eine Punktdichte von 96 DPI erzwingen" + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "Reiter mit Strg+Tab nach Nutzung wechseln" + +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "Alte Cookies nach 1 Stunde löschen" + +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "Alte Cookies after 1 Woche löschen" + +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "Alte Cookies nach 1 Monat löschen" + +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "Alte Cookies nach 1 Jahr löschen" + +#~ msgid "All cookies" +#~ msgstr "Alle Profildateien" + +#~ msgid "Session cookies" +#~ msgstr "Sitzungsprofile" + +#~ msgid "Show Transferbar" +#~ msgstr "Übertragungsleiste anzeigen" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "Die Übertragungsleiste anzeigen oder verbergen" + +#~ msgid "Search engines in location completion" +#~ msgstr "Suchmaschinen in Vervollständigung" + +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "Verfügbare Suchmaschinen in der Adressvervollständigung anzeigen" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "Bedienelemente der Leiste anzeigen" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "Die Bedienelemente der Leiste anzeigen oder verbergen" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Schnellwahl in neuen Reitern anzeigen" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Schnellwahl in neu geöffneten Reitern anzeigen" + +#~ msgid "Download Manager" +#~ msgstr "Übertragungsmanager" + +#~ msgid "An external download manager" +#~ msgstr "Ein externer Übertragungsmanager" + +#~ msgid "Open external pages in:" +#~ msgstr "Öffne Seiten von außerhalb in:" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "Wo Seiten von außerhalb geöffnet werden sollen" + +#~ msgid "Accept cookies" +#~ msgstr "Cookies annehmen" + +#~ msgid "What type of cookies to accept" +#~ msgstr "Welche Art von Profildateien (Cookies) angenommen werden" + +#~ msgid "Maximum cookie age" +#~ msgstr "Maximales Alter von Cookiedaten" + +#~ msgid "Maximum history age" +#~ msgstr "Maximales Verlaufsalter" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Zuletzt heruntergeladene Dateien merken" + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "Die zuletzt heruntegeladenen Dateien speichern" + +#~ msgid "Appearance" +#~ msgstr "Erscheinungsbild" + +#~ msgid "Web Cookies" +#~ msgstr "Benutzerprofile" + +#~ msgid "General" +#~ msgstr "Allgemein" + +#~ msgid "Font settings" +#~ msgstr "Schrifteinstellungen" + +#~ msgid "Navigationbar" +#~ msgstr "Navigationsleiste" + +#~ msgid "Interface" +#~ msgstr "Oberfläche" + +#~ msgid "Applications" +#~ msgstr "Anwendungen" + +#~ msgid "External applications" +#~ msgstr "Externe Anwendungen" + +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "Cookies beim Beenden von Midori löschen" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "Datenbankabfrage konnte nicht ausgeführt werden\n" + +#~ msgid "%s of %s, %s/s" +#~ msgstr "%s von %s, %s/s" + +#~ msgid "Open target folder for selected addon" +#~ msgstr "Zielordner für die ausgewählte Erweiterung öffnen" + +#~ msgid "Next Tab (History List)" +#~ msgstr "Nächster Reiter (Verlaufsgestützte Liste)" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "Voheriger Reiter (Verlaufsgestützte Liste)" + +#~ msgid "Previous tab from history" +#~ msgstr "Voheriger Reiter aus dem Verlauf" + +#~ msgid "Quit the application" +#~ msgstr "Programm beenden" + +#~ msgid "Show Blank page" +#~ msgstr "Leere Seite anzeigen" + +#~ msgid "Download with Download _Manager" +#~ msgstr "Mit Übertragungs_manager herunterladen" + +#~ msgid "Pageholder" +#~ msgstr "Seitenhalter" + +#~ msgid "_Pageholder" +#~ msgstr "_Seitenhalter" + +#~ msgid "Keep one or multiple pages open in parallel to your tabs" +#~ msgstr "Eine oder mehrere Seiten gleichzeitig mit den Reitern offen lassen." + +#~ msgid "_Contents" +#~ msgstr "_Inhalt" + +#~ msgid "Show the documentation" +#~ msgstr "Zeige die Dokumentation" + +#~ msgid "_Save Link destination" +#~ msgstr "Verweisziel _speichern" + +#~ msgid "_Download Link destination" +#~ msgstr "Verweisziel herunter_laden" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% geladen" + +#~ msgid "_Transferbar" +#~ msgstr "_Übertragungsleiste" + +#~ msgid "Show transferbar" +#~ msgstr "Übertragungsleiste anzeigen" + +#~ msgid "Show progress in location entry" +#~ msgstr "Fortschritt im Adressfeld anzeigen" + +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "Aktuellen Ladefortschritt im Adressfeld anzeigen" + +#~ msgid "Ask for the destination folder" +#~ msgstr "Nach dem Zielordner fragen" + +#~ msgid "Whether to ask for the destination folder when downloading a file" +#~ msgstr "Beim Herunterladen einer Datei nach dem Zielordner fragen" + +#~ msgid "Whether to show a notification when a transfer has been completed" +#~ msgstr "" +#~ "Eine Benachrichtigung anzeigen wenn eine Übertragung abgeschlossen wurde" + +#~ msgid "Download I_mage" +#~ msgstr "Bild herunterla_den" + +#~ msgid "Failed to clear search history: %s\n" +#~ msgstr "Suchverlauf konnte nicht geleert werden: %s\n" + +#~ msgid "Detach chosen panel from the window" +#~ msgstr "Gewählte Leiste vom Fenster ablösen" + +#~ msgid "Hide operating controls" +#~ msgstr "Bedienelemente anzeigen" + +#~ msgid "Spell Checking" +#~ msgstr "Rechtschreibprüfung" + +#~ msgid "" +#~ "A comma separated list of languages to be used for spell checking, for " +#~ "example \"en_GB,de_DE\"" +#~ msgstr "" +#~ "Eine durch Kommas getrennte Liste von Sprachen, die für die " +#~ "Rechtschreibprüfung benutzt werden sollen, zum Beispiel »en_GB,de_DE«" + +#~ msgid "Minimize _Current Tab" +#~ msgstr "Aktuellen Reiter _Minimieren" + +#~ msgid "Minimize the current tab" +#~ msgstr "Den aktuellen Reiter minimieren" + +#~ msgid "Spelling dictionaries:" +#~ msgstr "Rechtschreibwörterbücher" + +#~ msgid "Console" +#~ msgstr "Konsole" + +#~ msgid "Copy _All" +#~ msgstr "_Alle kopieren" + +#~ msgid "Copy All" +#~ msgstr "Alle kopieren" + +#~ msgid "_Cookie Manager" +#~ msgstr "_Cookieverwaltung" + +#~ msgid "External Applications" +#~ msgstr "Externe Anwendungen" + +#~ msgid "Associate URL schemes with external commands" +#~ msgstr "URL-Schemata mit Anwendungen verknüpfen" + #~ msgid "" #~ "Do you really want to remove '%s'?\n" #~ "\n" @@ -2829,9 +3325,6 @@ #~ msgid "Original cookies only" #~ msgstr "Nur ursprüngliche Profildateien" -#~ msgid "Accept cookies from the original website only" -#~ msgstr "Nur Profildateien von der ursprünglichen Seite annehmen" - #~ msgid "Remember last visited pages" #~ msgstr "Zuletzt besuchte Seiten merken" @@ -2866,9 +3359,6 @@ #~ msgid "New tabs open minimized" #~ msgstr "Neue Reiter werden minimiert geöffnet" -#~ msgid "Show the saved bookmarks" -#~ msgstr "Die gespeicherten Lesezeichen anzeigen" - #~ msgid "Set number of shortcuts" #~ msgstr "Anzahl Verknüpfungen ändern" @@ -2911,9 +3401,6 @@ #~ msgid "Enable special extensions for developers" #~ msgstr "Besondere Erweiterungen für Entwickler einschalten" -#~ msgid "DNS prefetching" -#~ msgstr "DNS-Auflösung im Voraus" - #~ msgid "Prefetch IP addresses of hovered links" #~ msgstr "Ermitteln der IP-Adressen von Verweisen im Voraus" @@ -2944,9 +3431,6 @@ #~ msgid "The character encoding to use by default" #~ msgstr "Der voreingestellte Zeichensatz" -#~ msgid "MB" -#~ msgstr "MB" - #~ msgid "User_styles" #~ msgstr "Benutzer_stile" @@ -2956,12 +3440,6 @@ #~ msgid "Whether text areas are resizable" #~ msgstr "Sollen Textfelder vergrößerbar sein oder nicht" -#~ msgid "_Closed Tabs and Windows" -#~ msgstr "_Geschlossene Reiter und Fenster" - -#~ msgid "Last open pages" -#~ msgstr "Zuletzt geöffnete Seiten" - #~ msgid "Both" #~ msgstr "Beides" diff -Nru midori-0.2.8/po/el.po midori-0.4.6/po/el.po --- midori-0.2.8/po/el.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/el.po 2012-05-14 22:13:42.000000000 +0000 @@ -2,2298 +2,2229 @@ # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Evaggelos Balaskas 2008-2009 +# Efstathios Iosifidis , 2012. +# msgid "" msgstr "" "Project-Id-Version: midori git version\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-27 20:54+0300\n" -"PO-Revision-Date: 2010-07-27 20:57+0200\n" -"Last-Translator: Evaggelos Balaskas \n" -"Language-Team: Greek \n" +"POT-Creation-Date: 2012-04-18 18:18+0000\n" +"PO-Revision-Date: 2012-04-18 21:44+0300\n" +"Last-Translator: Efstathios Iosifidis \n" +"Language-Team: Ελληνικά, Σύγχρονα \n" "Language: el\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" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Poedit-Language: Greek\n" "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-Country: GREECE\n" "X-Generator: Lokalize 0.2\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Ελαφρύς περιηγητής ιστού" +msgid "Browse the Web" +msgstr "Αναζήτηση στον Ιστό" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1298 -#: ../midori/main.c:1627 -#: ../midori/main.c:1635 -#: ../midori/main.c:1651 -#: ../midori/midori-websettings.c:310 +#, fuzzy +msgid "Internet;WWW;Explorer" +msgstr "Internet Explorer" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072 +#: ../midori/main.c:2086 ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Μιντόρι" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Περιηγητής Ιστού" -#: ../midori/main.c:99 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Ιδιωτική περιήγηση Midori" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Άνοιγμα ενός νέου παραθύρου ιδιωτικής περιήγησης" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164 +msgid "Private Browsing" +msgstr "Ιδιωτική περιήγηση" + +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Οι ρυθμίσεις δεν μπορούν να φορτωθούν: %s\n" -#: ../midori/main.c:148 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Η τιμή '%s' δεν είναι έγκυρη για το %s" -#: ../midori/main.c:155 -#: ../midori/main.c:241 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr "Μη έγκυρη τιμή ρύθμισης '%s'" -#: ../midori/main.c:368 -#: ../midori/main.c:441 -#: ../extensions/formhistory.c:440 +#: ../midori/main.c:380 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Οι μηχανές αναζήτησης δεν μπόρεσαν να φορτωθούν. %s\n" + +#: ../midori/main.c:434 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Αποτυχία κατά τον καθαρισμό του ιστορικού: %s\n" + +#: ../midori/main.c:454 ../midori/main.c:581 +#: ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" msgstr "Αποτυχία κατά το άνοιγμα της βάσης: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:424 +#: ../midori/main.c:524 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Αποτυχία στην διαγραφή των παλιών αντικειμένων από το ιστορικό: %s\n" -#: ../midori/main.c:467 +#: ../midori/main.c:564 ../panels/midori-history.c:232 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Αποτυχία στην διαγραφή του αντικειμένου από το ιστορικό: %s\n" + +#: ../midori/main.c:611 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Οι σελιδοδείκτες δεν μπόρεσαν να αποθηκευτούν. %s" -#: ../midori/main.c:498 +#: ../midori/main.c:633 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Οι ρυθμίσεις δεν μπορούν να αποθηκευτούν. %s" -#: ../midori/main.c:536 +#: ../midori/main.c:668 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Οι μηχανές αναζήτησης δεν μπόρεσαν να αποθηκευτούν. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:556 -#: ../midori/main.c:579 +#: ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Τα απορρίμματα δεν μπόρεσαν να αποθηκευτούν. %s" -#: ../midori/main.c:638 -#: ../midori/main.c:878 +#: ../midori/main.c:746 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Επεκτάσεις" + +#: ../midori/main.c:760 +msgid "Privacy" +msgstr "Προσωπικό απόρρητο" + +#: ../midori/main.c:772 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"Τα cookies αποθηκεύουν δεδομένα σύνδεσης, αποθηκεύουν παιχνίδια ή προφίλ " +"χρηστών για διαφημιστικούς λόγους." + +#: ../midori/main.c:828 #, c-format msgid "The session couldn't be saved. %s" msgstr "Η συνεδρία δεν μπόρεσε να αποθηκευτεί. %s" -#: ../midori/main.c:822 -msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "Δεν είναι διαθέσιμο κανένα πιστοποιητικό ρίζας. Πιστοποιητικά SSL δεν μπορούν να επιβεβαιωθούν." - -#: ../midori/main.c:912 -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:1046 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" +"Δεν είναι διαθέσιμο κανένα πιστοποιητικό ρίζας. Πιστοποιητικά SSL δεν " +"μπορούν να επιβεβαιωθούν." -#: ../midori/main.c:927 +#: ../midori/main.c:1115 +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:1134 msgid "Modify _preferences" msgstr "Τροποποίηση _προτιμήσεων" -#: ../midori/main.c:931 -msgid "Reset the last _session" -msgstr "Επαναφορά της τελευταίας σ_υνεδρίας" - -#: ../midori/main.c:936 +#: ../midori/main.c:1138 msgid "Disable all _extensions" msgstr "Απενεργοποίηση όλων των επ_εκτάσεων" -#: ../midori/main.c:1176 -#: ../midori/main.c:1920 +#: ../midori/main.c:1151 +msgid "Discard old tabs" +msgstr "Απόρριψη παλιών καρτελών" + +#: ../midori/main.c:1152 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "Εμφάνιση των τελευταίων καρτέλων χωρίς φόρτωση" + +#: ../midori/main.c:1153 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "Εμφάνιση των τελευταίων ανοιχτών καρτελών" + +#: ../midori/main.c:1400 ../midori/main.c:2464 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Η συνεδρία δεν μπορεί να φορτωθεί: %s\n" -#: ../midori/main.c:1298 -msgid "No filename specified" -msgstr "Δεν ορίστηκε όνομα αρχείου" - -#: ../midori/main.c:1317 -msgid "An unknown error occured." -msgstr "Συνέβη ένα άγνωστο σφάλμα." - -#: ../midori/main.c:1348 +#: ../midori/main.c:1538 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Το στιγμιότυπο αποθηκεύτηκε στο: %s\n" -#: ../midori/main.c:1520 +#: ../midori/main.c:1951 msgid "Run ADDRESS as a web application" msgstr "Άνοιγμα της διεύθυνσης ως διαδικτυακή εφαρμογή" -#: ../midori/main.c:1520 +#: ../midori/main.c:1951 msgid "ADDRESS" msgstr "Διεύθυνση" -#: ../midori/main.c:1523 +#: ../midori/main.c:1954 msgid "Use FOLDER as configuration folder" msgstr "Χρήση φακέλου ως φάκελος ρύθμισης" -#: ../midori/main.c:1523 +#: ../midori/main.c:1954 msgid "FOLDER" msgstr "ΦΑΚΕΛΟΣ" -#: ../midori/main.c:1526 +#: ../midori/main.c:1957 +msgid "Private browsing, no changes are saved" +msgstr "Ιδιωτική περιήγηση, οι τροποποιήσεις δεν αποθηκεύονται" + +#: ../midori/main.c:1959 msgid "Show a diagnostic dialog" msgstr "Εμφάνιση του διαλόγου διάγνωσης" -#: ../midori/main.c:1528 +#: ../midori/main.c:1961 msgid "Run the specified filename as javascript" msgstr "Τρέξε το συγκεκριμένο όνομα αρχείου ως javascript" -#: ../midori/main.c:1531 +#: ../midori/main.c:1963 msgid "Take a snapshot of the specified URI" msgstr "Αποθήκευση του συγκεκριμένου URI" -#: ../midori/main.c:1534 +#: ../midori/main.c:1965 msgid "Execute the specified command" msgstr "Εκτέλεση της συγκεκριμένης εντολής" -#: ../midori/main.c:1536 +#: ../midori/main.c:1967 +msgid "List available commands to execute with -e/ --execute" +msgstr "Εμφάνιση των διαθέσιμων εντολών προς εκτέλεση με e-/ --execute" + +#: ../midori/main.c:1969 msgid "Display program version" msgstr "Προβολή έκδοσης προγράμματος" -#: ../midori/main.c:1538 +#: ../midori/main.c:1971 msgid "Addresses" msgstr "Διευθύνσεις" -#: ../midori/main.c:1540 +#: ../midori/main.c:1973 msgid "Block URIs according to regular expression PATTERN" msgstr "Εμπόδισε URIs σύμφωνα με την κανονική έκφραση ΜΟΤΙΒΟ" -#: ../midori/main.c:1540 +#: ../midori/main.c:1973 msgid "PATTERN" msgstr "ΜΟΤΙΒΟ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1544 +#: ../midori/main.c:1977 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Επαναφορά midori μετά από SECONDS δευτερόλεπτα απραγίας" -#: ../midori/main.c:1544 +#: ../midori/main.c:1977 msgid "SECONDS" msgstr "ΔΕΥΤΕΡΟΛΕΠΤΑ" -#: ../midori/main.c:1624 +#: ../midori/main.c:1980 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Ανακατεύθυνση μηνυμάτων κονσόλας στο συγκεκριμένο ΑΡΧΕΙΟ" + +#: ../midori/main.c:1980 +msgid "FILENAME" +msgstr "ΟΝΟΜΑ ΑΡΧΕΙΟΥ" + +#: ../midori/main.c:2045 msgid "[Addresses]" msgstr "[Διευθύνσεις" -#: ../midori/main.c:1652 +#: ../midori/main.c:2087 msgid "Please report comments, suggestions and bugs to:" msgstr "Παρακαλώ αναφέρατε σχόλια, προτάσεις και σφάλματα στο:" -#: ../midori/main.c:1654 +#: ../midori/main.c:2089 msgid "Check for new versions at:" msgstr "Έλεγχος για νέα έκδοση στο:" -#: ../midori/main.c:1769 -msgid "The specified configuration folder is invalid." -msgstr "Η συγκεκριμένη ρύθμιση φακέλου είναι άκυρη." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2173 +msgid "Saved logins and _passwords" +msgstr "Αποθηκευμένες συνδέσεις και _συνθηματικά" + +#: ../midori/main.c:2175 +msgid "Cookies and Website data" +msgstr "" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2179 ../midori/midori-websettings.c:996 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Προσωρινής μνήμης ιστού" + +#: ../midori/main.c:2182 +msgid "Website icons" +msgstr "Εικονίδια ιστότοπων" + +#: ../midori/main.c:2288 +msgid "An unknown error occured" +msgstr "Ένα άγνωστο σφάλμα προέκυψε" -#: ../midori/main.c:1817 +#: ../midori/main.c:2395 msgid "An instance of Midori is already running but not responding.\n" msgstr "Ένα στιγμιότυπο του Μιντόρι τρέχει ήδη αλλά δεν ανταποκρίνεται.\n" -#: ../midori/main.c:1872 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "Οι μηχανές αναζήτησης δεν μπόρεσαν να φορτωθούν. %s\n" - -#: ../midori/main.c:1893 +#: ../midori/main.c:2431 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Οι σελιδοδείκτες δεν μπορούν να φορτωθούν: %s\n" -#: ../midori/main.c:1935 +#: ../midori/main.c:2479 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Τα απορρίμματα δεν μπόρεσαν να φορτωθούν: %s\n" -#: ../midori/main.c:1948 +#: ../midori/main.c:2492 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Το ιστορικό δεν μπόρεσε να φορτωθεί: %s\n" -#: ../midori/main.c:1962 +#: ../midori/main.c:2508 msgid "The following errors occured:" msgstr "Δημιουργήθηκαν τα ακόλουθα σφάλματα:" -#: ../midori/main.c:1978 +#: ../midori/main.c:2524 msgid "_Ignore" msgstr "Α_γνόησε" -#: ../midori/midori-array.c:429 +#: ../midori/midori-app.c:1334 +msgid "_Bookmark" +msgstr "_Σελιδοδείκτης" + +#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6073 +msgid "_Bookmarks" +msgstr "_Σελιδοδείκτες" + +#: ../midori/midori-app.c:1336 +msgid "Add Boo_kmark" +msgstr "Προσθήκη σ_ελιδοδείκτη" + +#: ../midori/midori-app.c:1337 +msgid "_Console" +msgstr "_Τερματικό" + +#: ../midori/midori-app.c:1338 +msgid "_Extensions" +msgstr "_Επεκτάσεις" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4600 +msgid "_History" +msgstr "_Ιστορικό" + +#: ../midori/midori-app.c:1340 +msgid "_Homepage" +msgstr "_Αρχική σελίδα" + +#: ../midori/midori-app.c:1341 +msgid "_Userscripts" +msgstr "_Δέσμες εντολών χρήστη" + +#: ../midori/midori-app.c:1342 +msgid "New _Tab" +msgstr "Νέα _καρτέλα" + +#: ../midori/midori-app.c:1343 +msgid "_Transfers" +msgstr "_Μεταφορές" + +#: ../midori/midori-app.c:1344 +msgid "Netscape p_lugins" +msgstr "Α_ρθρωμάτων netscape" + +#: ../midori/midori-app.c:1345 +msgid "_Closed Tabs" +msgstr "_Κλειστές καρτέλες" + +#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5229 +msgid "New _Window" +msgstr "Νέο _παράθυρο" + +#: ../midori/midori-app.c:1347 +msgid "New _Folder" +msgstr "Νέος _φάκελος" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "Το αρχείο δεν βρέθηκε." -#: ../midori/midori-array.c:463 -#: ../midori/midori-array.c:486 -#: ../midori/midori-array.c:496 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Κακοσχηματισμένο έγγραφο." -#: ../midori/midori-array.c:505 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "Άγνωστος τύπος συνδέσμου." -#: ../midori/midori-array.c:719 +#: ../midori/midori-array.c:915 msgid "Writing failed." msgstr "Αποτυχία εγγραφής." -#: ../midori/midori-browser.c:337 -#: ../midori/midori-browser.c:4929 -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5311 +#: ../midori/midori-browser.c:5320 msgid "Reload the current page" msgstr "Ανανέωση της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:347 -#: ../midori/midori-browser.c:4932 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:5317 msgid "Stop loading the current page" msgstr "Σταμάτημα φόρτωσης της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:461 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% φορτώθηκε" - -#: ../midori/midori-browser.c:500 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" msgstr "Αποτυχία κατά την ανανέωση του τίτλου: %s\n" -#: ../midori/midori-browser.c:513 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." msgstr "Αναπάντεχη ενέργεια '%s'." -#: ../midori/midori-browser.c:739 +#: ../midori/midori-browser.c:579 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Ιδιωτική περιήγηση)" + +#: ../midori/midori-browser.c:693 ../midori/midori-browser.c:726 +msgid "Toplevel folder" +msgstr "Αρχικός φάκελος" + +#: ../midori/midori-browser.c:784 msgid "New folder" msgstr "Νέος φάκελος" -#: ../midori/midori-browser.c:739 +#: ../midori/midori-browser.c:784 msgid "Edit folder" msgstr "Επεξεργασία φακέλου" -#: ../midori/midori-browser.c:741 +#: ../midori/midori-browser.c:786 msgid "New bookmark" msgstr "Νέος σελιδοδείκτης" -#: ../midori/midori-browser.c:741 +#: ../midori/midori-browser.c:786 msgid "Edit bookmark" msgstr "Επεξεργασία σελιδοδείκτη" -#: ../midori/midori-browser.c:772 +#: ../midori/midori-browser.c:828 msgid "_Title:" msgstr "_Τίτλος:" -#: ../midori/midori-browser.c:789 -#: ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "_Περιγραφή:" - -#: ../midori/midori-browser.c:808 -#: ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:848 ../midori/midori-searchaction.c:961 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Διεύθυνση:" -#: ../midori/midori-browser.c:840 -#: ../midori/midori-browser.c:4048 +#: ../midori/midori-browser.c:871 ../midori/midori-browser.c:4337 msgid "_Folder:" msgstr "_Φάκελος:" -#: ../midori/midori-browser.c:850 -#: ../midori/midori-browser.c:944 -#: ../midori/midori-browser.c:4053 -#: ../midori/midori-browser.c:4082 -msgid "Toplevel folder" -msgstr "Αρχικός φάκελος" - -#: ../midori/midori-browser.c:882 +#: ../midori/midori-browser.c:887 msgid "Add to _Speed Dial" msgstr "Προσθήκη στην _γρήγορη σύνδεση" -#: ../midori/midori-browser.c:895 +#: ../midori/midori-browser.c:900 msgid "Show in the tool_bar" msgstr "Εμφάνιση στην εργαλειο_θήκη" -#: ../midori/midori-browser.c:910 +#: ../midori/midori-browser.c:915 msgid "Run as _web application" msgstr "Εκτέλεση ως _διαδικτυακή εφαρμογή" -#: ../midori/midori-browser.c:989 +#: ../midori/midori-browser.c:986 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Το αρχείο \"%s\" δεν μπορεί να αποθηκευτεί σε αυτόν τον φάκελο." + +#: ../midori/midori-browser.c:988 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Δεν έχετε δικαιώματα εγγραφής σε αυτή την τοποθεσία" + +#: ../midori/midori-browser.c:995 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Δεν υπάρχει αρκετός ελεύθερος χώρος για να κατεβάσετε \"%s\"." -#: ../midori/midori-browser.c:993 +#: ../midori/midori-browser.c:998 #, c-format msgid "The file needs %s but only %s are left." msgstr "Το αρχείο χρειάζεται %s αλλά έχουν απομείνει μόνο %s." -#: ../midori/midori-browser.c:1050 -#: ../midori/midori-browser.c:4090 -#: ../midori/midori-browser.c:4125 +#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4406 msgid "Save file as" msgstr "Αποθήκευση αρχείου ως" -#: ../midori/midori-browser.c:1443 +#: ../midori/midori-browser.c:1330 +msgid "New Window" +msgstr "Νέο παράθυρο" + +#: ../midori/midori-browser.c:1330 +msgid "A new window has been opened" +msgstr "Ένα νέο παράθυρο έχει ανοιχθεί" + +#: ../midori/midori-browser.c:1333 +msgid "New Tab" +msgstr "Νέα καρτέλα" + +#: ../midori/midori-browser.c:1333 +msgid "A new tab has been opened" +msgstr "Μια νέα καρτέλα έχει ανοιχθεί" + +#: ../midori/midori-browser.c:1368 +msgid "Error opening the image!" +msgstr "Σφάλμα ανοίγματος εικόνας!" + +#: ../midori/midori-browser.c:1369 +msgid "Can not open selected image in a default viewer." +msgstr "" + +#: ../midori/midori-browser.c:1375 +#, fuzzy +msgid "Error downloading the image!" +msgstr "Σφάλμα κατά την φόρτωση ροής '%s'" + +#: ../midori/midori-browser.c:1376 +msgid "Can not download selected image." +msgstr "Αδυναμία λήψης επιλεγμένης εικόνας." + +#: ../midori/midori-browser.c:1502 msgid "Save file" msgstr "Αποθήκευση αρχείου" -#: ../midori/midori-browser.c:2160 +#: ../midori/midori-browser.c:2377 msgid "Open file" msgstr "Άνοιγμα αρχείου" -#: ../midori/midori-browser.c:2238 +#: ../midori/midori-browser.c:2509 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." msgstr "" -"Για την χρήση του παραπάνω URI ανοίξτε έναν συλλέκτη νέων. Υπάρχει συνήθως ένα μενού ή ένα πλήκτρο \"Νέα Συνδρομή\", \"Νέα Νέα Ροή\" ή παρόμοια.\n" -"Εναλλακτικά πήγαινε στις προτιμήσεις, εφαρμογές στο midori, κι επιλέξτε έναν συλλέκτη νέων. Την επόμενη φορά που θα κάνετε click σε εικονίδιο ροής νέων, θα προστεθεί αυτόματα." +"Για την χρήση του παραπάνω URI ανοίξτε έναν συλλέκτη νέων. Υπάρχει συνήθως " +"ένα μενού ή ένα πλήκτρο \"Νέα Συνδρομή\", \"Νέα Νέα Ροή\" ή παρόμοια.\n" +"Εναλλακτικά πήγαινε στις προτιμήσεις, εφαρμογές στο midori, κι επιλέξτε έναν " +"συλλέκτη νέων. Την επόμενη φορά που θα κάνετε click σε εικονίδιο ροής νέων, " +"θα προστεθεί αυτόματα." -#: ../midori/midori-browser.c:2244 -#: ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2515 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Νέα ροή" -#: ../midori/midori-browser.c:2287 -#: ../midori/midori-browser.c:4994 -#: ../panels/midori-bookmarks.c:423 +#: ../midori/midori-browser.c:2558 ../midori/midori-browser.c:5380 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "Προσθήκη ενός νέου σελιδοδείκτη" -#: ../midori/midori-browser.c:3293 -#: ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 -#: ../midori/sokoke.c:436 -#: ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "Δεν μπορεί να εκτελεστεί το εξωτερικό πρόγραμμα." +#: ../midori/midori-browser.c:3057 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "Άδειο" + +#: ../midori/midori-browser.c:3477 +msgid "Toggle text cursor navigation" +msgstr "Εναλλαγή κειμένου κέρσορα πλοήγησης" -#: ../midori/midori-browser.c:3556 -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:3793 ../midori/midori-browser.c:5766 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Αποτυχία εισαγωγής νέου αντικειμένου στο ιστορικό: %s\n" -#: ../midori/midori-browser.c:3883 -#: ../panels/midori-bookmarks.c:736 -#: ../panels/midori-history.c:685 +#: ../midori/midori-browser.c:4125 ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 msgid "Open all in _Tabs" msgstr "Άνοιγμα όλων σε _καρτέλες" -#: ../midori/midori-browser.c:3890 -#: ../panels/midori-bookmarks.c:742 -#: ../panels/midori-history.c:691 -#: ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4132 ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Άνοιγμα σε νέα_καρτέλα" -#: ../midori/midori-browser.c:3893 -#: ../midori/midori-view.c:2339 -#: ../midori/midori-view.c:4012 -#: ../panels/midori-bookmarks.c:744 -#: ../panels/midori-history.c:693 -#: ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4135 ../midori/midori-view.c:2657 +#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Άνοιγμα σε νέο _παράθυρο" -#: ../midori/midori-browser.c:3971 +#: ../midori/midori-browser.c:4224 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3972 +#: ../midori/midori-browser.c:4225 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:4226 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3974 +#: ../midori/midori-browser.c:4227 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3975 +#: ../midori/midori-browser.c:4228 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3999 +#: ../midori/midori-browser.c:4229 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4250 msgid "Import bookmarks..." msgstr "Εισαγωγή συνδέσμων..." -#: ../midori/midori-browser.c:4002 -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4253 ../midori/midori-browser.c:5385 msgid "_Import bookmarks" msgstr "_Εισαγωγή συνδέσμων..." -#: ../midori/midori-browser.c:4013 +#: ../midori/midori-browser.c:4264 msgid "_Application:" msgstr "_Εφαρμογή:" -#: ../midori/midori-browser.c:4040 -#: ../midori/midori-browser.c:5112 -#: ../midori/midori-websettings.c:224 -#: ../midori/midori-websettings.c:315 -#: ../katze/katze-utils.c:692 -msgid "Custom..." -msgstr "Προσαρμογή..." +#: ../midori/midori-browser.c:4329 +msgid "Import from XBEL or HTML file" +msgstr "Εισαγωγή από αρχείο XBEL ή HTML" + +#: ../midori/midori-browser.c:4364 +msgid "Import from a file" +msgstr "Εισαγωγή από αρχείο" -#: ../midori/midori-browser.c:4101 +#: ../midori/midori-browser.c:4376 msgid "Failed to import bookmarks" msgstr "Αποτυχία εισαγωγής συνδέσμων" -#: ../midori/midori-browser.c:4142 -msgid "Failed to export bookmarks" -msgstr "Αποτυχία εξαγωγής συνδέσμων" +#: ../midori/midori-browser.c:4411 +msgid "XBEL Bookmarks" +msgstr "Σελιδοδείκτες XBEL" + +#: ../midori/midori-browser.c:4416 +msgid "Netscape Bookmarks" +msgstr "Σελιδοδείκτες Netscape" -#: ../midori/midori-browser.c:4195 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "Αποτυχία κατά τον καθαρισμό του ιστορικού: %s\n" +#: ../midori/midori-browser.c:4430 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "" +"Το Midori μπορεί κάνει εξαγωγή μόνο σε XBEL (*.xbel) και Netscape (*.html)" -#: ../midori/midori-browser.c:4203 -#, c-format -msgid "Failed to clear search history: %s\n" -msgstr "Αποτυχία κατά τον καθαρισμό του ιστορικού αναζήτησης: %s\n" +#: ../midori/midori-browser.c:4445 +msgid "Failed to export bookmarks" +msgstr "Αποτυχία εξαγωγής συνδέσμων" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4310 +#: ../midori/midori-browser.c:4567 msgid "Clear Private Data" msgstr "Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:4314 +#: ../midori/midori-browser.c:4571 msgid "_Clear private data" msgstr "_Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:4328 +#: ../midori/midori-browser.c:4584 msgid "Clear the following data:" msgstr "Καθαρισμός των παρακάτω δεδομένων:" -#: ../midori/midori-browser.c:4338 -#: ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:114 -msgid "History" -msgstr "Ιστορικό" - -#: ../midori/midori-browser.c:4343 -msgid "Cookies" -msgstr "Cookies" - -#: ../midori/midori-browser.c:4348 -msgid "'Flash' Cookies" -msgstr "Άδειασμα των cookies" - -#: ../midori/midori-browser.c:4353 -msgid "Website icons" -msgstr "Εικονίδια ιστότοπων" - -#: ../midori/midori-browser.c:4358 -#: ../midori/sokoke.c:1315 -msgid "_Closed Tabs" -msgstr "_Κλειστές καρτέλες" - -#: ../midori/midori-browser.c:4363 -#: ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "Προσωρινής μνήμης ιστού" +#: ../midori/midori-browser.c:4594 +msgid "Last open _tabs" +msgstr "Τελευταίες ανοιχτές _καρτελές" -#: ../midori/midori-browser.c:4371 +#: ../midori/midori-browser.c:4620 msgid "Clear private data when _quitting Midori" msgstr "Καθαρισμός προσωπικών δεδομένων κατά τον _τερματισμό του Midori" -#: ../midori/midori-browser.c:4512 +#: ../midori/midori-browser.c:4815 msgid "A lightweight web browser." msgstr "Ένας ελαφρύς περιηγητής ιστού" -#: ../midori/midori-browser.c:4514 -msgid "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." -msgstr "Η βιβλιοθήκη είναι ελεύθερο λογισμικό - μπορείτε να το αναδιανέμεται και/ή να το τροποποιήσετε κάτω από την άδεια χρήστης GNU Lesser General Public License όπως δημοσιεύεται από το Free Software Foundation - είτε έκδοση 2.1 της άδειας, ή (κατά την γνώμη σας) οποιαδήποτε νεώτερη." +#: ../midori/midori-browser.c:4816 +msgid "See about:version for version info." +msgstr "Δείτε στο about:version για πληροφορίες έκδοσης." -#: ../midori/midori-browser.c:4533 +#: ../midori/midori-browser.c:4818 +msgid "" +"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." +msgstr "" +"Η βιβλιοθήκη είναι ελεύθερο λογισμικό - μπορείτε να το αναδιανέμεται και/ή " +"να το τροποποιήσετε κάτω από την άδεια χρήστης GNU Lesser General Public " +"License όπως δημοσιεύεται από το Free Software Foundation - είτε έκδοση 2.1 " +"της άδειας, ή (κατά την γνώμη σας) οποιαδήποτε νεώτερη." + +#: ../midori/midori-browser.c:4839 msgid "translator-credits" msgstr "Ευάγγελος Μπαλάσκας 2008,2009" -#: ../midori/midori-browser.c:4842 +#: ../midori/midori-browser.c:5227 msgid "_File" msgstr "_Αρχείο" -#: ../midori/midori-browser.c:4844 -#: ../midori/sokoke.c:1316 -msgid "New _Window" -msgstr "Νέο _παράθυρο" - -#: ../midori/midori-browser.c:4845 +#: ../midori/midori-browser.c:5230 msgid "Open a new window" msgstr "Άνοιγμα ενός νέου παραθύρου" -#: ../midori/midori-browser.c:4848 +#: ../midori/midori-browser.c:5233 msgid "Open a new tab" msgstr "Άνοιγμα μίας νέας καρτέλας" -#: ../midori/midori-browser.c:4850 -msgid "P_rivate Browsing" -msgstr "Π_ροσωπική περιήγηση" - -#: ../midori/midori-browser.c:4851 -msgid "Don't save any private data while browsing" -msgstr "Να μην γίνει αποθήκευση προσωπικών δεδομένων κατά την περιήγηση" +#: ../midori/midori-browser.c:5235 +msgid "New P_rivate Browsing Window" +msgstr "Νέο παράθυρο ιδιωτικής περιήγησης" -#: ../midori/midori-browser.c:4855 +#: ../midori/midori-browser.c:5239 msgid "Open a file" msgstr "Άνοιγμα αρχείου" -#: ../midori/midori-browser.c:4858 +#: ../midori/midori-browser.c:5241 +msgid "_Save Page As..." +msgstr "_Αποθήκευση ως..." + +#: ../midori/midori-browser.c:5242 msgid "Save to a file" msgstr "Αποθήκευση σε αρχείου" -#: ../midori/midori-browser.c:4860 +#: ../midori/midori-browser.c:5244 msgid "Add to Speed _dial" msgstr "Προσθήκη σε γρήγορη σ_ύνδεση" -#: ../midori/midori-browser.c:4861 -msgid "Add shortcut to speed dial" -msgstr "Προσθήκη συντόμευσης σε γρήγορη σύνδεση" - -#: ../midori/midori-browser.c:4863 +#: ../midori/midori-browser.c:5248 msgid "Add Shortcut to the _desktop" msgstr "Προσθήκη συντόμευσης στην _επιφάνεια εργασίας" -#: ../midori/midori-browser.c:4864 -msgid "Add shortcut to the desktop" -msgstr "Προσθήκη συντόμευσης στην _επιφάνεια" +#: ../midori/midori-browser.c:5250 +msgid "Create _Launcher" +msgstr "Δημιουργία _εκκινητή" -#: ../midori/midori-browser.c:4866 +#: ../midori/midori-browser.c:5254 msgid "Subscribe to News _feed" msgstr "Εγγραφή σε _ροή νέων" -#: ../midori/midori-browser.c:4867 -msgid "Subscribe to this news feed" -msgstr "Εγγραφή στην ροή νέων" - -#: ../midori/midori-browser.c:4872 +#: ../midori/midori-browser.c:5260 msgid "_Close Tab" msgstr "_Κλείσιμο καρτέλας" -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:5261 msgid "Close the current tab" msgstr "Κλείσιμο της τρέχουσας καρτέλας" -#: ../midori/midori-browser.c:4875 +#: ../midori/midori-browser.c:5263 msgid "C_lose Window" msgstr "Κ_λείσιμο παραθύρου" -#: ../midori/midori-browser.c:4876 -msgid "Close this window" -msgstr "Κλείσιμο αυτού του παραθύρου" - -#: ../midori/midori-browser.c:4879 +#: ../midori/midori-browser.c:5267 msgid "Print the current page" msgstr "Εκτύπωση της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:4882 -msgid "Quit the application" -msgstr "Έξοδος από την εφαρμογή" +#: ../midori/midori-browser.c:5269 +msgid "Close a_ll Windows" +msgstr "Κλείσιμο _όλων των παραθύρων" -#: ../midori/midori-browser.c:4884 +#: ../midori/midori-browser.c:5272 msgid "_Edit" msgstr "_Επεξεργασία" -#: ../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:4898 -#: ../midori/midori-browser.c:4901 -msgid "Copy the selected text" -msgstr "Αντιγραφή επιλεγμένου κειμένου" - -#: ../midori/midori-browser.c:4904 -msgid "Paste text from the clipboard" -msgstr "Επικόλληση κειμένου από το πρόχειρο" - -#: ../midori/midori-browser.c:4907 -msgid "Delete the selected text" -msgstr "Διαγραφή του επιλεγμένου κειμένου" - -#: ../midori/midori-browser.c:4910 -msgid "Select all text" -msgstr "Επιλογή όλου του κειμένου" +#: ../midori/midori-browser.c:5295 +msgid "_Find..." +msgstr "_Εύρεση..." -#: ../midori/midori-browser.c:4913 +#: ../midori/midori-browser.c:5296 msgid "Find a word or phrase in the page" msgstr "Αναζήτηση μίας λέξης ή φράσης στην σελίδα" -#: ../midori/midori-browser.c:4915 +#: ../midori/midori-browser.c:5298 msgid "Find _Next" msgstr "Εύρεση επ_όμενο" -#: ../midori/midori-browser.c:4916 -msgid "Find the next occurrence of a word or phrase" -msgstr "Εύρεση της επόμενης ύπαρξης της λέξης ή της φράσης" - -#: ../midori/midori-browser.c:4918 +#: ../midori/midori-browser.c:5301 msgid "Find _Previous" msgstr "Εύρεση _προηγούμενο" -#: ../midori/midori-browser.c:4919 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Εύρεση της προηγούμενης ύπαρξης της λέξης ή της φράσης" - -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:5305 msgid "Configure the application preferences" msgstr "Παραμετροποίηση των ρυθμίσεων της εφαρμογής" -#: ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:5307 msgid "_View" msgstr "_Εμφάνιση" -#: ../midori/midori-browser.c:4926 +#: ../midori/midori-browser.c:5308 msgid "_Toolbars" msgstr "_Εργαλειοθήκες" -#: ../midori/midori-browser.c:4938 +#: ../midori/midori-browser.c:5313 +msgid "Reload page without caching" +msgstr "Ανανέωση σελίδας χωρίς προσωρινή μνήμη" + +#: ../midori/midori-browser.c:5323 msgid "Increase the zoom level" msgstr "Αύξηση του επίπεδου εστίασης" -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:5326 msgid "Decrease the zoom level" msgstr "Μείωση του επιπέδου εστίασης" -#: ../midori/midori-browser.c:4944 -msgid "Reset the zoom level" -msgstr "Επαναφορά του επιπέδου εστίασης" - -#: ../midori/midori-browser.c:4945 +#: ../midori/midori-browser.c:5330 msgid "_Encoding" msgstr "_Κωδικοποίηση" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:5332 msgid "View So_urce" msgstr "Προβολή κ_ώδικα" -#: ../midori/midori-browser.c:4948 -msgid "View the source code of the page" -msgstr "Προβολή του πηγαίου κώδικα αυτής της σελίδας" +#: ../midori/midori-browser.c:5335 +msgid "Ca_ret Browsing" +msgstr "Περιήγηση κέρσορα κειμένου" -#: ../midori/midori-browser.c:4951 +#: ../midori/midori-browser.c:5339 msgid "Toggle fullscreen view" msgstr "Εναλλαγή σε πλήρη οθόνη" -#: ../midori/midori-browser.c:4954 +#: ../midori/midori-browser.c:5341 msgid "Scroll _Left" msgstr "Μετακίνηση _αριστερά" -#: ../midori/midori-browser.c:4955 -msgid "Scroll to the left" -msgstr "Μετακίνηση προς αριστερά" - -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:5344 msgid "Scroll _Down" msgstr "Μετακίνηση _κάτω" -#: ../midori/midori-browser.c:4958 -msgid "Scroll down" -msgstr "Μετακίνηση κάτω" - -#: ../midori/midori-browser.c:4960 +#: ../midori/midori-browser.c:5347 msgid "Scroll _Up" msgstr "Μετακίνηση _επάνω" -#: ../midori/midori-browser.c:4961 -msgid "Scroll up" -msgstr "Μετακίνηση _επάνω" - -#: ../midori/midori-browser.c:4963 +#: ../midori/midori-browser.c:5350 msgid "Scroll _Right" msgstr "Μετακίνηση _δεξιά" -#: ../midori/midori-browser.c:4964 -msgid "Scroll to the right" -msgstr "Μετακίνηση προς τα δεξιά" - -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:5353 msgid "_Go" msgstr "_Μετάβαση" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:5356 msgid "Go back to the previous page" msgstr "Μετάβαση στην προηγούμενη σελίδα" -#: ../midori/midori-browser.c:4973 +#: ../midori/midori-browser.c:5359 msgid "Go forward to the next page" msgstr "Μετάβαση στην επόμενη σελίδα" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4977 +#: ../midori/midori-browser.c:5363 msgid "Go to the previous sub-page" msgstr "Μετάβαση στην προηγούμενη υπό-σελίδα" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4981 +#: ../midori/midori-browser.c:5367 msgid "Go to the next sub-page" msgstr "Μετάβαση στην επόμενη υπό-σελίδα" -#: ../midori/midori-browser.c:4984 +#: ../midori/midori-browser.c:5370 msgid "Go to your homepage" msgstr "Μετάβαση στην αρχική σελίδα" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:5372 msgid "Empty Trash" msgstr "Άδειασμα απορριμμάτων" -#: ../midori/midori-browser.c:4987 -msgid "Delete the contents of the trash" -msgstr "Διαγραφή των περιεχομένων των απορριμμάτων" - -#: ../midori/midori-browser.c:4989 +#: ../midori/midori-browser.c:5375 msgid "Undo _Close Tab" msgstr "Αναίρεση κλ_είσιμο καρτέλας" -#: ../midori/midori-browser.c:4990 -msgid "Open the last closed tab" -msgstr "Άνοιγμα της τελευταίας καρτέλας που έκλεισε" - -#: ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:5382 msgid "Add a new _folder" msgstr "Προσθήκη ενός νέου φ_ακέλου" -#: ../midori/midori-browser.c:4997 -msgid "Add a new bookmark folder" -msgstr "Προσθήκη ενός νέου φακέλου σελιδοδεικτών" - -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:5388 msgid "_Export bookmarks" msgstr "_Εξαγωγή συνδέσμων" -#: ../midori/midori-browser.c:5005 -#: ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5391 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Διαχείριση των μηχανών αναζήτησης" -#: ../midori/midori-browser.c:5006 -msgid "Add, edit and remove search engines..." -msgstr "Προσθήκη, επεξεργασία και διαγραφή των μηχανών αναζήτησης..." - -#: ../midori/midori-browser.c:5009 +#: ../midori/midori-browser.c:5394 msgid "_Clear Private Data" msgstr "_Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:5010 -msgid "Clear private data..." -msgstr "Καθαρισμός προσωπικών δεδομένων..." - -#: ../midori/midori-browser.c:5014 +#: ../midori/midori-browser.c:5397 msgid "_Inspect Page" msgstr "_Εξέταση σελίδας" -#: ../midori/midori-browser.c:5015 -msgid "Inspect page details and access developer tools..." -msgstr "Εξέταση λεπτομερειών σελίδας και πρόσβαση σε διαχειριστικά εργαλεία ..." - -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:5401 msgid "_Previous Tab" msgstr "_Προηγούμενη καρτέλα" -#: ../midori/midori-browser.c:5021 -msgid "Switch to the previous tab" -msgstr "Μετάβαση στην προηγούμενη καρτέλα" - -#: ../midori/midori-browser.c:5023 +#: ../midori/midori-browser.c:5404 msgid "_Next Tab" msgstr "Επόμε_νη καρτέλα" -#: ../midori/midori-browser.c:5024 -msgid "Switch to the next tab" -msgstr "Μετάβαση στην επόμενη καρτέλα" +#: ../midori/midori-browser.c:5406 +msgid "Move Tab _Backward" +msgstr "Μετακίνηση καρτέλας _πίσω" + +#: ../midori/midori-browser.c:5408 +msgid "_Move Tab Forward" +msgstr "_Μετακίνηση καρτέλας εμπρός" -#: ../midori/midori-browser.c:5026 +#: ../midori/midori-browser.c:5411 msgid "Focus _Current Tab" msgstr "Εστίαση στην _ισχύουσα καρτέλα" -#: ../midori/midori-browser.c:5027 -msgid "Focus the current tab" -msgstr "Εστίαση στην ισχύουσα καρτέλα" - -#: ../midori/midori-browser.c:5029 -msgid "Minimize _Current Tab" -msgstr "Ελαχιστοποίηση της _τρέχουσας καρτέλας" - -#: ../midori/midori-browser.c:5030 -msgid "Minimize the current tab" -msgstr "Ελαχιστοποίηση της συγκεκριμένης καρτέλας" +#: ../midori/midori-browser.c:5414 +msgid "Focus _Next view" +msgstr "Εστίαση στην _επόμενη προβολή" + +#: ../midori/midori-browser.c:5417 +msgid "Only show the Icon of the _Current Tab" +msgstr "Εμφάνιση μόνο του εικονιδίου της _τρέχουσας καρτέλας" -#: ../midori/midori-browser.c:5032 +#: ../midori/midori-browser.c:5420 msgid "_Duplicate Current Tab" msgstr "_Διπλασίασε την τρέχουσα καρτέλα" -#: ../midori/midori-browser.c:5033 -msgid "Duplicate the current tab" -msgstr "Διπλασιασμός της συγκεκριμένης καρτέλας" - -#: ../midori/midori-browser.c:5035 +#: ../midori/midori-browser.c:5423 msgid "Close Ot_her Tabs" msgstr "Κλείσιμο των άλλ_ων καρτελών" -#: ../midori/midori-browser.c:5036 -msgid "Close all tabs except the current tab" -msgstr "Κλείσιμο των άλλων καρτελών εκτός της τρέχουσας" - -#: ../midori/midori-browser.c:5038 +#: ../midori/midori-browser.c:5426 msgid "Open last _session" msgstr "Επαναφορά της τελευταίας _συνεδρίας" -#: ../midori/midori-browser.c:5039 -msgid "Open the tabs saved in the last session" -msgstr "Άνοιγμα των καρτελών που αποθηκεύτηκαν κατά την τελευταία συνεδρία" - -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:5429 msgid "_Help" msgstr "_Βοήθεια" -#: ../midori/midori-browser.c:5043 -msgid "_Contents" -msgstr "_Περιεχόμενα" - -#: ../midori/midori-browser.c:5044 -msgid "Show the documentation" -msgstr "Εμφάνιση της τεκμηρίωσης" - -#: ../midori/midori-browser.c:5046 +#: ../midori/midori-browser.c:5431 msgid "_Frequent Questions" msgstr "Σ_υχνές ερωτήσεις" -#: ../midori/midori-browser.c:5047 -msgid "Show the Frequently Asked Questions" -msgstr "Εμφάνιση των πιο συχνά ερωτηθέντων ερωτήσεων" - -#: ../midori/midori-browser.c:5049 -msgid "_Report a Bug" -msgstr "Α_ναφορά σφάλματος" - -#: ../midori/midori-browser.c:5050 -msgid "Open Midori's bug tracker" -msgstr "Άνοιγμα καταγραφής σφαλμάτων midori" - -#: ../midori/midori-browser.c:5053 -msgid "Show information about the program" -msgstr "Εμφάνιση πληροφοριών σχετικά με την εφαρμογή" +#: ../midori/midori-browser.c:5434 +msgid "_Report a Problem..." +msgstr "_Αναφορά προβλήματος..." -#: ../midori/midori-browser.c:5061 +#: ../midori/midori-browser.c:5446 msgid "_Menubar" msgstr "_Μπάρα μενού" -#: ../midori/midori-browser.c:5062 -msgid "Show menubar" -msgstr "Προβολή μπάρας μενού" - -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:5450 msgid "_Navigationbar" msgstr "_Μπάρα περιήγησης" -#: ../midori/midori-browser.c:5066 -msgid "Show navigationbar" -msgstr "Εμφάνιση περιήγησης" - -#: ../midori/midori-browser.c:5069 +#: ../midori/midori-browser.c:5454 msgid "Side_panel" msgstr "Πλαϊνό _πλαίσιο" -#: ../midori/midori-browser.c:5070 -msgid "Show sidepanel" -msgstr "Εμφάνιση πλαϊνού πλαισίου" +#: ../midori/midori-browser.c:5455 +msgid "Sidepanel" +msgstr "Πλαϊνό πλαίσιο" -#: ../midori/midori-browser.c:5073 +#: ../midori/midori-browser.c:5458 msgid "_Bookmarkbar" msgstr "_Μπάρα σελιδοδείκτη" -#: ../midori/midori-browser.c:5074 -msgid "Show bookmarkbar" -msgstr "Εμφάνιση μπάρα σελιδοδείκτη" - -#: ../midori/midori-browser.c:5077 -msgid "_Transferbar" -msgstr "_Μπάρα μεταφορών" - -#: ../midori/midori-browser.c:5078 -msgid "Show transferbar" -msgstr "Εμφάνιση μπάρα μεταφορών" - -#: ../midori/midori-browser.c:5081 +#: ../midori/midori-browser.c:5462 msgid "_Statusbar" msgstr "_Γραμμή κατάστασης" -#: ../midori/midori-browser.c:5082 -msgid "Show statusbar" -msgstr "Εμφάνιση γραμμής κατάστασης" - -#: ../midori/midori-browser.c:5090 +#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:311 msgid "_Automatic" msgstr "_Αυτόματα" -#: ../midori/midori-browser.c:5093 -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:236 msgid "Chinese (BIG5)" msgstr "Κινέζικα (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5097 +#: ../midori/midori-browser.c:5478 msgid "Japanese (SHIFT__JIS)" msgstr "Ιαπωνικά (SHIFT__JIS)" -#: ../midori/midori-browser.c:5100 -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5481 ../midori/midori-websettings.c:238 msgid "Korean (EUC-KR)" msgstr "Κορεάτικα (EUC-KR)" -#: ../midori/midori-browser.c:5103 -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5484 ../midori/midori-websettings.c:239 msgid "Russian (KOI8-R)" msgstr "Ρωσικά (KOI8-R)" -#: ../midori/midori-browser.c:5106 -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5487 ../midori/midori-websettings.c:240 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5109 -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5490 ../midori/midori-websettings.c:241 msgid "Western (ISO-8859-1)" msgstr "Δυτικά (ISO-8859-1)" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5493 ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "Προσαρμογή..." + +#: ../midori/midori-browser.c:5998 msgid "_Separator" msgstr "_Διαχωριστής" -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:6005 msgid "_Location..." msgstr "_Τοποθεσία:" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:6007 msgid "Open a particular location" msgstr "Άνοιγμα συγκεκριμένης τοποθεσίας" -#: ../midori/midori-browser.c:5657 +#: ../midori/midori-browser.c:6029 msgid "_Web Search..." msgstr "_Αναζήτηση ιστού..." -#: ../midori/midori-browser.c:5659 +#: ../midori/midori-browser.c:6031 msgid "Run a web search" msgstr "Εκκίνηση μίας αναζήτησης ιστού" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:6058 msgid "Reopen a previously closed tab or window" msgstr "Ξανα-άνοιγμα προηγούμενης καρτέλας ή παράθυρο που έχει κλείσει" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:6075 +msgid "Show the saved bookmarks" +msgstr "Εμφάνιση των αποθηκευμένων σελιδοδεικτών" + +#: ../midori/midori-browser.c:6092 msgid "_Tools" msgstr "_Εργαλεία" -#: ../midori/midori-browser.c:5712 +#: ../midori/midori-browser.c:6108 msgid "_Window" msgstr "_Παράθυρο" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:6110 msgid "Show a list of all open tabs" msgstr "Εμφάνιση μίας λίστας με όλες τις ανοιχτές καρτέλες" -#: ../midori/midori-browser.c:5728 +#: ../midori/midori-browser.c:6124 msgid "_Menu" msgstr "_Μενού" -#: ../midori/midori-browser.c:5730 +#: ../midori/midori-browser.c:6126 msgid "Menu" msgstr "Μενού" -#: ../midori/midori-browser.c:6307 +#: ../midori/midori-browser.c:6940 #, c-format msgid "Unexpected setting '%s'" msgstr "Αναπάντεχη ρύθμιση '%s'" -#: ../midori/midori-locationaction.c:379 +#: ../midori/midori-extension.c:329 #, c-format -msgid "Failed to select from history\n" -msgstr "Αποτυχία επιλογής ιστορικό: \n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "Η ρύθμιση της επέκτασης '%s' δεν μπορεί να φορτωθεί: %s\n" -#: ../midori/midori-locationaction.c:467 +#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "Αναζήτηση για %s" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Οι ρυθμίσεις της επέκτασης '%s' δεν μπορεί να αποθηκευτεί: %s\n" -#: ../midori/midori-locationaction.c:490 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "Αναζήτηση με %s" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Αναζήτηση με..." + +#: ../midori/midori-locationaction.c:537 #, c-format -msgid "Failed to execute database statement\n" -msgstr "Αποτυχία εκτέλεσης δήλωσης βάσης δεδομένων\n" +msgid "Failed to select from history\n" +msgstr "Αποτυχία επιλογής ιστορικό: \n" + +#: ../midori/midori-locationaction.c:624 +#, c-format +msgid "Search for %s" +msgstr "Αναζήτηση για %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1253 +#: ../midori/midori-locationaction.c:1400 msgid "Paste and p_roceed" msgstr "Επικόλληση και σ_υνέχεια" -#: ../midori/midori-panel.c:432 -#: ../midori/midori-panel.c:434 -msgid "Detach chosen panel from the window" -msgstr "Αποσύνδεση επιλεγμένου πλαισίου από το παράθυρο" - -#: ../midori/midori-panel.c:444 -#: ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 -#: ../midori/midori-panel.c:642 +#: ../midori/midori-locationaction.c:1768 +msgid "Not verified" +msgstr "Μη επαληθευμένο" + +#: ../midori/midori-locationaction.c:1788 +msgid "Verified and encrypted connection" +msgstr "Επαληθευμένη και κρυπτογραφημένη σύνδεση" + +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα δεξιά" -#: ../midori/midori-panel.c:456 -#: ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Κλείσιμο πλαισίου" -#: ../midori/midori-panel.c:640 -#: ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα αριστερά" -#: ../midori/midori-panel.c:797 -msgid "Hide operating controls" -msgstr "Απόκρυψη στοιχείων λειτουργίας" - -#: ../midori/midori-websettings.c:200 -msgid "Show Blank page" -msgstr "Εμφάνιση κενής σελίδας" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "Εμφάνιση γρήγορης κλήσης" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" msgstr "Εμφάνιση αρχικής σελίδας" -#: ../midori/midori-websettings.c:202 -msgid "Show last open tabs" -msgstr "Εμφάνιση των τελευταίων ανοιχτών καρτελών" - -#: ../midori/midori-websettings.c:203 -msgid "Show last tabs without loading" -msgstr "Εμφάνιση των τελευταίων καρτέλων χωρίς φόρτωση" - -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:237 msgid "Japanese (SHIFT_JIS)" msgstr "Ιαπωνικά (SHIFT_JIS)" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:257 msgid "New tab" msgstr "Νέα καρτέλα" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:258 msgid "New window" msgstr "Νέο παράθυρο" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:259 msgid "Current tab" msgstr "Τρέχον καρτέλα" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:274 msgid "Default" msgstr "Προκαθορισμένο" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:275 msgid "Icons" msgstr "Εικονίδια" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:276 msgid "Small icons" msgstr "Μικρά εικονίδια" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:277 msgid "Text" msgstr "Κείμενο" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:278 msgid "Icons and text" msgstr "Εικονίδια με κείμενο" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:279 msgid "Text beside icons" msgstr "Κείμενο δίπλα στα εικονίδια" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:294 msgid "Automatic (GNOME or environment)" msgstr "Αυτόματα (Gnome ή περιβάλλον)" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:295 msgid "HTTP proxy server" msgstr "HTTP διακομιστής μεσολάβησης" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:296 msgid "No proxy server" msgstr "Κανένας διακομιστής μεσολάβησης" -#: ../midori/midori-websettings.c:293 -msgid "All cookies" -msgstr "Όλα τα cookies" - -#: ../midori/midori-websettings.c:294 -msgid "Session cookies" -msgstr "Cookies συνεδρίας" - -#: ../midori/midori-websettings.c:295 -#: ../katze/katze-utils.c:668 -msgid "None" -msgstr "Κανένα" - -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:400 msgid "Remember last window size" msgstr "Απομνημόνευση μεγέθους τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:401 msgid "Whether to save the last window size" msgstr "Εάν θα αποθηκεύεται το μέγεθος του τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:409 msgid "Last window width" msgstr "Πλάτος τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:410 msgid "The last saved window width" msgstr "Το τελευταίο αποθηκευμένο πλάτος παραθύρου" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:418 msgid "Last window height" msgstr "Ύψος τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:419 msgid "The last saved window height" msgstr "Το τελευταίο ύψος αποθηκευμένου παραθύρου" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:444 msgid "Last panel position" msgstr "Η τελευταία θέση πλαισίου" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:445 msgid "The last saved panel position" msgstr "Η τελευταία αποθηκευμένη θέση πλαισίου" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:454 msgid "Last panel page" msgstr "Η τελευταία σελίδα πλαισίου" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:455 msgid "The last saved panel page" msgstr "Η τελευταία αποθηκευμένη σελίδα πλαισίου" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:463 msgid "Last Web search" msgstr "Τελευταία αναζήτηση ιστού" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:464 msgid "The last saved Web search" msgstr "Η τελευταία αποθηκευμένη αναζήτηση ιστού" -#: ../midori/midori-websettings.c:440 +#: ../midori/midori-websettings.c:473 msgid "Show Menubar" msgstr "Εμφάνιση γραμμής μενού" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:474 msgid "Whether to show the menubar" msgstr "Εάν θα φαίνεται η μπάρα του μενού" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:482 msgid "Show Navigationbar" msgstr "Εμφάνιση της γραμμής πλοήγησης" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:483 msgid "Whether to show the navigationbar" msgstr "Εάν θα φαίνεται η γραμμή πλοήγησης" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:491 msgid "Show Bookmarkbar" msgstr "Εμφάνιση μπάρας σελιδοδεικτών" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:492 msgid "Whether to show the bookmarkbar" msgstr "Εάν θα φαίνεται η μπάρα των σελιδοδεικτών" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:500 msgid "Show Panel" msgstr "Εμφάνιση πλαισίου" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:501 msgid "Whether to show the panel" msgstr "Εάν θα φαίνεται το πλαίσιο" -#: ../midori/midori-websettings.c:483 -msgid "Show Transferbar" -msgstr "Εμφάνιση μπάρας μεταφορών" - -#: ../midori/midori-websettings.c:484 -msgid "Whether to show the transferbar" -msgstr "Εάν θα φαίνεται η μπάρα μεταφορών" - -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:509 msgid "Show Statusbar" msgstr "Εμφάνιση γραμμής κατάστασης" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:510 msgid "Whether to show the statusbar" msgstr "Εάν θα φαίνεται η γραμμή κατάστασης" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:519 msgid "Toolbar Style:" msgstr "Στυλ εργαλειοθήκης:" -#: ../midori/midori-websettings.c:503 +#: ../midori/midori-websettings.c:520 msgid "The style of the toolbar" msgstr "Το στυλ της εργαλειοθήκης" -#: ../midori/midori-websettings.c:519 -msgid "Show progress in location entry" -msgstr "Να εμφανίζεται η πρόοδος στην τοποθεσίας εισαγωγής" - -#: ../midori/midori-websettings.c:520 -msgid "Whether to show loading progress in the location entry" -msgstr "Εάν θα εμφανίζεται η πρόοδος φόρτωσης στην τοποθεσία εισαγωγής" - -#: ../midori/midori-websettings.c:535 -msgid "Search engines in location completion" -msgstr "Μηχανές αναζήτησης στην τοποθεσία συμπλήρωσης" - -#: ../midori/midori-websettings.c:536 -msgid "Whether to show search engines in the location completion" -msgstr "Εάν θα φαίνονται οι μηχανές αναζήτησης στην τοποθεσία συμπλήρωσης" - -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:529 msgid "Toolbar Items" msgstr "Αντικείμενα εργαλειοθήκης" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:530 msgid "The items to show on the toolbar" msgstr "Τι αντικείμενα να εμφανίζονται στην εργαλειοθήκη" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:538 msgid "Compact Sidepanel" msgstr "Σύμπτυξη πλαϊνού πλαισίου" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:539 msgid "Whether to make the sidepanel compact" msgstr "Εάν θα γίνει σύμπτυξη του πλαϊνού πλαισίου" -#: ../midori/midori-websettings.c:569 -msgid "Show operating controls of the panel" -msgstr "Εμφάνιση των στοιχείων λειτουργίας στο ταμπλό" - -#: ../midori/midori-websettings.c:570 -msgid "Whether to show the operating controls of the panel" -msgstr "Εάν θα φαίνονται τα στοιχεία λειτουργίας στο ταμπλό" - -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:554 msgid "Align sidepanel on the right" msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα δεξιά" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:555 msgid "Whether to align the sidepanel on the right" msgstr "Εάν θα ευθυγραμμίζεται το πλαϊνό πλαίσιο στα δεξιά" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:570 msgid "Open panels in separate windows" msgstr "Άνοιγμα ταμπλών σε ξεχωριστά παράθυρα" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:571 msgid "Whether to always open panels in separate windows" msgstr "Εάν θα ανοίγουν πάντα τα ταμπλό σε ξεχωριστά παράθυρα" -#: ../midori/midori-websettings.c:611 +#: ../midori/midori-websettings.c:580 msgid "When Midori starts:" msgstr "Κατά την εκκίνηση του midori:" -#: ../midori/midori-websettings.c:612 +#: ../midori/midori-websettings.c:581 msgid "What to do when Midori starts" msgstr "Κατά την εκκίνηση του midori να φορτώνει:" -#: ../midori/midori-websettings.c:621 +#: ../midori/midori-websettings.c:590 msgid "Homepage:" msgstr "Αρχική σελίδα:" -#: ../midori/midori-websettings.c:622 +#: ../midori/midori-websettings.c:591 msgid "The homepage" msgstr "Η αρχική σελίδα" -#: ../midori/midori-websettings.c:637 +#: ../midori/midori-websettings.c:606 msgid "Show crash dialog" msgstr "Εμφάνιση παραθύρου αποτυχίας" -#: ../midori/midori-websettings.c:638 +#: ../midori/midori-websettings.c:607 msgid "Show a dialog after Midori crashed" msgstr "Εμφάνιση διαλόγου μετά από αποτυχία" -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:654 -msgid "Show speed dial in new tabs" -msgstr "Εμφάνιση γρήγορης σύνδεσης σε νέες καρτέλες" - -#: ../midori/midori-websettings.c:655 -msgid "Show speed dial in newly opened tabs" -msgstr "Εμφάνιση γρήγορης σύνδεσης στις νέες ανοιχτές καρτέλες" - -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:615 msgid "Save downloaded files to:" msgstr "Αποθήκευση των αρχείων που κατέβηκαν στο:" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:616 msgid "The folder downloaded files are saved to" -msgstr "Ο κατάλογος στον οποίο αποθηκεύονται τα αρχεία που κατεβαίνουν" - -#: ../midori/midori-websettings.c:685 -msgid "Ask for the destination folder" -msgstr "Ερώτηση για τον κατάλογο αποθήκευσης" - -#: ../midori/midori-websettings.c:686 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "Εάν θα ρωτάει για τον κατάλογο αποθήκευσης όταν κατεβαίνει ένα αρχείο" - -#: ../midori/midori-websettings.c:705 -msgid "Notify when a transfer has been completed" -msgstr "Ειδοποίηση όταν μία μεταφορά έχει ολοκληρωθεί" - -#: ../midori/midori-websettings.c:706 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "Εάν θα εμφανίζεται μία ειδοποίηση όταν ολοκληρωθεί μία μεταφορά" - -#: ../midori/midori-websettings.c:718 -msgid "Download Manager" -msgstr "Διαχειριστής μεταφορών" - -#: ../midori/midori-websettings.c:719 -msgid "An external download manager" -msgstr "Εξωτερικός διαχειριστής μεταφορών" +msgstr "Ο κατάλογος στον οποίο αποθηκεύονται τα αρχεία που κατεβαίνουν" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:624 msgid "Text Editor" msgstr "Κειμενογράφος" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:625 msgid "An external text editor" msgstr "Εξωτερικός κειμενογράφος" -#: ../midori/midori-websettings.c:743 +#: ../midori/midori-websettings.c:640 msgid "News Aggregator" msgstr "Διαχειριστής νέων" -#: ../midori/midori-websettings.c:744 +#: ../midori/midori-websettings.c:641 msgid "An external news aggregator" msgstr "Εξωτερικός διαχειριστής νέων" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:649 msgid "Location entry Search" msgstr "Διεύθυνση για αναζήτηση" -#: ../midori/midori-websettings.c:753 +#: ../midori/midori-websettings.c:650 msgid "The search to perform inside the location entry" msgstr "Η αναζήτηση να πραγματοποιηθεί εσωτερικά της τοποθεσίας εισαγωγής" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:658 msgid "Preferred Encoding" msgstr "Προτιμώμενη κωδικοποίηση" -#: ../midori/midori-websettings.c:762 +#: ../midori/midori-websettings.c:659 msgid "The preferred character encoding" msgstr "Η προτιμώμενη κωδικοποίηση χαρακτήρων" -#: ../midori/midori-websettings.c:772 +#: ../midori/midori-websettings.c:669 msgid "Always Show Tabbar" msgstr "Εμφάνιση πάντα της γραμμής καρτελών" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:670 msgid "Always show the tabbar" msgstr "Εμφάνιση πάντα της μπάρας με τις καρτέλες" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:683 msgid "Close Buttons on Tabs" msgstr "Κουμπιά κλεισίματος στις καρτέλες" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:684 msgid "Whether tabs have close buttons" msgstr "Εάν οι καρτέλες θα έχουν κουμπί κλεισίματος" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:709 msgid "Open new pages in:" msgstr "Άνοιγμα νέων σελίδων σε:" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:710 msgid "Where to open new pages" msgstr "Που να ανοίγουν οι νέες σελίδες" -#: ../midori/midori-websettings.c:800 -msgid "Open external pages in:" -msgstr "Άνοιγμα εξωτερικών σελίδων σε:" - -#: ../midori/midori-websettings.c:801 -msgid "Where to open externally opened pages" -msgstr "Που να ανοίγουν οι εξωτερικές ανοιγμένες σελίδες" - -#: ../midori/midori-websettings.c:810 +#: ../midori/midori-websettings.c:719 msgid "Middle click opens Selection" msgstr "Το μεσαίο κλικ ανοίγει την Επιλογή" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:720 msgid "Load an address from the selection via middle click" msgstr "Φόρτωση μίας διεύθυνσης από την επιλογή μέσω του μεσαίου κλικ" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:728 msgid "Open tabs in the background" msgstr "Άνοιγμα των καρτελών στο παρασκήνιο" -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:729 msgid "Whether to open new tabs in the background" msgstr "Εάν θα ανοίγονται νέες καρτέλες στο παρασκήνιο" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:737 msgid "Open Tabs next to Current" msgstr "Άνοιγμα των καρτελών δίπλα στο τρέχων" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:738 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Εάν θα ανοίγονται νέες καρτέλες δίπλα στην τρέχουσα καρτέλα ή μετά την τελευταία" +msgstr "" +"Εάν θα ανοίγονται νέες καρτέλες δίπλα στην τρέχουσα καρτέλα ή μετά την " +"τελευταία" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:746 msgid "Open popups in tabs" msgstr "Άνοιγμα αναδυόμενων παραθύρων σε καρτέλες" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:747 msgid "Whether to open popup windows in tabs" msgstr "Εάν θα ανοίγονται τα αναδυόμενα παράθυρα σε καρτέλες" -#: ../midori/midori-websettings.c:848 -#: ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Αυτόματη φόρτωση εικόνων" -#: ../midori/midori-websettings.c:849 +#: ../midori/midori-websettings.c:758 msgid "Load and display images automatically" msgstr "Αυτόματη φόρτωση και εμφάνιση εικόνων" -#: ../midori/midori-websettings.c:856 -#: ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 msgid "Enable scripts" msgstr "Ενεργοποίηση δεσμών εντολών" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:766 msgid "Enable embedded scripting languages" msgstr "Ενεργοποίηση ενσωματωμένων γλωσσών κειμένου" -#: ../midori/midori-websettings.c:864 -#: ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" msgstr "Ενεργοποίηση αρθρωμάτων netscape" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:774 msgid "Enable embedded Netscape plugin objects" msgstr "Ενεργοποίηση ενσωματωμένων αρθρωμάτων netscape" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:789 +msgid "Enable Spell Checking" +msgstr "Ενεργοποίηση ορθογραφίας" + +#: ../midori/midori-websettings.c:790 +msgid "Enable spell checking while typing" +msgstr "Ενεργοποίηση ορθογραφίας κατά την πληκτρολόγηση" + +#: ../midori/midori-websettings.c:796 msgid "Enable HTML5 database support" msgstr "Ενεργοποίηση υποστήριξης βάσης δεδομένων HTML5" -#: ../midori/midori-websettings.c:882 +#: ../midori/midori-websettings.c:797 msgid "Whether to enable HTML5 database support" msgstr "Εάν θα ενεργοποιηθεί η τοπική υποστήριξη αποθήκευσης HTML5" -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:803 msgid "Enable HTML5 local storage support" msgstr "Ενεργοποίηση τοπικής υποστήριξης αποθήκευσης HTML5" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:804 msgid "Whether to enable HTML5 local storage support" msgstr "Εάν θα ενεργοποιηθεί η τοπική υποστήριξη αποθήκευσης HTML5" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:810 msgid "Enable offline web application cache" msgstr "Ενεργοποίηση προσωρινής μνήμης δικτυακή εφαρμογής εκτός σύνδεσης" -#: ../midori/midori-websettings.c:898 +#: ../midori/midori-websettings.c:811 msgid "Whether to enable offline web application cache" msgstr "Εάν θα ενεργοποιηθεί η προσωρινή μνήμη της εφαρμογής εκτός σύνδεσης" -#: ../midori/midori-websettings.c:923 +#: ../midori/midori-websettings.c:827 +msgid "Flash window on background tabs" +msgstr "Αναβόσβησε το παράθυρο στις παρασκήνιες καρτέλες" + +#: ../midori/midori-websettings.c:828 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "" +"Αναβόσβησε το παράθυρο του περιηγητή όταν μία καρτέλα ανοιχθεί στο παρασκήνιο" + +#: ../midori/midori-websettings.c:836 +#, fuzzy +msgid "Enable WebGL support" +msgstr "Ενεργοποίηση υποστήριξης βάσης δεδομένων HTML5" + +#: ../midori/midori-websettings.c:837 +msgid "Allow websites to use OpenGL rendering" +msgstr "" + +#: ../midori/midori-websettings.c:863 msgid "Zoom Text and Images" msgstr "Εστίαση κειμένου και εικόνων" -#: ../midori/midori-websettings.c:924 +#: ../midori/midori-websettings.c:864 msgid "Whether to zoom text and images" msgstr "Εάν θα εστιάζεται το κείμενο και οι εικόνες" -#: ../midori/midori-websettings.c:939 +#: ../midori/midori-websettings.c:879 msgid "Find inline while typing" msgstr "Ενσωματωμένη εύρεση κατά την πληκτρολόγηση" -#: ../midori/midori-websettings.c:940 +#: ../midori/midori-websettings.c:880 msgid "Whether to automatically find inline while typing" msgstr "Εάν θα γίνεται αυτόματη ενσωματωμένη αναζήτηση κατά την πληκτρολόγηση" -#: ../midori/midori-websettings.c:955 +#: ../midori/midori-websettings.c:895 msgid "Kinetic scrolling" msgstr "Κινητική κύλιση" -#: ../midori/midori-websettings.c:956 +#: ../midori/midori-websettings.c:896 msgid "Whether scrolling should kinetically move according to speed" msgstr "Εάν η κύλιση θα κινείται ανάλογα με την ταχύτητα " -#: ../midori/midori-websettings.c:964 -msgid "Accept cookies" -msgstr "Αποδοχή cookies" - -#: ../midori/midori-websettings.c:965 -msgid "What type of cookies to accept" -msgstr "Τι τύπο cookies να γίνονται αποδεκτά" - -#: ../midori/midori-websettings.c:974 -msgid "Maximum cookie age" -msgstr "Μέγιστος χρόνος cookie" +#: ../midori/midori-websettings.c:904 +msgid "Delete old Cookies after:" +msgstr "Διαγραφή παλιών cookies μετά από:" -#: ../midori/midori-websettings.c:975 +#: ../midori/midori-websettings.c:905 msgid "The maximum number of days to save cookies for" msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση των cookies" -#: ../midori/midori-websettings.c:984 -msgid "Maximum history age" -msgstr "Μέγιστο χρόνος ιστορικού" +#: ../midori/midori-websettings.c:921 +msgid "Only accept Cookies from sites you visit" +msgstr "Αποδοχή Cookies μόνο από τα επισκεπτόμενους ιστότοπους" + +#: ../midori/midori-websettings.c:922 +msgid "Block cookies sent by third-party websites" +msgstr "Εμπόδισε cookies που στέλνονται από τρίτους ιστότοπους " + +#: ../midori/midori-websettings.c:936 +msgid "Delete pages from history after:" +msgstr "Διαγραφή σελίδων από το ιστορικό μετά από:" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:937 msgid "The maximum number of days to save the history for" msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση του ιστορικού" -#: ../midori/midori-websettings.c:993 -msgid "Remember last downloaded files" -msgstr "Απομνημόνευση των τελευταίων αρχείων που κατέβηκαν" - -#: ../midori/midori-websettings.c:994 -msgid "Whether the last downloaded files are saved" -msgstr "Εάν θα αποθηκεύονται τα τελευταία αρχεία που κατέβηκαν" - -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:952 msgid "Proxy server" msgstr "Διακομιστής μεσολάβησης" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:953 msgid "The type of proxy server to use" msgstr "Ο τύπος του διακομιστής προς χρήση" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:962 msgid "HTTP Proxy Server" msgstr "HTTP διακομιστής μεσολάβησης" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:963 msgid "The proxy server used for HTTP connections" msgstr "Ο μεσολαβητής χρησιμοποιείται για http συνδέσεις" +#: ../midori/midori-websettings.c:978 +msgid "Port" +msgstr "Πόρτα" + +#: ../midori/midori-websettings.c:979 +msgid "The proxy server port used for HTTP connections" +msgstr "Η πόρτα του μεσολαβητή χρησιμοποιείται για HTTP συνδέσεις" + +#: ../midori/midori-websettings.c:997 +msgid "The maximum size of cached pages on disk" +msgstr "Το μέγιστο μέγεθος των προσωρινά αποθηκευμένων σελίδων στο δίσκο" + #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1038 +#: ../midori/midori-websettings.c:1014 msgid "Identify as" msgstr "Αναγνώριση ως" -#: ../midori/midori-websettings.c:1039 +#: ../midori/midori-websettings.c:1015 msgid "What to identify as to web pages" msgstr "Με τι να αναγνωρίζεται στις σελίδες ιστού" -#: ../midori/midori-websettings.c:1055 +#: ../midori/midori-websettings.c:1031 msgid "Identification string" msgstr "Αλφαριθμητικό αναγνώρισης" -#: ../midori/midori-websettings.c:1056 +#: ../midori/midori-websettings.c:1032 msgid "The application identification string" msgstr "Το αλφαριθμητικό αναγνώρισης της εφαρμογής" -#: ../midori/midori-websettings.c:1071 +#: ../midori/midori-websettings.c:1048 msgid "Preferred languages" msgstr "Προτιμώμενες γλώσσες" -#: ../midori/midori-websettings.c:1072 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "Μία διαχωρισμένη λίστα των προτιμώμενων γλωσσών με κόμμα για επεξεργασία των πολυγλωσσικών ιστοσελίδων, για παράδειγμα \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +#: ../midori/midori-websettings.c:1049 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"Μία διαχωρισμένη λίστα των προτιμώμενων γλωσσών με κόμμα για επεξεργασία των " +"πολυγλωσσικών ιστοσελίδων, για παράδειγμα \"de\", \"ru,nl\" or \"en-us;" +"q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1087 +#: ../midori/midori-websettings.c:1064 msgid "Clear private data" msgstr "Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-websettings.c:1088 +#: ../midori/midori-websettings.c:1065 msgid "The private data selected for deletion" 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:1229 -#: ../midori/midori-view.c:4462 -#: ../midori/midori-view.c:4466 +#: ../midori/midori-websettings.c:1080 +msgid "Clear data" +msgstr "Καθαρισμός δεδομένων" + +#: ../midori/midori-websettings.c:1081 +msgid "The data selected for deletion" +msgstr "Τα δεδομένα που επιλέχθηκαν για διαγραφή" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1130 +msgid "Strip referrer details sent to websites" +msgstr "Αφαίρεση λεπτομερειών referrer που αποστέλλονται σε ιστοσελίδες" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1132 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Εάν η κεφαλίδα \"Referer\" θα πρέπει να συντομεύσει στο hostname" + +#: ../midori/midori-websettings.c:1146 +msgid "Always use my font choices" +msgstr "Πάντα χρήση των δικών μου επιλογών γραμματοσειράς" + +#: ../midori/midori-websettings.c:1147 +msgid "Override fonts picked by websites with user preferences" +msgstr "" +"Παράκαμψη της επιλογής των γραμματοσειρών των ιστότοπων με τις επιλογές του " +"χρήστη" + +#: ../midori/midori-view.c:1360 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s θέλει να σώσει μια βάση δεδομένων HTML5." + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Deny" +msgstr "_Άρνηση" + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Allow" +msgstr "_Αποδοχή" + +#: ../midori/midori-view.c:1392 +#, c-format +msgid "%s wants to know your location." +msgstr "%s θέλει να ξέρει τη θέση σας." + +#: ../midori/midori-view.c:1485 #, c-format msgid "Error - %s" msgstr "Σφάλμα- %s" -#: ../midori/midori-view.c:1230 +#: ../midori/midori-view.c:1486 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Η σελίδα '%s' δεν μπορεί να φορτωθεί." -#: ../midori/midori-view.c:1232 +#: ../midori/midori-view.c:1488 msgid "Try again" msgstr "Δοκιμάστε ξανά" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1251 -#, c-format -msgid "Not found - %s" -msgstr "Δεν βρέθηκε - %s" - -#: ../midori/midori-view.c:1435 -#: ../midori/midori-view.c:2280 +#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598 #, c-format msgid "Send a message to %s" msgstr "Αποστολή μηνύματος στο: %s" -#: ../midori/midori-view.c:2062 -#: ../midori/midori-view.c:2447 +#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747 msgid "Inspect _Element" msgstr "Εξέταση _στοιχείου" -#: ../midori/midori-view.c:2114 -#: ../midori/midori-view.c:2184 +#: ../midori/midori-view.c:2480 msgid "Open Link in New _Tab" msgstr "Άνοιγμα συνδέσμου σε νέα κ_αρτέλα" -#: ../midori/midori-view.c:2118 +#: ../midori/midori-view.c:2484 msgid "Open Link in _Foreground Tab" msgstr "Άνοιγμα συνδέσμου σε νέα καρτέλα στο π_ροσκήνιο" -#: ../midori/midori-view.c:2119 +#: ../midori/midori-view.c:2485 msgid "Open Link in _Background Tab" msgstr "Άνοιγμα συνδέσμου σε καρτέλα στο _παρασκήνιο" -#: ../midori/midori-view.c:2122 -#: ../midori/midori-view.c:2191 +#: ../midori/midori-view.c:2488 msgid "Open Link in New _Window" msgstr "Άνοιγμα συνδέσμου σε νέο _παράθυρο" -#: ../midori/midori-view.c:2125 +#: ../midori/midori-view.c:2491 msgid "Open Link as Web A_pplication" msgstr "Άνοιγμα ως δικτυακή εφ_αρμογή" -#: ../midori/midori-view.c:2128 +#: ../midori/midori-view.c:2496 msgid "Copy Link de_stination" msgstr "Αντιγραφή συνδέσμου πρ_οορισμού" -#: ../midori/midori-view.c:2131 -#: ../midori/midori-view.c:2203 -msgid "_Save Link destination" -msgstr "Απ_οθήκευση συνδέσμου προορισμού" - -#: ../midori/midori-view.c:2132 -#: ../midori/midori-view.c:2197 -msgid "_Download Link destination" -msgstr "Κ_ατέβασμα συνδέσμου προορισμού" - -#: ../midori/midori-view.c:2136 -#: ../midori/midori-view.c:2166 -#: ../midori/midori-view.c:2208 -msgid "Download with Download _Manager" -msgstr "Κατέβασμα με τον διαχειριστή μεταφορών" - -#: ../midori/midori-view.c:2145 +#: ../midori/midori-view.c:2512 msgid "Open _Image in New Tab" msgstr "Άνοιγμα ει_κόνας σε νέα καρτέλα" -#: ../midori/midori-view.c:2148 +#: ../midori/midori-view.c:2515 msgid "Copy Image _Address" msgstr "Αντιγραφή _διεύθυνσης εικόνας" -#: ../midori/midori-view.c:2151 +#: ../midori/midori-view.c:2518 msgid "Save I_mage" msgstr "Αποθήκευση ει_κόνας" -#: ../midori/midori-view.c:2152 -msgid "Download I_mage" -msgstr "Αποθήκευση ει_κόνας" +#: ../midori/midori-view.c:2521 +#, fuzzy +msgid "Open in Image _Viewer" +msgstr "Άνοιγμα ει_κόνας σε νέα καρτέλα" -#: ../midori/midori-view.c:2159 +#: ../midori/midori-view.c:2528 msgid "Copy Video _Address" msgstr "Αντιγραφή _διεύθυνσης βίντεο" -#: ../midori/midori-view.c:2162 +#: ../midori/midori-view.c:2531 msgid "Save _Video" msgstr "Αποθήκευση _βίντεο" -#: ../midori/midori-view.c:2162 +#: ../midori/midori-view.c:2531 msgid "Download _Video" msgstr "Αποθήκευση _βίντεο" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2557 msgid "Search _with" msgstr "Αναζήτηση _με" -#: ../midori/midori-view.c:2260 -#: ../midori/midori-view.c:2267 +#: ../midori/midori-view.c:2589 msgid "_Search the Web" msgstr "_Αναζήτηση στον ιστό" -#: ../midori/midori-view.c:2288 +#: ../midori/midori-view.c:2606 msgid "Open Address in New _Tab" msgstr "Άνοιγμα διεύθυνσης σε νέα_καρτέλα" -#: ../midori/midori-view.c:2592 +#: ../midori/midori-view.c:2909 msgid "Open or download file" msgstr "Άνοιγμα ή κατέβασμα αρχείου" -#: ../midori/midori-view.c:2611 +#: ../midori/midori-view.c:2929 #, c-format msgid "File Type: '%s'" msgstr "Τύπος αρχείου: '%s'" -#: ../midori/midori-view.c:2614 +#: ../midori/midori-view.c:2931 #, 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:2618 +#: ../midori/midori-view.c:2935 +#, c-format +msgid "File Name: %s" +msgstr "Όνομα Αρχείου: %s" + +#: ../midori/midori-view.c:2955 #, c-format msgid "Open %s" msgstr "Άνοιγμα %s" -#: ../midori/midori-view.c:3159 +#: ../midori/midori-view.c:3576 #, c-format msgid "Inspect page - %s" msgstr "Εξέταση σελίδα -%s" -#: ../midori/midori-view.c:3440 -msgid "Speed dial" +#: ../midori/midori-view.c:3923 +msgid "Speed Dial" msgstr "Γρήγορη σύνδεση" -#: ../midori/midori-view.c:3441 +#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020 msgid "Click to add a shortcut" msgstr "Κάντε click για προσθήκη συντόμευσης" -#: ../midori/midori-view.c:3442 +#: ../midori/midori-view.c:3925 msgid "Enter shortcut address" msgstr "Εισάγεται διεύθυνση συντόμευσης" -#: ../midori/midori-view.c:3443 +#: ../midori/midori-view.c:3926 msgid "Enter shortcut title" msgstr "Εισάγετε τίτλο συντόμευσης" -#: ../midori/midori-view.c:3444 +#: ../midori/midori-view.c:3927 msgid "Are you sure you want to delete this shortcut?" msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την συντόμευση;" -#: ../midori/midori-view.c:3445 -msgid "Set number of columns and rows" -msgstr "Ορισμός αριθμού στηλών και γραμμών" +#: ../midori/midori-view.c:4089 +#, c-format +msgid "No documentation installed" +msgstr "Δεν έχει εγκατασταθεί τεκμηρίωση" -#: ../midori/midori-view.c:3446 -msgid "Enter number of columns and rows:" -msgstr "Εισάγεται τον αριθμό των στηλών και γραμμών:" +#: ../midori/midori-view.c:4165 +msgid "Midori doesn't store any personal data:" +msgstr "Ο Midori δεν αποθηκεύει προσωπικά δεδομένα:" -#: ../midori/midori-view.c:3447 -msgid "Invalid input for the size of the speed dial" -msgstr "Άκυρη εισαγωγή για το μέγεθος της γρήγορης σύνδεσης" +#: ../midori/midori-view.c:4166 +msgid "No history or web cookies are being saved." +msgstr "" -#: ../midori/midori-view.c:3448 -msgid "Thumb size:" -msgstr "Μέγεθος μικρογραφίας:" +#: ../midori/midori-view.c:4167 +msgid "Extensions are disabled." +msgstr "" -#: ../midori/midori-view.c:3449 -msgid "Small" -msgstr "Μικρό" +#: ../midori/midori-view.c:4168 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "" -#: ../midori/midori-view.c:3450 -msgid "Medium" -msgstr "Μεσαίο" +#: ../midori/midori-view.c:4169 +msgid "Midori prevents websites from tracking the user:" +msgstr "" -#: ../midori/midori-view.c:3451 -msgid "Big" -msgstr "Μεγάλο" +#: ../midori/midori-view.c:4170 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "" -#: ../midori/midori-view.c:3477 -#, c-format -msgid "Document cannot be displayed" -msgstr "Το αρχείο δεν μπορεί να εμφανιστεί" +#: ../midori/midori-view.c:4171 +msgid "DNS prefetching is disabled." +msgstr "" -#: ../midori/midori-view.c:3500 -#, c-format -msgid "No documentation installed" -msgstr "Δεν έχει εγκατασταθεί τεκμηρίωση" +#: ../midori/midori-view.c:4172 +msgid "The language and timezone are not revealed to websites." +msgstr "Η γλώσσα και η ζώνη ώρας δεν εμφανίζονται στις ιστοσελίδες." -#: ../midori/midori-view.c:3618 +#: ../midori/midori-view.c:4173 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "" + +#: ../midori/midori-view.c:4222 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "" +"Οι αριθμοί έκδοσης στις παρενθέσεις δείχνουν την έκδοση που χρησιμοποιήθηκε " +"κατά την εκτέλεση." + +#: ../midori/midori-view.c:4278 msgid "Page loading delayed" msgstr "Καθυστέρηση φόρτωση σελίδας" -#: ../midori/midori-view.c:3619 +#: ../midori/midori-view.c:4279 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "Καθυστέρηση φόρτωσης είτε λόγω κάποιου σφάλματος είτε για ρυθμίσεις εκκίνησης." +msgstr "" +"Καθυστέρηση φόρτωσης είτε λόγω πρόσφατης κατάρρευσης ή εφαρμογής ρυθμίσεων " +"εκκίνησης." -#: ../midori/midori-view.c:3620 +#: ../midori/midori-view.c:4280 msgid "Load Page" msgstr "Φόρτωση σελίδας" -#: ../midori/midori-view.c:3762 +#: ../midori/midori-view.c:4446 msgid "Blank page" msgstr "Κενή σελίδα" -#: ../midori/midori-view.c:4016 +#: ../midori/midori-view.c:4708 msgid "_Duplicate Tab" msgstr "_Διπλότυπη καρτέλα" -#: ../midori/midori-view.c:4021 -msgid "_Restore Tab" -msgstr "_Επαναφορά καρτέλας" - -#: ../midori/midori-view.c:4021 -msgid "_Minimize Tab" -msgstr "_Ελαχιστοποίηση καρτέλας" +#: ../midori/midori-view.c:4713 +msgid "Show Tab _Label" +msgstr "Εμφάνιση _ετικέτας καρτέλας" + +#: ../midori/midori-view.c:4713 +msgid "Show Tab _Icon Only" +msgstr "Εμφάνιση μόνο των πλακ_ιδίων καρτέλας" -#: ../midori/midori-view.c:4027 +#: ../midori/midori-view.c:4719 msgid "Close ot_her Tabs" msgstr "Κλείσιμο άλλ_ων καρτελών" -#: ../midori/midori-view.c:4699 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5532 +msgid "previous" +msgstr "προηγούμενο" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5551 +msgid "next" +msgstr "επόμενο" + +#: ../midori/midori-view.c:5564 msgid "Print background images" msgstr "Εκτύπωση εικόνων παρασκηνίου" -#: ../midori/midori-view.c:4700 +#: ../midori/midori-view.c:5565 msgid "Whether background images should be printed" msgstr "Εάν θα τυπώνονται οι εικόνες παρασκηνίου" -#: ../midori/midori-view.c:4752 -#: ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:5597 msgid "Features" msgstr "Χαρακτηριστικά" -#. Page "General" -#: ../midori/midori-preferences.c:301 -msgid "General" -msgstr "Γενικά" - -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Εκκίνηση" -#: ../midori/midori-preferences.c:317 -#: ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Χρήση _τρέχουσας σελίδας" + +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Τρέχουσα σελίδα ως αρχική" -#: ../midori/midori-preferences.c:334 -#: ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Μεταφορές" - #. Page "Appearance" -#: ../midori/midori-preferences.c:352 -msgid "Appearance" -msgstr "Εμφάνιση" - -#: ../midori/midori-preferences.c:353 -msgid "Font settings" -msgstr "Ρυθμίσεις γραμματοσειράς" - -#: ../midori/midori-preferences.c:355 -msgid "Default Font Family" -msgstr "Προεπιλεγμένη οικογένεια γραμματοσειράς" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Γραμματοσειρές" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Αναλογική οικογένεια γραμματοσειράς" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" -msgstr "Η προκαθορισμένη οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση του κειμένου" +msgstr "" +"Η προκαθορισμένη οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση " +"του κειμένου" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "Το προκαθορισμένο μέγεθος γραμματοσειράς για την εμφάνιση του κειμένου" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Σταθερού-μεγέθους οικογένεια γραμματοσειράς" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" -msgstr "Η οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση σταθερού μεγέθους κειμένου" +msgstr "" +"Η οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση σταθερού " +"μεγέθους κειμένου" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" -msgstr "Το μέγεθος της γραμματοσειράς που χρησιμοποιείται για την εμφάνιση κειμένου σταθερού μεγέθους" +msgstr "" +"Το μέγεθος της γραμματοσειράς που χρησιμοποιείται για την εμφάνιση κειμένου " +"σταθερού μεγέθους" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Ελάχιστο μέγεθος γραμματοσειράς" -#: ../midori/midori-preferences.c:374 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "Το ελάχιστο μέγεθος γραμματοσειράς για την εμφάνιση του κειμένου" #. Page "Behavior" -#: ../midori/midori-preferences.c:383 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Συμπεριφορά" -#: ../midori/midori-preferences.c:396 -msgid "Enforce 96 dots per inch" -msgstr "Επιβολή 96 dots ανά ίντσα" - -#: ../midori/midori-preferences.c:397 -msgid "Enforce a video dot density of 96 DPI" -msgstr "Επιβολή της πυκνότητας βίντεο dot στα 96DPI" - -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Να επιτρέπονται στις δέσμες εντολών να ανοίγουν αναδυόμενα παράθυρα." -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "Εάν θα επιτρέπονται στις δέσμες εντολών να ανοίγουν αυτόματα αναδυόμενα παράθυρα" - -#: ../midori/midori-preferences.c:422 -msgid "Spell Checking" -msgstr "Ορθογραφία πληκτρολόγησης" - -#: ../midori/midori-preferences.c:425 -msgid "Enable Spell Checking" -msgstr "Ενεργοποίηση ορθογραφίας" - -#: ../midori/midori-preferences.c:426 -msgid "Enable spell checking while typing" -msgstr "Ενεργοποίηση ορθογραφίας κατά την πληκτρολόγηση" - -#: ../midori/midori-preferences.c:428 -msgid "Spelling dictionaries:" -msgstr "Λεξικά συλλαβισμού:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:432 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "Μία διαχωρισμένη λίστα με τις γλώσσες που μπορείτε να χρησιμοποιήσετε κατά την ορθογραφία πληκτρολόγησης, για παράδειγμα \"en_GB,de_DE\"" +msgstr "" +"Εάν θα επιτρέπονται στις δέσμες εντολών να ανοίγουν αυτόματα αναδυόμενα " +"παράθυρα" #. Page "Interface" -#: ../midori/midori-preferences.c:438 -msgid "Interface" -msgstr "Διεπαφή" - -#: ../midori/midori-preferences.c:439 -msgid "Navigationbar" -msgstr "Γραμμή πλοήγησης" - -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Περιήγηση" -#. Page "Applications" -#: ../midori/midori-preferences.c:471 -msgid "Applications" -msgstr "Εφαρμογές" - -#: ../midori/midori-preferences.c:472 -msgid "External applications" -msgstr "Εξωτερικές εφαρμογές" - #. Page "Network" -#: ../midori/midori-preferences.c:488 -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "Δίκτυο" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:463 msgid "Hostname" msgstr "Όνομα διακομιστή" -#. Page "Privacy" -#: ../midori/midori-preferences.c:514 -msgid "Privacy" -msgstr "Προσωπικό απόρρητο" - -#: ../midori/midori-preferences.c:515 -msgid "Web Cookies" -msgstr "Cookies ιστού" - -#: ../midori/midori-preferences.c:524 -#: ../midori/midori-preferences.c:538 -msgid "days" -msgstr "ημέρες" - -#: ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Άδειο" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "ΜΒ" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Προσθήκη μηχανής αναζήτησης" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Επεξεργασία μηχανής αναζήτησης" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Όνομα:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Περιγραφή:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "_Εικονίδιο:" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "_Μορφότυπο:" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "Διαχείριση των μηχανών αναζήτησης" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "Χρήση ως _προκαθορισμένο" -#: ../midori/sokoke.c:1304 -msgid "_Bookmark" -msgstr "_Σελιδοδείκτης" - -#: ../midori/sokoke.c:1305 -msgid "_Bookmarks" -msgstr "_Σελιδοδείκτες" - -#: ../midori/sokoke.c:1306 -msgid "Add Boo_kmark" -msgstr "Προσθήκη σ_ελιδοδείκτη" - -#: ../midori/sokoke.c:1307 -msgid "_Console" -msgstr "_Τερματικό" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "Άνοιγμα με" -#: ../midori/sokoke.c:1308 -msgid "_Extensions" -msgstr "_Επεκτάσεις" +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Επιλέξτε μια εφαρμογή ή εντολή για να ανοίξει το \"%s\":" -#: ../midori/sokoke.c:1309 -msgid "_History" -msgstr "_Ιστορικό" +#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "Δεν μπορεί να εκτελεστεί το εξωτερικό πρόγραμμα." -#: ../midori/sokoke.c:1310 -msgid "_Homepage" -msgstr "_Αρχική σελίδα" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d ώρα" +msgstr[1] "%d ώρες" -#: ../midori/sokoke.c:1311 -msgid "_Userscripts" -msgstr "_Δέσμες εντολών χρήστη" +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d λεπτό" +msgstr[1] "%d λεπτά" -#: ../midori/sokoke.c:1312 -msgid "New _Tab" -msgstr "Νέα _καρτέλα" +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d δευτερόλεπτο" +msgstr[1] "%d δευτερόλεπτα" -#: ../midori/sokoke.c:1313 -msgid "_Transfers" -msgstr "_Μεταφορές" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s από %s" -#: ../midori/sokoke.c:1314 -msgid "Netscape p_lugins" -msgstr "Α_ρθρωμάτων netscape" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/sokoke.c:1317 -msgid "New _Folder" -msgstr "Νέος _φάκελος" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr " - %s απομένει" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:201 +#: ../toolbars/midori-findbar.c:291 msgid "_Inline Find:" msgstr "Ε_νσωματωμένη αναζήτηση:" -#: ../toolbars/midori-findbar.c:233 +#: ../toolbars/midori-findbar.c:317 msgid "Previous" msgstr "Προηγούμενο" -#: ../toolbars/midori-findbar.c:239 +#: ../toolbars/midori-findbar.c:323 msgid "Next" msgstr "Επόμενο" -#: ../toolbars/midori-findbar.c:243 +#: ../toolbars/midori-findbar.c:327 msgid "Match Case" msgstr "Ταίριασμα πεζών" -#: ../toolbars/midori-findbar.c:252 +#: ../toolbars/midori-findbar.c:336 msgid "Highlight Matches" msgstr "Τονισμός των ταιριασμάτων" -#: ../toolbars/midori-findbar.c:263 +#: ../toolbars/midori-findbar.c:347 msgid "Close Findbar" msgstr "Κλείσιμο μπάρας εύρεσης" -#: ../toolbars/midori-transferbar.c:88 -#: ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s από %s" - -#: ../toolbars/midori-transferbar.c:123 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "Το αρχείο '%s' έχει κατέβει." -#: ../toolbars/midori-transferbar.c:126 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Η μεταφορά ολοκληρώθηκε" -#: ../toolbars/midori-transferbar.c:257 -#: ../panels/midori-transfers.c:141 +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "Το αρχείο που κατέβηκε είναι εσφαλμένο." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"Το άθροισμα ελέγχου που παρέχεται με το σύνδεσμο δεν ταιριάζει. Αυτό " +"σημαίνει ότι το αρχείο είναι μάλλον ελλιπές ή τροποποιήθηκε στη συνέχεια." + +#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Καθαρισμός όλων" -#: ../toolbars/midori-transferbar.c:300 -#: ../toolbars/midori-transferbar.c:302 +#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 msgid "Some files are being downloaded" msgstr "Μερικά αρχεία κατεβαίνουν" -#: ../toolbars/midori-transferbar.c:306 +#: ../toolbars/midori-transferbar.c:377 msgid "_Quit Midori" msgstr "_Τερματισμός του Μιντόρι" -#: ../toolbars/midori-transferbar.c:308 +#: ../toolbars/midori-transferbar.c:379 msgid "The transfers will be cancelled if Midori quits." msgstr "Οι μεταφορές θα ακυρωθούν εάν τερματιστεί ο midori." -#: ../panels/midori-bookmarks.c:116 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Σελιδοδείκτες" -#: ../panels/midori-bookmarks.c:275 +#: ../panels/midori-bookmarks.c:257 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Απέτυχε η προσθήκη σελιδοδείκτη: %s\n" -#: ../panels/midori-bookmarks.c:307 -#: ../panels/midori-history.c:169 -#: ../panels/midori-history.c:199 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Αποτυχία στην διαγραφή του αντικειμένου από το ιστορικό: %s\n" - -#: ../panels/midori-bookmarks.c:431 +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "Επεξεργασία του επιλεγμένου σελιδοδείκτη" -#: ../panels/midori-bookmarks.c:439 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "Διαγραφή του επιλεγμένου σελιδοδείκτη" -#: ../panels/midori-bookmarks.c:453 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" msgstr "Προσθήκη ενός νέου φακέλου" -#: ../panels/midori-bookmarks.c:583 -#: ../panels/midori-history.c:520 +#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 msgid "Separator" msgstr "Διαχωριστικό" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "Τερματικό" - -#: ../panels/midori-console.c:361 -msgid "Copy _All" -msgstr "Αντιγραφή _όλων" - -#: ../panels/midori-console.c:362 -msgid "Copy All" -msgstr "Αντιγραφή όλων" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "Ιστορικό" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Επεκτάσεις" +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "Σήμερα" -#: ../panels/midori-history.c:146 -msgid "A week ago" -msgstr "Μια βδομάδα πριν" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "Χθες" -#: ../panels/midori-history.c:148 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d μέρα πριν" msgstr[1] "%d μέρες πριν" -#: ../panels/midori-history.c:151 -msgid "Today" -msgstr "Σήμερα" - -#: ../panels/midori-history.c:153 -msgid "Yesterday" -msgstr "Χθες" +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "Μια βδομάδα πριν" -#: ../panels/midori-history.c:324 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" -msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα αντικείμενα του ιστορικού;" +msgstr "" +"Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα αντικείμενα του ιστορικού;" -#: ../panels/midori-history.c:369 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" msgstr "Σελιδοποίηση του επιλεγμένου αντικειμένου του ιστορικού" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" msgstr "Διαγραφή του επιλεγμένου αντικειμένου από το ιστορικό" -#: ../panels/midori-history.c:386 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "Καθαρισμός ολόκληρου του ιστορικού" -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Μεταφορές" + +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" -msgstr "Άνοιγμα φακέλου προορισμού" +msgstr "Άνοιγμα _φακέλου προορισμού" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" msgstr "Αντιγραφή τοποθεσίας σ_υνδέσμου" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Απαιτείται αυθεντικοποίηση" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" @@ -2301,167 +2232,249 @@ "Απαιτείται ένα όνομα χρήσης και ένα συνθηματικό\n" "για το άνοιγμα της τοποθεσίας:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "Όνομα χρήσης" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "Συνθηματικό" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "Α_πομνημόνευση συνθηματικού" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Το εικονίδιο Named '%s' δεν μπορεί να φορτωθεί" -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Το εικονίδιο Stock '%s' δεν μπορεί να φορτωθεί" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "Τα κινούμενα γραφικά πλαίσια δεν λειτουργούν" -#: ../katze/katze-utils.c:499 -#: ../katze/katze-utils.c:894 +#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Η ιδιότητα '%s' δεν είναι έγκυρη για το %s" -#: ../katze/katze-utils.c:545 -#: ../katze/katze-utils.c:574 +#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Επιλογή αρχείου" -#: ../katze/katze-utils.c:560 +#: ../katze/katze-utils.c:506 msgid "Choose folder" msgstr "Επιλογή φακέλου" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "Κανένα" + +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "1 ώρα" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "1 ημέρα" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "1 Εβδομάδα" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "1 μήνας" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "1 έτος" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Προτιμήσεις για %s" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:473 msgid "Configure Advertisement filters" msgstr "Ρύθμιση φίλτρων διαφημίσεων" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:504 #, 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:587 -msgid "Configure _Advertisement filters..." -msgstr "Ρύθμιση φίλτρων δ_ιαφημίσεων..." +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:841 +#: ../extensions/adblock.c:882 msgid "Edit rule" msgstr "Επεξεργασία κανόνα" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:896 msgid "_Rule:" msgstr "_Κανόνας:" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:950 msgid "Bl_ock image" msgstr "Φρ_αγή εικόνας" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:955 msgid "Bl_ock link" msgstr "Φρ_αγή συνδέσμου" -#: ../extensions/adblock.c:1494 +#: ../extensions/adblock.c:1670 msgid "Advertisement blocker" msgstr "Εμποδιστής διαφημίσεων" -#: ../extensions/adblock.c:1495 +#: ../extensions/adblock.c:1671 msgid "Block advertisements according to a filter list" msgstr "Μπλόκαρε διαφημίσεις σύμφωνα με μία λίστα με φίλτρα" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "Αντιγραφή %s στον κατάλογο %s." +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "" +"Αυτή η σελίδα φαίνεται να περιλαμβάνει ένα σενάριο χρήστη. Θέλετε να το " +"εγκαταστήσετε;" -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "_Εγκατάσταση σεναρίου χρήστη" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "" +"Αυτή η σελίδα φαίνεται να περιέχει ένα στυλ χρήστη. Θέλετε να το " +"εγκαταστήσετε;" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_Εγκατάσταση στυλ χρήστη" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Να μην εγκατασταθεί" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Δέσμες εντολών χρηστών" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Θέματα χρήστη" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Σφάλμα" + +#: ../extensions/addons.c:421 #, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "Οι ρυθμίσεις της επέκτασης '%s' δεν μπορεί να αποθηκευτεί: %s\n" +msgid "Do you want to delete '%s'?" +msgstr "Θέλετε να διαγράψετε το '%s';" + +#: ../extensions/addons.c:427 +msgid "Delete user script" +msgstr "Διαγραφή δέσμης εντολών χρήστη" + +#: ../extensions/addons.c:428 +msgid "Delete user style" +msgstr "Διαγραφή θεμάτων χρήστη" + +#: ../extensions/addons.c:431 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "Το αρχείο %s θα διαγραφεί μόνιμα." + +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "Άνοιγμα στον κειμενογράφο" + +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "Άνοιγμα φακέλου προορισμού" -#: ../extensions/addons.c:1086 -#: ../extensions/addons.c:1253 +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "Προσθήκη νέας επέκτασης" + +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "Απομάκρυνση της επιλεγμένης επέκτασης" + +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" msgstr "Προσθήκες χρήστη" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Αδυναμία παρακολούθησης του καταλόγου '%s': %s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" msgstr "Υποστήριξη για δέσμες εντολών χρήστη και στυλ χρήστη" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "Χρωματιστές καρτέλες" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Ευκρινές αποχρώσεις σε κάθε καρτέλα" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Διαχειριστής cookie" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "Διαγραφή όλων" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 -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:105 +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:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "Ανάπτυξη όλων" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "Μάζεμα όλων" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα cookies;" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Ερώτηση" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." msgstr "Μόνο τα cookies που ταιριάζουν στο φίλτρο θα διαγραφούν." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "Στο τέλος της συνεδρίας" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2478,15 +2491,15 @@ "Ασφάλεια: %s\n" "Λήγει: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Ναι" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "Όχι" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" @@ -2495,82 +2508,76 @@ "Τομέας: %s\n" "Cookies: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Όνομα" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "_Ανάπτυξη όλων" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "_Μάζεμα όλων" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 msgid "Filter:" msgstr "Φίλτρο:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 -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" -msgstr "_Διαχειριστής cookie" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +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:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Λίστα, εμφάνιση και διαγραφή cookies" -#: ../extensions/copy-tabs.c:39 +#: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" msgstr "Αντιγραφή _διεύθυνσης καρτέλας" -#: ../extensions/copy-tabs.c:98 +#: ../extensions/copy-tabs.c:95 msgid "Copy Addresses of Tabs" msgstr "Αντιγραφή διευθύνσεων από καρτέλες" -#: ../extensions/copy-tabs.c:99 +#: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Αντιγραφή των διευθύνσεων όλων των καρτέλων στο πρόχειρο" -#: ../extensions/external-applications.vala:93 -msgid "External Applications" -msgstr "Εξωτερικές εφαρμογές" - -#: ../extensions/external-applications.vala:94 -msgid "Associate URL schemes with external commands" -msgstr "Συσχέτιση URL σχημάτων με εξωτερικές εντολές" - #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "Αποτυχία εύρεσης απαιτούμενου στοιχείου Atom \"entry\" στα δεδομένα XML." +msgstr "" +"Αποτυχία εύρεσης απαιτούμενου στοιχείου Atom \"entry\" στα δεδομένα XML." #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "Αποτυχία εύρεσης απαιτούμενου στοιχείου Atom \"feed\" στα δεδομένα XML." +msgstr "" +"Αποτυχία εύρεσης απαιτούμενου στοιχείου Atom \"feed\" στα δεδομένα XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Τελευταία ενημέρωση: %s." -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "Ροές νέων" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "Προσθήκη ενός νέας ροής" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "Διαγραφή ροής" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "_Ροές" @@ -2603,11 +2610,8 @@ #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "Αποτυχία εύρεσης απαιτούμενου στοιχείου RSS \"channel\" στα XML δεδομένα." - -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "Σφάλμα" +msgstr "" +"Αποτυχία εύρεσης απαιτούμενου στοιχείου RSS \"channel\" στα XML δεδομένα." #: ../extensions/feed-panel/main.c:131 #, c-format @@ -2619,182 +2623,283 @@ msgid "Error loading feed '%s'" msgstr "Σφάλμα κατά την φόρτωση ροής '%s'" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "Πλαίσιο ροής" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Ανάγνωση Atom / RSS ροών" -#: ../extensions/formhistory.c:142 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" msgstr "Απέτυχε η προσθήκη τιμής φόρμας: %s\n" -#: ../extensions/formhistory.c:455 -#: ../extensions/formhistory.c:459 +#: ../extensions/formhistory/formhistory.c:95 +#, fuzzy +msgid "Form history" +msgstr "Ιστορικό δεδομένων φόρμας" + +#: ../extensions/formhistory/formhistory.c:112 +#, fuzzy +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Απαιτείται ένα όνομα χρήσης και ένα συνθηματικό\n" +"για το άνοιγμα της τοποθεσίας:" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "Απομνημόνευση συνθηματικού σε αυτή τη σελίδα;" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Απομνημόνευση" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Ποτέ γι' αυτή τη σελίδα" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "Φόρμα εναλλαγής από την κατάσταση ιστορικού" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "" +"Ενεργοποίηση ή απενεργοποίηση ιστορικότητας φόρμας για την τελευταία " +"τρέχουσα καρτέλα." + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Αποτυχία κατά την εκτέλεση της δήλωσης στην βάση: %s\n" -#: ../extensions/formhistory.c:503 +#: ../extensions/formhistory/formhistory.c:629 +#, fuzzy +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" +"ενεργοποίηση ιστορικότητας φόρμας μόνο μέσω συντόμευσης(Ctrl+Shift+F) ανά " +"καρτέλα" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "Ιστορικό δεδομένων φόρμας" + +#: ../extensions/formhistory/formhistory.c:669 msgid "Stores history of entered form data" msgstr "Αποθηκεύει το ιστορικό των δεδομένων που έχουν εισαχθεί σε φόρμες" -#: ../extensions/formhistory.c:507 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#, fuzzy, c-format +msgid "Failed to select suggestions\n" +msgstr "Αποτυχία επιλογής ιστορικό: \n" + +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Δεν υπάρχουν μη επισκεπτόμενες καρτέλες" + +#: ../extensions/history-list.vala:235 #, c-format -msgid "Not available: %s" -msgstr "Μη διαθέσιμα: %s" +msgid "History-List" +msgstr "Λίστα-Ιστορικού" -#: ../extensions/formhistory.c:508 -msgid "Resource files not installed" -msgstr "Τα αρχεία πόρων δεν έχουν εγκατασταθεί" +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Συμπεριφορά κλεισίματος καρτέλας" -#: ../extensions/formhistory.c:514 -msgid "Form history filler" -msgstr "Ιστορικό δεδομένων φόρμας" +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Μην κάνεις τίποτα" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Μετάβαση στην τελευταία προσβληθείσα καρτέλα" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Μετάβαση στην νεότερη καρτέλα" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Επόμενη νέα καρτέλα (λίστα ιστορικού)" -#: ../extensions/history-list.vala:174 -msgid "Next Tab (History List)" -msgstr "Επόμενη καρτέλα (λίστα ιστορικού)" - -#: ../extensions/history-list.vala:175 -msgid "Next tab from history" -msgstr "Επόμενη καρτέλα από το ιστορικό" - -#: ../extensions/history-list.vala:184 -msgid "Previous Tab (History List)" -msgstr "Προηγούμενη καρτέλα (λίστα ιστορικού)" - -#: ../extensions/history-list.vala:185 -msgid "Previous tab from history" -msgstr "Προηγούμενη καρτέλα από ιστορικό" +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Επόμενη νέα καρτέλα από το ιστορικό" -#: ../extensions/history-list.vala:245 +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Προηγούμενη νέα καρτέλα (λίστα ιστορικού)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Προηγούμενη νέα καρτέλα από ιστορικό" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Εμφάνιση καρτέλας στο παρασκήνιο (λίστα ιστορικού)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Εμφάνιση της τρέχουσας επιλεγμένης καρτέλας στο παρασκήνιο" + +#: ../extensions/history-list.vala:569 msgid "History List" msgstr "Λίστα ιστορικού" -#: ../extensions/history-list.vala:246 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Να επιτρέπεται η εναλλαγή καρτελών επιλέγοντας από την ταξινομημένη λίστα της τελευταίας χρήσης." +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "" +"Μετακίνηση στην τελευταία χρησιμοποιημένη καρτέλα όταν εναλλάσσονται ή " +"κλείνονται οι καρτέλες" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Κινήσεις ποντικιού" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 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 -msgid "Pageholder" -msgstr "Αποθήκευση Σελίδων" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "_Αποθήκευση σελίδων" - -#: ../extensions/page-holder.c:178 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "Να μένει μία ή περισσότερες σελίδες παράλληλα ανοιχτές στις καρτέλες σας" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "Ανανέωση σελίδας ή διακοπή φόρτωσης" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "Προσαρμογή συντομεύσεων πληκτρολογίου" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "Προσαρμογή σ_υντομεύσεων..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Συντομεύσεις" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "Εμφάνιση και επεξεργασία συντομεύσεων πληκτρολογίου" -#: ../extensions/status-clock.c:176 +#: ../extensions/status-clock.c:174 msgid "Statusbar Clock" msgstr "Ρολόι στην γραμμή κατάστασης" -#: ../extensions/status-clock.c:177 +#: ../extensions/status-clock.c:175 msgid "Display date and time in the statusbar" msgstr "Εμφάνιση ημερομηνίας και ώρας στην γραμμή κατάστασης" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Εικόνες" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Δέσμες εντολών" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Αρθρωμάτων netscape" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "Γραμμή κατάστασης χαρακτηριστικών" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" -msgstr "Εύκολη εναλλαγή χαρακτηριστικών στις ιστοσελίδες ενεργοποίηση και απενεργοποίηση" +msgstr "" +"Εύκολη εναλλαγή χαρακτηριστικών στις ιστοσελίδες ενεργοποίηση και " +"απενεργοποίηση" -#: ../extensions/tab-panel.c:568 -#: ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Πλαίσιο καρτέλας" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "Πλαίσιο κ_αρτέλας" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Εμφάνιση καρτελών στο κάθετο πλαίσιο" -#: ../extensions/tabs-minimized.c:79 -msgid "Minimize new Tabs" -msgstr "Ελαχιστοποίηση των νέων καρτέλων" - -#: ../extensions/tabs-minimized.c:80 -msgid "New tabs open minimized" -msgstr "Οι νέες καρτέλες ανοίγουν ελαχιστοποιημένες" +#: ../extensions/tabs-minimized.c:76 +msgid "Only Icons on Tabs by default" +msgstr "Μόνο εικονίδια στις καρτέλες εξ'ορισμού" + +#: ../extensions/tabs-minimized.c:77 +msgid "New tabs have no label by default" +msgstr "Οι νέες καρτέλες δεν έχουν ετικέτα εξ'ορισμού" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Προσαρμογή εργαλειοθήκης" -#: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "Επιλέξτε τα αντικείμενα που θα εμφανίζονται στην εργαλειοθήκη. Τα αντικείμενα μπορούνε να ταξινομηθούν κατά την μεταφορά." +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"Επιλέξτε τα αντικείμενα που θα εμφανίζονται στην εργαλειοθήκη. Τα " +"αντικείμενα μπορούνε να ταξινομηθούν κατά την μεταφορά." -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Διαθέσιμα αντικείμενα" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Εμφανίσιμα αντικείμενα" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "Προσαρμογή _εργαλειοθήκης..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Προσαρμογή..." + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" msgstr "Επεξεργασία εργαλειοθήκης" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" msgstr "Εύκολη επεξεργασία της εμφάνισης της εργαλειοθήκης" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "Προσωρινή μνήμη επικοινωνίας HTTP στο δίσκο" +#~ msgid "Lightweight web browser" +#~ msgstr "Ελαφρύς περιηγητής ιστού" + +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "Η συγκεκριμένη ρύθμιση φακέλου είναι άκυρη." + +#~ msgid "Cookies" +#~ msgstr "Cookies" + +#~ msgid "'Flash' Cookies" +#~ msgstr "Άδειασμα των cookies" + +#~ msgid "HTML5 _Databases" +#~ msgstr "_Βάσεις δεδομένων HTML5" + +#~ msgid "Offline Application Cache" +#~ msgstr "Εκτός σύνδεσης προσωρινή μνήμη εφαρμογής" + +#~ msgid "Not available: %s" +#~ msgstr "Μη διαθέσιμα: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "Τα αρχεία πόρων δεν έχουν εγκατασταθεί" diff -Nru midori-0.2.8/po/en_GB.po midori-0.4.6/po/en_GB.po --- midori-0.2.8/po/en_GB.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/en_GB.po 2012-05-14 22:13:42.000000000 +0000 @@ -3,119 +3,141 @@ # This file is distributed under the same license as the midori package. # Bastien Nocera 2008 # Abigail Brady 2008 -# +# msgid "" msgstr "" "Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-24 00:05+0100\n" +"POT-Creation-Date: 2012-04-22 20:03+0000\n" "PO-Revision-Date: 2010-01-24 14:14+1100\n" "Last-Translator: Jeff Bailes \n" "Language-Team: British English \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Lightweight web browser" +msgid "Browse the Web" +msgstr "Browse the Web" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1453 ../midori/main.c:1659 -#: ../midori/main.c:1667 ../midori/main.c:1678 -#: ../midori/midori-websettings.c:296 +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "Internet;WWW;Explorer" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072 +#: ../midori/main.c:2086 ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Web Browser" -#: ../midori/main.c:96 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Midori Private Browsing" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Open a new private browsing window" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164 +msgid "Private Browsing" +msgstr "Private Browsing" + +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "The configuration couldn't be loaded: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Value '%s' is invalid for %s" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr "Invalid configuration value '%s'" -#: ../midori/main.c:389 +#: ../midori/main.c:380 #, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Failed to remove history item: %s\n" +msgid "The search engines couldn't be loaded. %s\n" +msgstr "The search engines couldn't be loaded. %s\n" -#: ../midori/main.c:412 +#: ../midori/main.c:434 #, c-format msgid "Failed to clear history: %s\n" msgstr "Failed to clear history: %s\n" -#: ../midori/main.c:432 -#, c-format -msgid "Failed to update history item: %s\n" -msgstr "Failed to update history item: %s\n" - -#: ../midori/main.c:466 -#, c-format -msgid "Failed to get current time: %s\n" -msgstr "Failed to get current time: %s\n" - -#: ../midori/main.c:482 -#, c-format -msgid "Failed to add history item: %s\n" -msgstr "Failed to add history item: %s\n" - -#: ../midori/main.c:509 ../extensions/formhistory.c:437 +#: ../midori/main.c:454 ../midori/main.c:581 +#: ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" msgstr "Failed to open database: %s\n" -#: ../midori/main.c:584 ../midori/midori-locationaction.c:450 -#: ../midori/midori-locationaction.c:455 ../extensions/formhistory.c:452 -#: ../extensions/formhistory.c:456 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Failed to execute database statement: %s\n" - #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:616 +#: ../midori/main.c:524 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Failed to remove old history items: %s\n" -#: ../midori/main.c:644 +#: ../midori/main.c:564 ../panels/midori-history.c:232 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Failed to remove history item: %s\n" + +#: ../midori/main.c:611 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "The bookmarks couldn't be saved. %s" + +#: ../midori/main.c:633 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "The configuration couldn't be saved. %s" -#: ../midori/main.c:682 +#: ../midori/main.c:668 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "The search engines couldn't be saved. %s" -#: ../midori/main.c:701 ../midori/main.c:751 ../midori/main.c:771 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "The bookmarks couldn't be saved. %s" - #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:801 ../midori/main.c:824 +#: ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" msgstr "The wastebasket couldn't be saved. %s" -#: ../midori/main.c:888 ../midori/main.c:1091 +#: ../midori/main.c:746 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Extensions" + +#: ../midori/main.c:760 +msgid "Privacy" +msgstr "Privacy" + +#: ../midori/main.c:772 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." + +#: ../midori/main.c:828 #, c-format msgid "The session couldn't be saved. %s" msgstr "The session couldn't be saved. %s" -#: ../midori/main.c:1125 +#: ../midori/main.c:1046 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" +"No root certificate file is available. SSL certificates cannot be verified." + +#: ../midori/main.c:1115 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." @@ -123,1409 +145,1455 @@ "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." -#: ../midori/main.c:1140 +#: ../midori/main.c:1134 msgid "Modify _preferences" msgstr "Modify _preferences" -#: ../midori/main.c:1144 -msgid "Reset the last _session" -msgstr "Reset the last _session" - -#: ../midori/main.c:1149 +#: ../midori/main.c:1138 msgid "Disable all _extensions" msgstr "Disable all _extensions" -#: ../midori/main.c:1357 ../midori/main.c:1893 +#: ../midori/main.c:1151 +msgid "Discard old tabs" +msgstr "Discard old tabs" + +#: ../midori/main.c:1152 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "Show last tabs without loading" + +#: ../midori/main.c:1153 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "Show last open tabs" + +#: ../midori/main.c:1400 ../midori/main.c:2464 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "The session couldn't be loaded: %s\n" -#: ../midori/main.c:1453 -msgid "No filename specified" -msgstr "No filename specified" - -#: ../midori/main.c:1476 -msgid "An unknown error occured." -msgstr "An unknown error occured." - -#: ../midori/main.c:1508 +#: ../midori/main.c:1538 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Snapshot saved to: %s\n" -#: ../midori/main.c:1568 +#: ../midori/main.c:1951 msgid "Run ADDRESS as a web application" msgstr "Run ADDRESS as a web application" -#: ../midori/main.c:1568 +#: ../midori/main.c:1951 msgid "ADDRESS" msgstr "ADDRESS" -#: ../midori/main.c:1571 +#: ../midori/main.c:1954 msgid "Use FOLDER as configuration folder" msgstr "Use FOLDER as configuration folder" -#: ../midori/main.c:1571 +#: ../midori/main.c:1954 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1574 +#: ../midori/main.c:1957 +msgid "Private browsing, no changes are saved" +msgstr "Private browsing, no changes are saved" + +#: ../midori/main.c:1959 msgid "Show a diagnostic dialog" msgstr "Show a diagnostic dialogue" -#: ../midori/main.c:1576 +#: ../midori/main.c:1961 msgid "Run the specified filename as javascript" msgstr "Run the specified filename as javascript" -#: ../midori/main.c:1579 +#: ../midori/main.c:1963 msgid "Take a snapshot of the specified URI" msgstr "Take a snapshot of the specified URI" -#: ../midori/main.c:1582 +#: ../midori/main.c:1965 msgid "Execute the specified command" msgstr "Execute the specified command" -#: ../midori/main.c:1584 +#: ../midori/main.c:1967 +msgid "List available commands to execute with -e/ --execute" +msgstr "List available commands to execute with -e/ --execute" + +#: ../midori/main.c:1969 msgid "Display program version" msgstr "Display program version" -#: ../midori/main.c:1586 +#: ../midori/main.c:1971 msgid "Addresses" msgstr "Addresses" -#: ../midori/main.c:1656 +#: ../midori/main.c:1973 +msgid "Block URIs according to regular expression PATTERN" +msgstr "Block URIs according to regular expression PATTERN" + +#: ../midori/main.c:1973 +msgid "PATTERN" +msgstr "PATTERN" + +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:1977 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "Reset Midori after SECONDS seconds of inactivity" + +#: ../midori/main.c:1977 +msgid "SECONDS" +msgstr "SECONDS" + +#: ../midori/main.c:1980 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Redirects console warnings to the specified FILENAME" + +#: ../midori/main.c:1980 +msgid "FILENAME" +msgstr "FILENAME" + +#: ../midori/main.c:2045 msgid "[Addresses]" msgstr "[Addresses]" -#: ../midori/main.c:1679 +#: ../midori/main.c:2087 msgid "Please report comments, suggestions and bugs to:" msgstr "Please report comments, suggestions and bugs to:" -#: ../midori/main.c:1681 +#: ../midori/main.c:2089 msgid "Check for new versions at:" msgstr "Check for new versions at:" -#: ../midori/main.c:1764 -msgid "The specified configuration folder is invalid." -msgstr "The specified configuration folder is invalid." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2173 +msgid "Saved logins and _passwords" +msgstr "Saved logins and _passwords" + +#: ../midori/main.c:2175 +msgid "Cookies and Website data" +msgstr "Cookies and Website data" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2179 ../midori/midori-websettings.c:996 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Web Cache" + +#: ../midori/main.c:2182 +msgid "Website icons" +msgstr "Website icons" + +#: ../midori/main.c:2288 +msgid "An unknown error occured" +msgstr "An unknown error occured" -#: ../midori/main.c:1812 +#: ../midori/main.c:2395 msgid "An instance of Midori is already running but not responding.\n" msgstr "An instance of Midori is already running but not responding.\n" -#: ../midori/main.c:1860 +#: ../midori/main.c:2431 #, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "The search engines couldn't be loaded. %s\n" - -#: ../midori/main.c:1878 -#, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "The bookmarks couldn't be loaded: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" +msgstr "Bookmarks couldn't be loaded: %s\n" -#: ../midori/main.c:1906 +#: ../midori/main.c:2479 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "The wastebasket couldn't be loaded: %s\n" -#: ../midori/main.c:1918 +#: ../midori/main.c:2492 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "The history couldn't be loaded: %s\n" -#: ../midori/main.c:1931 +#: ../midori/main.c:2508 msgid "The following errors occured:" msgstr "The following errors occured:" -#: ../midori/main.c:1947 +#: ../midori/main.c:2524 msgid "_Ignore" msgstr "_Ignore" -#: ../midori/midori-array.c:428 +#: ../midori/midori-app.c:1334 +msgid "_Bookmark" +msgstr "_Bookmark" + +#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060 +msgid "_Bookmarks" +msgstr "_Bookmarks" + +#: ../midori/midori-app.c:1336 +msgid "Add Boo_kmark" +msgstr "Add Boo_kmark" + +#: ../midori/midori-app.c:1337 +msgid "_Console" +msgstr "_Console" + +#: ../midori/midori-app.c:1338 +msgid "_Extensions" +msgstr "_Extensions" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589 +msgid "_History" +msgstr "_History" + +#: ../midori/midori-app.c:1340 +msgid "_Homepage" +msgstr "_Homepage" + +#: ../midori/midori-app.c:1341 +msgid "_Userscripts" +msgstr "_Userscripts" + +#: ../midori/midori-app.c:1342 +msgid "New _Tab" +msgstr "New _Tab" + +#: ../midori/midori-app.c:1343 +msgid "_Transfers" +msgstr "_Transfers" + +#: ../midori/midori-app.c:1344 +msgid "Netscape p_lugins" +msgstr "Netscape p_lugins" + +#: ../midori/midori-app.c:1345 +msgid "_Closed Tabs" +msgstr "_Closed Tabs" + +#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216 +msgid "New _Window" +msgstr "New _Window" + +#: ../midori/midori-app.c:1347 +msgid "New _Folder" +msgstr "New _Folder" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "File not found." -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Malformed document." -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "Unrecognised bookmark format." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1029 -#, c-format +#: ../midori/midori-array.c:915 msgid "Writing failed." msgstr "Writing failed." -#: ../midori/midori-browser.c:339 ../midori/midori-browser.c:5150 -#: ../midori/midori-browser.c:5156 +#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298 +#: ../midori/midori-browser.c:5307 msgid "Reload the current page" msgstr "Reload the current page" -#: ../midori/midori-browser.c:349 ../midori/midori-browser.c:5153 +#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304 msgid "Stop loading the current page" msgstr "Stop loading the current page" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:476 #, c-format -msgid "%d%% loaded" -msgstr "%d%% loaded" +msgid "Failed to update title: %s\n" +msgstr "Failed to update title: %s\n" -#: ../midori/midori-browser.c:485 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." msgstr "Unexpected action '%s'." -#: ../midori/midori-browser.c:691 +#: ../midori/midori-browser.c:569 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Private Browsing)" + +#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716 +msgid "Toplevel folder" +msgstr "Toplevel folder" + +#: ../midori/midori-browser.c:774 msgid "New folder" msgstr "New folder" -#: ../midori/midori-browser.c:691 +#: ../midori/midori-browser.c:774 msgid "Edit folder" msgstr "Edit folder" -#: ../midori/midori-browser.c:693 +#: ../midori/midori-browser.c:776 msgid "New bookmark" msgstr "New bookmark" -#: ../midori/midori-browser.c:693 +#: ../midori/midori-browser.c:776 msgid "Edit bookmark" msgstr "Edit bookmark" -#: ../midori/midori-browser.c:723 +#: ../midori/midori-browser.c:818 msgid "_Title:" msgstr "_Title:" -#: ../midori/midori-browser.c:736 ../midori/midori-searchaction.c:967 -msgid "_Description:" -msgstr "_Description:" - -#: ../midori/midori-browser.c:755 ../midori/midori-searchaction.c:981 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Address:" -#: ../midori/midori-browser.c:785 ../midori/midori-browser.c:4385 +#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326 msgid "_Folder:" msgstr "_Folder:" -#: ../midori/midori-browser.c:795 ../midori/midori-browser.c:875 -#: ../midori/midori-browser.c:4390 ../midori/midori-browser.c:4422 -msgid "Toplevel folder" -msgstr "Toplevel folder" +#: ../midori/midori-browser.c:877 +msgid "Add to _Speed Dial" +msgstr "Add to _Speed Dial" -#: ../midori/midori-browser.c:824 +#: ../midori/midori-browser.c:890 msgid "Show in the tool_bar" msgstr "Show in the tool_bar" -#: ../midori/midori-browser.c:839 +#: ../midori/midori-browser.c:905 msgid "Run as _web application" msgstr "Run as _web application" -#: ../midori/midori-browser.c:955 ../midori/midori-browser.c:4440 +#: ../midori/midori-browser.c:976 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "The file \"%s\" can't be saved in this folder." + +#: ../midori/midori-browser.c:978 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "You don't have permission to write in this location." + +#: ../midori/midori-browser.c:985 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "There is not enough free space to download \"%s\"." + +#: ../midori/midori-browser.c:988 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "The file needs %s but only %s are left." + +#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395 msgid "Save file as" msgstr "Save file as" -#: ../midori/midori-browser.c:1329 ../panels/midori-transfers.c:271 -#, c-format -msgid "%s of %s" -msgstr "%s of %s" +#: ../midori/midori-browser.c:1320 +msgid "New Window" +msgstr "New Window" + +#: ../midori/midori-browser.c:1320 +msgid "A new window has been opened" +msgstr "A new window has been opened" + +#: ../midori/midori-browser.c:1323 +msgid "New Tab" +msgstr "New Tab" + +#: ../midori/midori-browser.c:1323 +msgid "A new tab has been opened" +msgstr "A new tab has been opened" + +#: ../midori/midori-browser.c:1358 +msgid "Error opening the image!" +msgstr "Error opening the image!" + +#: ../midori/midori-browser.c:1359 +msgid "Can not open selected image in a default viewer." +msgstr "Can not open selected image in a default viewer." #: ../midori/midori-browser.c:1365 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "The file '%s' has been downloaded." +msgid "Error downloading the image!" +msgstr "Error downloading the image!" -#: ../midori/midori-browser.c:1369 -msgid "Transfer completed" -msgstr "Transfer completed" +#: ../midori/midori-browser.c:1366 +msgid "Can not download selected image." +msgstr "Can not download selected image." -#: ../midori/midori-browser.c:1509 +#: ../midori/midori-browser.c:1492 msgid "Save file" msgstr "Save file" -#: ../midori/midori-browser.c:2218 +#: ../midori/midori-browser.c:2367 msgid "Open file" msgstr "Open file" -#: ../midori/midori-browser.c:2294 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2499 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr "" +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." + +#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "New feed" -#: ../midori/midori-browser.c:2335 ../midori/midori-browser.c:5201 -#: ../panels/midori-bookmarks.c:243 +#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "Add a new bookmark" -#: ../midori/midori-browser.c:2899 ../midori/midori-searchaction.c:491 +#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 msgid "Empty" msgstr "Empty" -#: ../midori/midori-browser.c:3511 ../midori/sokoke.c:333 -#: ../midori/sokoke.c:343 ../midori/sokoke.c:371 ../midori/sokoke.c:397 -#: ../midori/sokoke.c:411 -msgid "Could not run external program." -msgstr "Could not run external program." +#: ../midori/midori-browser.c:3467 +msgid "Toggle text cursor navigation" +msgstr "Toggle text cursor navigation" -#: ../midori/midori-browser.c:3751 +#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753 #, c-format -msgid "Search with %s" -msgstr "Search with %s" +msgid "Failed to insert new history item: %s\n" +msgstr "Failed to insert new history item: %s\n" -#: ../midori/midori-browser.c:4087 ../panels/midori-bookmarks.c:796 -#: ../panels/midori-history.c:822 +#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 msgid "Open all in _Tabs" msgstr "Open all in _Tabs" -#: ../midori/midori-browser.c:4094 ../panels/midori-bookmarks.c:802 -#: ../panels/midori-history.c:828 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Open in New _Tab" -#: ../midori/midori-browser.c:4097 ../panels/midori-bookmarks.c:804 -#: ../panels/midori-history.c:830 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657 +#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Open in New _Window" -#: ../midori/midori-browser.c:4314 +#: ../midori/midori-browser.c:4213 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4315 +#: ../midori/midori-browser.c:4214 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4316 +#: ../midori/midori-browser.c:4215 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4317 +#: ../midori/midori-browser.c:4216 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4318 +#: ../midori/midori-browser.c:4217 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4338 ../panels/midori-bookmarks.c:272 +#: ../midori/midori-browser.c:4218 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4239 msgid "Import bookmarks..." msgstr "Import bookmarks..." -#: ../midori/midori-browser.c:4341 ../midori/midori-browser.c:5206 +#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372 msgid "_Import bookmarks" msgstr "_Import bookmarks" -#: ../midori/midori-browser.c:4351 +#: ../midori/midori-browser.c:4253 msgid "_Application:" msgstr "_Application:" -#: ../midori/midori-browser.c:4377 ../midori/midori-browser.c:5305 -#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:301 -#: ../katze/katze-utils.c:676 -msgid "Custom..." -msgstr "Custom..." +#: ../midori/midori-browser.c:4318 +msgid "Import from XBEL or HTML file" +msgstr "Import from XBEL or HTML file" -#: ../midori/midori-browser.c:4451 +#: ../midori/midori-browser.c:4353 +msgid "Import from a file" +msgstr "Import from a file" + +#: ../midori/midori-browser.c:4365 msgid "Failed to import bookmarks" msgstr "Failed to import bookmarks" -#: ../midori/midori-browser.c:4597 +#: ../midori/midori-browser.c:4400 +msgid "XBEL Bookmarks" +msgstr "XBEL Bookmarks" + +#: ../midori/midori-browser.c:4405 +msgid "Netscape Bookmarks" +msgstr "Netscape Bookmarks" + +#: ../midori/midori-browser.c:4419 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" + +#: ../midori/midori-browser.c:4434 +msgid "Failed to export bookmarks" +msgstr "Failed to export bookmarks" + +#. i18n: Dialog: Clear Private Data, in the Tools menu +#: ../midori/midori-browser.c:4556 msgid "Clear Private Data" msgstr "Clear Private Data" -#: ../midori/midori-browser.c:4601 +#: ../midori/midori-browser.c:4560 msgid "_Clear private data" msgstr "_Clear private data" -#: ../midori/midori-browser.c:4614 +#: ../midori/midori-browser.c:4573 msgid "Clear the following data:" msgstr "Clear the following data:" -#: ../midori/midori-browser.c:4624 ../midori/midori-preferences.c:515 -#: ../panels/midori-history.c:108 -msgid "History" -msgstr "History" - -#: ../midori/midori-browser.c:4629 -msgid "Cookies" -msgstr "Cookies" - -#: ../midori/midori-browser.c:4634 -msgid "'Flash' Cookies" -msgstr "'Flash' Cookies" - -#: ../midori/midori-browser.c:4639 -msgid "Website icons" -msgstr "Website icons" - -#: ../midori/midori-browser.c:4644 ../midori/sokoke.c:1188 -msgid "_Closed Tabs" -msgstr "_Closed Tabs" - -#: ../midori/midori-browser.c:4649 ../extensions/web-cache.c:458 -msgid "Web Cache" -msgstr "Web Cache" +#: ../midori/midori-browser.c:4583 +msgid "Last open _tabs" +msgstr "Last open _tabs" -#: ../midori/midori-browser.c:4657 +#: ../midori/midori-browser.c:4609 msgid "Clear private data when _quitting Midori" msgstr "Clear private data when _quitting Midori" -#: ../midori/midori-browser.c:4765 +#: ../midori/midori-browser.c:4804 msgid "A lightweight web browser." msgstr "A lightweight web browser." -#: ../midori/midori-browser.c:4781 +#: ../midori/midori-browser.c:4805 +msgid "See about:version for version info." +msgstr "See about:version for version info." + +#: ../midori/midori-browser.c:4807 +msgid "" +"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." +msgstr "" +"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 Licence, or (at your " +"option) any later version." + +#: ../midori/midori-browser.c:4828 msgid "translator-credits" msgstr "" "Bastien Nocera \n" "Abigail Brady " -#: ../midori/midori-browser.c:5063 +#: ../midori/midori-browser.c:5214 msgid "_File" msgstr "_File" -#: ../midori/midori-browser.c:5065 ../midori/sokoke.c:1189 -msgid "New _Window" -msgstr "New _Window" - -#: ../midori/midori-browser.c:5066 +#: ../midori/midori-browser.c:5217 msgid "Open a new window" msgstr "Open a new window" -#: ../midori/midori-browser.c:5069 +#: ../midori/midori-browser.c:5220 msgid "Open a new tab" msgstr "Open a new tab" -#: ../midori/midori-browser.c:5071 -msgid "P_rivate Browsing" -msgstr "P_rivate Browsing" - -#: ../midori/midori-browser.c:5072 -msgid "Don't save any private data while browsing" -msgstr "Don't save any private data while browsing" +#: ../midori/midori-browser.c:5222 +msgid "New P_rivate Browsing Window" +msgstr "New P_rivate Browsing Window" -#: ../midori/midori-browser.c:5076 +#: ../midori/midori-browser.c:5226 msgid "Open a file" msgstr "Open a file" -#: ../midori/midori-browser.c:5079 +#: ../midori/midori-browser.c:5228 +msgid "_Save Page As..." +msgstr "_Save Page As..." + +#: ../midori/midori-browser.c:5229 msgid "Save to a file" msgstr "Save to a file" -#: ../midori/midori-browser.c:5081 +#: ../midori/midori-browser.c:5231 msgid "Add to Speed _dial" msgstr "Add to Speed _dial" -#: ../midori/midori-browser.c:5082 -msgid "Add shortcut to speed dial" -msgstr "Add shortcut to speed dial" - -#: ../midori/midori-browser.c:5084 +#: ../midori/midori-browser.c:5235 msgid "Add Shortcut to the _desktop" msgstr "Add Shortcut to the _desktop" -#: ../midori/midori-browser.c:5085 -msgid "Add shortcut to the desktop" -msgstr "Add shortcut to the desktop" +#: ../midori/midori-browser.c:5237 +msgid "Create _Launcher" +msgstr "Create _Launcher" -#: ../midori/midori-browser.c:5087 +#: ../midori/midori-browser.c:5241 msgid "Subscribe to News _feed" msgstr "Subscribe to News _feed" -#: ../midori/midori-browser.c:5088 -msgid "Subscribe to this news feed" -msgstr "Subscribe to this news feed" - -#: ../midori/midori-browser.c:5093 +#: ../midori/midori-browser.c:5247 msgid "_Close Tab" msgstr "_Close Tab" -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:5248 msgid "Close the current tab" msgstr "Close the current tab" -#: ../midori/midori-browser.c:5096 +#: ../midori/midori-browser.c:5250 msgid "C_lose Window" msgstr "C_lose Window" -#: ../midori/midori-browser.c:5097 -msgid "Close this window" -msgstr "Close this window" - -#: ../midori/midori-browser.c:5100 +#: ../midori/midori-browser.c:5254 msgid "Print the current page" msgstr "Print the current page" -#: ../midori/midori-browser.c:5103 -msgid "Quit the application" -msgstr "Quit the application" +#: ../midori/midori-browser.c:5256 +msgid "Close a_ll Windows" +msgstr "Close a_ll Windows" -#: ../midori/midori-browser.c:5105 +#: ../midori/midori-browser.c:5259 msgid "_Edit" msgstr "_Edit" -#: ../midori/midori-browser.c:5109 -msgid "Undo the last modification" -msgstr "Undo the last modification" - -#: ../midori/midori-browser.c:5112 -msgid "Redo the last modification" -msgstr "Redo the last modification" - -#: ../midori/midori-browser.c:5116 -msgid "Cut the selected text" -msgstr "Cut the selected text" - -#: ../midori/midori-browser.c:5119 ../midori/midori-browser.c:5122 -msgid "Copy the selected text" -msgstr "Copy the selected text" - -#: ../midori/midori-browser.c:5125 -msgid "Paste text from the clipboard" -msgstr "Paste text from the clipboard" - -#: ../midori/midori-browser.c:5128 -msgid "Delete the selected text" -msgstr "Delete the selected text" - -#: ../midori/midori-browser.c:5131 -msgid "Select all text" -msgstr "Select all text" +#: ../midori/midori-browser.c:5282 +msgid "_Find..." +msgstr "_Find..." -#: ../midori/midori-browser.c:5134 +#: ../midori/midori-browser.c:5283 msgid "Find a word or phrase in the page" msgstr "Find a word or phrase in the page" -#: ../midori/midori-browser.c:5136 +#: ../midori/midori-browser.c:5285 msgid "Find _Next" msgstr "Find _Next" -#: ../midori/midori-browser.c:5137 -msgid "Find the next occurrence of a word or phrase" -msgstr "Find the next occurrence of a word or phrase" - -#: ../midori/midori-browser.c:5139 +#: ../midori/midori-browser.c:5288 msgid "Find _Previous" msgstr "Find _Previous" -#: ../midori/midori-browser.c:5140 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Find the previous occurrence of a word or phrase" - -#: ../midori/midori-browser.c:5144 +#: ../midori/midori-browser.c:5292 msgid "Configure the application preferences" msgstr "Configure the application preferences" -#: ../midori/midori-browser.c:5146 +#: ../midori/midori-browser.c:5294 msgid "_View" msgstr "_View" -#: ../midori/midori-browser.c:5147 +#: ../midori/midori-browser.c:5295 msgid "_Toolbars" msgstr "_Toolbars" -#: ../midori/midori-browser.c:5159 +#: ../midori/midori-browser.c:5300 +msgid "Reload page without caching" +msgstr "Reload page without caching" + +#: ../midori/midori-browser.c:5310 msgid "Increase the zoom level" msgstr "Increase the zoom level" -#: ../midori/midori-browser.c:5162 +#: ../midori/midori-browser.c:5313 msgid "Decrease the zoom level" msgstr "Decrease the zoom level" -#: ../midori/midori-browser.c:5165 -msgid "Reset the zoom level" -msgstr "Reset the zoom level" - -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:5317 msgid "_Encoding" msgstr "_Encoding" -#: ../midori/midori-browser.c:5168 +#: ../midori/midori-browser.c:5319 msgid "View So_urce" msgstr "View So_urce" -#: ../midori/midori-browser.c:5169 -msgid "View the source code of the page" -msgstr "View the source code of the page" +#: ../midori/midori-browser.c:5322 +msgid "Ca_ret Browsing" +msgstr "Ca_ret Browsing" -#: ../midori/midori-browser.c:5172 +#: ../midori/midori-browser.c:5326 msgid "Toggle fullscreen view" msgstr "Toggle fullscreen view" -#: ../midori/midori-browser.c:5174 +#: ../midori/midori-browser.c:5328 +msgid "Scroll _Left" +msgstr "Scroll _Left" + +#: ../midori/midori-browser.c:5331 +msgid "Scroll _Down" +msgstr "Scroll _Down" + +#: ../midori/midori-browser.c:5334 +msgid "Scroll _Up" +msgstr "Scroll _Up" + +#: ../midori/midori-browser.c:5337 +msgid "Scroll _Right" +msgstr "Scroll _Right" + +#: ../midori/midori-browser.c:5340 msgid "_Go" msgstr "_Go" -#: ../midori/midori-browser.c:5177 +#: ../midori/midori-browser.c:5343 msgid "Go back to the previous page" msgstr "Go back to the previous page" -#: ../midori/midori-browser.c:5180 +#: ../midori/midori-browser.c:5346 msgid "Go forward to the next page" msgstr "Go forward to the next page" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5184 +#: ../midori/midori-browser.c:5350 msgid "Go to the previous sub-page" msgstr "Go to the previous sub-page" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5188 +#: ../midori/midori-browser.c:5354 msgid "Go to the next sub-page" msgstr "Go to the next sub-page" -#: ../midori/midori-browser.c:5191 +#: ../midori/midori-browser.c:5357 msgid "Go to your homepage" msgstr "Go to your homepage" -#: ../midori/midori-browser.c:5193 +#: ../midori/midori-browser.c:5359 msgid "Empty Trash" msgstr "Empty Wastebasket" -#: ../midori/midori-browser.c:5194 -msgid "Delete the contents of the trash" -msgstr "Delete the contents of the wastebasket" - -#: ../midori/midori-browser.c:5196 +#: ../midori/midori-browser.c:5362 msgid "Undo _Close Tab" msgstr "Undo _Close Tab" -#: ../midori/midori-browser.c:5197 -msgid "Open the last closed tab" -msgstr "Open the last closed tab" - -#: ../midori/midori-browser.c:5203 +#: ../midori/midori-browser.c:5369 msgid "Add a new _folder" msgstr "Add a new _folder" -#: ../midori/midori-browser.c:5204 -msgid "Add a new bookmark folder" -msgstr "Add a new bookmark folder" +#: ../midori/midori-browser.c:5375 +msgid "_Export bookmarks" +msgstr "_Export bookmarks" -#: ../midori/midori-browser.c:5209 ../midori/midori-searchaction.c:500 +#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Manage Search Engines" -#: ../midori/midori-browser.c:5210 -msgid "Add, edit and remove search engines..." -msgstr "Add, edit and remove search engines..." - -#: ../midori/midori-browser.c:5213 +#: ../midori/midori-browser.c:5381 msgid "_Clear Private Data" msgstr "_Clear Private Data" -#: ../midori/midori-browser.c:5214 -msgid "Clear private data..." -msgstr "Clear private data..." - -#: ../midori/midori-browser.c:5218 +#: ../midori/midori-browser.c:5384 msgid "_Inspect Page" msgstr "_Inspect Page" -#: ../midori/midori-browser.c:5219 -msgid "Inspect page details and access developer tools..." -msgstr "Inspect page details and access developer tools..." - -#: ../midori/midori-browser.c:5224 +#: ../midori/midori-browser.c:5388 msgid "_Previous Tab" msgstr "_Previous Tab" -#: ../midori/midori-browser.c:5225 -msgid "Switch to the previous tab" -msgstr "Switch to the previous tab" - -#: ../midori/midori-browser.c:5227 +#: ../midori/midori-browser.c:5391 msgid "_Next Tab" msgstr "_Next Tab" -#: ../midori/midori-browser.c:5228 -msgid "Switch to the next tab" -msgstr "Switch to the next tab" +#: ../midori/midori-browser.c:5393 +msgid "Move Tab _Backward" +msgstr "Move Tab _Backwards" + +#: ../midori/midori-browser.c:5395 +msgid "_Move Tab Forward" +msgstr "_Move Tab Forwards" -#: ../midori/midori-browser.c:5230 +#: ../midori/midori-browser.c:5398 msgid "Focus _Current Tab" msgstr "Focus _Current Tab" -#: ../midori/midori-browser.c:5231 -msgid "Focus the current tab" -msgstr "Focus the current tab" +#: ../midori/midori-browser.c:5401 +msgid "Focus _Next view" +msgstr "Focus _Next view" + +#: ../midori/midori-browser.c:5404 +msgid "Only show the Icon of the _Current Tab" +msgstr "Only show the Icon of the _Current Tab" + +#: ../midori/midori-browser.c:5407 +msgid "_Duplicate Current Tab" +msgstr "_Duplicate Current Tab" + +#: ../midori/midori-browser.c:5410 +msgid "Close Ot_her Tabs" +msgstr "Close Ot_her Tabs" -#: ../midori/midori-browser.c:5233 +#: ../midori/midori-browser.c:5413 msgid "Open last _session" msgstr "Open last _session" -#: ../midori/midori-browser.c:5234 -msgid "Open the tabs saved in the last session" -msgstr "Open the tabs saved in the last session" - -#: ../midori/midori-browser.c:5236 +#: ../midori/midori-browser.c:5416 msgid "_Help" msgstr "_Help" -#: ../midori/midori-browser.c:5238 -msgid "_Contents" -msgstr "_Contents" - -#: ../midori/midori-browser.c:5239 -msgid "Show the documentation" -msgstr "Show the documentation" - -#: ../midori/midori-browser.c:5241 +#: ../midori/midori-browser.c:5418 msgid "_Frequent Questions" msgstr "_Frequent Questions" -#: ../midori/midori-browser.c:5242 -msgid "Show the Frequently Asked Questions" -msgstr "Show the Frequently Asked Questions" - -#: ../midori/midori-browser.c:5244 -msgid "_Report a Bug" -msgstr "_Report a Bug" - -#: ../midori/midori-browser.c:5245 -msgid "Open Midori's bug tracker" -msgstr "Open Midori's bug tracker" - -#: ../midori/midori-browser.c:5248 -msgid "Show information about the program" -msgstr "Show information about the program" +#: ../midori/midori-browser.c:5421 +msgid "_Report a Problem..." +msgstr "_Report a Problem..." -#: ../midori/midori-browser.c:5255 +#: ../midori/midori-browser.c:5433 msgid "_Menubar" msgstr "_Menubar" -#: ../midori/midori-browser.c:5256 -msgid "Show menubar" -msgstr "Show menubar" - -#: ../midori/midori-browser.c:5259 +#: ../midori/midori-browser.c:5437 msgid "_Navigationbar" msgstr "_Navigationbar" -#: ../midori/midori-browser.c:5260 -msgid "Show navigationbar" -msgstr "Show navigationbar" - -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:5441 msgid "Side_panel" msgstr "Side_panel" -#: ../midori/midori-browser.c:5264 -msgid "Show sidepanel" -msgstr "Show sidepanel" +#: ../midori/midori-browser.c:5442 +msgid "Sidepanel" +msgstr "Sidepanel" -#: ../midori/midori-browser.c:5267 +#: ../midori/midori-browser.c:5445 msgid "_Bookmarkbar" msgstr "_Bookmarkbar" -#: ../midori/midori-browser.c:5268 -msgid "Show bookmarkbar" -msgstr "Show bookmarkbar" - -#: ../midori/midori-browser.c:5271 -msgid "_Transferbar" -msgstr "_Transferbar" - -#: ../midori/midori-browser.c:5272 -msgid "Show transferbar" -msgstr "Show transferbar" - -#: ../midori/midori-browser.c:5275 +#: ../midori/midori-browser.c:5449 msgid "_Statusbar" msgstr "_Statusbar" -#: ../midori/midori-browser.c:5276 -msgid "Show statusbar" -msgstr "Show statusbar" - -#: ../midori/midori-browser.c:5283 +#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311 msgid "_Automatic" msgstr "_Automatic" -#: ../midori/midori-browser.c:5286 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236 msgid "Chinese (BIG5)" msgstr "Chinese (BIG5)" -#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:5290 +#. i18n: A double underscore "__" is used to prevent the mnemonic +#: ../midori/midori-browser.c:5465 msgid "Japanese (SHIFT__JIS)" msgstr "Japanese (SHIFT__JIS)" -#: ../midori/midori-browser.c:5293 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238 msgid "Korean (EUC-KR)" msgstr "Korean (EUC-KR)" -#: ../midori/midori-browser.c:5296 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239 msgid "Russian (KOI8-R)" msgstr "Russian (KOI8-R)" -#: ../midori/midori-browser.c:5299 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5302 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241 msgid "Western (ISO-8859-1)" msgstr "Western (ISO-8859-1)" -#: ../midori/midori-browser.c:5856 +#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "Custom..." + +#: ../midori/midori-browser.c:5985 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:5863 +#: ../midori/midori-browser.c:5992 msgid "_Location..." msgstr "_Location..." -#: ../midori/midori-browser.c:5865 +#: ../midori/midori-browser.c:5994 msgid "Open a particular location" msgstr "Open a particular location" -#: ../midori/midori-browser.c:5889 +#: ../midori/midori-browser.c:6016 msgid "_Web Search..." msgstr "_Web Search..." -#: ../midori/midori-browser.c:5891 +#: ../midori/midori-browser.c:6018 msgid "Run a web search" msgstr "Run a web search" -#: ../midori/midori-browser.c:5912 +#: ../midori/midori-browser.c:6045 msgid "Reopen a previously closed tab or window" msgstr "Reopen a previously closed tab or window" -#: ../midori/midori-browser.c:5927 -msgid "_Recently visited pages" -msgstr "_Recently visited pages" - -#: ../midori/midori-browser.c:5929 -msgid "Reopen pages that you visited earlier" -msgstr "Reopen pages that you visited earlier" - -#: ../midori/midori-browser.c:5944 ../midori/sokoke.c:1178 -msgid "_Bookmarks" -msgstr "_Bookmarks" - -#: ../midori/midori-browser.c:5946 +#: ../midori/midori-browser.c:6062 msgid "Show the saved bookmarks" msgstr "Show the saved bookmarks" -#: ../midori/midori-browser.c:5961 +#: ../midori/midori-browser.c:6079 msgid "_Tools" msgstr "_Tools" -#: ../midori/midori-browser.c:5974 +#: ../midori/midori-browser.c:6095 msgid "_Window" msgstr "_Window" -#: ../midori/midori-browser.c:5976 +#: ../midori/midori-browser.c:6097 msgid "Show a list of all open tabs" msgstr "Show a list of all open tabs" -#: ../midori/midori-browser.c:5990 +#: ../midori/midori-browser.c:6111 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:5992 +#: ../midori/midori-browser.c:6113 msgid "Menu" msgstr "Menu" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6196 -msgid "_Inline Find:" -msgstr "_Inline Find:" - -#: ../midori/midori-browser.c:6227 -msgid "Previous" -msgstr "Previous" +#: ../midori/midori-browser.c:6927 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Unexpected setting '%s'" -#: ../midori/midori-browser.c:6232 -msgid "Next" -msgstr "Next" +#: ../midori/midori-extension.c:329 +#, c-format +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "The configuration of the extension '%s' couldn't be loaded: %s\n" -#: ../midori/midori-browser.c:6237 -msgid "Match Case" -msgstr "Match Case" +#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "The configuration of the extension '%s' couldn't be saved: %s\n" -#: ../midori/midori-browser.c:6246 -msgid "Highlight Matches" -msgstr "Highlight Matches" +#: ../midori/midori-locationaction.c:394 +#, c-format +msgid "Search with %s" +msgstr "Search with %s" -#: ../midori/midori-browser.c:6258 -msgid "Close Findbar" -msgstr "Close Findbar" +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Search with..." -#: ../midori/midori-browser.c:6304 ../panels/midori-transfers.c:142 -msgid "Clear All" -msgstr "Clear All" +#: ../midori/midori-locationaction.c:537 +#, c-format +msgid "Failed to select from history\n" +msgstr "Failed to select from history\n" -#: ../midori/midori-browser.c:6657 +#: ../midori/midori-locationaction.c:624 #, c-format -msgid "Unexpected setting '%s'" -msgstr "Unexpected setting '%s'" +msgid "Search for %s" +msgstr "Search for %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1437 +#: ../midori/midori-locationaction.c:1398 msgid "Paste and p_roceed" msgstr "Paste and p_roceed" -#: ../midori/midori-panel.c:431 ../midori/midori-panel.c:433 -msgid "Detach chosen panel from the window" -msgstr "Detach chosen panel from the window" +#: ../midori/midori-locationaction.c:1739 +msgid "Not verified" +msgstr "Not verified" + +#: ../midori/midori-locationaction.c:1759 +msgid "Verified and encrypted connection" +msgstr "Verified and encrypted connection" + +#: ../midori/midori-locationaction.c:1771 +msgid "Open, unencrypted connection" +msgstr "Open, unencrypted connection" -#: ../midori/midori-panel.c:443 ../midori/midori-panel.c:445 -#: ../midori/midori-panel.c:638 ../midori/midori-panel.c:641 +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" msgstr "Align sidepanel to the right" -#: ../midori/midori-panel.c:455 ../midori/midori-panel.c:456 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Close panel" -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Align sidepanel to the left" -#: ../midori/midori-panel.c:796 -msgid "Show operating _controls" -msgstr "Show operating _controls" - -#: ../midori/midori-websettings.c:204 -msgid "Show Blank page" -msgstr "Show Blank page" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "Show Speed Dial" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" msgstr "Show Homepage" -#: ../midori/midori-websettings.c:206 -msgid "Show last open tabs" -msgstr "Show last open tabs" - -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:237 msgid "Japanese (SHIFT_JIS)" msgstr "Japanese (SHIFT_JIS)" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:257 msgid "New tab" msgstr "New tab" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:258 msgid "New window" msgstr "New window" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:259 msgid "Current tab" msgstr "Current tab" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:274 msgid "Default" msgstr "Default" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:275 msgid "Icons" msgstr "Icons" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:276 msgid "Small icons" msgstr "Small icons" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:277 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:278 msgid "Icons and text" msgstr "Icons and text" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:279 msgid "Text beside icons" msgstr "Text beside icons" -#: ../midori/midori-websettings.c:279 -msgid "All cookies" -msgstr "All cookies" - -#: ../midori/midori-websettings.c:280 -msgid "Session cookies" -msgstr "Session cookies" +#: ../midori/midori-websettings.c:294 +msgid "Automatic (GNOME or environment)" +msgstr "Automatic (GNOME or environment)" + +#: ../midori/midori-websettings.c:295 +msgid "HTTP proxy server" +msgstr "HTTP proxy server" -#: ../midori/midori-websettings.c:281 ../panels/midori-addons.c:98 -#: ../katze/katze-utils.c:652 -msgid "None" -msgstr "None" +#: ../midori/midori-websettings.c:296 +msgid "No proxy server" +msgstr "No proxy server" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:299 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:300 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:400 msgid "Remember last window size" msgstr "Remember last window size" -#: ../midori/midori-websettings.c:354 +#: ../midori/midori-websettings.c:401 msgid "Whether to save the last window size" msgstr "Whether to save the last window size" -#: ../midori/midori-websettings.c:362 +#: ../midori/midori-websettings.c:409 msgid "Last window width" msgstr "Last window width" -#: ../midori/midori-websettings.c:363 +#: ../midori/midori-websettings.c:410 msgid "The last saved window width" msgstr "The last saved window width" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:418 msgid "Last window height" msgstr "Last window height" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:419 msgid "The last saved window height" msgstr "The last saved window height" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:444 msgid "Last panel position" msgstr "Last panel position" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:445 msgid "The last saved panel position" msgstr "The last saved panel position" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:454 msgid "Last panel page" msgstr "Last panel page" -#: ../midori/midori-websettings.c:408 +#: ../midori/midori-websettings.c:455 msgid "The last saved panel page" msgstr "The last saved panel page" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:463 msgid "Last Web search" msgstr "Last Web search" -#: ../midori/midori-websettings.c:417 +#: ../midori/midori-websettings.c:464 msgid "The last saved Web search" msgstr "The last saved Web search" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:473 msgid "Show Menubar" msgstr "Show Menubar" -#: ../midori/midori-websettings.c:427 +#: ../midori/midori-websettings.c:474 msgid "Whether to show the menubar" msgstr "Whether to show the menubar" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:482 msgid "Show Navigationbar" msgstr "Show Navigationbar" -#: ../midori/midori-websettings.c:436 +#: ../midori/midori-websettings.c:483 msgid "Whether to show the navigationbar" msgstr "Whether to show the navigationbar" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:491 msgid "Show Bookmarkbar" msgstr "Show Bookmarkbar" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:492 msgid "Whether to show the bookmarkbar" msgstr "Whether to show the bookmarkbar" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:500 msgid "Show Panel" msgstr "Show Panel" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:501 msgid "Whether to show the panel" msgstr "Whether to show the panel" -#: ../midori/midori-websettings.c:469 -msgid "Show Transferbar" -msgstr "Show Transferbar" - -#: ../midori/midori-websettings.c:470 -msgid "Whether to show the transferbar" -msgstr "Whether to show the transferbar" - -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:509 msgid "Show Statusbar" msgstr "Show Statusbar" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:510 msgid "Whether to show the statusbar" msgstr "Whether to show the statusbar" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:519 msgid "Toolbar Style:" msgstr "Toolbar Style:" -#: ../midori/midori-websettings.c:489 +#: ../midori/midori-websettings.c:520 msgid "The style of the toolbar" msgstr "The style of the toolbar" -#: ../midori/midori-websettings.c:505 -msgid "Show progress in location entry" -msgstr "Show progress in location entry" - -#: ../midori/midori-websettings.c:506 -msgid "Whether to show loading progress in the location entry" -msgstr "Whether to show loading progress in the location entry" - -#: ../midori/midori-websettings.c:521 -msgid "Search engines in location completion" -msgstr "Search engines in location completion" - -#: ../midori/midori-websettings.c:522 -msgid "Whether to show search engines in the location completion" -msgstr "Whether to show search engines in the location completion" - -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:529 msgid "Toolbar Items" msgstr "Toolbar Items" -#: ../midori/midori-websettings.c:531 +#: ../midori/midori-websettings.c:530 msgid "The items to show on the toolbar" msgstr "The items to show on the toolbar" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:538 msgid "Compact Sidepanel" msgstr "Compact Sidepanel" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:539 msgid "Whether to make the sidepanel compact" msgstr "Whether to make the sidepanel compact" -#: ../midori/midori-websettings.c:555 -msgid "Show operating controls of the panel" -msgstr "Show operating controls of the panel" - -#: ../midori/midori-websettings.c:556 -msgid "Whether to show the operating controls of the panel" -msgstr "Whether to show the operating controls of the panel" - -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:554 msgid "Align sidepanel on the right" msgstr "Align sidepanel on the right" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:555 msgid "Whether to align the sidepanel on the right" msgstr "Whether to align the sidepanel on the right" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:570 msgid "Open panels in separate windows" msgstr "Open panels in separate windows" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:571 msgid "Whether to always open panels in separate windows" msgstr "Whether to always open panels in separate windows" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:580 msgid "When Midori starts:" msgstr "When Midori starts:" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:581 msgid "What to do when Midori starts" msgstr "What to do when Midori starts" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:590 msgid "Homepage:" msgstr "Homepage:" -#: ../midori/midori-websettings.c:608 +#: ../midori/midori-websettings.c:591 msgid "The homepage" msgstr "The homepage" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:606 msgid "Show crash dialog" msgstr "Show crash dialogue" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:607 msgid "Show a dialog after Midori crashed" msgstr "Show a dialogue after Midori crashed" -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:640 -msgid "Show speed dial in new tabs" -msgstr "Show speed dial in new tabs" - -#: ../midori/midori-websettings.c:641 -msgid "Show speed dial in newly opened tabs" -msgstr "Show speed dial in newly opened tabs" - -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:615 msgid "Save downloaded files to:" msgstr "Save downloaded files to:" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:616 msgid "The folder downloaded files are saved to" msgstr "The folder downloaded files are saved to" -#: ../midori/midori-websettings.c:671 -msgid "Ask for the destination folder" -msgstr "Ask for the destination folder" - -#: ../midori/midori-websettings.c:672 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "Whether to ask for the destination folder when downloading a file" - -#: ../midori/midori-websettings.c:691 -msgid "Notify when a transfer has been completed" -msgstr "Notify when a transfer has been completed" - -#: ../midori/midori-websettings.c:692 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "Whether to show a notification when a transfer has been completed" - -#: ../midori/midori-websettings.c:704 -msgid "Download Manager" -msgstr "Download Manager" - -#: ../midori/midori-websettings.c:705 -msgid "An external download manager" -msgstr "An external download manager" - -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:624 msgid "Text Editor" msgstr "Text Editor" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:625 msgid "An external text editor" msgstr "An external text editor" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:640 msgid "News Aggregator" msgstr "News Aggregator" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:641 msgid "An external news aggregator" msgstr "An external news aggregator" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:649 msgid "Location entry Search" msgstr "Location entry Search" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:650 msgid "The search to perform inside the location entry" msgstr "The search to perform inside the location entry" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:658 msgid "Preferred Encoding" msgstr "Preferred Encoding" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:659 msgid "The preferred character encoding" msgstr "The preferred character encoding" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:669 msgid "Always Show Tabbar" msgstr "Always Show Tabbar" -#: ../midori/midori-websettings.c:759 +#: ../midori/midori-websettings.c:670 msgid "Always show the tabbar" msgstr "Always show the tabbar" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:683 msgid "Close Buttons on Tabs" msgstr "Close Buttons on Tabs" -#: ../midori/midori-websettings.c:768 +#: ../midori/midori-websettings.c:684 msgid "Whether tabs have close buttons" msgstr "Whether tabs have close buttons" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:709 msgid "Open new pages in:" msgstr "Open new pages in:" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:710 msgid "Where to open new pages" msgstr "Where to open new pages" -#: ../midori/midori-websettings.c:786 -msgid "Open external pages in:" -msgstr "Open external pages in:" - -#: ../midori/midori-websettings.c:787 -msgid "Where to open externally opened pages" -msgstr "Where to open externally opened pages" - -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:719 msgid "Middle click opens Selection" msgstr "Middle click opens Selection" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:720 msgid "Load an address from the selection via middle click" msgstr "Load an address from the selection via middle click" -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:728 msgid "Open tabs in the background" msgstr "Open tabs in the background" -#: ../midori/midori-websettings.c:806 +#: ../midori/midori-websettings.c:729 msgid "Whether to open new tabs in the background" msgstr "Whether to open new tabs in the background" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:737 msgid "Open Tabs next to Current" msgstr "Open Tabs next to Current" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:738 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Whether to open new tabs next to the current tab or after the last one" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:746 msgid "Open popups in tabs" msgstr "Open popups in tabs" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:747 msgid "Whether to open popup windows in tabs" msgstr "Whether to open popup windows in tabs" -#: ../midori/midori-websettings.c:834 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Load images automatically" -#: ../midori/midori-websettings.c:835 +#: ../midori/midori-websettings.c:758 msgid "Load and display images automatically" msgstr "Load and display images automatically" -#: ../midori/midori-websettings.c:842 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 msgid "Enable scripts" msgstr "Enable scripts" -#: ../midori/midori-websettings.c:843 +#: ../midori/midori-websettings.c:766 msgid "Enable embedded scripting languages" msgstr "Enable embedded scripting languages" -#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" msgstr "Enable Netscape plugins" -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:774 msgid "Enable embedded Netscape plugin objects" msgstr "Enable embedded Netscape plugin objects" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:789 +msgid "Enable Spell Checking" +msgstr "Enable Spell Checking" + +#: ../midori/midori-websettings.c:790 +msgid "Enable spell checking while typing" +msgstr "Enable spell checking while typing" + +#: ../midori/midori-websettings.c:796 +msgid "Enable HTML5 database support" +msgstr "Enable HTML5 database support" + +#: ../midori/midori-websettings.c:797 +msgid "Whether to enable HTML5 database support" +msgstr "Whether to enable HTML5 database support" + +#: ../midori/midori-websettings.c:803 +msgid "Enable HTML5 local storage support" +msgstr "Enable HTML5 local storage support" + +#: ../midori/midori-websettings.c:804 +msgid "Whether to enable HTML5 local storage support" +msgstr "Whether to enable HTML5 local storage support" + +#: ../midori/midori-websettings.c:810 +msgid "Enable offline web application cache" +msgstr "Enable offline web application cache" + +#: ../midori/midori-websettings.c:811 +msgid "Whether to enable offline web application cache" +msgstr "Whether to enable offline web application cache" + +#: ../midori/midori-websettings.c:827 +msgid "Flash window on background tabs" +msgstr "Flash window on background tabs" + +#: ../midori/midori-websettings.c:828 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "Flash the browser window if a new tab was opened in the background" + +#: ../midori/midori-websettings.c:836 +msgid "Enable WebGL support" +msgstr "Enable WebGL support" + +#: ../midori/midori-websettings.c:837 +msgid "Allow websites to use OpenGL rendering" +msgstr "Allow websites to use OpenGL rendering" + +#: ../midori/midori-websettings.c:863 msgid "Zoom Text and Images" msgstr "Zoom Text and Images" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:864 msgid "Whether to zoom text and images" msgstr "Whether to zoom text and images" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:879 msgid "Find inline while typing" msgstr "Find inline while typing" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:880 msgid "Whether to automatically find inline while typing" msgstr "Whether to automatically find inline while typing" -#: ../midori/midori-websettings.c:916 +#: ../midori/midori-websettings.c:895 msgid "Kinetic scrolling" msgstr "Kinetic scrolling" -#: ../midori/midori-websettings.c:917 +#: ../midori/midori-websettings.c:896 msgid "Whether scrolling should kinetically move according to speed" msgstr "Whether scrolling should kinetically move according to speed" -#: ../midori/midori-websettings.c:925 -msgid "Accept cookies" -msgstr "Accept cookies" - -#: ../midori/midori-websettings.c:926 -msgid "What type of cookies to accept" -msgstr "What type of cookies to accept" - -#: ../midori/midori-websettings.c:942 -msgid "Original cookies only" -msgstr "Original cookies only" - -#: ../midori/midori-websettings.c:943 -msgid "Accept cookies from the original website only" -msgstr "Accept cookies from the original website only" - -#: ../midori/midori-websettings.c:951 -msgid "Maximum cookie age" -msgstr "Maximum cookie age" +#: ../midori/midori-websettings.c:904 +msgid "Delete old Cookies after:" +msgstr "Delete old Cookies after:" -#: ../midori/midori-websettings.c:952 +#: ../midori/midori-websettings.c:905 msgid "The maximum number of days to save cookies for" msgstr "The maximum number of days to save cookies for" -#: ../midori/midori-websettings.c:969 -msgid "Remember last visited pages" -msgstr "Remember last visited pages" - -#: ../midori/midori-websettings.c:970 -msgid "Whether the last visited pages are saved" -msgstr "Whether the last visited pages are saved" +#: ../midori/midori-websettings.c:921 +msgid "Only accept Cookies from sites you visit" +msgstr "Only accept Cookies from sites you visit" + +#: ../midori/midori-websettings.c:922 +msgid "Block cookies sent by third-party websites" +msgstr "Block cookies sent by third-party websites" + +#: ../midori/midori-websettings.c:936 +msgid "Delete pages from history after:" +msgstr "Delete pages from history after:" -#: ../midori/midori-websettings.c:978 -msgid "Maximum history age" -msgstr "Maximum history age" - -#: ../midori/midori-websettings.c:979 +#: ../midori/midori-websettings.c:937 msgid "The maximum number of days to save the history for" msgstr "The maximum number of days to save the history for" -#: ../midori/midori-websettings.c:987 -msgid "Remember last downloaded files" -msgstr "Remember last downloaded files" - -#: ../midori/midori-websettings.c:988 -msgid "Whether the last downloaded files are saved" -msgstr "Whether the last downloaded files are saved" - -#: ../midori/midori-websettings.c:998 -msgid "Proxy Server" -msgstr "Proxy Server" +#: ../midori/midori-websettings.c:952 +msgid "Proxy server" +msgstr "Proxy server" + +#: ../midori/midori-websettings.c:953 +msgid "The type of proxy server to use" +msgstr "The type of proxy server to use" + +#: ../midori/midori-websettings.c:962 +msgid "HTTP Proxy Server" +msgstr "HTTP Proxy Server" -#: ../midori/midori-websettings.c:999 +#: ../midori/midori-websettings.c:963 msgid "The proxy server used for HTTP connections" msgstr "The proxy server used for HTTP connections" -#: ../midori/midori-websettings.c:1014 -msgid "Detect proxy server automatically" -msgstr "Detect proxy server automatically" +#: ../midori/midori-websettings.c:978 +msgid "Port" +msgstr "Port" -#: ../midori/midori-websettings.c:1015 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Whether to detect the proxy server automatically from the environment" +#: ../midori/midori-websettings.c:979 +msgid "The proxy server port used for HTTP connections" +msgstr "The proxy server port used for HTTP connections" + +#: ../midori/midori-websettings.c:997 +msgid "The maximum size of cached pages on disk" +msgstr "The maximum size of cached pages on disk" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:1014 msgid "Identify as" msgstr "Identify as" -#: ../midori/midori-websettings.c:1032 +#: ../midori/midori-websettings.c:1015 msgid "What to identify as to web pages" msgstr "What to identify as to web pages" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1031 msgid "Identification string" msgstr "Identification string" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:1032 msgid "The application identification string" msgstr "The application identification string" -#: ../midori/midori-websettings.c:1064 +#: ../midori/midori-websettings.c:1048 msgid "Preferred languages" msgstr "Preferred languages" -#: ../midori/midori-websettings.c:1065 +#: ../midori/midori-websettings.c:1049 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1533,528 +1601,606 @@ "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1080 +#: ../midori/midori-websettings.c:1064 msgid "Clear private data" msgstr "Clear private data" -#: ../midori/midori-websettings.c:1081 +#: ../midori/midori-websettings.c:1065 msgid "The private data selected for deletion" msgstr "The private data selected for deletion" -#. 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:953 ../midori/midori-view.c:4155 -#: ../midori/midori-view.c:4159 +#: ../midori/midori-websettings.c:1080 +msgid "Clear data" +msgstr "Clear data" + +#: ../midori/midori-websettings.c:1081 +msgid "The data selected for deletion" +msgstr "The data selected for deletion" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1130 +msgid "Strip referrer details sent to websites" +msgstr "Strip referrer details sent to websites" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1132 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Whether the \"Referer\" header should be shortened to the hostname" + +#: ../midori/midori-websettings.c:1146 +msgid "Always use my font choices" +msgstr "Always use my font choices" + +#: ../midori/midori-websettings.c:1147 +msgid "Override fonts picked by websites with user preferences" +msgstr "Override fonts picked by websites with user preferences" + +#: ../midori/midori-view.c:1360 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s wants to save an HTML5 database." + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Deny" +msgstr "_Deny" + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Allow" +msgstr "_Allow" + +#: ../midori/midori-view.c:1392 +#, c-format +msgid "%s wants to know your location." +msgstr "%s wants to know your location." + +#: ../midori/midori-view.c:1485 #, c-format msgid "Error - %s" msgstr "Error - %s" -#: ../midori/midori-view.c:954 +#: ../midori/midori-view.c:1486 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "The page '%s' couldn't be loaded." -#: ../midori/midori-view.c:959 +#: ../midori/midori-view.c:1488 msgid "Try again" msgstr "Try again" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:992 -#, c-format -msgid "Not found - %s" -msgstr "Not found - %s" - -#: ../midori/midori-view.c:1210 ../midori/midori-view.c:2066 +#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598 #, c-format msgid "Send a message to %s" msgstr "Send a message to %s" -#: ../midori/midori-view.c:1835 ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747 msgid "Inspect _Element" msgstr "Inspect _Element" -#: ../midori/midori-view.c:1887 ../midori/midori-view.c:1965 -msgid "Open _Link" -msgstr "Open _Link" - -#: ../midori/midori-view.c:1890 ../midori/midori-view.c:1967 +#: ../midori/midori-view.c:2480 msgid "Open Link in New _Tab" msgstr "Open Link in New _Tab" -#: ../midori/midori-view.c:1894 +#: ../midori/midori-view.c:2484 msgid "Open Link in _Foreground Tab" msgstr "Open Link in _Foreground Tab" -#: ../midori/midori-view.c:1895 +#: ../midori/midori-view.c:2485 msgid "Open Link in _Background Tab" msgstr "Open Link in _Background Tab" -#: ../midori/midori-view.c:1898 ../midori/midori-view.c:1974 +#: ../midori/midori-view.c:2488 msgid "Open Link in New _Window" msgstr "Open Link in New _Window" -#: ../midori/midori-view.c:1901 +#: ../midori/midori-view.c:2491 msgid "Open Link as Web A_pplication" msgstr "Open Link as Web A_pplication" -#: ../midori/midori-view.c:1904 +#: ../midori/midori-view.c:2496 msgid "Copy Link de_stination" msgstr "Copy Link de_stination" -#: ../midori/midori-view.c:1907 ../midori/midori-view.c:1986 -msgid "_Save Link destination" -msgstr "_Save Link destination" - -#: ../midori/midori-view.c:1908 ../midori/midori-view.c:1980 -msgid "_Download Link destination" -msgstr "_Download Link destination" - -#: ../midori/midori-view.c:1912 ../midori/midori-view.c:1948 -#: ../midori/midori-view.c:1991 -msgid "Download with Download _Manager" -msgstr "Download with Download _Manager" - -#: ../midori/midori-view.c:1924 +#: ../midori/midori-view.c:2512 msgid "Open _Image in New Tab" msgstr "Open _Image in New Tab" -#: ../midori/midori-view.c:1927 -msgid "Open Image in New Wi_ndow" -msgstr "Open Image in New Wi_ndow" - -#: ../midori/midori-view.c:1930 +#: ../midori/midori-view.c:2515 msgid "Copy Image _Address" msgstr "Copy Image _Address" -#: ../midori/midori-view.c:1933 +#: ../midori/midori-view.c:2518 msgid "Save I_mage" msgstr "Save I_mage" -#: ../midori/midori-view.c:1934 -msgid "Download I_mage" -msgstr "Download I_mage" +#: ../midori/midori-view.c:2521 +msgid "Open in Image _Viewer" +msgstr "Open in Image _Viewer" -#: ../midori/midori-view.c:1941 +#: ../midori/midori-view.c:2528 msgid "Copy Video _Address" msgstr "Copy Video _Address" -#: ../midori/midori-view.c:1944 +#: ../midori/midori-view.c:2531 msgid "Save _Video" msgstr "Save _Video" -#: ../midori/midori-view.c:1944 +#: ../midori/midori-view.c:2531 msgid "Download _Video" msgstr "Download _Video" -#: ../midori/midori-view.c:2011 +#: ../midori/midori-view.c:2557 msgid "Search _with" msgstr "Search _with" -#: ../midori/midori-view.c:2046 ../midori/midori-view.c:2053 +#: ../midori/midori-view.c:2589 msgid "_Search the Web" msgstr "_Search the Web" -#: ../midori/midori-view.c:2074 +#: ../midori/midori-view.c:2606 msgid "Open Address in New _Tab" msgstr "Open Address in New _Tab" -#: ../midori/midori-view.c:2360 +#: ../midori/midori-view.c:2909 msgid "Open or download file" msgstr "Open or download file" -#: ../midori/midori-view.c:2383 +#: ../midori/midori-view.c:2929 #, c-format msgid "File Type: '%s'" msgstr "File Type: '%s'" -#: ../midori/midori-view.c:2386 +#: ../midori/midori-view.c:2931 #, c-format msgid "File Type: %s ('%s')" msgstr "File Type: %s ('%s')" -#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2390 +#: ../midori/midori-view.c:2935 +#, c-format +msgid "File Name: %s" +msgstr "File Name: %s" + +#: ../midori/midori-view.c:2955 #, c-format msgid "Open %s" msgstr "Open %s" -#: ../midori/midori-view.c:2905 +#: ../midori/midori-view.c:3576 #, c-format msgid "Inspect page - %s" msgstr "Inspect page - %s" -#: ../midori/midori-view.c:3162 -msgid "Speed dial" -msgstr "Speed dial" +#: ../midori/midori-view.c:3923 +msgid "Speed Dial" +msgstr "Speed Dial" -#: ../midori/midori-view.c:3163 +#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020 msgid "Click to add a shortcut" msgstr "Click to add a shortcut" -#: ../midori/midori-view.c:3164 +#: ../midori/midori-view.c:3925 msgid "Enter shortcut address" msgstr "Enter shortcut address" -#: ../midori/midori-view.c:3165 +#: ../midori/midori-view.c:3926 msgid "Enter shortcut title" msgstr "Enter shortcut title" -#: ../midori/midori-view.c:3166 +#: ../midori/midori-view.c:3927 msgid "Are you sure you want to delete this shortcut?" msgstr "Are you sure you want to delete this shortcut?" -#: ../midori/midori-view.c:3196 -#, c-format -msgid "Document cannot be displayed" -msgstr "Document cannot be displayed" - -#: ../midori/midori-view.c:3213 +#: ../midori/midori-view.c:4089 #, c-format msgid "No documentation installed" msgstr "No documentation installed" -#: ../midori/midori-view.c:3432 +#: ../midori/midori-view.c:4165 +msgid "Midori doesn't store any personal data:" +msgstr "Midori doesn't store any personal data:" + +#: ../midori/midori-view.c:4166 +msgid "No history or web cookies are being saved." +msgstr "No history or web cookies are being saved." + +#: ../midori/midori-view.c:4167 +msgid "Extensions are disabled." +msgstr "Extensions are disabled." + +#: ../midori/midori-view.c:4168 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "HTML5 storage, local database and application caches are disabled." + +#: ../midori/midori-view.c:4169 +msgid "Midori prevents websites from tracking the user:" +msgstr "Midori prevents websites from tracking the user:" + +#: ../midori/midori-view.c:4170 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "Referrer URLs are stripped down to the hostname." + +#: ../midori/midori-view.c:4171 +msgid "DNS prefetching is disabled." +msgstr "DNS prefetching is disabled." + +#: ../midori/midori-view.c:4172 +msgid "The language and timezone are not revealed to websites." +msgstr "The language and timezone are not revealed to websites." + +#: ../midori/midori-view.c:4173 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "Flash and other Netscape plugins cannot be listed by websites." + +#: ../midori/midori-view.c:4222 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "Version numbers in brackets show the version used at runtime." + +#: ../midori/midori-view.c:4278 +msgid "Page loading delayed" +msgstr "Page loading delayed" + +#: ../midori/midori-view.c:4279 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "Loading delayed either due to a recent crash or startup preferences." + +#: ../midori/midori-view.c:4280 +msgid "Load Page" +msgstr "Load Page" + +#: ../midori/midori-view.c:4446 msgid "Blank page" msgstr "Blank page" -#: ../midori/midori-view.c:3692 +#: ../midori/midori-view.c:4708 msgid "_Duplicate Tab" msgstr "_Duplicate Tab" -#: ../midori/midori-view.c:3697 -msgid "_Restore Tab" -msgstr "_Restore Tab" - -#: ../midori/midori-view.c:3697 -msgid "_Minimize Tab" -msgstr "_Minimise Tab" +#: ../midori/midori-view.c:4713 +msgid "Show Tab _Label" +msgstr "Show Tab _Label" + +#: ../midori/midori-view.c:4713 +msgid "Show Tab _Icon Only" +msgstr "Show Tab _Icon Only" -#: ../midori/midori-view.c:3703 +#: ../midori/midori-view.c:4719 msgid "Close ot_her Tabs" msgstr "Close ot_her Tabs" -#: ../midori/midori-view.c:4327 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5532 +msgid "previous" +msgstr "previous" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5551 +msgid "next" +msgstr "next" + +#: ../midori/midori-view.c:5564 msgid "Print background images" msgstr "Print background images" -#: ../midori/midori-view.c:4328 +#: ../midori/midori-view.c:5565 msgid "Whether background images should be printed" msgstr "Whether background images should be printed" -#: ../midori/midori-view.c:4380 ../midori/midori-preferences.c:382 +#: ../midori/midori-view.c:5597 msgid "Features" msgstr "Features" -#. Page "General" -#: ../midori/midori-preferences.c:299 -msgid "General" -msgstr "General" - -#: ../midori/midori-preferences.c:300 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Startup" -#: ../midori/midori-preferences.c:315 ../midori/midori-preferences.c:322 +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Use _current page" + +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Use current page as homepage" -#: ../midori/midori-preferences.c:332 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Transfers" - #. Page "Appearance" -#: ../midori/midori-preferences.c:350 -msgid "Appearance" -msgstr "Appearance" - -#: ../midori/midori-preferences.c:351 -msgid "Font settings" -msgstr "Font settings" - -#: ../midori/midori-preferences.c:353 -msgid "Default Font Family" -msgstr "Default Font Family" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Fonts" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Proportional Font Family" -#: ../midori/midori-preferences.c:356 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "The default font family used to display text" -#: ../midori/midori-preferences.c:359 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "The default font size used to display text" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Fixed-width Font Family" -#: ../midori/midori-preferences.c:364 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "The font family used to display fixed-width text" -#: ../midori/midori-preferences.c:367 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" msgstr "The font size used to display fixed-width text" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Minimum Font Size" -#: ../midori/midori-preferences.c:372 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "The minimum font size used to display text" #. Page "Behavior" -#: ../midori/midori-preferences.c:381 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Behaviour" -#: ../midori/midori-preferences.c:394 -msgid "Enforce 96 dots per inch" -msgstr "Enforce 96 dots per inch" - -#: ../midori/midori-preferences.c:395 -msgid "Enforce a video dot density of 96 DPI" -msgstr "Enforce a video dot density of 96 DPI" - -#: ../midori/midori-preferences.c:414 -msgid "Spell Checking" -msgstr "Spell Checking" - -#: ../midori/midori-preferences.c:417 -msgid "Enable Spell Checking" -msgstr "Enable Spell Checking" - -#: ../midori/midori-preferences.c:418 -msgid "Enable spell checking while typing" -msgstr "Enable spell checking while typing" - -#: ../midori/midori-preferences.c:420 -msgid "Spelling dictionaries:" -msgstr "Spelling dictionaries:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:424 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" -msgstr "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" +#: ../midori/midori-preferences.c:385 +msgid "Allow scripts to open popups" +msgstr "Allow scripts to open popups" + +#: ../midori/midori-preferences.c:386 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "Whether scripts are allowed to open popup windows automatically" #. Page "Interface" -#: ../midori/midori-preferences.c:430 -msgid "Interface" -msgstr "Interface" - -#: ../midori/midori-preferences.c:431 -msgid "Navigationbar" -msgstr "Navigationbar" - -#: ../midori/midori-preferences.c:439 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Browsing" -#. Page "Applications" -#: ../midori/midori-preferences.c:461 -msgid "Applications" -msgstr "Applications" - -#: ../midori/midori-preferences.c:462 -msgid "External applications" -msgstr "External applications" - #. Page "Network" -#: ../midori/midori-preferences.c:478 ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "Network" -#. Page "Privacy" -#: ../midori/midori-preferences.c:503 -msgid "Privacy" -msgstr "Privacy" - -#: ../midori/midori-preferences.c:504 -msgid "Web Cookies" -msgstr "Web Cookies" - -#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:520 -msgid "days" -msgstr "days" +#: ../midori/midori-preferences.c:463 +msgid "Hostname" +msgstr "Hostname" + +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "MB" -#: ../midori/midori-searchaction.c:923 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Add search engine" -#: ../midori/midori-searchaction.c:923 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Edit search engine" -#: ../midori/midori-searchaction.c:951 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Name:" -#: ../midori/midori-searchaction.c:995 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Description:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "_Icon:" -#: ../midori/midori-searchaction.c:1009 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "_Token:" -#: ../midori/midori-searchaction.c:1240 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "Manage Search Engines" -#: ../midori/midori-searchaction.c:1341 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "Use as _default" -#: ../midori/sokoke.c:1177 -msgid "_Bookmark" -msgstr "_Bookmark" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "Open with" -#: ../midori/sokoke.c:1179 -msgid "Add Boo_kmark" -msgstr "Add Boo_kmark" +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Choose an application or command to open \"%s\":" -#: ../midori/sokoke.c:1180 -msgid "_Console" -msgstr "_Console" +#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "Could not run external program." -#: ../midori/sokoke.c:1181 -msgid "_Extensions" -msgstr "_Extensions" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d hour" +msgstr[1] "%d hours" -#: ../midori/sokoke.c:1182 -msgid "_History" -msgstr "_History" +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minute" +msgstr[1] "%d minutes" -#: ../midori/sokoke.c:1183 -msgid "_Homepage" -msgstr "_Homepage" +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d second" +msgstr[1] "%d seconds" -#: ../midori/sokoke.c:1184 -msgid "_Userscripts" -msgstr "_Userscripts" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s of %s" -#: ../midori/sokoke.c:1185 -msgid "New _Tab" -msgstr "New _Tab" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/sokoke.c:1186 -msgid "_Transfers" -msgstr "_Transfers" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr " - %s remaining" -#: ../midori/sokoke.c:1187 -msgid "Netscape p_lugins" -msgstr "Netscape p_lugins" +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:291 +msgid "_Inline Find:" +msgstr "_Inline Find:" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:144 -msgid "Userscripts" -msgstr "Userscripts" +#: ../toolbars/midori-findbar.c:317 +msgid "Previous" +msgstr "Previous" -#: ../panels/midori-addons.c:100 -msgid "Userstyles" -msgstr "Userstyles" +#: ../toolbars/midori-findbar.c:323 +msgid "Next" +msgstr "Next" -#: ../panels/midori-addons.c:305 -#, c-format -msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -msgstr "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#: ../toolbars/midori-findbar.c:327 +msgid "Match Case" +msgstr "Match Case" + +#: ../toolbars/midori-findbar.c:336 +msgid "Highlight Matches" +msgstr "Highlight Matches" + +#: ../toolbars/midori-findbar.c:347 +msgid "Close Findbar" +msgstr "Close Findbar" -#: ../panels/midori-addons.c:911 +#: ../toolbars/midori-transferbar.c:122 #, c-format -msgid "Can't monitor folder '%s': %s" -msgstr "Can't monitor folder '%s': %s" +msgid "The file '%s' has been downloaded." +msgstr "The file '%s' has been downloaded." + +#: ../toolbars/midori-transferbar.c:125 +msgid "Transfer completed" +msgstr "Transfer completed" -#: ../panels/midori-bookmarks.c:112 +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "The downloaded file is erroneous." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." + +#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "Clear All" + +#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 +msgid "Some files are being downloaded" +msgstr "Some files are being downloaded" + +#: ../toolbars/midori-transferbar.c:377 +msgid "_Quit Midori" +msgstr "_Quit Midori" + +#: ../toolbars/midori-transferbar.c:379 +msgid "The transfers will be cancelled if Midori quits." +msgstr "The transfers will be cancelled if Midori quits." + +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Bookmarks" -#: ../panels/midori-bookmarks.c:251 +#: ../panels/midori-bookmarks.c:257 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Failed to add bookmark item: %s\n" + +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "Edit the selected bookmark" -#: ../panels/midori-bookmarks.c:259 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "Delete the selected bookmark" -#: ../panels/midori-bookmarks.c:279 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" msgstr "Add a new folder" -#: ../panels/midori-bookmarks.c:609 +#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 msgid "Separator" msgstr "Separator" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "Console" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "History" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Extensions" +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "Today" + +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "Yesterday" + +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "%d day ago" +msgstr[1] "%d days ago" + +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "A week ago" -#: ../panels/midori-history.c:162 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" msgstr "Are you sure you want to remove all history items?" -#: ../panels/midori-history.c:217 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" msgstr "Bookmark the selected history item" -#: ../panels/midori-history.c:226 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" msgstr "Delete the selected history item" -#: ../panels/midori-history.c:234 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "Clear the entire history" -#: ../panels/midori-history.c:598 -msgid "Erroneous clock time" -msgstr "Erroneous clock time" - -#: ../panels/midori-history.c:599 -msgid "" -"The clock time lies in the past. Please check the current date and time." -msgstr "" -"The clock time lies in the past. Please check the current date and time." - -#: ../panels/midori-history.c:611 -msgid "A week ago" -msgstr "A week ago" - -#: ../panels/midori-history.c:616 -#, c-format -msgid "%d day ago" -msgid_plural "%d days ago" -msgstr[0] "%d day ago" -msgstr[1] "%d days ago" - -#: ../panels/midori-history.c:624 -msgid "Today" -msgstr "Today" - -#: ../panels/midori-history.c:626 -msgid "Yesterday" -msgstr "Yesterday" +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Transfers" -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" msgstr "Open Destination _Folder" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" msgstr "Copy Link Loc_ation" -#: ../katze/katze-http-auth.c:209 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Authentication Required" -#: ../katze/katze-http-auth.c:225 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" @@ -2062,55 +2208,80 @@ "A username and a password are required\n" "to open this location:" -#: ../katze/katze-http-auth.c:239 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "Username" -#: ../katze/katze-http-auth.c:252 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "Password" -#: ../katze/katze-http-auth.c:266 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "_Remember password" -#: ../katze/katze-throbber.c:828 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Named icon '%s' couldn't be loaded" -#: ../katze/katze-throbber.c:841 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Stock icon '%s' couldn't be loaded" -#: ../katze/katze-throbber.c:907 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "Animation frames are broken" -#: ../katze/katze-utils.c:487 ../katze/katze-utils.c:878 +#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Property '%s' is invalid for %s" -#: ../katze/katze-utils.c:533 ../katze/katze-utils.c:562 +#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Choose file" -#: ../katze/katze-utils.c:548 +#: ../katze/katze-utils.c:506 msgid "Choose folder" msgstr "Choose folder" -#: ../katze/katze-preferences.c:91 +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "None" + +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "1 hour" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "1 day" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "1 week" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "1 month" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "1 year" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Preferences for %s" -#: ../extensions/adblock.c:362 +#: ../extensions/adblock.c:473 msgid "Configure Advertisement filters" msgstr "Configure Advertisement filters" -#: ../extensions/adblock.c:394 +#: ../extensions/adblock.c:504 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2119,36 +2290,130 @@ "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." -#: ../extensions/adblock.c:534 -msgid "Configure _Advertisement filters..." -msgstr "Configure _Advertisement filters..." +#: ../extensions/adblock.c:882 +msgid "Edit rule" +msgstr "Edit rule" + +#: ../extensions/adblock.c:896 +msgid "_Rule:" +msgstr "_Rule:" + +#: ../extensions/adblock.c:950 +msgid "Bl_ock image" +msgstr "Bl_ock image" + +#: ../extensions/adblock.c:955 +msgid "Bl_ock link" +msgstr "Bl_ock link" -#: ../extensions/adblock.c:1368 +#: ../extensions/adblock.c:1670 msgid "Advertisement blocker" msgstr "Advertisement blocker" -#: ../extensions/adblock.c:1369 +#: ../extensions/adblock.c:1671 msgid "Block advertisements according to a filter list" msgstr "Block advertisements according to a filter list" -#: ../extensions/colorful-tabs.c:136 +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "This page appears to contain a user script. Do you wish to install it?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "_Install user script" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "This page appears to contain a user style. Do you wish to install it?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_Install user style" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Don't install" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 +msgid "Userscripts" +msgstr "Userscripts" + +#: ../extensions/addons.c:324 ../extensions/addons.c:683 +msgid "Userstyles" +msgstr "Userstyles" + +#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Error" + +#: ../extensions/addons.c:421 +#, c-format +msgid "Do you want to delete '%s'?" +msgstr "Do you want to delete '%s'?" + +#: ../extensions/addons.c:427 +msgid "Delete user script" +msgstr "Delete user script" + +#: ../extensions/addons.c:428 +msgid "Delete user style" +msgstr "Delete user style" + +#: ../extensions/addons.c:431 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "The file %s will be permanently deleted." + +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "Open in Text Editor" + +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "Open Target Folder" + +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "Add new addon" + +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "Remove selected addon" + +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 +msgid "User addons" +msgstr "User addons" + +#: ../extensions/addons.c:1826 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "Can't monitor folder '%s': %s" + +#: ../extensions/addons.c:1915 +msgid "Support for userscripts and userstyles" +msgstr "Support for userscripts and userstyles" + +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "Colourful Tabs" -#: ../extensions/colorful-tabs.c:137 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Tint each tab distinctly" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Cookie Manager" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "Delete All" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 +#: ../extensions/cookie-manager/cookie-manager-page.c:105 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." @@ -2156,31 +2421,31 @@ "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." -#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "Expand All" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "Collapse All" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" msgstr "Do you really want to delete all cookies?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Question" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." msgstr "Only cookies which match the filter will be deleted." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "At the end of the session" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2197,15 +2462,15 @@ "Secure: %s\n" "Expires: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Yes" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "No" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" @@ -2214,23 +2479,23 @@ "Domain: %s\n" "Cookies: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Name" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "_Expand All" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "_Collapse All" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 msgid "Filter:" msgstr "Filter:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "" "Enter a filter string to show only cookies whose name or domain field match " "the entered filter" @@ -2238,56 +2503,64 @@ "Enter a filter string to show only cookies whose name or domain field match " "the entered filter" -#: ../extensions/cookie-manager/main.c:40 -msgid "_Cookie Manager" -msgstr "_Cookie Manager" - -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "List, view and delete cookies" -#: ../extensions/feed-panel/feed-atom.c:237 +#: ../extensions/copy-tabs.c:38 +msgid "Copy Tab _Addresses" +msgstr "Copy Tab _Addresses" + +#: ../extensions/copy-tabs.c:95 +msgid "Copy Addresses of Tabs" +msgstr "Copy Addresses of Tabs" + +#: ../extensions/copy-tabs.c:96 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Copy the addresses of all tabs to the clipboard" + +#: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Failed to find required Atom \"entry\" elements in XML data." -#: ../extensions/feed-panel/feed-atom.c:343 +#: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Failed to find required Atom \"feed\" elements in XML data." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Last updated: %s." -#: ../extensions/feed-panel/feed-panel.c:667 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "Feeds" -#: ../extensions/feed-panel/feed-panel.c:720 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "Add new feed" -#: ../extensions/feed-panel/feed-panel.c:727 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "Delete feed" -#: ../extensions/feed-panel/feed-panel.c:810 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "_Feeds" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Failed to find root element in feed XML data." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Unsupported feed format." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Failed to parse XML feed: %s" @@ -2308,164 +2581,697 @@ msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Failed to find required RSS \"channel\" elements in XML data." -#: ../extensions/feed-panel/main.c:132 -msgid "Error" -msgstr "Error" - -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "Feed '%s' already exists" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Error loading feed '%s'" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "Feed Panel" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Read Atom/ RSS feeds" -#: ../extensions/formhistory.c:140 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" msgstr "Failed to add form value: %s\n" -#: ../extensions/formhistory.c:501 -msgid "Stores history of entered form data" -msgstr "Stores history of entered form data" +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "Form history" -#: ../extensions/formhistory.c:505 +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"A username and a password are required\n" +"to open this location:" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "Remember password on this page?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Remember" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "Not now" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Never for this page" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "Toggle form history state" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "Activate or deactivate form history for the current tab." + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format -msgid "Not available: %s" -msgstr "Not available: %s" +msgid "Failed to execute database statement: %s\n" +msgstr "Failed to execute database statement: %s\n" -#: ../extensions/formhistory.c:506 -msgid "Resource files not installed" -msgstr "Resource files not installed" +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "Only activate form history via hotkey (Ctrl+Shift+F) per tab" -#: ../extensions/formhistory.c:512 +#: ../extensions/formhistory/formhistory.c:668 msgid "Form history filler" msgstr "Form history filler" -#: ../extensions/mouse-gestures.c:288 +#: ../extensions/formhistory/formhistory.c:669 +msgid "Stores history of entered form data" +msgstr "Stores history of entered form data" + +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#, c-format +msgid "Failed to select suggestions\n" +msgstr "Failed to select suggestions\n" + +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "There are no unvisited tabs" + +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "History-List" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Tab closing behaviour" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Do nothing" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Switch to last viewed tab" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Switch to newest tab" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Next new Tab (History List)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Next new tab from history" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Previous new Tab (History List)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Previous new tab from history" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Display tab in background (History List)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Display the current selected tab in background" + +#: ../extensions/history-list.vala:569 +msgid "History List" +msgstr "History List" + +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "Move to the last used tab when switching or closing tabs" + +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Mouse Gestures" -#: ../extensions/mouse-gestures.c:289 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Control Midori by moving the mouse" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 -msgid "Pageholder" -msgstr "Pageholder" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "_Pageholder" - -#: ../extensions/page-holder.c:178 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "Keep one or multiple pages open in parallel to your tabs" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "Reload page or stop loading" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "Customise Keyboard shortcuts" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "Customise Sh_ortcuts..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Shortcuts" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "View and edit keyboard shortcuts" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/status-clock.c:174 +msgid "Statusbar Clock" +msgstr "Statusbar Clock" + +#: ../extensions/status-clock.c:175 +msgid "Display date and time in the statusbar" +msgstr "Display date and time in the statusbar" + +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Images" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Scripts" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Netscape plugins" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "Statusbar Features" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" msgstr "Easily toggle features on web pages on and off" -#: ../extensions/tab-panel.c:565 ../extensions/tab-panel.c:622 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Tab Panel" -#: ../extensions/tab-panel.c:606 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "T_ab Panel" -#: ../extensions/tab-panel.c:623 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Show tabs in a vertical panel" -#: ../extensions/tab-switcher.c:394 -msgid "Tab History List" -msgstr "Tab History List" - -#: ../extensions/tab-switcher.c:395 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Allows to switch tabs by choosing from a list sorted by last usage" +#: ../extensions/tabs-minimized.c:76 +msgid "Only Icons on Tabs by default" +msgstr "Only Icons on Tabs by default" + +#: ../extensions/tabs-minimized.c:77 +msgid "New tabs have no label by default" +msgstr "New tabs have no label by default" -#: ../extensions/toolbar-editor.c:391 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Customise Toolbar" -#: ../extensions/toolbar-editor.c:407 +#: ../extensions/toolbar-editor.c:409 msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " +"Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " +"Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." -#: ../extensions/toolbar-editor.c:423 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Available Items" -#: ../extensions/toolbar-editor.c:444 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Displayed Items" -#: ../extensions/toolbar-editor.c:579 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "Customise _Toolbar..." -#: ../extensions/toolbar-editor.c:612 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Customise..." + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" msgstr "Toolbar Editor" -#: ../extensions/toolbar-editor.c:614 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" msgstr "Easily edit the toolbar layout" -#: ../extensions/toolbar-editor.c:617 -msgid "Not available on this platform" -msgstr "Not available on this platform" - -#: ../extensions/web-cache.c:459 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "Cache HTTP communication on disk" +#~ msgid "Lightweight web browser" +#~ msgstr "Lightweight web browser" + +#~ msgid "Reset the last _session" +#~ msgstr "Reset the last _session" + +#~ msgid "No filename specified" +#~ msgstr "No filename specified" + +#~ msgid "Cookies" +#~ msgstr "Cookies" + +#~ msgid "'Flash' Cookies" +#~ msgstr "'Flash' Cookies" + +#~ msgid "HTML5 _Databases" +#~ msgstr "HTML5 _Databases" + +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "The specified configuration folder is invalid." + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% loaded" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "Don't save any private data while browsing" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Add shortcut to speed dial" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Add shortcut to the desktop" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "Subscribe to this news feed" + +#~ msgid "Close this window" +#~ msgstr "Close this window" + +#~ msgid "Quit the application" +#~ msgstr "Quit the application" + +#~ msgid "Undo the last modification" +#~ msgstr "Undo the last modification" + +#~ msgid "Redo the last modification" +#~ msgstr "Redo the last modification" + +#~ msgid "Cut the selected text" +#~ msgstr "Cut the selected text" + +#~ msgid "Copy the selected text" +#~ msgstr "Copy the selected text" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "Paste text from the clipboard" + +#~ msgid "Delete the selected text" +#~ msgstr "Delete the selected text" + +#~ msgid "Select all text" +#~ msgstr "Select all text" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Find the next occurrence of a word or phrase" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Find the previous occurrence of a word or phrase" + +#~ msgid "Reset the zoom level" +#~ msgstr "Reset the zoom level" + +#~ msgid "View the source code of the page" +#~ msgstr "View the source code of the page" + +#~ msgid "Scroll to the left" +#~ msgstr "Scroll to the left" + +#~ msgid "Scroll down" +#~ msgstr "Scroll down" + +#~ msgid "Scroll up" +#~ msgstr "Scroll up" + +#~ msgid "Scroll to the right" +#~ msgstr "Scroll to the right" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "Delete the contents of the wastebasket" + +#~ msgid "Open the last closed tab" +#~ msgstr "Open the last closed tab" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Add a new bookmark folder" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Add, edit and remove search engines..." + +#~ msgid "Clear private data..." +#~ msgstr "Clear private data..." + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "Inspect page details and access developer tools..." + +#~ msgid "Switch to the previous tab" +#~ msgstr "Switch to the previous tab" + +#~ msgid "Focus the current tab" +#~ msgstr "Focus the current tab" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Only show the icon of the current tab" + +#~ msgid "Duplicate the current tab" +#~ msgstr "Duplicate the current tab" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Close all tabs except the current tab" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Open the tabs saved in the last session" + +#~ msgid "_Contents" +#~ msgstr "_Contents" + +#~ msgid "Show the documentation" +#~ msgstr "Show the documentation" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Show the Frequently Asked Questions" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Open Midori's bug tracker" + +#~ msgid "Show information about the program" +#~ msgstr "Show information about the program" + +#~ msgid "Show menubar" +#~ msgstr "Show menubar" + +#~ msgid "Show navigationbar" +#~ msgstr "Show navigationbar" + +#~ msgid "Show sidepanel" +#~ msgstr "Show sidepanel" + +#~ msgid "Show bookmarkbar" +#~ msgstr "Show bookmarkbar" + +#~ msgid "_Transferbar" +#~ msgstr "_Transferbar" + +#~ msgid "Show transferbar" +#~ msgstr "Show transferbar" + +#~ msgid "Show statusbar" +#~ msgstr "Show statusbar" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "Failed to execute database statement\n" + +#~ msgid "Show Blank page" +#~ msgstr "Show Blank page" + +#~ msgid "All cookies" +#~ msgstr "All cookies" + +#~ msgid "Session cookies" +#~ msgstr "Session cookies" + +#~ msgid "Show Transferbar" +#~ msgstr "Show Transferbar" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "Whether to show the transferbar" + +#~ msgid "Show progress in location entry" +#~ msgstr "Show progress in location entry" + +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "Whether to show loading progress in the location entry" + +#~ msgid "Search engines in location completion" +#~ msgstr "Search engines in location completion" + +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "Whether to show search engines in the location completion" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "Show operating controls of the panel" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "Whether to show the operating controls of the panel" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Show speed dial in new tabs" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Show speed dial in newly opened tabs" + +#~ msgid "Ask for the destination folder" +#~ msgstr "Ask for the destination folder" + +#~ msgid "Whether to ask for the destination folder when downloading a file" +#~ msgstr "Whether to ask for the destination folder when downloading a file" + +#~ msgid "Whether to show a notification when a transfer has been completed" +#~ msgstr "Whether to show a notification when a transfer has been completed" + +#~ msgid "Download Manager" +#~ msgstr "Download Manager" + +#~ msgid "An external download manager" +#~ msgstr "An external download manager" + +#~ msgid "Open external pages in:" +#~ msgstr "Open external pages in:" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "Where to open externally opened pages" + +#~ msgid "Accept cookies" +#~ msgstr "Accept cookies" + +#~ msgid "What type of cookies to accept" +#~ msgstr "What type of cookies to accept" + +#~ msgid "Maximum cookie age" +#~ msgstr "Maximum cookie age" + +#~ msgid "Maximum history age" +#~ msgstr "Maximum history age" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Remember last downloaded files" + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "Whether the last downloaded files are saved" + +#~ msgid "Not found - %s" +#~ msgstr "Not found - %s" + +#~ msgid "_Save Link destination" +#~ msgstr "_Save Link destination" + +#~ msgid "_Download Link destination" +#~ msgstr "_Download Link destination" + +#~ msgid "Download with Download _Manager" +#~ msgstr "Download with Download _Manager" + +#~ msgid "Download I_mage" +#~ msgstr "Download I_mage" + +#~ msgid "Set number of columns and rows" +#~ msgstr "Set number of columns and rows" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Enter number of columns and rows:" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "Invalid input for the size of the speed dial" + +#~ msgid "Thumb size:" +#~ msgstr "Thumb size:" + +#~ msgid "Small" +#~ msgstr "Small" + +#~ msgid "Medium" +#~ msgstr "Medium" + +#~ msgid "Big" +#~ msgstr "Big" + +#~ msgid "Document cannot be displayed" +#~ msgstr "Document cannot be displayed" + +#~ msgid "General" +#~ msgstr "General" + +#~ msgid "Appearance" +#~ msgstr "Appearance" + +#~ msgid "Font settings" +#~ msgstr "Font settings" + +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "Enforce 96 dots per inch" + +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "Enforce a video dot density of 96 DPI" + +#~ msgid "Interface" +#~ msgstr "Interface" + +#~ msgid "Navigationbar" +#~ msgstr "Navigationbar" + +#~ msgid "Applications" +#~ msgstr "Applications" + +#~ msgid "External applications" +#~ msgstr "External applications" + +#~ msgid "Web Cookies" +#~ msgstr "Web Cookies" + +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "Delete cookies when quitting Midori" + +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "Delete old cookies after 1 hour" + +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "Delete old cookies after 1 week" + +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "Delete old cookies after 1 month" + +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "Delete old cookies after 1 year" + +#~ msgid "days" +#~ msgstr "days" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Configure _Advertisement filters..." + +#~ msgid "Open target folder for selected addon" +#~ msgstr "Open target folder for selected addon" + +#~ msgid "Not available: %s" +#~ msgstr "Not available: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "Resource files not installed" + +#~ msgid "Next Tab (History List)" +#~ msgstr "Next Tab (History List)" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "Previous Tab (History List)" + +#~ msgid "Previous tab from history" +#~ msgstr "Previous tab from history" + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "Switch tabs with Ctrl+Tab sorted by last usage" + +#~ msgid "Pageholder" +#~ msgstr "Pageholder" + +#~ msgid "_Pageholder" +#~ msgstr "_Pageholder" + +#~ msgid "Keep one or multiple pages open in parallel to your tabs" +#~ msgstr "Keep one or multiple pages open in parallel to your tabs" + +#~ msgid "Failed to get current time: %s\n" +#~ msgstr "Failed to get current time: %s\n" + +#~ msgid "_Recently visited pages" +#~ msgstr "_Recently visited pages" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Reopen pages that you visited earlier" + +#~ msgid "Detach chosen panel from the window" +#~ msgstr "Detach chosen panel from the window" + +#~ msgid "Show operating _controls" +#~ msgstr "Show operating _controls" + +#~ msgid "Original cookies only" +#~ msgstr "Original cookies only" + +#~ msgid "Remember last visited pages" +#~ msgstr "Remember last visited pages" + +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "Whether the last visited pages are saved" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "Detect proxy server automatically" + +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" +#~ msgstr "" +#~ "Whether to detect the proxy server automatically from the environment" + +#~ msgid "Open _Link" +#~ msgstr "Open _Link" + +#~ msgid "Open Image in New Wi_ndow" +#~ msgstr "Open Image in New Wi_ndow" + +#~ msgid "_Restore Tab" +#~ msgstr "_Restore Tab" + +#~ msgid "_Minimize Tab" +#~ msgstr "_Minimise Tab" + +#~ msgid "Spell Checking" +#~ msgstr "Spell Checking" + +#~ msgid "Spelling dictionaries:" +#~ msgstr "Spelling dictionaries:" + +#~ msgid "" +#~ "A comma separated list of languages to be used for spell checking, for " +#~ "example \"en_GB,de_DE\"" +#~ msgstr "" +#~ "A comma separated list of languages to be used for spell checking, for " +#~ "example \"en_GB,de_DE\"" + +#~ msgid "" +#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "" +#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." + +#~ msgid "Console" +#~ msgstr "Console" + +#~ msgid "Erroneous clock time" +#~ msgstr "Erroneous clock time" + +#~ msgid "" +#~ "The clock time lies in the past. Please check the current date and time." +#~ msgstr "" +#~ "The clock time lies in the past. Please check the current date and time." + +#~ msgid "_Cookie Manager" +#~ msgstr "_Cookie Manager" + +#~ msgid "Not available on this platform" +#~ msgstr "Not available on this platform" diff -Nru midori-0.2.8/po/eo.po midori-0.4.6/po/eo.po --- midori-0.2.8/po/eo.po 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/po/eo.po 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,2793 @@ +# Esperanto translations for Midori package. +# Copyright (C) 2012 Midori +# This file is distributed under the same license as the Midori package. +# Michael Moroni , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: Midori 0.4.3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-03-07 08:18+0000\n" +"PO-Revision-Date: 2012-02-28 17:26+0100\n" +"Last-Translator: Michael Moroni \n" +"Language-Team: Esperanto\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: eo\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/midori.desktop.in.h:1 +msgid "Browse the Web" +msgstr "Retumi" + +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "Interreto;TTT;Eksplorilo" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:1988 ../midori/main.c:2008 +#: ../midori/main.c:2022 ../midori/midori-websettings.c:308 +msgid "Midori" +msgstr "Midori" + +#: ../data/midori.desktop.in.h:4 +msgid "Web Browser" +msgstr "Retumilo" + +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Privata retumado de Midori" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Malfermi novan fenestron por privata retumado" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4025 +msgid "Private Browsing" +msgstr "Privata retumado" + +#: ../midori/main.c:96 ../midori/main.c:102 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "La agordoj ne ŝargeblas: %s\n" + +#: ../midori/main.c:150 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Valoro '%s' nevalidas por %s" + +#: ../midori/main.c:155 ../midori/main.c:259 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "Nevalida agordvaloro '%s'" + +#: ../midori/main.c:364 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "La serĉilo ne ŝargeblis. %s\n" + +#: ../midori/main.c:418 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Forigado de la kronologio fiaskis: %s\n" + +#: ../midori/main.c:438 ../midori/main.c:562 +#: ../extensions/formhistory/formhistory.c:529 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "Malfermado de la datumbazo fiaskis: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:505 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "La malnovaj kronologieroj ne forigeblis: %s\n" + +#: ../midori/main.c:545 ../panels/midori-history.c:231 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "La kronologiero ne forigeblis: %s\n" + +#: ../midori/main.c:592 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "La legosigno ne konserveblis. %s" + +#: ../midori/main.c:614 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "La agordoj ne konserveblis. %s" + +#: ../midori/main.c:649 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "La serĉilo ne konserveblis. %s" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:686 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "La rubujo ne konserveblis. %s" + +#: ../midori/main.c:727 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Etendaĵoj" + +#: ../midori/main.c:741 +msgid "Privacy" +msgstr "Privateco" + +#: ../midori/main.c:753 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" + +#: ../midori/main.c:809 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "La seanco ne konserveblis. %s" + +#: ../midori/main.c:1027 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" + +#: ../midori/main.c:1096 +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:1115 +msgid "Modify _preferences" +msgstr "Redakti a_gordojn" + +#: ../midori/main.c:1119 +msgid "Disable all _extensions" +msgstr "Malŝalti ĉiujn _etendaĵojn" + +#: ../midori/main.c:1132 +msgid "Discard old tabs" +msgstr "Ignori malnovajn langetojn" + +#: ../midori/main.c:1133 ../midori/midori-websettings.c:217 +msgid "Show last tabs without loading" +msgstr "Montri lastajn langetojn sen ŝargi" + +#: ../midori/main.c:1134 ../midori/midori-websettings.c:216 +msgid "Show last open tabs" +msgstr "Montri laste malfermitajn langetojn" + +#: ../midori/main.c:1342 ../midori/main.c:2399 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "La seanco ne ŝargeblis: %s\n" + +#: ../midori/main.c:1480 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Ekrankopio konservita ĉe: %s\n" + +#: ../midori/main.c:1891 +msgid "Run ADDRESS as a web application" +msgstr "Ruli ADRESON kiel retaplikaĵo" + +#: ../midori/main.c:1891 +msgid "ADDRESS" +msgstr "ADRESON" + +#: ../midori/main.c:1894 +msgid "Use FOLDER as configuration folder" +msgstr "Uzi DOSIERUJON kiel agorddosierujon" + +#: ../midori/main.c:1894 +msgid "FOLDER" +msgstr "DOSIERUJON" + +#: ../midori/main.c:1897 +msgid "Private browsing, no changes are saved" +msgstr "" + +#: ../midori/main.c:1899 +msgid "Show a diagnostic dialog" +msgstr "" + +#: ../midori/main.c:1901 +msgid "Run the specified filename as javascript" +msgstr "" + +#: ../midori/main.c:1903 +msgid "Take a snapshot of the specified URI" +msgstr "" + +#: ../midori/main.c:1905 +msgid "Execute the specified command" +msgstr "" + +#: ../midori/main.c:1907 +msgid "List available commands to execute with -e/ --execute" +msgstr "" + +#: ../midori/main.c:1909 +msgid "Display program version" +msgstr "" + +#: ../midori/main.c:1911 +msgid "Addresses" +msgstr "" + +#: ../midori/main.c:1913 +msgid "Block URIs according to regular expression PATTERN" +msgstr "" + +#: ../midori/main.c:1913 +msgid "PATTERN" +msgstr "" + +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:1917 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "" + +#: ../midori/main.c:1917 +msgid "SECONDS" +msgstr "" + +#: ../midori/main.c:1920 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "" + +#: ../midori/main.c:1920 +msgid "FILENAME" +msgstr "" + +#: ../midori/main.c:1985 +msgid "[Addresses]" +msgstr "" + +#: ../midori/main.c:1995 +msgid "The specified configuration folder is invalid." +msgstr "" + +#: ../midori/main.c:2023 +msgid "Please report comments, suggestions and bugs to:" +msgstr "" + +#: ../midori/main.c:2025 +msgid "Check for new versions at:" +msgstr "" + +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2109 +msgid "Saved logins and _passwords" +msgstr "" + +#: ../midori/main.c:2111 +msgid "Cookies and Website data" +msgstr "" + +#: ../midori/main.c:2114 ../midori/midori-websettings.c:956 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "" + +#: ../midori/main.c:2117 +msgid "Website icons" +msgstr "" + +#: ../midori/main.c:2224 +msgid "An unknown error occured" +msgstr "" + +#: ../midori/main.c:2330 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "" + +#: ../midori/main.c:2366 +#, c-format +msgid "Bookmarks couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:2414 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:2427 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:2443 +msgid "The following errors occured:" +msgstr "" + +#: ../midori/main.c:2459 +msgid "_Ignore" +msgstr "_Ignori" + +#: ../midori/midori-app.c:1331 +msgid "_Bookmark" +msgstr "_Legosigno" + +#: ../midori/midori-app.c:1332 ../midori/midori-browser.c:5933 +msgid "_Bookmarks" +msgstr "_Legosignoj" + +#: ../midori/midori-app.c:1333 +msgid "Add Boo_kmark" +msgstr "_Aldoni legosignon" + +#: ../midori/midori-app.c:1334 +msgid "_Console" +msgstr "" + +#: ../midori/midori-app.c:1335 +msgid "_Extensions" +msgstr "_Etendaĵoj" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1336 ../midori/midori-browser.c:4502 +msgid "_History" +msgstr "_Kronologio" + +#: ../midori/midori-app.c:1337 +msgid "_Homepage" +msgstr "_Hejmpaĝo" + +#: ../midori/midori-app.c:1338 +msgid "_Userscripts" +msgstr "_Uzantskriptoj" + +#: ../midori/midori-app.c:1339 +msgid "New _Tab" +msgstr "Nova lange_to" + +#: ../midori/midori-app.c:1340 +msgid "_Transfers" +msgstr "_Transigoj" + +#: ../midori/midori-app.c:1341 +msgid "Netscape p_lugins" +msgstr "_Kromprogramo de Netscape" + +#: ../midori/midori-app.c:1342 +msgid "_Closed Tabs" +msgstr "_Fermitaj langetoj" + +#: ../midori/midori-app.c:1343 ../midori/midori-browser.c:5088 +msgid "New _Window" +msgstr "No_va fenestro" + +#: ../midori/midori-app.c:1344 +msgid "New _Folder" +msgstr "Nova _dosierujo" + +#: ../midori/midori-array.c:522 +msgid "File not found." +msgstr "Dosiero ne trovata." + +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +msgid "Malformed document." +msgstr "Miskreita dokumento" + +#: ../midori/midori-array.c:628 +msgid "Unrecognized bookmark format." +msgstr "Nerekonata aranĝo de legosignoj." + +#: ../midori/midori-array.c:915 +msgid "Writing failed." +msgstr "Skribado fiaskis." + +#: ../midori/midori-browser.c:321 ../midori/midori-browser.c:5170 +#: ../midori/midori-browser.c:5179 +msgid "Reload the current page" +msgstr "Refreŝigi la aktualan paĝon" + +#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:5176 +msgid "Stop loading the current page" +msgstr "Haltigi refreŝigado de la aktuala paĝo" + +#: ../midori/midori-browser.c:455 +#, c-format +msgid "Failed to update title: %s\n" +msgstr "Ĝisdatigado de titolo fiaskis: %s\n" + +#: ../midori/midori-browser.c:468 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Neatendita ago '%s'." + +#: ../midori/midori-browser.c:558 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (privata retumado)" + +#: ../midori/midori-browser.c:668 ../midori/midori-browser.c:701 +msgid "Toplevel folder" +msgstr "" + +#: ../midori/midori-browser.c:758 +msgid "New folder" +msgstr "Nova dosierujo" + +#: ../midori/midori-browser.c:758 +msgid "Edit folder" +msgstr "Redakti dosierujon" + +#: ../midori/midori-browser.c:760 +msgid "New bookmark" +msgstr "Nova legosigno" + +#: ../midori/midori-browser.c:760 +msgid "Edit bookmark" +msgstr "Redakti legosignon" + +#: ../midori/midori-browser.c:791 +msgid "_Title:" +msgstr "_Titolo:" + +#: ../midori/midori-browser.c:811 ../midori/midori-searchaction.c:961 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "_Adreso:" + +#: ../midori/midori-browser.c:834 ../midori/midori-browser.c:4239 +msgid "_Folder:" +msgstr "_Dosierujo:" + +#: ../midori/midori-browser.c:850 +msgid "Add to _Speed Dial" +msgstr "Aldoni al ra_pida voko" + +#: ../midori/midori-browser.c:863 +msgid "Show in the tool_bar" +msgstr "Montri en la ilo_breto" + +#: ../midori/midori-browser.c:878 +msgid "Run as _web application" +msgstr "R_uli kiel retaplikaĵo" + +#: ../midori/midori-browser.c:949 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Ne povas konservi la dosieron \"%s\" en ĉi tiu dosierujo." + +#: ../midori/midori-browser.c:951 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Vi ne estas rajtigita por skribi en ĉi tiu loko." + +#: ../midori/midori-browser.c:958 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "Ne estas sufiĉe da libera spaco por elŝuti \"%s\"." + +#: ../midori/midori-browser.c:961 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "La dosiero postulas %s sed nur %s restas." + +#: ../midori/midori-browser.c:999 ../midori/midori-browser.c:4308 +msgid "Save file as" +msgstr "Konservi dosieron kiel" + +#: ../midori/midori-browser.c:1293 +msgid "New Window" +msgstr "Nova fenestro" + +#: ../midori/midori-browser.c:1293 +msgid "A new window has been opened" +msgstr "Nova fenestro estas malfermita" + +#: ../midori/midori-browser.c:1296 +msgid "New Tab" +msgstr "Nova langeto" + +#: ../midori/midori-browser.c:1296 +msgid "A new tab has been opened" +msgstr "Nova langeto estas malfermita" + +#: ../midori/midori-browser.c:1331 +msgid "Error opening the image!" +msgstr "Eraro dum malfermado de bildo!" + +#: ../midori/midori-browser.c:1332 +msgid "Can not open selected image in a default viewer." +msgstr "Ne povas malfermi elektitan bildon en apriora montrilo." + +#: ../midori/midori-browser.c:1338 +msgid "Error downloading the image!" +msgstr "Eraro dum elŝutado de bildo!" + +#: ../midori/midori-browser.c:1339 +msgid "Can not download selected image." +msgstr "Ne povas elŝuti elektitan bildon." + +#: ../midori/midori-browser.c:1442 +msgid "Save file" +msgstr "Konservi dosieron" + +#: ../midori/midori-browser.c:2293 +msgid "Open file" +msgstr "Malfermi dosieron" + +#: ../midori/midori-browser.c:2425 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr "" + +#: ../midori/midori-browser.c:2431 ../extensions/feed-panel/main.c:365 +msgid "New feed" +msgstr "Nova fluo" + +#: ../midori/midori-browser.c:2474 ../midori/midori-browser.c:5239 +#: ../panels/midori-bookmarks.c:426 +msgid "Add a new bookmark" +msgstr "Aldoni novan legosignon" + +#: ../midori/midori-browser.c:2973 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "Malplena" + +#: ../midori/midori-browser.c:3393 +msgid "Toggle text cursor navigation" +msgstr "" + +#: ../midori/midori-browser.c:3705 ../midori/midori-browser.c:5625 +#, c-format +msgid "Failed to insert new history item: %s\n" +msgstr "Enmetado de nova kronologiero fiaskis: %s\n" + +#: ../midori/midori-browser.c:4036 ../panels/midori-bookmarks.c:742 +#: ../panels/midori-history.c:799 +msgid "Open all in _Tabs" +msgstr "Malfermi ĉion en lange_toj" + +#: ../midori/midori-browser.c:4043 ../panels/midori-bookmarks.c:748 +#: ../panels/midori-history.c:805 ../extensions/feed-panel/feed-panel.c:528 +msgid "Open in New _Tab" +msgstr "Malfermi en nova lange_to" + +#: ../midori/midori-browser.c:4046 ../midori/midori-view.c:2573 +#: ../midori/midori-view.c:4525 ../panels/midori-bookmarks.c:750 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:530 +msgid "Open in New _Window" +msgstr "Malfermi en nova _fenestro" + +#: ../midori/midori-browser.c:4126 +msgid "Arora" +msgstr "Aroro" + +#: ../midori/midori-browser.c:4127 +msgid "Kazehakase" +msgstr "Kazehakaso" + +#: ../midori/midori-browser.c:4128 +msgid "Opera" +msgstr "Opero" + +#: ../midori/midori-browser.c:4129 +msgid "Konqueror" +msgstr "Konkeroro" + +#: ../midori/midori-browser.c:4130 +msgid "Epiphany" +msgstr "Epifanio" + +#: ../midori/midori-browser.c:4131 +#, c-format +msgid "Firefox (%s)" +msgstr "Fajrfokso (%s)" + +#: ../midori/midori-browser.c:4152 +msgid "Import bookmarks..." +msgstr "Importi legosignojn..." + +#: ../midori/midori-browser.c:4155 ../midori/midori-browser.c:5244 +msgid "_Import bookmarks" +msgstr "_Importi legosignojn" + +#: ../midori/midori-browser.c:4166 +msgid "_Application:" +msgstr "_Aplikaĵo:" + +#: ../midori/midori-browser.c:4231 +msgid "Import from XBEL or HTML file" +msgstr "Importi el XBEL- aŭ HTML- dosiero" + +#: ../midori/midori-browser.c:4266 +msgid "Import from a file" +msgstr "Importi el dosiero" + +#: ../midori/midori-browser.c:4278 +msgid "Failed to import bookmarks" +msgstr "Importado de legosignoj fiaskis" + +#: ../midori/midori-browser.c:4313 +msgid "XBEL Bookmarks" +msgstr "XBEL-legosignoj" + +#: ../midori/midori-browser.c:4318 +msgid "Netscape Bookmarks" +msgstr "Netscape-legosignoj" + +#: ../midori/midori-browser.c:4332 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "" + +#: ../midori/midori-browser.c:4347 +msgid "Failed to export bookmarks" +msgstr "" + +#. i18n: Dialog: Clear Private Data, in the Tools menu +#: ../midori/midori-browser.c:4469 +msgid "Clear Private Data" +msgstr "" + +#: ../midori/midori-browser.c:4473 +msgid "_Clear private data" +msgstr "" + +#: ../midori/midori-browser.c:4486 +msgid "Clear the following data:" +msgstr "" + +#: ../midori/midori-browser.c:4496 +msgid "Last open _tabs" +msgstr "" + +#: ../midori/midori-browser.c:4522 +msgid "Clear private data when _quitting Midori" +msgstr "" + +#: ../midori/midori-browser.c:4698 +msgid "A lightweight web browser." +msgstr "" + +#: ../midori/midori-browser.c:4699 +msgid "See about:version for version info." +msgstr "" + +#: ../midori/midori-browser.c:4701 +msgid "" +"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." +msgstr "" + +#: ../midori/midori-browser.c:4722 +msgid "translator-credits" +msgstr "" + +#: ../midori/midori-browser.c:5086 +msgid "_File" +msgstr "_Dosiero" + +#: ../midori/midori-browser.c:5089 +msgid "Open a new window" +msgstr "Malfermi en nova fenestro" + +#: ../midori/midori-browser.c:5092 +msgid "Open a new tab" +msgstr "Malfermi en nova langeto" + +#: ../midori/midori-browser.c:5094 +msgid "New P_rivate Browsing Window" +msgstr "Nova fenestro por privata retumado" + +#: ../midori/midori-browser.c:5098 +msgid "Open a file" +msgstr "Malfermi dosieron" + +#: ../midori/midori-browser.c:5100 +msgid "_Save Page As..." +msgstr "Kon_servi paĝon kiel..." + +#: ../midori/midori-browser.c:5101 +msgid "Save to a file" +msgstr "Konservi en dosiero" + +#: ../midori/midori-browser.c:5103 +msgid "Add to Speed _dial" +msgstr "Al_doni al rapida vokujo" + +#: ../midori/midori-browser.c:5107 +msgid "Add Shortcut to the _desktop" +msgstr "Al_doni ligilon al labortablo" + +#: ../midori/midori-browser.c:5109 +msgid "Create _Launcher" +msgstr "Krei _lanĉilon" + +#: ../midori/midori-browser.c:5113 +msgid "Subscribe to News _feed" +msgstr "" + +#: ../midori/midori-browser.c:5119 +msgid "_Close Tab" +msgstr "Fermi lan_geton" + +#: ../midori/midori-browser.c:5120 +msgid "Close the current tab" +msgstr "Fermi aktualan langeton" + +#: ../midori/midori-browser.c:5122 +msgid "C_lose Window" +msgstr "Fermi fenes_tron" + +#: ../midori/midori-browser.c:5126 +msgid "Print the current page" +msgstr "Presi la aktualan paĝon" + +#: ../midori/midori-browser.c:5128 +msgid "Close a_ll Windows" +msgstr "Fermi ĉiujn fenes_trojn" + +#: ../midori/midori-browser.c:5131 +msgid "_Edit" +msgstr "R_edakti" + +#: ../midori/midori-browser.c:5154 +msgid "_Find..." +msgstr "_Trovi..." + +#: ../midori/midori-browser.c:5155 +msgid "Find a word or phrase in the page" +msgstr "Trovi vorton aŭ frazon en la paĝo" + +#: ../midori/midori-browser.c:5157 +msgid "Find _Next" +msgstr "Trovi _sekvan" + +#: ../midori/midori-browser.c:5160 +msgid "Find _Previous" +msgstr "Trovi _antaŭan" + +#: ../midori/midori-browser.c:5164 +msgid "Configure the application preferences" +msgstr "Agordi aplikaĵon" + +#: ../midori/midori-browser.c:5166 +msgid "_View" +msgstr "_Vidi" + +#: ../midori/midori-browser.c:5167 +msgid "_Toolbars" +msgstr "Ilobre_toj" + +#: ../midori/midori-browser.c:5172 +msgid "Reload page without caching" +msgstr "Reŝargi paĝon sen kaŝmemorigi" + +#: ../midori/midori-browser.c:5182 +msgid "Increase the zoom level" +msgstr "Altigi la pligrandignivelon" + +#: ../midori/midori-browser.c:5185 +msgid "Decrease the zoom level" +msgstr "Malaltigi la pligrandignivelon" + +#: ../midori/midori-browser.c:5189 +msgid "_Encoding" +msgstr "Kod_ado" + +#: ../midori/midori-browser.c:5191 +msgid "View So_urce" +msgstr "Vidi font_on" + +#: ../midori/midori-browser.c:5194 +msgid "Ca_ret Browsing" +msgstr "" + +#: ../midori/midori-browser.c:5198 +msgid "Toggle fullscreen view" +msgstr "" + +#: ../midori/midori-browser.c:5200 +msgid "Scroll _Left" +msgstr "" + +#: ../midori/midori-browser.c:5203 +msgid "Scroll _Down" +msgstr "" + +#: ../midori/midori-browser.c:5206 +msgid "Scroll _Up" +msgstr "" + +#: ../midori/midori-browser.c:5209 +msgid "Scroll _Right" +msgstr "" + +#: ../midori/midori-browser.c:5212 +msgid "_Go" +msgstr "I_ri" + +#: ../midori/midori-browser.c:5215 +msgid "Go back to the previous page" +msgstr "" + +#: ../midori/midori-browser.c:5218 +msgid "Go forward to the next page" +msgstr "" + +#. i18n: Visit the previous logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5222 +msgid "Go to the previous sub-page" +msgstr "" + +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5226 +msgid "Go to the next sub-page" +msgstr "" + +#: ../midori/midori-browser.c:5229 +msgid "Go to your homepage" +msgstr "Iri al via hejmpaĝo" + +#: ../midori/midori-browser.c:5231 +msgid "Empty Trash" +msgstr "" + +#: ../midori/midori-browser.c:5234 +msgid "Undo _Close Tab" +msgstr "" + +#: ../midori/midori-browser.c:5241 +msgid "Add a new _folder" +msgstr "" + +#: ../midori/midori-browser.c:5247 +msgid "_Export bookmarks" +msgstr "" + +#: ../midori/midori-browser.c:5250 ../midori/midori-searchaction.c:497 +msgid "_Manage Search Engines" +msgstr "" + +#: ../midori/midori-browser.c:5253 +msgid "_Clear Private Data" +msgstr "" + +#: ../midori/midori-browser.c:5256 +msgid "_Inspect Page" +msgstr "" + +#: ../midori/midori-browser.c:5260 +msgid "_Previous Tab" +msgstr "" + +#: ../midori/midori-browser.c:5263 +msgid "_Next Tab" +msgstr "" + +#: ../midori/midori-browser.c:5265 +msgid "Move Tab _Backward" +msgstr "" + +#: ../midori/midori-browser.c:5267 +msgid "_Move Tab Forward" +msgstr "" + +#: ../midori/midori-browser.c:5270 +msgid "Focus _Current Tab" +msgstr "" + +#: ../midori/midori-browser.c:5273 +msgid "Focus _Next view" +msgstr "" + +#: ../midori/midori-browser.c:5276 +msgid "Only show the Icon of the _Current Tab" +msgstr "" + +#: ../midori/midori-browser.c:5279 +msgid "_Duplicate Current Tab" +msgstr "" + +#: ../midori/midori-browser.c:5282 +msgid "Close Ot_her Tabs" +msgstr "" + +#: ../midori/midori-browser.c:5285 +msgid "Open last _session" +msgstr "" + +#: ../midori/midori-browser.c:5288 +msgid "_Help" +msgstr "" + +#: ../midori/midori-browser.c:5290 +msgid "_Frequent Questions" +msgstr "" + +#: ../midori/midori-browser.c:5293 +msgid "_Report a Problem..." +msgstr "" + +#: ../midori/midori-browser.c:5305 +msgid "_Menubar" +msgstr "" + +#: ../midori/midori-browser.c:5309 +msgid "_Navigationbar" +msgstr "" + +#: ../midori/midori-browser.c:5313 +msgid "Side_panel" +msgstr "" + +#: ../midori/midori-browser.c:5314 +msgid "Sidepanel" +msgstr "" + +#: ../midori/midori-browser.c:5317 +msgid "_Bookmarkbar" +msgstr "" + +#: ../midori/midori-browser.c:5321 +msgid "_Statusbar" +msgstr "" + +#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:307 +msgid "_Automatic" +msgstr "" + +#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:232 +msgid "Chinese (BIG5)" +msgstr "" + +#. i18n: A double underscore "__" is used to prevent the mnemonic +#: ../midori/midori-browser.c:5337 +msgid "Japanese (SHIFT__JIS)" +msgstr "" + +#: ../midori/midori-browser.c:5340 ../midori/midori-websettings.c:234 +msgid "Korean (EUC-KR)" +msgstr "" + +#: ../midori/midori-browser.c:5343 ../midori/midori-websettings.c:235 +msgid "Russian (KOI8-R)" +msgstr "" + +#: ../midori/midori-browser.c:5346 ../midori/midori-websettings.c:236 +msgid "Unicode (UTF-8)" +msgstr "" + +#: ../midori/midori-browser.c:5349 ../midori/midori-websettings.c:237 +msgid "Western (ISO-8859-1)" +msgstr "" + +#: ../midori/midori-browser.c:5352 ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:313 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "" + +#: ../midori/midori-browser.c:5858 +msgid "_Separator" +msgstr "" + +#: ../midori/midori-browser.c:5865 +msgid "_Location..." +msgstr "" + +#: ../midori/midori-browser.c:5867 +msgid "Open a particular location" +msgstr "" + +#: ../midori/midori-browser.c:5889 +msgid "_Web Search..." +msgstr "" + +#: ../midori/midori-browser.c:5891 +msgid "Run a web search" +msgstr "" + +#: ../midori/midori-browser.c:5918 +msgid "Reopen a previously closed tab or window" +msgstr "" + +#: ../midori/midori-browser.c:5935 +msgid "Show the saved bookmarks" +msgstr "" + +#: ../midori/midori-browser.c:5952 +msgid "_Tools" +msgstr "" + +#: ../midori/midori-browser.c:5968 +msgid "_Window" +msgstr "" + +#: ../midori/midori-browser.c:5970 +msgid "Show a list of all open tabs" +msgstr "" + +#: ../midori/midori-browser.c:5984 +msgid "_Menu" +msgstr "" + +#: ../midori/midori-browser.c:5986 +msgid "Menu" +msgstr "" + +#: ../midori/midori-browser.c:6659 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "" + +#: ../midori/midori-extension.c:310 +#, c-format +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1695 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "" + +#: ../midori/midori-locationaction.c:472 +#, c-format +msgid "Failed to select from history\n" +msgstr "" + +#: ../midori/midori-locationaction.c:558 +#, c-format +msgid "Search for %s" +msgstr "" + +#: ../midori/midori-locationaction.c:592 +#, c-format +msgid "Search with %s" +msgstr "" + +#. i18n: Right-click on Location, Open an URL from the clipboard +#: ../midori/midori-locationaction.c:1359 +msgid "Paste and p_roceed" +msgstr "" + +#: ../midori/midori-locationaction.c:1727 +msgid "Not verified" +msgstr "" + +#: ../midori/midori-locationaction.c:1747 +msgid "Verified and encrypted connection" +msgstr "" + +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 +msgid "Align sidepanel to the right" +msgstr "" + +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 +msgid "Close panel" +msgstr "" + +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 +msgid "Align sidepanel to the left" +msgstr "" + +#: ../midori/midori-websettings.c:214 +msgid "Show Speed Dial" +msgstr "" + +#: ../midori/midori-websettings.c:215 +msgid "Show Homepage" +msgstr "" + +#: ../midori/midori-websettings.c:233 +msgid "Japanese (SHIFT_JIS)" +msgstr "" + +#: ../midori/midori-websettings.c:253 +msgid "New tab" +msgstr "" + +#: ../midori/midori-websettings.c:254 +msgid "New window" +msgstr "" + +#: ../midori/midori-websettings.c:255 +msgid "Current tab" +msgstr "" + +#: ../midori/midori-websettings.c:270 +msgid "Default" +msgstr "" + +#: ../midori/midori-websettings.c:271 +msgid "Icons" +msgstr "" + +#: ../midori/midori-websettings.c:272 +msgid "Small icons" +msgstr "" + +#: ../midori/midori-websettings.c:273 +msgid "Text" +msgstr "" + +#: ../midori/midori-websettings.c:274 +msgid "Icons and text" +msgstr "" + +#: ../midori/midori-websettings.c:275 +msgid "Text beside icons" +msgstr "" + +#: ../midori/midori-websettings.c:290 +msgid "Automatic (GNOME or environment)" +msgstr "" + +#: ../midori/midori-websettings.c:291 +msgid "HTTP proxy server" +msgstr "" + +#: ../midori/midori-websettings.c:292 +msgid "No proxy server" +msgstr "" + +#: ../midori/midori-websettings.c:309 +msgid "Safari" +msgstr "" + +#: ../midori/midori-websettings.c:310 +msgid "iPhone" +msgstr "" + +#: ../midori/midori-websettings.c:311 +msgid "Firefox" +msgstr "" + +#: ../midori/midori-websettings.c:312 +msgid "Internet Explorer" +msgstr "" + +#: ../midori/midori-websettings.c:365 +msgid "Remember last window size" +msgstr "" + +#: ../midori/midori-websettings.c:366 +msgid "Whether to save the last window size" +msgstr "" + +#: ../midori/midori-websettings.c:374 +msgid "Last window width" +msgstr "" + +#: ../midori/midori-websettings.c:375 +msgid "The last saved window width" +msgstr "" + +#: ../midori/midori-websettings.c:383 +msgid "Last window height" +msgstr "" + +#: ../midori/midori-websettings.c:384 +msgid "The last saved window height" +msgstr "" + +#: ../midori/midori-websettings.c:409 +msgid "Last panel position" +msgstr "" + +#: ../midori/midori-websettings.c:410 +msgid "The last saved panel position" +msgstr "" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:419 +msgid "Last panel page" +msgstr "" + +#: ../midori/midori-websettings.c:420 +msgid "The last saved panel page" +msgstr "" + +#: ../midori/midori-websettings.c:428 +msgid "Last Web search" +msgstr "" + +#: ../midori/midori-websettings.c:429 +msgid "The last saved Web search" +msgstr "" + +#: ../midori/midori-websettings.c:438 +msgid "Show Menubar" +msgstr "" + +#: ../midori/midori-websettings.c:439 +msgid "Whether to show the menubar" +msgstr "" + +#: ../midori/midori-websettings.c:447 +msgid "Show Navigationbar" +msgstr "" + +#: ../midori/midori-websettings.c:448 +msgid "Whether to show the navigationbar" +msgstr "" + +#: ../midori/midori-websettings.c:456 +msgid "Show Bookmarkbar" +msgstr "" + +#: ../midori/midori-websettings.c:457 +msgid "Whether to show the bookmarkbar" +msgstr "" + +#: ../midori/midori-websettings.c:465 +msgid "Show Panel" +msgstr "" + +#: ../midori/midori-websettings.c:466 +msgid "Whether to show the panel" +msgstr "" + +#: ../midori/midori-websettings.c:474 +msgid "Show Statusbar" +msgstr "" + +#: ../midori/midori-websettings.c:475 +msgid "Whether to show the statusbar" +msgstr "" + +#: ../midori/midori-websettings.c:484 +msgid "Toolbar Style:" +msgstr "" + +#: ../midori/midori-websettings.c:485 +msgid "The style of the toolbar" +msgstr "" + +#: ../midori/midori-websettings.c:494 +msgid "Toolbar Items" +msgstr "" + +#: ../midori/midori-websettings.c:495 +msgid "The items to show on the toolbar" +msgstr "" + +#: ../midori/midori-websettings.c:503 +msgid "Compact Sidepanel" +msgstr "" + +#: ../midori/midori-websettings.c:504 +msgid "Whether to make the sidepanel compact" +msgstr "" + +#: ../midori/midori-websettings.c:519 +msgid "Align sidepanel on the right" +msgstr "" + +#: ../midori/midori-websettings.c:520 +msgid "Whether to align the sidepanel on the right" +msgstr "" + +#: ../midori/midori-websettings.c:535 +msgid "Open panels in separate windows" +msgstr "" + +#: ../midori/midori-websettings.c:536 +msgid "Whether to always open panels in separate windows" +msgstr "" + +#: ../midori/midori-websettings.c:545 +msgid "When Midori starts:" +msgstr "" + +#: ../midori/midori-websettings.c:546 +msgid "What to do when Midori starts" +msgstr "" + +#: ../midori/midori-websettings.c:555 +msgid "Homepage:" +msgstr "" + +#: ../midori/midori-websettings.c:556 +msgid "The homepage" +msgstr "" + +#: ../midori/midori-websettings.c:571 +msgid "Show crash dialog" +msgstr "" + +#: ../midori/midori-websettings.c:572 +msgid "Show a dialog after Midori crashed" +msgstr "" + +#: ../midori/midori-websettings.c:580 +msgid "Save downloaded files to:" +msgstr "" + +#: ../midori/midori-websettings.c:581 +msgid "The folder downloaded files are saved to" +msgstr "" + +#: ../midori/midori-websettings.c:589 +msgid "Text Editor" +msgstr "" + +#: ../midori/midori-websettings.c:590 +msgid "An external text editor" +msgstr "" + +#: ../midori/midori-websettings.c:605 +msgid "News Aggregator" +msgstr "" + +#: ../midori/midori-websettings.c:606 +msgid "An external news aggregator" +msgstr "" + +#: ../midori/midori-websettings.c:614 +msgid "Location entry Search" +msgstr "" + +#: ../midori/midori-websettings.c:615 +msgid "The search to perform inside the location entry" +msgstr "" + +#: ../midori/midori-websettings.c:623 +msgid "Preferred Encoding" +msgstr "" + +#: ../midori/midori-websettings.c:624 +msgid "The preferred character encoding" +msgstr "" + +#: ../midori/midori-websettings.c:634 +msgid "Always Show Tabbar" +msgstr "" + +#: ../midori/midori-websettings.c:635 +msgid "Always show the tabbar" +msgstr "" + +#: ../midori/midori-websettings.c:643 +msgid "Close Buttons on Tabs" +msgstr "" + +#: ../midori/midori-websettings.c:644 +msgid "Whether tabs have close buttons" +msgstr "" + +#: ../midori/midori-websettings.c:669 +msgid "Open new pages in:" +msgstr "" + +#: ../midori/midori-websettings.c:670 +msgid "Where to open new pages" +msgstr "" + +#: ../midori/midori-websettings.c:679 +msgid "Middle click opens Selection" +msgstr "" + +#: ../midori/midori-websettings.c:680 +msgid "Load an address from the selection via middle click" +msgstr "" + +#: ../midori/midori-websettings.c:688 +msgid "Open tabs in the background" +msgstr "" + +#: ../midori/midori-websettings.c:689 +msgid "Whether to open new tabs in the background" +msgstr "" + +#: ../midori/midori-websettings.c:697 +msgid "Open Tabs next to Current" +msgstr "" + +#: ../midori/midori-websettings.c:698 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "" + +#: ../midori/midori-websettings.c:706 +msgid "Open popups in tabs" +msgstr "" + +#: ../midori/midori-websettings.c:707 +msgid "Whether to open popup windows in tabs" +msgstr "" + +#: ../midori/midori-websettings.c:717 ../extensions/statusbar-features.c:134 +msgid "Load images automatically" +msgstr "" + +#: ../midori/midori-websettings.c:718 +msgid "Load and display images automatically" +msgstr "" + +#: ../midori/midori-websettings.c:725 ../extensions/statusbar-features.c:143 +msgid "Enable scripts" +msgstr "" + +#: ../midori/midori-websettings.c:726 +msgid "Enable embedded scripting languages" +msgstr "" + +#: ../midori/midori-websettings.c:733 ../extensions/statusbar-features.c:154 +msgid "Enable Netscape plugins" +msgstr "" + +#: ../midori/midori-websettings.c:734 +msgid "Enable embedded Netscape plugin objects" +msgstr "" + +#: ../midori/midori-websettings.c:749 +msgid "Enable Spell Checking" +msgstr "" + +#: ../midori/midori-websettings.c:750 +msgid "Enable spell checking while typing" +msgstr "" + +#: ../midori/midori-websettings.c:756 +msgid "Enable HTML5 database support" +msgstr "" + +#: ../midori/midori-websettings.c:757 +msgid "Whether to enable HTML5 database support" +msgstr "" + +#: ../midori/midori-websettings.c:763 +msgid "Enable HTML5 local storage support" +msgstr "" + +#: ../midori/midori-websettings.c:764 +msgid "Whether to enable HTML5 local storage support" +msgstr "" + +#: ../midori/midori-websettings.c:770 +msgid "Enable offline web application cache" +msgstr "" + +#: ../midori/midori-websettings.c:771 +msgid "Whether to enable offline web application cache" +msgstr "" + +#: ../midori/midori-websettings.c:787 +msgid "Flash window on background tabs" +msgstr "" + +#: ../midori/midori-websettings.c:788 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "" + +#: ../midori/midori-websettings.c:796 +msgid "Enable WebGL support" +msgstr "" + +#: ../midori/midori-websettings.c:797 +msgid "Allow websites to use OpenGL rendering" +msgstr "" + +#: ../midori/midori-websettings.c:823 +msgid "Zoom Text and Images" +msgstr "" + +#: ../midori/midori-websettings.c:824 +msgid "Whether to zoom text and images" +msgstr "" + +#: ../midori/midori-websettings.c:839 +msgid "Find inline while typing" +msgstr "" + +#: ../midori/midori-websettings.c:840 +msgid "Whether to automatically find inline while typing" +msgstr "" + +#: ../midori/midori-websettings.c:855 +msgid "Kinetic scrolling" +msgstr "" + +#: ../midori/midori-websettings.c:856 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "" + +#: ../midori/midori-websettings.c:864 +msgid "Delete old Cookies after:" +msgstr "" + +#: ../midori/midori-websettings.c:865 +msgid "The maximum number of days to save cookies for" +msgstr "" + +#: ../midori/midori-websettings.c:881 +msgid "Only accept Cookies from sites you visit" +msgstr "" + +#: ../midori/midori-websettings.c:882 +msgid "Block cookies sent by third-party websites" +msgstr "" + +#: ../midori/midori-websettings.c:896 +msgid "Delete pages from history after:" +msgstr "" + +#: ../midori/midori-websettings.c:897 +msgid "The maximum number of days to save the history for" +msgstr "" + +#: ../midori/midori-websettings.c:912 +msgid "Proxy server" +msgstr "" + +#: ../midori/midori-websettings.c:913 +msgid "The type of proxy server to use" +msgstr "" + +#: ../midori/midori-websettings.c:922 +msgid "HTTP Proxy Server" +msgstr "" + +#: ../midori/midori-websettings.c:923 +msgid "The proxy server used for HTTP connections" +msgstr "" + +#: ../midori/midori-websettings.c:938 +msgid "Port" +msgstr "" + +#: ../midori/midori-websettings.c:939 +msgid "The proxy server port used for HTTP connections" +msgstr "" + +#: ../midori/midori-websettings.c:957 +msgid "The maximum size of cached pages on disk" +msgstr "" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:974 +msgid "Identify as" +msgstr "" + +#: ../midori/midori-websettings.c:975 +msgid "What to identify as to web pages" +msgstr "" + +#: ../midori/midori-websettings.c:991 +msgid "Identification string" +msgstr "" + +#: ../midori/midori-websettings.c:992 +msgid "The application identification string" +msgstr "" + +#: ../midori/midori-websettings.c:1008 +msgid "Preferred languages" +msgstr "" + +#: ../midori/midori-websettings.c:1009 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" + +#: ../midori/midori-websettings.c:1024 +msgid "Clear private data" +msgstr "" + +#: ../midori/midori-websettings.c:1025 +msgid "The private data selected for deletion" +msgstr "" + +#: ../midori/midori-websettings.c:1040 +msgid "Clear data" +msgstr "" + +#: ../midori/midori-websettings.c:1041 +msgid "The data selected for deletion" +msgstr "" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1090 +msgid "Strip referrer details sent to websites" +msgstr "" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1092 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "" + +#: ../midori/midori-websettings.c:1106 +msgid "Always use my font choices" +msgstr "" + +#: ../midori/midori-websettings.c:1107 +msgid "Override fonts picked by websites with user preferences" +msgstr "" + +#: ../midori/midori-view.c:1307 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "" + +#: ../midori/midori-view.c:1311 ../midori/midori-view.c:1343 +msgid "_Deny" +msgstr "" + +#: ../midori/midori-view.c:1311 ../midori/midori-view.c:1343 +msgid "_Allow" +msgstr "" + +#: ../midori/midori-view.c:1339 +#, c-format +msgid "%s wants to know your location." +msgstr "" + +#: ../midori/midori-view.c:1430 +#, c-format +msgid "Error - %s" +msgstr "" + +#: ../midori/midori-view.c:1431 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "" + +#: ../midori/midori-view.c:1433 +msgid "Try again" +msgstr "" + +#: ../midori/midori-view.c:1610 ../midori/midori-view.c:2514 +#, c-format +msgid "Send a message to %s" +msgstr "" + +#: ../midori/midori-view.c:2345 ../midori/midori-view.c:2663 +msgid "Inspect _Element" +msgstr "" + +#: ../midori/midori-view.c:2397 +msgid "Open Link in New _Tab" +msgstr "" + +#: ../midori/midori-view.c:2401 +msgid "Open Link in _Foreground Tab" +msgstr "" + +#: ../midori/midori-view.c:2402 +msgid "Open Link in _Background Tab" +msgstr "" + +#: ../midori/midori-view.c:2405 +msgid "Open Link in New _Window" +msgstr "" + +#: ../midori/midori-view.c:2408 +msgid "Open Link as Web A_pplication" +msgstr "" + +#: ../midori/midori-view.c:2413 +msgid "Copy Link de_stination" +msgstr "" + +#: ../midori/midori-view.c:2429 +msgid "Open _Image in New Tab" +msgstr "" + +#: ../midori/midori-view.c:2432 +msgid "Copy Image _Address" +msgstr "" + +#: ../midori/midori-view.c:2435 +msgid "Save I_mage" +msgstr "" + +#: ../midori/midori-view.c:2438 +msgid "Open in Image _Viewer" +msgstr "" + +#: ../midori/midori-view.c:2445 +msgid "Copy Video _Address" +msgstr "" + +#: ../midori/midori-view.c:2448 +msgid "Save _Video" +msgstr "" + +#: ../midori/midori-view.c:2448 +msgid "Download _Video" +msgstr "" + +#: ../midori/midori-view.c:2474 +msgid "Search _with" +msgstr "" + +#: ../midori/midori-view.c:2506 +msgid "_Search the Web" +msgstr "" + +#: ../midori/midori-view.c:2522 +msgid "Open Address in New _Tab" +msgstr "" + +#: ../midori/midori-view.c:2814 +msgid "Open or download file" +msgstr "" + +#: ../midori/midori-view.c:2833 +#, c-format +msgid "File Type: '%s'" +msgstr "" + +#: ../midori/midori-view.c:2835 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "" + +#: ../midori/midori-view.c:2839 +#, c-format +msgid "File Name: %s" +msgstr "" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:2858 +#, c-format +msgid "Open %s" +msgstr "" + +#: ../midori/midori-view.c:3483 +#, c-format +msgid "Inspect page - %s" +msgstr "" + +#: ../midori/midori-view.c:3784 +msgid "Speed Dial" +msgstr "" + +#: ../midori/midori-view.c:3785 ../midori/midori-view.c:3881 +msgid "Click to add a shortcut" +msgstr "" + +#: ../midori/midori-view.c:3786 +msgid "Enter shortcut address" +msgstr "" + +#: ../midori/midori-view.c:3787 +msgid "Enter shortcut title" +msgstr "" + +#: ../midori/midori-view.c:3788 +msgid "Are you sure you want to delete this shortcut?" +msgstr "" + +#: ../midori/midori-view.c:3950 +#, c-format +msgid "No documentation installed" +msgstr "" + +#: ../midori/midori-view.c:4026 +msgid "Midori doesn't store any personal data:" +msgstr "" + +#: ../midori/midori-view.c:4027 +msgid "No history or web cookies are being saved." +msgstr "" + +#: ../midori/midori-view.c:4028 +msgid "Extensions are disabled." +msgstr "" + +#: ../midori/midori-view.c:4029 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "" + +#: ../midori/midori-view.c:4030 +msgid "Midori prevents websites from tracking the user:" +msgstr "" + +#: ../midori/midori-view.c:4031 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "" + +#: ../midori/midori-view.c:4032 +msgid "DNS prefetching is disabled." +msgstr "" + +#: ../midori/midori-view.c:4033 +msgid "The language and timezone are not revealed to websites." +msgstr "" + +#: ../midori/midori-view.c:4034 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "" + +#: ../midori/midori-view.c:4071 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "" + +#: ../midori/midori-view.c:4126 +msgid "Page loading delayed" +msgstr "" + +#: ../midori/midori-view.c:4127 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "" + +#: ../midori/midori-view.c:4128 +msgid "Load Page" +msgstr "" + +#: ../midori/midori-view.c:4267 +msgid "Blank page" +msgstr "" + +#: ../midori/midori-view.c:4529 +msgid "_Duplicate Tab" +msgstr "" + +#: ../midori/midori-view.c:4534 +msgid "Show Tab _Label" +msgstr "" + +#: ../midori/midori-view.c:4534 +msgid "Show Tab _Icon Only" +msgstr "" + +#: ../midori/midori-view.c:4540 +msgid "Close ot_her Tabs" +msgstr "" + +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5311 +msgid "previous" +msgstr "" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5330 +msgid "next" +msgstr "" + +#: ../midori/midori-view.c:5343 +msgid "Print background images" +msgstr "" + +#: ../midori/midori-view.c:5344 +msgid "Whether background images should be printed" +msgstr "" + +#: ../midori/midori-view.c:5376 +msgid "Features" +msgstr "" + +#: ../midori/midori-preferences.c:297 +msgid "Startup" +msgstr "" + +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "" + +#: ../midori/midori-preferences.c:314 +msgid "Use current page as homepage" +msgstr "" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "" + +#: ../midori/midori-preferences.c:330 +msgid "The default font family used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:333 +msgid "The default font size used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:335 +msgid "Fixed-width Font Family" +msgstr "" + +#: ../midori/midori-preferences.c:339 +msgid "The font family used to display fixed-width text" +msgstr "" + +#: ../midori/midori-preferences.c:342 +msgid "The font size used to display fixed-width text" +msgstr "" + +#: ../midori/midori-preferences.c:344 +msgid "Minimum Font Size" +msgstr "" + +#: ../midori/midori-preferences.c:348 +msgid "The minimum font size used to display text" +msgstr "" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:359 +msgid "Behavior" +msgstr "" + +#: ../midori/midori-preferences.c:385 +msgid "Allow scripts to open popups" +msgstr "" + +#: ../midori/midori-preferences.c:386 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "" + +#. Page "Interface" +#: ../midori/midori-preferences.c:416 +msgid "Browsing" +msgstr "" + +#. Page "Network" +#: ../midori/midori-preferences.c:454 +msgid "Network" +msgstr "" + +#: ../midori/midori-preferences.c:461 +msgid "Hostname" +msgstr "" + +#: ../midori/midori-preferences.c:485 +msgid "MB" +msgstr "" + +#: ../midori/midori-searchaction.c:902 +msgid "Add search engine" +msgstr "" + +#: ../midori/midori-searchaction.c:902 +msgid "Edit search engine" +msgstr "" + +#: ../midori/midori-searchaction.c:931 +msgid "_Name:" +msgstr "" + +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "" + +#: ../midori/midori-searchaction.c:981 +msgid "_Icon:" +msgstr "" + +#: ../midori/midori-searchaction.c:995 +msgid "_Token:" +msgstr "" + +#: ../midori/midori-searchaction.c:1295 +msgid "Manage Search Engines" +msgstr "" + +#: ../midori/midori-searchaction.c:1395 +msgid "Use as _default" +msgstr "" + +#: ../midori/sokoke.c:412 +msgid "Open with" +msgstr "" + +#: ../midori/sokoke.c:420 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "" + +#: ../midori/sokoke.c:461 ../midori/sokoke.c:471 ../midori/sokoke.c:499 +#: ../midori/sokoke.c:528 ../midori/sokoke.c:542 +msgid "Could not run external program." +msgstr "" + +#: ../midori/sokoke.c:1653 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "" +msgstr[1] "" + +#: ../midori/sokoke.c:1654 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../midori/sokoke.c:1655 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "" +msgstr[1] "" + +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1663 ../panels/midori-transfers.c:267 +#, c-format +msgid "%s of %s" +msgstr "" + +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1672 +msgid "?B" +msgstr "" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1675 +#, c-format +msgid " (%s/s)" +msgstr "" + +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1692 +#, c-format +msgid " - %s remaining" +msgstr "" + +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:263 +msgid "_Inline Find:" +msgstr "" + +#: ../toolbars/midori-findbar.c:289 +msgid "Previous" +msgstr "" + +#: ../toolbars/midori-findbar.c:295 +msgid "Next" +msgstr "" + +#: ../toolbars/midori-findbar.c:299 +msgid "Match Case" +msgstr "" + +#: ../toolbars/midori-findbar.c:308 +msgid "Highlight Matches" +msgstr "" + +#: ../toolbars/midori-findbar.c:319 +msgid "Close Findbar" +msgstr "" + +#: ../toolbars/midori-transferbar.c:122 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "" + +#: ../toolbars/midori-transferbar.c:125 +msgid "Transfer completed" +msgstr "" + +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "" + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" + +#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "" + +#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 +msgid "Some files are being downloaded" +msgstr "" + +#: ../toolbars/midori-transferbar.c:374 +msgid "_Quit Midori" +msgstr "" + +#: ../toolbars/midori-transferbar.c:376 +msgid "The transfers will be cancelled if Midori quits." +msgstr "" + +#: ../panels/midori-bookmarks.c:113 +msgid "Bookmarks" +msgstr "" + +#: ../panels/midori-bookmarks.c:256 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "" + +#: ../panels/midori-bookmarks.c:434 +msgid "Edit the selected bookmark" +msgstr "" + +#: ../panels/midori-bookmarks.c:442 +msgid "Delete the selected bookmark" +msgstr "" + +#: ../panels/midori-bookmarks.c:457 +msgid "Add a new folder" +msgstr "" + +#: ../panels/midori-bookmarks.c:591 ../panels/midori-history.c:631 +msgid "Separator" +msgstr "" + +#: ../panels/midori-history.c:110 +msgid "History" +msgstr "" + +#: ../panels/midori-history.c:157 ../panels/midori-history.c:188 +msgid "Today" +msgstr "" + +#: ../panels/midori-history.c:159 ../panels/midori-history.c:190 +msgid "Yesterday" +msgstr "" + +#: ../panels/midori-history.c:161 ../panels/midori-history.c:185 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "" +msgstr[1] "" + +#: ../panels/midori-history.c:164 ../panels/midori-history.c:183 +msgid "A week ago" +msgstr "" + +#: ../panels/midori-history.c:359 +msgid "Are you sure you want to remove all history items?" +msgstr "" + +#: ../panels/midori-history.c:405 +msgid "Bookmark the selected history item" +msgstr "" + +#: ../panels/midori-history.c:414 +msgid "Delete the selected history item" +msgstr "" + +#: ../panels/midori-history.c:422 +msgid "Clear the entire history" +msgstr "" + +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "" + +#: ../panels/midori-transfers.c:467 +msgid "Open Destination _Folder" +msgstr "" + +#: ../panels/midori-transfers.c:470 +msgid "Copy Link Loc_ation" +msgstr "" + +#: ../katze/katze-http-auth.c:210 +msgid "Authentication Required" +msgstr "" + +#: ../katze/katze-http-auth.c:226 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" + +#: ../katze/katze-http-auth.c:240 +msgid "Username" +msgstr "" + +#: ../katze/katze-http-auth.c:253 +msgid "Password" +msgstr "" + +#: ../katze/katze-http-auth.c:267 +msgid "_Remember password" +msgstr "" + +#: ../katze/katze-throbber.c:949 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:962 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:1042 +msgid "Animation frames are broken" +msgstr "" + +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "" + +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 +#: ../extensions/addons.c:308 +msgid "Choose file" +msgstr "" + +#: ../katze/katze-utils.c:500 +msgid "Choose folder" +msgstr "" + +#: ../katze/katze-utils.c:604 +msgid "None" +msgstr "" + +#: ../katze/katze-utils.c:719 +msgid "1 hour" +msgstr "" + +#: ../katze/katze-utils.c:720 +msgid "1 day" +msgstr "" + +#: ../katze/katze-utils.c:721 +msgid "1 week" +msgstr "" + +#: ../katze/katze-utils.c:722 +msgid "1 month" +msgstr "" + +#: ../katze/katze-utils.c:723 +msgid "1 year" +msgstr "" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 +#, c-format +msgid "Preferences for %s" +msgstr "" + +#: ../extensions/adblock.c:467 +msgid "Configure Advertisement filters" +msgstr "" + +#: ../extensions/adblock.c:498 +#, 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:846 +msgid "Edit rule" +msgstr "" + +#: ../extensions/adblock.c:860 +msgid "_Rule:" +msgstr "" + +#: ../extensions/adblock.c:914 +msgid "Bl_ock image" +msgstr "" + +#: ../extensions/adblock.c:919 +msgid "Bl_ock link" +msgstr "" + +#: ../extensions/adblock.c:1538 +msgid "Advertisement blocker" +msgstr "" + +#: ../extensions/adblock.c:1539 +msgid "Block advertisements according to a filter list" +msgstr "" + +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 +msgid "Userscripts" +msgstr "" + +#: ../extensions/addons.c:324 ../extensions/addons.c:683 +msgid "Userstyles" +msgstr "" + +#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "" + +#: ../extensions/addons.c:421 +#, c-format +msgid "Do you want to delete '%s'?" +msgstr "" + +#: ../extensions/addons.c:427 +msgid "Delete user script" +msgstr "" + +#: ../extensions/addons.c:428 +msgid "Delete user style" +msgstr "" + +#: ../extensions/addons.c:431 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "" + +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "" + +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "" + +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "" + +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "" + +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 +msgid "User addons" +msgstr "" + +#: ../extensions/addons.c:1826 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "" + +#: ../extensions/addons.c:1915 +msgid "Support for userscripts and userstyles" +msgstr "" + +#: ../extensions/colorful-tabs.c:201 +msgid "Colorful Tabs" +msgstr "" + +#: ../extensions/colorful-tabs.c:202 +msgid "Tint each tab distinctly" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 +msgid "Cookie Manager" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:103 +msgid "Delete All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:105 +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:120 +msgid "Expand All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:127 +msgid "Collapse All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:572 +msgid "Do you really want to delete all cookies?" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:574 +msgid "Question" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:583 +msgid "Only cookies which match the filter will be deleted." +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:671 +msgid "At the end of the session" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:680 +msgid "Yes" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:680 +msgid "No" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#, c-format +msgid "" +"Domain: %s\n" +"Cookies: %d" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 +msgid "Name" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +msgid "_Expand All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 +msgid "_Collapse All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +msgid "Filter:" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" + +#: ../extensions/cookie-manager/main.c:36 +msgid "List, view and delete cookies" +msgstr "" + +#: ../extensions/copy-tabs.c:38 +msgid "Copy Tab _Addresses" +msgstr "" + +#: ../extensions/copy-tabs.c:95 +msgid "Copy Addresses of Tabs" +msgstr "" + +#: ../extensions/copy-tabs.c:96 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "" + +#: ../extensions/feed-panel/feed-atom.c:209 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-atom.c:315 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "" + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:387 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:653 +msgid "Feeds" +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:706 +msgid "Add new feed" +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:713 +msgid "Delete feed" +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:795 +msgid "_Feeds" +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:195 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:235 +#, c-format +msgid "Unsupported feed format." +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:265 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:148 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:248 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/main.c:131 +#, c-format +msgid "Feed '%s' already exists" +msgstr "" + +#: ../extensions/feed-panel/main.c:208 +#, c-format +msgid "Error loading feed '%s'" +msgstr "" + +#: ../extensions/feed-panel/main.c:518 +msgid "Feed Panel" +msgstr "" + +#: ../extensions/feed-panel/main.c:519 +msgid "Read Atom/ RSS feeds" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:39 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:292 +msgid "Remember password on this page?" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:297 +msgid "Remember" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:298 +msgid "Not now" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Never for this page" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:435 +msgid "Toggle form history state" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:436 +msgid "Activate or deactivate form history for the current tab." +msgstr "" + +#: ../extensions/formhistory/formhistory.c:547 +#: ../extensions/formhistory/formhistory.c:551 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:627 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:666 +msgid "Form history filler" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:667 +msgid "Stores history of entered form data" +msgstr "" + +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#, c-format +msgid "Failed to select suggestions\n" +msgstr "" + +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "" + +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "" + +#: ../extensions/history-list.vala:569 +msgid "History List" +msgstr "" + +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "" + +#: ../extensions/mouse-gestures.c:301 +msgid "Mouse Gestures" +msgstr "" + +#: ../extensions/mouse-gestures.c:302 +msgid "Control Midori by moving the mouse" +msgstr "" + +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "" + +#: ../extensions/shortcuts.c:176 +msgid "Customize Keyboard shortcuts" +msgstr "" + +#: ../extensions/shortcuts.c:283 +msgid "Customize Sh_ortcuts..." +msgstr "" + +#: ../extensions/shortcuts.c:320 +msgid "Shortcuts" +msgstr "" + +#: ../extensions/shortcuts.c:321 +msgid "View and edit keyboard shortcuts" +msgstr "" + +#: ../extensions/status-clock.c:174 +msgid "Statusbar Clock" +msgstr "" + +#: ../extensions/status-clock.c:175 +msgid "Display date and time in the statusbar" +msgstr "" + +#: ../extensions/statusbar-features.c:131 +msgid "Images" +msgstr "" + +#: ../extensions/statusbar-features.c:140 +msgid "Scripts" +msgstr "" + +#: ../extensions/statusbar-features.c:151 +msgid "Netscape plugins" +msgstr "" + +#: ../extensions/statusbar-features.c:199 +msgid "Statusbar Features" +msgstr "" + +#: ../extensions/statusbar-features.c:200 +msgid "Easily toggle features on web pages on and off" +msgstr "" + +#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683 +msgid "Tab Panel" +msgstr "" + +#: ../extensions/tab-panel.c:666 +msgid "T_ab Panel" +msgstr "" + +#: ../extensions/tab-panel.c:684 +msgid "Show tabs in a vertical panel" +msgstr "" + +#: ../extensions/tabs-minimized.c:76 +msgid "Only Icons on Tabs by default" +msgstr "" + +#: ../extensions/tabs-minimized.c:77 +msgid "New tabs have no label by default" +msgstr "" + +#: ../extensions/toolbar-editor.c:393 +msgid "Customize Toolbar" +msgstr "" + +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" + +#: ../extensions/toolbar-editor.c:425 +msgid "Available Items" +msgstr "" + +#: ../extensions/toolbar-editor.c:446 +msgid "Displayed Items" +msgstr "" + +#: ../extensions/toolbar-editor.c:581 +msgid "Customize _Toolbar..." +msgstr "" + +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "" + +#: ../extensions/toolbar-editor.c:627 +msgid "Toolbar Editor" +msgstr "" + +#: ../extensions/toolbar-editor.c:628 +msgid "Easily edit the toolbar layout" +msgstr "" + +#: ../extensions/web-cache.c:463 +msgid "Cache HTTP communication on disk" +msgstr "" diff -Nru midori-0.2.8/po/es.po midori-0.4.6/po/es.po --- midori-0.2.8/po/es.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/es.po 2012-05-14 22:13:42.000000000 +0000 @@ -7,350 +7,526 @@ # Elega 2009 # Guillermo Iguarán 2009 # Abel Martín 2010 -# +# msgid "" msgstr "" "Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-31 16:08+0000\n" -"PO-Revision-Date: 2010-06-04 10:22+0100\n" -"Last-Translator: Abel Martín \n" -"Language-Team: GALPon MiniNo \n" +"POT-Creation-Date: 2012-05-13 15:27+0000\n" +"PO-Revision-Date: 2012-05-13 11:54-0600\n" +"Last-Translator: Sergio García \n" +"Language-Team: Spanish/es \n" +"Language: es\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" +"X-Generator: Lokalize 1.2\n" +"X-Poedit-Language: Spanish\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Navegador web ligero" +msgid "Browse the Web" +msgstr "Navegue por la web" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 -#: ../midori/main.c:1665 ../midori/main.c:1681 -#: ../midori/midori-websettings.c:312 +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "Internet;WWW;Explorer" + +#: ../data/midori.desktop.in.h:3 +#: ../midori/main.c:1972 +#: ../midori/main.c:1996 +#: ../midori/main.c:2010 +#: ../midori/midori-websettings.c:313 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Navegador web" -#: ../midori/main.c:99 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Midori Navegación Privada" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Abrir una nueva ventana de navegación privada" + +#: ../data/midori-private.desktop.in.h:3 +#: ../midori/midori-view.c:4288 +msgid "Private Browsing" +msgstr "Navegación Privada" + +#: ../midori/main.c:97 +#: ../midori/main.c:103 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "No se pudo cargar la configuración: %s\n" -#: ../midori/main.c:148 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" -msgstr "El valor '%s' no es válido para %s" +msgstr "El valor «%s» no es válido para %s" -#: ../midori/main.c:155 ../midori/main.c:241 +#: ../midori/main.c:156 +#: ../midori/main.c:260 #, c-format msgid "Invalid configuration value '%s'" -msgstr "Valor de configuración inválido '%s'" +msgstr "Valor de configuración no válido «%s»" -#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 +#: ../midori/main.c:381 #, c-format -msgid "Failed to open database: %s\n" -msgstr "Fallo al abrir la base de datos: %s\n" +msgid "The search engines couldn't be loaded. %s\n" +msgstr "No se pudieron cargar los motores de búsqueda. %s\n" -#. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:424 +#: ../midori/main.c:435 #, c-format -msgid "Failed to remove old history items: %s\n" -msgstr "Fallo al quitar elementos antiguos del historial: %s\n" +msgid "Failed to clear history: %s\n" +msgstr "No se pudo vaciar el historial: %s\n" -#: ../midori/main.c:455 ../panels/midori-history.c:169 -#: ../panels/midori-history.c:199 +#: ../midori/main.c:455 +#: ../extensions/formhistory/formhistory.c:531 #, c-format -msgid "Failed to remove history item: %s\n" -msgstr "No se han podido quitar los elementos del historial: %s\n" +msgid "Failed to open database: %s\n" +msgstr "No se pudo abrir la base de datos: %s\n" -#: ../midori/main.c:500 +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:525 #, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "No se pudieron guardar los marcadores. %s" +msgid "Failed to remove old history items: %s\n" +msgstr "No se pudieron quitar elementos antiguos del historial: %s\n" -#: ../midori/main.c:528 +#: ../midori/main.c:547 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "No se pudo guardar la configuración. %s" -#: ../midori/main.c:566 +#: ../midori/main.c:582 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "No se pudieron guardar los motores de búsqueda. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:586 ../midori/main.c:609 +#: ../midori/main.c:619 #, c-format msgid "The trash couldn't be saved. %s" msgstr "No se pudo guardar la papelera. %s" -#: ../midori/main.c:668 ../midori/main.c:908 +#: ../midori/main.c:660 +#: ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Extensiones" + +#: ../midori/main.c:674 +msgid "Privacy" +msgstr "Privacidad" + +#: ../midori/main.c:686 +msgid "Cookies store login data, saved games, or user profiles for advertisement purposes." +msgstr "Las cookies almacenan datos de inicio de sesión, juegos guardados o perfiles de usuario para fines publicitarios." + +#: ../midori/main.c:742 #, c-format msgid "The session couldn't be saved. %s" msgstr "No se pudo guardar la sesión. %s" -#: ../midori/main.c:852 +#: ../midori/main.c:960 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "No hay ningún archivo de cerficado raíz disponible. Los certificados SSL no se pueden verificar." -#: ../midori/main.c:942 +#: ../midori/main.c:1036 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 se cerró insperadamente la última vez. Si esto sucede repetidamente, pruebe una de las siguientes opciones para resolver el problema." -#: ../midori/main.c:957 +#: ../midori/main.c:1055 msgid "Modify _preferences" msgstr "Modificar _preferencias" -#: ../midori/main.c:961 -msgid "Reset the last _session" -msgstr "Restaurar la última _sesión" - -#: ../midori/main.c:966 +#: ../midori/main.c:1059 msgid "Disable all _extensions" -msgstr "Deshabilitar todas las _extensiones" +msgstr "Desactivar todas las _extensiones" + +#: ../midori/main.c:1072 +msgid "Discard old tabs" +msgstr "Descartar las pestañas viejas" + +#: ../midori/main.c:1073 +#: ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "Mostrar las últimas etiquetas sin cargar" + +#: ../midori/main.c:1074 +#: ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "Mostrar las últimas pestañas abiertas" -#: ../midori/main.c:1206 ../midori/main.c:1952 +#: ../midori/main.c:1321 +#: ../midori/main.c:2399 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "No se pudo cargar la sesión: %s\n" -#: ../midori/main.c:1328 -msgid "No filename specified" -msgstr "No se especificó el nombre del archivo" - -#: ../midori/main.c:1347 -msgid "An unknown error occured." -msgstr "Se produjo un error desconocido." - -#: ../midori/main.c:1378 +#: ../midori/main.c:1459 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captura guardada en: %s\n" -#: ../midori/main.c:1550 +#: ../midori/main.c:1875 msgid "Run ADDRESS as a web application" msgstr "Ejecutar DIRECCIÓN como una aplicación web" -#: ../midori/main.c:1550 +#: ../midori/main.c:1875 msgid "ADDRESS" msgstr "DIRECCIÓN" -#: ../midori/main.c:1553 +#: ../midori/main.c:1878 msgid "Use FOLDER as configuration folder" msgstr "Utilizar CARPETA como carpeta de configuración" -#: ../midori/main.c:1553 +#: ../midori/main.c:1878 msgid "FOLDER" msgstr "CARPETA" -#: ../midori/main.c:1556 +#: ../midori/main.c:1881 +msgid "Private browsing, no changes are saved" +msgstr "Navegación privada, no se guardan los cambios" + +#: ../midori/main.c:1883 msgid "Show a diagnostic dialog" msgstr "Mostrar diálogo de diagnóstico" -#: ../midori/main.c:1558 +#: ../midori/main.c:1885 msgid "Run the specified filename as javascript" -msgstr "Ejecute el nombre de archivo especificado como javascript" +msgstr "Ejecutar el nombre de archivo especificado como JavaScript" -#: ../midori/main.c:1561 +#: ../midori/main.c:1887 msgid "Take a snapshot of the specified URI" -msgstr "Tomar una captura de la URL especificada" +msgstr "Tomar una captura de la URI especificada" -#: ../midori/main.c:1564 +#: ../midori/main.c:1889 msgid "Execute the specified command" msgstr "Ejecutar el comando especificado" -#: ../midori/main.c:1566 +#: ../midori/main.c:1891 +msgid "List available commands to execute with -e/ --execute" +msgstr "Mostrar los comandos disponibles para ejecutar con -e/ --execute" + +#: ../midori/main.c:1893 msgid "Display program version" msgstr "Mostrar la versión del programa" -#: ../midori/main.c:1568 +#: ../midori/main.c:1895 msgid "Addresses" msgstr "Direcciones" -#: ../midori/main.c:1570 +#: ../midori/main.c:1897 msgid "Block URIs according to regular expression PATTERN" -msgstr "Bloquear URIs según PATRÓN de expresión regular" +msgstr "Bloquear URI según PATRÓN de expresión regular" -#: ../midori/main.c:1570 +#: ../midori/main.c:1897 msgid "PATTERN" -msgstr "PATTERN" +msgstr "PATRÓN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1574 +#: ../midori/main.c:1901 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Restablecer Midori después de SEGUNDOS segundos de inactividad" -#: ../midori/main.c:1574 +#: ../midori/main.c:1901 msgid "SECONDS" msgstr "SEGUNDOS" -#: ../midori/main.c:1654 +#: ../midori/main.c:1904 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Redirecciona las advertencias de la consola en el FILENAME especificado" + +#: ../midori/main.c:1904 +msgid "FILENAME" +msgstr "NOMBRE DE ARCHIVO" + +#: ../midori/main.c:1969 msgid "[Addresses]" msgstr "[Direcciones]" -#: ../midori/main.c:1682 +#: ../midori/main.c:2011 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor envíe comentarios, sugerencias y errores a:" -#: ../midori/main.c:1684 +#: ../midori/main.c:2013 msgid "Check for new versions at:" msgstr "Buscar nuevas versiones en:" -#: ../midori/main.c:1801 -msgid "The specified configuration folder is invalid." -msgstr "La carpeta de configuración especificada no es válida." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2108 +msgid "Saved logins and _passwords" +msgstr "Inicios de sesión y _contraseñas guardadas" + +#: ../midori/main.c:2110 +msgid "Cookies and Website data" +msgstr "Cookies y datos de sitios web" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2114 +#: ../midori/midori-websettings.c:997 +#: ../extensions/web-cache.c:462 +#: ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Caché web" + +#: ../midori/main.c:2117 +msgid "Website icons" +msgstr "Iconos de sitios web" + +#: ../midori/main.c:2223 +msgid "An unknown error occured" +msgstr "Se produjo un error desconocido" -#: ../midori/main.c:1849 +#: ../midori/main.c:2330 msgid "An instance of Midori is already running but not responding.\n" msgstr "Una instancia de Midori ya se está ejecutando pero no responde.\n" -#: ../midori/main.c:1904 +#: ../midori/main.c:2366 #, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "No se pudieron cargar los motores de búsqueda. %s\n" - -#: ../midori/main.c:1925 -#, fuzzy, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "No se pudieron cargar los marcadores: %s\n" -#: ../midori/main.c:1967 +#: ../midori/main.c:2414 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "No se pudo cargar la papelera: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:2427 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "No se pudo cargar el historial: %s\n" -#: ../midori/main.c:1994 +#: ../midori/main.c:2443 msgid "The following errors occured:" msgstr "Se produjeron los siguientes errores:" -#: ../midori/main.c:2010 +#: ../midori/main.c:2459 msgid "_Ignore" msgstr "_Ignorar" -#: ../midori/midori-array.c:429 +#: ../midori/midori-app.c:1339 +msgid "_Bookmark" +msgstr "_Marcador" + +#: ../midori/midori-app.c:1340 +#: ../midori/midori-browser.c:6066 +msgid "_Bookmarks" +msgstr "_Marcadores" + +#: ../midori/midori-app.c:1341 +msgid "Add Boo_kmark" +msgstr "Añadir _marcador" + +#: ../midori/midori-app.c:1342 +msgid "_Console" +msgstr "_Consola" + +#: ../midori/midori-app.c:1343 +msgid "_Extensions" +msgstr "_Extensiones" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1344 +#: ../midori/midori-browser.c:4591 +msgid "_History" +msgstr "_Historial" + +#: ../midori/midori-app.c:1345 +msgid "_Homepage" +msgstr "_Página de inicio" + +#: ../midori/midori-app.c:1346 +msgid "_Userscripts" +msgstr "_Scripts de usuario" + +#: ../midori/midori-app.c:1347 +msgid "New _Tab" +msgstr "Nueva _pestaña" + +#: ../midori/midori-app.c:1348 +msgid "_Transfers" +msgstr "_Transferencias" + +#: ../midori/midori-app.c:1349 +msgid "Netscape p_lugins" +msgstr "C_omplementos de Netscape" + +#: ../midori/midori-app.c:1350 +msgid "_Closed Tabs" +msgstr "_Pestañas cerradas" + +#: ../midori/midori-app.c:1351 +#: ../midori/midori-browser.c:5218 +msgid "New _Window" +msgstr "Nueva _ventana" + +#: ../midori/midori-app.c:1352 +msgid "New _Folder" +msgstr "Nueva _carpeta" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "Archivo no encontrado." -#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 -#: ../midori/midori-array.c:496 +#: ../midori/midori-array.c:547 +#: ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 +#: ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Documento defectuoso." -#: ../midori/midori-array.c:505 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "Formato de marcador no reconocido." -#: ../midori/midori-array.c:719 +#: ../midori/midori-array.c:915 msgid "Writing failed." msgstr "Falló la escritura." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 -#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:350 +#: ../midori/midori-browser.c:5300 +#: ../midori/midori-browser.c:5309 msgid "Reload the current page" msgstr "Recargar la página actual" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 +#: ../midori/midori-browser.c:359 +#: ../midori/midori-browser.c:5306 msgid "Stop loading the current page" msgstr "Detener la carga de la página actual" -#: ../midori/midori-browser.c:453 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% cargado" - -#: ../midori/midori-browser.c:491 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" -msgstr "Fallo al actualizar el título: %s\n" +msgstr "No se pudo actualizar el título: %s\n" -#: ../midori/midori-browser.c:504 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." -msgstr "Acción inesperada '%s'." +msgstr "Acción inesperada «%s»." + +#: ../midori/midori-browser.c:569 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (navegación privada)" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:683 +#: ../midori/midori-browser.c:716 +msgid "Toplevel folder" +msgstr "Carpeta de nivel superior" + +#: ../midori/midori-browser.c:774 msgid "New folder" msgstr "Nueva carpeta" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:774 msgid "Edit folder" msgstr "Editar carpeta" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "New bookmark" msgstr "Nuevo marcador" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:818 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "_Descripción:" - -#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:838 +#: ../midori/midori-searchaction.c:961 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Dirección:" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:861 +#: ../midori/midori-browser.c:4328 msgid "_Folder:" msgstr "_Carpeta:" -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 -#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 -msgid "Toplevel folder" -msgstr "Carpeta de nivel superior" - -#: ../midori/midori-browser.c:872 +#: ../midori/midori-browser.c:877 msgid "Add to _Speed Dial" -msgstr "Añadir a marcación _rápida" +msgstr "Añadir a marcado _rápido" -#: ../midori/midori-browser.c:885 +#: ../midori/midori-browser.c:890 msgid "Show in the tool_bar" msgstr "Mostrar en la _barra de herramientas" -#: ../midori/midori-browser.c:900 +#: ../midori/midori-browser.c:905 msgid "Run as _web application" msgstr "Ejecutar como aplicación _web" -#: ../midori/midori-browser.c:979 +#: ../midori/midori-browser.c:976 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "El archivo «%s» no puede guardarse en esta carpeta." + +#: ../midori/midori-browser.c:978 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "No tiene los permisos suficientes para escribir en esta ubicación." + +#: ../midori/midori-browser.c:985 #, c-format msgid "There is not enough free space to download \"%s\"." -msgstr "No hay suficiente espacio para descargar \"%s\"." +msgstr "No hay suficiente espacio para descargar «%s»." -#: ../midori/midori-browser.c:983 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "El archivo necesita %s pero solo quedan %s libres." -#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 -#: ../midori/midori-browser.c:4085 +#: ../midori/midori-browser.c:1026 +#: ../midori/midori-browser.c:4397 msgid "Save file as" msgstr "Guardar archivo como" -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1320 +msgid "New Window" +msgstr "Nueva ventana" + +#: ../midori/midori-browser.c:1320 +msgid "A new window has been opened" +msgstr "Se ha abierto una ventana nueva" + +#: ../midori/midori-browser.c:1323 +msgid "New Tab" +msgstr "Nueva pestaña" + +#: ../midori/midori-browser.c:1323 +msgid "A new tab has been opened" +msgstr "Se ha abierto una pestaña nueva" + +#: ../midori/midori-browser.c:1358 +msgid "Error opening the image!" +msgstr "Error abriendo la imagen:" + +#: ../midori/midori-browser.c:1359 +msgid "Can not open selected image in a default viewer." +msgstr "No se puede abrir la imagen seleccionada en el visor predeteminado." + +#: ../midori/midori-browser.c:1365 +msgid "Error downloading the image!" +msgstr "Error al cargar el canal '%s'" + +#: ../midori/midori-browser.c:1366 +msgid "Can not download selected image." +msgstr "No se puede descargar la imágen seleccionada." + +#: ../midori/midori-browser.c:1492 msgid "Save file" msgstr "Guardar archivo" -#: ../midori/midori-browser.c:2150 +#: ../midori/midori-browser.c:2367 msgid "Open file" msgstr "Abrir archivo" -#: ../midori/midori-browser.c:2228 +#: ../midori/midori-browser.c:2499 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -358,149 +534,154 @@ "La URI de arriba abre un nuevo canal de noticias. Normalmente hay un botón \"Nueva subscripción\", \"Nuevo canal de noticias\" o similar.\n" "Alternativamente vaya a Preferencias, Aplicaciones en Midori y elija Canal de noticias. La próxima vez que haga clic en un icono de canal de noticias se añadirá automáticamente." -#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2505 +#: ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nuevo canal" -#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 -#: ../panels/midori-bookmarks.c:406 +#: ../midori/midori-browser.c:2548 +#: ../midori/midori-browser.c:5369 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "Añadir un nuevo marcador" -#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "No se pudo ejecutar la aplicación externa." +#: ../midori/midori-browser.c:3047 +#: ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "Vacío" -#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:3469 +msgid "Toggle text cursor navigation" +msgstr "Activar o desactivar la navegación con el cursor del texto" + +#: ../midori/midori-browser.c:3784 +#: ../midori/midori-browser.c:5759 #, c-format msgid "Failed to insert new history item: %s\n" -msgstr "Fallo al insertar un nuevo elemento en el historial: %s\n" +msgstr "No se pudo insertar un nuevo elemento en el historial: %s\n" -#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:734 +#: ../midori/midori-browser.c:4116 +#: ../panels/midori-bookmarks.c:745 +#: ../panels/midori-history.c:803 msgid "Open all in _Tabs" msgstr "Abrir todo en _pestañas" -#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 -#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4123 +#: ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 +#: ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Abrir en una nueva _pestaña " -#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 -#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4126 +#: ../midori/midori-view.c:2688 +#: ../midori/midori-view.c:4828 +#: ../panels/midori-bookmarks.c:753 +#: ../panels/midori-history.c:811 +#: ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Abrir en una nueva _ventana" -#: ../midori/midori-browser.c:3931 +#: ../midori/midori-browser.c:4215 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3932 +#: ../midori/midori-browser.c:4216 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:4217 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:4218 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3935 +#: ../midori/midori-browser.c:4219 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3959 +#: ../midori/midori-browser.c:4220 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4241 msgid "Import bookmarks..." msgstr "Importar marcadores..." -#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4244 +#: ../midori/midori-browser.c:5374 msgid "_Import bookmarks" msgstr "_Importar marcadores" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:4255 msgid "_Application:" msgstr "_Aplicación:" -#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 -#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 -#: ../katze/katze-utils.c:696 -msgid "Custom..." -msgstr "Personalizado..." +#: ../midori/midori-browser.c:4320 +msgid "Import from XBEL or HTML file" +msgstr "Importar desde archivo XBEL o HTML" + +#: ../midori/midori-browser.c:4355 +msgid "Import from a file" +msgstr "Importar desde un archivo" -#: ../midori/midori-browser.c:4061 +#: ../midori/midori-browser.c:4367 msgid "Failed to import bookmarks" -msgstr "Fallo al importar marcadores" +msgstr "No se pudieron importar los marcadores" -#: ../midori/midori-browser.c:4102 -msgid "Failed to export bookmarks" -msgstr "Fallo al exportar marcadores" +#: ../midori/midori-browser.c:4402 +msgid "XBEL Bookmarks" +msgstr "Marcadores XBEL" -#: ../midori/midori-browser.c:4155 -#, fuzzy, c-format -msgid "Failed to clear history: %s\n" -msgstr "No se han podido quitar los elementos del historial: %s\n" +#: ../midori/midori-browser.c:4407 +msgid "Netscape Bookmarks" +msgstr "Marcadores Netscape " + +#: ../midori/midori-browser.c:4421 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "Midori sólo puede exportar a formatos XBEL (*.xbel) y Netscape (*.html)" -#: ../midori/midori-browser.c:4163 -#, fuzzy, c-format -msgid "Failed to clear search history: %s\n" -msgstr "Fallo al insertar un nuevo elemento en el historial: %s\n" +#: ../midori/midori-browser.c:4436 +msgid "Failed to export bookmarks" +msgstr "No se pudieron exportar los marcadores" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4270 +#: ../midori/midori-browser.c:4558 msgid "Clear Private Data" msgstr "Borrar datos privados" -#: ../midori/midori-browser.c:4274 +#: ../midori/midori-browser.c:4562 msgid "_Clear private data" msgstr "_Borrar datos privados" -#: ../midori/midori-browser.c:4288 +#: ../midori/midori-browser.c:4575 msgid "Clear the following data:" msgstr "Borrar los siguientes datos:" -#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:114 -msgid "History" -msgstr "Historial" - -#: ../midori/midori-browser.c:4303 -msgid "Cookies" -msgstr "Cookies" - -#: ../midori/midori-browser.c:4308 -msgid "'Flash' Cookies" -msgstr "Cookies 'Flash'" - -#: ../midori/midori-browser.c:4313 -msgid "Website icons" -msgstr "Íconos de sitios web" - -#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 -msgid "_Closed Tabs" -msgstr "_Pestañas cerradas" - -#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "Caché web" +#: ../midori/midori-browser.c:4585 +msgid "Last open _tabs" +msgstr "Últimas _pestañas abiertas" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4611 msgid "Clear private data when _quitting Midori" msgstr "Borrar datos privados al _salir de Midori" -#: ../midori/midori-browser.c:4472 +#: ../midori/midori-browser.c:4806 msgid "A lightweight web browser." -msgstr "Un navegador web ligero" +msgstr "Un navegador web ligero." -#: ../midori/midori-browser.c:4474 +#: ../midori/midori-browser.c:4807 +msgid "See about:version for version info." +msgstr "Escriba about:version para conocer más detalles de la versión." + +#: ../midori/midori-browser.c:4809 msgid "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." msgstr "Esta librería es software libre; puede redistribuirla y/o modificarla bajo los términos de la Licencia Pública General Reducida GNU tal y como es publicada por la Free Software Foundation; bien versión 2.1 de la licencia o (según su criterio) cualquier versión posterior." -#: ../midori/midori-browser.c:4493 +#: ../midori/midori-browser.c:4830 msgid "translator-credits" msgstr "" "Miguel Anxo Bouzada \n" @@ -510,1732 +691,1566 @@ "Guillermo Iguarán \n" "Abel Martín " -#: ../midori/midori-browser.c:4802 +#: ../midori/midori-browser.c:5216 msgid "_File" msgstr "_Archivo" -#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 -msgid "New _Window" -msgstr "Nueva _ventana" - -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:5219 msgid "Open a new window" -msgstr "Abrir una nueva ventana" +msgstr "Abrir una ventana nueva" -#: ../midori/midori-browser.c:4808 +#: ../midori/midori-browser.c:5222 msgid "Open a new tab" -msgstr "Abrir una nueva pestaña" +msgstr "Abrir una pestaña nueva" -#: ../midori/midori-browser.c:4810 -msgid "P_rivate Browsing" -msgstr "_Navegación privada" +#: ../midori/midori-browser.c:5224 +msgid "New P_rivate Browsing Window" +msgstr "Nueva ventana de navegación p_rivada" -#: ../midori/midori-browser.c:4811 -msgid "Don't save any private data while browsing" -msgstr "No guardar datos durante la navegación privada" - -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:5228 msgid "Open a file" msgstr "Abrir un archivo" -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:5230 +msgid "_Save Page As..." +msgstr "_Guardar página como..." + +#: ../midori/midori-browser.c:5231 msgid "Save to a file" msgstr "Guardar en un archivo" -#: ../midori/midori-browser.c:4820 +#: ../midori/midori-browser.c:5233 msgid "Add to Speed _dial" -msgstr "Añadir a marcación rápida" +msgstr "Añadir a _marcado rápido" -#: ../midori/midori-browser.c:4821 -msgid "Add shortcut to speed dial" -msgstr "Añadir acceso directo a marcación rápida" - -#: ../midori/midori-browser.c:4823 +#: ../midori/midori-browser.c:5237 msgid "Add Shortcut to the _desktop" msgstr "Añadir acceso directo en el _escritorio" -#: ../midori/midori-browser.c:4824 -msgid "Add shortcut to the desktop" -msgstr "Añadir acceso directo en el escritorio" +#: ../midori/midori-browser.c:5239 +msgid "Create _Launcher" +msgstr "Crear _lanzador" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:5243 msgid "Subscribe to News _feed" -msgstr "Suscribirse a _canal de noticias" - -#: ../midori/midori-browser.c:4827 -msgid "Subscribe to this news feed" -msgstr "Suscribirse a este canal de noticias" +msgstr "Suscribirse al _canal de noticias" -#: ../midori/midori-browser.c:4832 +#: ../midori/midori-browser.c:5249 msgid "_Close Tab" msgstr "_Cerrar pestaña" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:5250 msgid "Close the current tab" msgstr "Cerrar la pestaña actual" -#: ../midori/midori-browser.c:4835 +#: ../midori/midori-browser.c:5252 msgid "C_lose Window" msgstr "_Cerrar ventana" -#: ../midori/midori-browser.c:4836 -msgid "Close this window" -msgstr "Cerrar ésta ventana" - -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:5256 msgid "Print the current page" msgstr "Imprimir la página actual" -#: ../midori/midori-browser.c:4842 -msgid "Quit the application" -msgstr "Salir de la aplicación" +#: ../midori/midori-browser.c:5258 +msgid "Close a_ll Windows" +msgstr "Cerrar _todas las ventanas" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:5261 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:4848 -msgid "Undo the last modification" -msgstr "Deshacer la última modificación" - -#: ../midori/midori-browser.c:4851 -msgid "Redo the last modification" -msgstr "Rehacer la última modificación" - -#: ../midori/midori-browser.c:4855 -msgid "Cut the selected text" -msgstr "Cortar el texto seleccionado" - -#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 -msgid "Copy the selected text" -msgstr "Copiar el texto seleccionado" - -#: ../midori/midori-browser.c:4864 -msgid "Paste text from the clipboard" -msgstr "Pegar texto del portapapeles" - -#: ../midori/midori-browser.c:4867 -msgid "Delete the selected text" -msgstr "Borrar el texto seleccionado" - -#: ../midori/midori-browser.c:4870 -msgid "Select all text" -msgstr "Seleccionar todo el texto" +#: ../midori/midori-browser.c:5284 +msgid "_Find..." +msgstr "_Buscar..." -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:5285 msgid "Find a word or phrase in the page" msgstr "Buscar una palabra o frase en la página" -#: ../midori/midori-browser.c:4875 +#: ../midori/midori-browser.c:5287 msgid "Find _Next" msgstr "Buscar _siguiente" -#: ../midori/midori-browser.c:4876 -msgid "Find the next occurrence of a word or phrase" -msgstr "Buscar la siguiente aparición de una palabra o una frase" - -#: ../midori/midori-browser.c:4878 +#: ../midori/midori-browser.c:5290 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../midori/midori-browser.c:4879 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Buscar la anterior aparición de una palabra o una frase" - -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:5294 msgid "Configure the application preferences" msgstr "Configurar las preferencias de la aplicación" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:5296 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:4886 +#: ../midori/midori-browser.c:5297 msgid "_Toolbars" msgstr "_Barra de herramientas" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:5302 +msgid "Reload page without caching" +msgstr "Recargar página sin caché" + +#: ../midori/midori-browser.c:5312 msgid "Increase the zoom level" msgstr "Aumentar el nivel de zoom" -#: ../midori/midori-browser.c:4901 +#: ../midori/midori-browser.c:5315 msgid "Decrease the zoom level" msgstr "Disminuir el nivel de zoom" -#: ../midori/midori-browser.c:4904 -msgid "Reset the zoom level" -msgstr "Restablecer el nivel de zoom" - -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:5319 msgid "_Encoding" msgstr "_Codificación" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:5321 msgid "View So_urce" msgstr "Ver _código fuente" -#: ../midori/midori-browser.c:4908 -msgid "View the source code of the page" -msgstr "Ver el código fuente de la página" +#: ../midori/midori-browser.c:5324 +msgid "Ca_ret Browsing" +msgstr "Navegación inter_calada" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:5328 msgid "Toggle fullscreen view" -msgstr "Activar/desactivar pantalla completa" +msgstr "Activar o desactivar pantalla completa" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:5330 msgid "Scroll _Left" msgstr "Desplazar hacia la _izquierda" -#: ../midori/midori-browser.c:4915 -msgid "Scroll to the left" -msgstr "Desplazar hacia la izquierda" - -#: ../midori/midori-browser.c:4917 +#: ../midori/midori-browser.c:5333 msgid "Scroll _Down" msgstr "Desplazar hacia a_bajo" -#: ../midori/midori-browser.c:4918 -msgid "Scroll down" -msgstr "Desplazar hacia abajo" - -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:5336 msgid "Scroll _Up" msgstr "Desplazar hacia a_rriba" -#: ../midori/midori-browser.c:4921 -msgid "Scroll up" -msgstr "Desplazar hacia arriba" - -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:5339 msgid "Scroll _Right" msgstr "Desplazar hacia la _derecha" -#: ../midori/midori-browser.c:4924 -msgid "Scroll to the right" -msgstr "Desplazar hacia la derecha" - -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:5342 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:5345 msgid "Go back to the previous page" msgstr "Retroceder una página" -#: ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:5348 msgid "Go forward to the next page" msgstr "Avanzar una página" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4937 +#: ../midori/midori-browser.c:5352 msgid "Go to the previous sub-page" -msgstr "Ir a la sub-página anterior" +msgstr "Ir a la subpágina anterior" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:5356 msgid "Go to the next sub-page" -msgstr "Ir a la sub-página siguiente" +msgstr "Ir a la subpágina siguiente" -#: ../midori/midori-browser.c:4944 +#: ../midori/midori-browser.c:5359 msgid "Go to your homepage" -msgstr "Abrir página de inicio" +msgstr "Abrir la página de inicio" -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:5361 msgid "Empty Trash" msgstr "Vaciar la papelera" -#: ../midori/midori-browser.c:4947 -msgid "Delete the contents of the trash" -msgstr "Borrar el contenido de la papelera" - -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:5364 msgid "Undo _Close Tab" -msgstr "Des_hacer el cierre de pestaña" +msgstr "Deshacer el _cierre de pestaña" -#: ../midori/midori-browser.c:4950 -msgid "Open the last closed tab" -msgstr "Abrir la última pestaña cerrada" - -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:5371 msgid "Add a new _folder" -msgstr "Añadir una nueva _carpeta" - -#: ../midori/midori-browser.c:4957 -msgid "Add a new bookmark folder" -msgstr "Añadir un nuevo marcador" +msgstr "Añadir una _carpeta nueva" -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:5377 msgid "_Export bookmarks" msgstr "_Exportar marcadores" -#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5380 +#: ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" -msgstr "_Administrar motores de búsqueda" - -#: ../midori/midori-browser.c:4966 -msgid "Add, edit and remove search engines..." -msgstr "Añadir, editar y quitar motores de búsqueda..." +msgstr "_Gestionar motores de búsqueda" -#: ../midori/midori-browser.c:4969 +#: ../midori/midori-browser.c:5383 msgid "_Clear Private Data" msgstr "_Borrar datos privados" -#: ../midori/midori-browser.c:4970 -msgid "Clear private data..." -msgstr "Borrar datos privados" - -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:5386 msgid "_Inspect Page" msgstr "_Inspeccionar página" -#: ../midori/midori-browser.c:4975 -msgid "Inspect page details and access developer tools..." -msgstr "Inspeccionar detalles de página y acceder a herramientas de desarrollo..." - -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:5390 msgid "_Previous Tab" -msgstr "_Pestaña anterior" - -#: ../midori/midori-browser.c:4981 -msgid "Switch to the previous tab" -msgstr "Cambiar a la pestaña anterior" +msgstr "Pestaña _anterior" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:5393 msgid "_Next Tab" -msgstr "_Pestaña siguiente" +msgstr "Pestaña _siguiente" -#: ../midori/midori-browser.c:4984 -msgid "Switch to the next tab" -msgstr "Cambiar a la pestaña siguiente" +#: ../midori/midori-browser.c:5395 +msgid "Move Tab _Backward" +msgstr "Mover pestaña hacia _atrás" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:5397 +msgid "_Move Tab Forward" +msgstr "_Mover pestaña hacia adelante" + +#: ../midori/midori-browser.c:5400 msgid "Focus _Current Tab" msgstr "Foco en la pestaña a_ctual" -#: ../midori/midori-browser.c:4987 -msgid "Focus the current tab" -msgstr "Foco en la pestaña actual" - -#: ../midori/midori-browser.c:4989 -#, fuzzy -msgid "Minimize _Current Tab" -msgstr "_Minimizar pestaña" - -#: ../midori/midori-browser.c:4990 -#, fuzzy -msgid "Minimize the current tab" -msgstr "Cerrar la pestaña actual" +#: ../midori/midori-browser.c:5403 +msgid "Focus _Next view" +msgstr "Enfocar _siguiente vista" + +#: ../midori/midori-browser.c:5406 +msgid "Only show the Icon of the _Current Tab" +msgstr "Solo mostrar el icono de la pestaña actual" -#: ../midori/midori-browser.c:4992 -#, fuzzy +#: ../midori/midori-browser.c:5409 msgid "_Duplicate Current Tab" -msgstr "_Duplicar pestaña" - -#: ../midori/midori-browser.c:4993 -#, fuzzy -msgid "Duplicate the current tab" -msgstr "Cerrar la pestaña actual" +msgstr "_Duplicar pestaña actual" -#: ../midori/midori-browser.c:4995 -#, fuzzy +#: ../midori/midori-browser.c:5412 msgid "Close Ot_her Tabs" msgstr "Cerrar las o_tras pestañas" -#: ../midori/midori-browser.c:4996 -#, fuzzy -msgid "Close all tabs except the current tab" -msgstr "Cerrar la pestaña actual" - -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5415 msgid "Open last _session" msgstr "Abrir la última _sesión" -#: ../midori/midori-browser.c:4999 -msgid "Open the tabs saved in the last session" -msgstr "Abrir las pestañas guardadas en la última sesión" - -#: ../midori/midori-browser.c:5001 +#: ../midori/midori-browser.c:5418 msgid "_Help" -msgstr "_Ayuda" +msgstr "Ay_uda" -#: ../midori/midori-browser.c:5003 -msgid "_Contents" -msgstr "_Contenido" - -#: ../midori/midori-browser.c:5004 -msgid "Show the documentation" -msgstr "Mostrar la documentación" - -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:5420 msgid "_Frequent Questions" msgstr "_Preguntas frecuentes" -#: ../midori/midori-browser.c:5007 -msgid "Show the Frequently Asked Questions" -msgstr "Mostrar las preguntas más frecuentes" - -#: ../midori/midori-browser.c:5009 -msgid "_Report a Bug" -msgstr "_Reportar un error" - -#: ../midori/midori-browser.c:5010 -msgid "Open Midori's bug tracker" -msgstr "Abrir el rastreador de errores de Midori" - -#: ../midori/midori-browser.c:5013 -msgid "Show information about the program" -msgstr "Mostrar información sobre el programa" +#: ../midori/midori-browser.c:5423 +msgid "_Report a Problem..." +msgstr "_Informar de un problema..." -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:5435 msgid "_Menubar" -msgstr "_Barra de menú" +msgstr "Barra de _menús" -#: ../midori/midori-browser.c:5022 -msgid "Show menubar" -msgstr "Mostrar la barra de menú" - -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:5439 msgid "_Navigationbar" -msgstr "_Barra de navegación" - -#: ../midori/midori-browser.c:5026 -msgid "Show navigationbar" -msgstr "Mostrar la barra de navegación" +msgstr "Barra de _navegación" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5443 msgid "Side_panel" msgstr "_Panel lateral" -#: ../midori/midori-browser.c:5030 -msgid "Show sidepanel" -msgstr "Mostrar el panel lateral" +#: ../midori/midori-browser.c:5444 +msgid "Sidepanel" +msgstr "Panel Lateral" -#: ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:5447 msgid "_Bookmarkbar" -msgstr "_Barra de marcadores" - -#: ../midori/midori-browser.c:5034 -msgid "Show bookmarkbar" -msgstr "Mostrar la barra de marcadores" - -#: ../midori/midori-browser.c:5037 -msgid "_Transferbar" -msgstr "_Barra de transferencias" - -#: ../midori/midori-browser.c:5038 -msgid "Show transferbar" -msgstr "Mostrar la barra de transferencias" +msgstr "Barra de _marcadores" -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:5451 msgid "_Statusbar" msgstr "_Barra de estado" -#: ../midori/midori-browser.c:5042 -msgid "Show statusbar" -msgstr "Mostrar la barra de estado" - -#: ../midori/midori-browser.c:5050 +#: ../midori/midori-browser.c:5460 +#: ../midori/midori-websettings.c:312 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 -msgid "Chinese (BIG5)" -msgstr "Chino (BIG5)" +#: ../midori/midori-browser.c:5463 +#: ../midori/midori-websettings.c:236 +msgid "Chinese Traditional (BIG5)" +msgstr "Chino tradicional (BIG5)" + +#: ../midori/midori-browser.c:5466 +#: ../midori/midori-websettings.c:237 +msgid "Chinese Simplified (GB18030)" +msgstr "Chino simplificado (GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5470 msgid "Japanese (SHIFT__JIS)" msgstr "Japonés (SHIFT__JIS)" -#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5473 +#: ../midori/midori-websettings.c:239 msgid "Korean (EUC-KR)" msgstr "Koreano (EUC-KR)" -#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5476 +#: ../midori/midori-websettings.c:240 msgid "Russian (KOI8-R)" msgstr "Ruso (KOI8-R)" -#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5479 +#: ../midori/midori-websettings.c:241 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5482 +#: ../midori/midori-websettings.c:242 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5485 +#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:318 +#: ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "Personalizado..." + +#: ../midori/midori-browser.c:5991 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5998 msgid "_Location..." msgstr "_Ubicación..." -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:6000 msgid "Open a particular location" msgstr "Abrir una dirección en particular" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:6022 msgid "_Web Search..." msgstr "_Buscar en la web..." -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:6024 msgid "Run a web search" msgstr "Realizar una búsqueda en la web" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:6051 msgid "Reopen a previously closed tab or window" msgstr "Abrir ventanas o pestañas cerradas" -#: ../midori/midori-browser.c:5659 +#: ../midori/midori-browser.c:6068 +msgid "Show the saved bookmarks" +msgstr "Mostrar los marcadores guardados." + +#: ../midori/midori-browser.c:6085 msgid "_Tools" msgstr "_Herramientas" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:6101 msgid "_Window" msgstr "_Ventanas" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:6103 msgid "Show a list of all open tabs" msgstr "Mostrar una lista de todas las pestañas abiertas" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:6117 msgid "_Menu" msgstr "_Menú" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:6119 msgid "Menu" -msgstr "_Menú" +msgstr "Menú" -#: ../midori/midori-browser.c:6262 +#: ../midori/midori-browser.c:6933 #, c-format msgid "Unexpected setting '%s'" -msgstr "Ajuste no esperado «%s»" +msgstr "Configuración no esperada «%s»" -#: ../midori/midori-locationaction.c:390 +#: ../midori/midori-extension.c:329 #, c-format -msgid "Failed to select from history\n" -msgstr "Fallo al seleccionar del historial\n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "No se pudo cargar la configuración de la extensión \"%s\": %s\n" -#: ../midori/midori-locationaction.c:474 +#: ../midori/midori-extension.c:747 +#: ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 +#: ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "Buscar %s" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "No se pudo guardar la configuración de la extensión '%s': %s\n" -#: ../midori/midori-locationaction.c:497 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "Buscar con %s" -#: ../midori/midori-locationaction.c:1307 +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Buscar con..." + +#: ../midori/midori-locationaction.c:537 +#, c-format +msgid "Failed to select from history\n" +msgstr "No se pudo seleccionar del historial\n" + +#: ../midori/midori-locationaction.c:624 #, c-format -msgid "Failed to execute database statement\n" -msgstr "Fallo al ejecutar sentencia de base de datos\n" +msgid "Search for %s" +msgstr "Buscar %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1363 +#: ../midori/midori-locationaction.c:1398 msgid "Paste and p_roceed" msgstr "Pegar y c_ontinuar" -#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 -msgid "Detach chosen panel from the window" -msgstr "Separar el panel elegido de la ventana" - -#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 -#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 +#: ../midori/midori-locationaction.c:1739 +msgid "Not verified" +msgstr "No verificada" + +#: ../midori/midori-locationaction.c:1759 +msgid "Verified and encrypted connection" +msgstr "Conexión verificada y cifrada" + +#: ../midori/midori-locationaction.c:1771 +msgid "Open, unencrypted connection" +msgstr "Conexión abierta y desencriptada" + +#: ../midori/midori-panel.c:397 +#: ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 +#: ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" msgstr "Alinear el panel a la derecha" -#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 +#: ../midori/midori-panel.c:409 +#: ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Cerrar panel" -#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 +#: ../midori/midori-panel.c:563 +#: ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Alinear el panel a la izquierda" -#: ../midori/midori-panel.c:771 -msgid "Hide operating controls" -msgstr "Ocultar _controles de operación" - -#: ../midori/midori-websettings.c:200 -msgid "Show Blank page" -msgstr "Mostrar página en blanco" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "Mostrar marcado rápido" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" -msgstr "Mostar página de inicio" - -#: ../midori/midori-websettings.c:202 -msgid "Show last open tabs" -msgstr "Mostrar las últimas pestañas abiertas" - -#: ../midori/midori-websettings.c:204 -msgid "Show last tabs without loading" -msgstr "Mostrar las últimas etiquetas sin cargar" +msgstr "Mostrar página de inicio" -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:238 msgid "Japanese (SHIFT_JIS)" msgstr "Japonés (SHIFT_JIS)" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:258 msgid "New tab" msgstr "Nueva pestaña" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:259 msgid "New window" msgstr "Nueva ventana" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:260 msgid "Current tab" msgstr "Pestaña actual" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:275 msgid "Default" msgstr "Predeterminado" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:276 msgid "Icons" -msgstr "Íconos" +msgstr "Iconos" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:277 msgid "Small icons" msgstr "Iconos pequeños" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:278 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:279 msgid "Icons and text" msgstr "Iconos y texto" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:280 msgid "Text beside icons" -msgstr "Texto al lado de los íconos" +msgstr "Texto al lado de los iconos" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:295 msgid "Automatic (GNOME or environment)" msgstr "Automático (GNOME o entorno)" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:296 msgid "HTTP proxy server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:297 msgid "No proxy server" msgstr "Sin servidor proxy" -#: ../midori/midori-websettings.c:295 -msgid "All cookies" -msgstr "Todas las cookies" - -#: ../midori/midori-websettings.c:296 -msgid "Session cookies" -msgstr "Cookies de la sesión" - -#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 -msgid "None" -msgstr "Ninguna" - -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:314 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:315 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:316 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:317 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:401 msgid "Remember last window size" msgstr "Recordar el tamaño de la última ventana" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:402 msgid "Whether to save the last window size" msgstr "Si se desea recordar el tamaño de la última ventana" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:410 msgid "Last window width" msgstr "Última anchura de la ventana" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:411 msgid "The last saved window width" msgstr "Última anchura de la ventana guardada" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:419 msgid "Last window height" msgstr "Última altura de la ventana" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:420 msgid "The last saved window height" msgstr "Última altura guardada de la ventana " -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:445 msgid "Last panel position" msgstr "Última posición del panel" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:446 msgid "The last saved panel position" msgstr "Ultima posición guardada del panel" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:455 msgid "Last panel page" msgstr "Última página del panel" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:456 msgid "The last saved panel page" msgstr "Última página guardada del panel" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:464 msgid "Last Web search" msgstr "Última búsqueda web" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:465 msgid "The last saved Web search" msgstr "Última búsqueda web guardada" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:474 msgid "Show Menubar" msgstr "Mostrar barra de menú" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:475 msgid "Whether to show the menubar" -msgstr "Si se desea mostrar la barra de menú" +msgstr "Mostrar u ocultar la barra de menú" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:483 msgid "Show Navigationbar" msgstr "Mostrar la barra de navegación" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:484 msgid "Whether to show the navigationbar" -msgstr "Si se desea mostrar la barra de navegación" +msgstr "Mostrar u ocultar la barra de navegación" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:492 msgid "Show Bookmarkbar" msgstr "Mostrar la barra de marcadores" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:493 msgid "Whether to show the bookmarkbar" -msgstr "Si se desea mostrar la barra de marcadores" +msgstr "Mostrar u ocultar la barra de marcadores" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:501 msgid "Show Panel" msgstr "Mostrar el panel" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:502 msgid "Whether to show the panel" -msgstr "Si se desea mostrar el panel" - -#: ../midori/midori-websettings.c:485 -msgid "Show Transferbar" -msgstr "Mostrar la barra de transferencias" +msgstr "Mostrar u ocultar el panel" -#: ../midori/midori-websettings.c:486 -msgid "Whether to show the transferbar" -msgstr "Si se desea mostrar la barra de transferencias" - -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:510 msgid "Show Statusbar" msgstr "Mostrar la barra de estado" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:511 msgid "Whether to show the statusbar" -msgstr "Si se desea mostrar la barra de estado" +msgstr "Mostrar u ocultar la barra de estado" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:520 msgid "Toolbar Style:" -msgstr "Estilo de la barra de tareas:" - -#: ../midori/midori-websettings.c:505 -msgid "The style of the toolbar" -msgstr "Estilo de la barra de herramientas" +msgstr "Estilo de la barra de herramientas:" #: ../midori/midori-websettings.c:521 -msgid "Show progress in location entry" -msgstr "Mostrar progreso en la barra de direcciones" - -#: ../midori/midori-websettings.c:522 -msgid "Whether to show loading progress in the location entry" -msgstr "Si se desea mostrar el progreso de carga en el lugar de entrada" - -#: ../midori/midori-websettings.c:537 -msgid "Search engines in location completion" -msgstr "Motores de búsqueda en completamiento" - -#: ../midori/midori-websettings.c:538 -msgid "Whether to show search engines in the location completion" -msgstr "Si se desea mostrar los motores de búsqueda en completamento de dirección" +msgid "The style of the toolbar" +msgstr "El estilo de la barra de herramientas" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:530 msgid "Toolbar Items" msgstr "Elementos de la barra de herramientas" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:531 msgid "The items to show on the toolbar" msgstr "Los elementos a mostrar en la barra de herramientas" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:539 msgid "Compact Sidepanel" msgstr "Panel lateral compacto" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:540 msgid "Whether to make the sidepanel compact" msgstr "Si se desea hacer compacto el panel lateral" -#: ../midori/midori-websettings.c:571 -msgid "Show operating controls of the panel" -msgstr "Mostrar los controles de operación en el panel" - -#: ../midori/midori-websettings.c:572 -msgid "Whether to show the operating controls of the panel" -msgstr "Si se desea mostrar los controles de operación en el panel" - -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:555 msgid "Align sidepanel on the right" msgstr "Alinear el panel a la derecha" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:556 msgid "Whether to align the sidepanel on the right" msgstr "Alinear el panel lateral a la derecha" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:571 msgid "Open panels in separate windows" msgstr "Abrir paneles en ventanas separadas" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:572 msgid "Whether to always open panels in separate windows" msgstr "Configura si los paneles se abren en ventanas separadas" -#: ../midori/midori-websettings.c:613 +#: ../midori/midori-websettings.c:581 msgid "When Midori starts:" -msgstr "Cuando Midori inicia:" +msgstr "Cuando se inicie Midori:" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:582 msgid "What to do when Midori starts" msgstr "Qué hacer al inicio de Midori" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:591 msgid "Homepage:" msgstr "Página de inicio:" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:592 msgid "The homepage" -msgstr "Página de inicio" +msgstr "La página de inicio" -#: ../midori/midori-websettings.c:639 +#: ../midori/midori-websettings.c:607 msgid "Show crash dialog" msgstr "Mostrar diálogo de cuelgue" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:608 msgid "Show a dialog after Midori crashed" -msgstr "Mostrar un dialogo despues de que Midori se cuelgue" - -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:656 -msgid "Show speed dial in new tabs" -msgstr "Mostrar marcación rápida en nuevas pestañas" - -#: ../midori/midori-websettings.c:657 -msgid "Show speed dial in newly opened tabs" -msgstr "Mostrar marcación rápida en la pestaña abierta recientemente" +msgstr "Mostrar un dialogo después de que Midori se cuelgue" -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:616 msgid "Save downloaded files to:" msgstr "Guardar los archivos descargados en:" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:617 msgid "The folder downloaded files are saved to" msgstr "Carpeta donde se guardan los archivos descargados" -#: ../midori/midori-websettings.c:687 -msgid "Ask for the destination folder" -msgstr "Preguntar por la carpeta de destino" - -#: ../midori/midori-websettings.c:688 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "Si se desea seleccionar la carpeta de destino cuando se descarga un archivo" - -#: ../midori/midori-websettings.c:707 -msgid "Notify when a transfer has been completed" -msgstr "Notificarme sobre las transferencias completas" - -#: ../midori/midori-websettings.c:708 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "Si se desea mostrar una notificación cuando se ha completado la transferencia" - -#: ../midori/midori-websettings.c:720 -msgid "Download Manager" -msgstr "Gestor de descargas" - -#: ../midori/midori-websettings.c:721 -msgid "An external download manager" -msgstr "Gestor de descargas externo" - -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:625 msgid "Text Editor" msgstr "Editor de texto" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:626 msgid "An external text editor" msgstr "Editor de textos externo" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:641 msgid "News Aggregator" msgstr "Agregador de noticias" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:642 msgid "An external news aggregator" msgstr "Un agregador de noticias externo" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:650 msgid "Location entry Search" msgstr "Búsqueda en la barra" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:651 msgid "The search to perform inside the location entry" msgstr "Hacer una búsqueda a partir del contenido de la barra de direcciones" -#: ../midori/midori-websettings.c:763 +#: ../midori/midori-websettings.c:659 msgid "Preferred Encoding" msgstr "Codificación preferida" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:660 msgid "The preferred character encoding" msgstr "Codificación de caracteres preferida" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:670 msgid "Always Show Tabbar" msgstr "Siempre mostrar la barra de pestañas" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:671 msgid "Always show the tabbar" msgstr "Siempre mostrar la barra de pestañas" -#: ../midori/midori-websettings.c:783 +#: ../midori/midori-websettings.c:684 msgid "Close Buttons on Tabs" msgstr "Botón de cerrar en las pestañas" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:685 msgid "Whether tabs have close buttons" msgstr "Si se desea que las pestañas tengan el botón de cerrar" -#: ../midori/midori-websettings.c:792 +#: ../midori/midori-websettings.c:710 msgid "Open new pages in:" msgstr "Abrir las páginas nuevas en:" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:711 msgid "Where to open new pages" -msgstr "Donde abrir las páginas nuevas" - -#: ../midori/midori-websettings.c:802 -msgid "Open external pages in:" -msgstr "Abrir las páginas externas en:" - -#: ../midori/midori-websettings.c:803 -msgid "Where to open externally opened pages" -msgstr "Donde abrir las páginas externas" +msgstr "Dónde abrir las páginas nuevas" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:720 msgid "Middle click opens Selection" -msgstr "Clic del medio abre la selección" +msgstr "Abrir la selección con pulsación central" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:721 msgid "Load an address from the selection via middle click" msgstr "Cargar una dirección desde la selección a través del botón del medio del ratón" -#: ../midori/midori-websettings.c:821 +#: ../midori/midori-websettings.c:729 msgid "Open tabs in the background" msgstr "Abrir pestañas en segundo plano" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:730 msgid "Whether to open new tabs in the background" msgstr "Si se desea que las nuevas pestañas se abran en segundo plano" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:738 msgid "Open Tabs next to Current" msgstr "Abrir pestañas junto a la actual" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:739 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Si se desea que las nuevas pestañas se abran al lado de la pestaña actual o después de la última" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:747 msgid "Open popups in tabs" -msgstr "Abrir emergentes en pestañas" +msgstr "Abrir ventanas emergentes en pestañas" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:748 msgid "Whether to open popup windows in tabs" msgstr "Si se desea abrir las ventanas emergentes en pestañas" -#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:758 +#: ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Cargar imágenes automáticamente" -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:759 msgid "Load and display images automatically" msgstr "Cargar y mostrar imágenes automáticamente" -#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:766 +#: ../extensions/statusbar-features.c:143 msgid "Enable scripts" -msgstr "Habilitar scripts" +msgstr "Activar scripts" -#: ../midori/midori-websettings.c:859 +#: ../midori/midori-websettings.c:767 msgid "Enable embedded scripting languages" -msgstr "Habilitar script de lenguajes embebidos" +msgstr "Activar idiomas de escrituras incrustadas" -#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:774 +#: ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" -msgstr "Habilitar complementos Netscape" +msgstr "Activar complementos de Netscape" -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:775 msgid "Enable embedded Netscape plugin objects" -msgstr "Habilitar el complemento de objetos embebidos Netscape" +msgstr "Activar el complemento de objetos incrustados Netscape" + +#: ../midori/midori-websettings.c:790 +msgid "Enable Spell Checking" +msgstr "Activar corrección ortográfica" -#: ../midori/midori-websettings.c:883 +#: ../midori/midori-websettings.c:791 +msgid "Enable spell checking while typing" +msgstr "Activar corrección ortográfica mientras se escribe" + +#: ../midori/midori-websettings.c:797 msgid "Enable HTML5 database support" msgstr "Activar soporte de base de datos HTML5" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:798 msgid "Whether to enable HTML5 database support" msgstr "Configura si se activa el soporte de base de datos de HTML5" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:804 msgid "Enable HTML5 local storage support" msgstr "Activar soporte de almacenamiento local HTML5" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:805 msgid "Whether to enable HTML5 local storage support" msgstr "Configura si se activa el soporte de almacenamiento local de HTML5" -#: ../midori/midori-websettings.c:899 +#: ../midori/midori-websettings.c:811 msgid "Enable offline web application cache" msgstr "Activar caché local de aplicación web" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:812 msgid "Whether to enable offline web application cache" msgstr "Configura si se activa el caché local de aplicación web" -#: ../midori/midori-websettings.c:925 +#: ../midori/midori-websettings.c:828 +msgid "Flash window on background tabs" +msgstr "Destellar ventana en pestañas en segundo plano" + +#: ../midori/midori-websettings.c:829 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "El flash de la ventana del navegador si una nueva pestaña se abre en el fondo" + +#: ../midori/midori-websettings.c:837 +msgid "Enable WebGL support" +msgstr "Habilitar soporte WebGL" + +#: ../midori/midori-websettings.c:838 +msgid "Allow websites to use OpenGL rendering" +msgstr "Permitir a los sitios web utilizar renderizado OpenGL" + +#: ../midori/midori-websettings.c:864 msgid "Zoom Text and Images" msgstr "Ampliar textos e imágenes" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:865 msgid "Whether to zoom text and images" msgstr "Si se desea ampliar texto e imágenes" -#: ../midori/midori-websettings.c:941 +#: ../midori/midori-websettings.c:880 msgid "Find inline while typing" msgstr "Buscar en el texto al escribir" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:881 msgid "Whether to automatically find inline while typing" msgstr "Si se desea buscar automáticamente en el texto al comenzar a escribir" -#: ../midori/midori-websettings.c:957 +#: ../midori/midori-websettings.c:896 msgid "Kinetic scrolling" msgstr "Desplazamiento dinámico" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:897 msgid "Whether scrolling should kinetically move according to speed" msgstr "Configura si el desplazamiento debe realizarse de forma acorde a la velocidad" -#: ../midori/midori-websettings.c:966 -msgid "Accept cookies" -msgstr "Aceptar cookies" - -#: ../midori/midori-websettings.c:967 -msgid "What type of cookies to accept" -msgstr "Qué tipos de cookies son aceptadas" - -#: ../midori/midori-websettings.c:976 -msgid "Maximum cookie age" -msgstr "Duración máxima de las cookies" +#: ../midori/midori-websettings.c:905 +msgid "Delete old Cookies after:" +msgstr "Eliminar cookies antiguas después de:" -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:906 msgid "The maximum number of days to save cookies for" msgstr "Número máximo de días para conservar las cookies" -#: ../midori/midori-websettings.c:986 -msgid "Maximum history age" -msgstr "Duración máxima del historial" +#: ../midori/midori-websettings.c:922 +msgid "Only accept Cookies from sites you visit" +msgstr "Solo aceptar cookies de los sitios que visite" + +#: ../midori/midori-websettings.c:923 +msgid "Block cookies sent by third-party websites" +msgstr "Bloquear cookies enviadas por sitios de terceros" + +#: ../midori/midori-websettings.c:937 +msgid "Delete pages from history after:" +msgstr "Eliminar páginas del historial después de:" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:938 msgid "The maximum number of days to save the history for" msgstr "Número máximo de días para conservar el historial" -#: ../midori/midori-websettings.c:995 -msgid "Remember last downloaded files" -msgstr "Recordar los últimos archivos descargados" - -#: ../midori/midori-websettings.c:996 -msgid "Whether the last downloaded files are saved" -msgstr "Si se desea que los archivos descargados sean recordados" - -#: ../midori/midori-websettings.c:1013 +#: ../midori/midori-websettings.c:953 msgid "Proxy server" msgstr "Servidor proxy" -#: ../midori/midori-websettings.c:1014 +#: ../midori/midori-websettings.c:954 msgid "The type of proxy server to use" msgstr "El tipo de servidor a usar" -#: ../midori/midori-websettings.c:1023 +#: ../midori/midori-websettings.c:963 msgid "HTTP Proxy Server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:1024 +#: ../midori/midori-websettings.c:964 msgid "The proxy server used for HTTP connections" msgstr "Servidor proxy utilizado para conexiones HTTP" +#: ../midori/midori-websettings.c:979 +msgid "Port" +msgstr "Puerto" + +#: ../midori/midori-websettings.c:980 +msgid "The proxy server port used for HTTP connections" +msgstr "El puerto del servidor proxy usado para conexiones HTTP" + +#: ../midori/midori-websettings.c:998 +msgid "The maximum size of cached pages on disk" +msgstr "El tamaño máximo de páginas de caché en el disco" + #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1040 +#: ../midori/midori-websettings.c:1015 msgid "Identify as" msgstr "Identificar como:" -#: ../midori/midori-websettings.c:1041 +#: ../midori/midori-websettings.c:1016 msgid "What to identify as to web pages" msgstr "Identificar como páginas web" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1032 msgid "Identification string" msgstr "Cadena de identificación" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1033 msgid "The application identification string" msgstr "Aplicación de identificación de cadenas" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1049 msgid "Preferred languages" msgstr "Idiomas preferidos" -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:1050 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Una lista separada por comas de idioma preferidos para procesar páginas multi-idiomas, como por ejemplo \"de\", \"ru,nl\" o \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1089 +#: ../midori/midori-websettings.c:1065 msgid "Clear private data" msgstr "Borrar datos privados" -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1066 msgid "The private data selected for deletion" msgstr "Los datos privados seleccionados para su eliminación" -#. 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:1227 ../midori/midori-view.c:4442 -#: ../midori/midori-view.c:4446 +#: ../midori/midori-websettings.c:1081 +msgid "Clear data" +msgstr "Borrar datos privados" + +#: ../midori/midori-websettings.c:1082 +msgid "The data selected for deletion" +msgstr "Los datos seleccionados para eliminarse" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1131 +msgid "Strip referrer details sent to websites" +msgstr "Franja de detalles referentes enviados a los sitios web" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1133 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Si se debe acortar la cabecera del \\ \"Referer\\ \"" + +#: ../midori/midori-websettings.c:1147 +msgid "Always use my font choices" +msgstr "Siempre usar las tipografías que elija" + +#: ../midori/midori-websettings.c:1148 +msgid "Override fonts picked by websites with user preferences" +msgstr "Usar las tipografías elegidas por el usuario en vez de las elegidas por los sitios web" + +#: ../midori/midori-view.c:1375 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s desea grabar una base de datos HTML5" + +#: ../midori/midori-view.c:1379 +#: ../midori/midori-view.c:1411 +msgid "_Deny" +msgstr "_Denegar " + +#: ../midori/midori-view.c:1379 +#: ../midori/midori-view.c:1411 +msgid "_Allow" +msgstr "_Permitir" + +#: ../midori/midori-view.c:1407 +#, c-format +msgid "%s wants to know your location." +msgstr "%s desea conocer su ubicación actual." + +#: ../midori/midori-view.c:1500 #, c-format msgid "Error - %s" msgstr "Error - %s" -#: ../midori/midori-view.c:1228 +#: ../midori/midori-view.c:1501 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "No se pudo cargar la página '%s'." -#: ../midori/midori-view.c:1230 +#: ../midori/midori-view.c:1503 msgid "Try again" msgstr "Inténtelo de nuevo" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1249 -#, c-format -msgid "Not found - %s" -msgstr "No se ha encontrado - %s" - -#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 +#: ../midori/midori-view.c:1701 +#: ../midori/midori-view.c:2623 #, c-format msgid "Send a message to %s" msgstr "Enviar un mensaje a %s" -#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 +#: ../midori/midori-view.c:2453 +#: ../midori/midori-view.c:2779 msgid "Inspect _Element" msgstr "Inspeccionar _elemento" -#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2505 msgid "Open Link in New _Tab" msgstr "Abrir enlace en nueva _pestaña" -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2509 msgid "Open Link in _Foreground Tab" msgstr "Abrir enlace en pestaña en _primer plano" -#: ../midori/midori-view.c:2118 +#: ../midori/midori-view.c:2510 msgid "Open Link in _Background Tab" msgstr "Abrir enlace en pestaña en _segundo plano" -#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2513 msgid "Open Link in New _Window" msgstr "Abrir enlace en nueva _ventana" -#: ../midori/midori-view.c:2124 +#: ../midori/midori-view.c:2516 msgid "Open Link as Web A_pplication" msgstr "Abrir enlace como a_plicación web" -#: ../midori/midori-view.c:2127 +#: ../midori/midori-view.c:2521 msgid "Copy Link de_stination" msgstr "Copiar de_stino del enlace" -#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 -msgid "_Save Link destination" -msgstr "_Guardar enlace" - -#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 -msgid "_Download Link destination" -msgstr "_Descargar enlace" - -#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 -#: ../midori/midori-view.c:2207 -msgid "Download with Download _Manager" -msgstr "Descargar con el _gestor de descargas" - -#: ../midori/midori-view.c:2144 +#: ../midori/midori-view.c:2537 msgid "Open _Image in New Tab" msgstr "Abrir _imagen en nueva pestaña" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2540 msgid "Copy Image _Address" msgstr "Copiar _dirección de imagen" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2543 msgid "Save I_mage" msgstr "Guardar i_magen" -#: ../midori/midori-view.c:2151 -msgid "Download I_mage" -msgstr "Descargar i_magen" +#: ../midori/midori-view.c:2546 +msgid "Open in Image _Viewer" +msgstr "Abrir en _Visor de Imagenes" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2553 msgid "Copy Video _Address" msgstr "Copiar _dirección de vídeo" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2556 msgid "Save _Video" msgstr "Guardar _vídeo" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2556 msgid "Download _Video" msgstr "Descargar _vídeo" -#: ../midori/midori-view.c:2224 +#: ../midori/midori-view.c:2582 msgid "Search _with" msgstr "Buscar _con" -#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2614 msgid "_Search the Web" msgstr "_Buscar en la web" -#: ../midori/midori-view.c:2287 +#: ../midori/midori-view.c:2631 msgid "Open Address in New _Tab" msgstr "Abrir dirección en una nueva _pestaña " -#: ../midori/midori-view.c:2591 +#: ../midori/midori-view.c:2684 +msgid "Open _Frame in New Tab" +msgstr "Abrir _marco en nueva pestaña" + +#: ../midori/midori-view.c:2988 msgid "Open or download file" msgstr "Abrir o descargar archivo" -#: ../midori/midori-view.c:2610 +#: ../midori/midori-view.c:3008 #, c-format msgid "File Type: '%s'" msgstr "Tipo de archivo: '%s'" -#: ../midori/midori-view.c:2613 +#: ../midori/midori-view.c:3010 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de archivo: %s ('%s')" -#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2617 +#: ../midori/midori-view.c:3014 +#, c-format +msgid "File Name: %s" +msgstr "Nombre de archivo: %s" + +#: ../midori/midori-view.c:3041 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:3158 +#: ../midori/midori-view.c:3700 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar la página - %s" -#: ../midori/midori-view.c:3439 -msgid "Speed dial" +#: ../midori/midori-view.c:4047 +msgid "Speed Dial" msgstr "Marcación rápida" -#: ../midori/midori-view.c:3440 +#: ../midori/midori-view.c:4048 +#: ../midori/midori-view.c:4144 msgid "Click to add a shortcut" msgstr "Haga clic aquí para añadir un acceso directo" -#: ../midori/midori-view.c:3441 +#: ../midori/midori-view.c:4049 msgid "Enter shortcut address" msgstr "Introduzca la dirección del acceso directo" -#: ../midori/midori-view.c:3442 +#: ../midori/midori-view.c:4050 msgid "Enter shortcut title" msgstr "Introduzca el título del acceso directo" -#: ../midori/midori-view.c:3443 +#: ../midori/midori-view.c:4051 msgid "Are you sure you want to delete this shortcut?" msgstr "¿Está seguro que desea eliminar este acceso directo?" -#: ../midori/midori-view.c:3444 -msgid "Set number of columns and rows" -msgstr "Establecer el número de columnas y filas" - -#: ../midori/midori-view.c:3445 -msgid "Enter number of columns and rows:" -msgstr "Introduzca el número de columnas y filas:" - -#: ../midori/midori-view.c:3446 -msgid "Invalid input for the size of the speed dial" -msgstr "Valores no válidos para el tamaño de la marcación rápida" - -#: ../midori/midori-view.c:3447 -msgid "Thumb size:" -msgstr "Tamaño de miniatura:" - -#: ../midori/midori-view.c:3448 -msgid "Small" -msgstr "Pequeño" - -#: ../midori/midori-view.c:3449 -msgid "Medium" -msgstr "Medio" - -#: ../midori/midori-view.c:3450 -msgid "Big" -msgstr "Grande" - -#: ../midori/midori-view.c:3476 -#, c-format -msgid "Document cannot be displayed" -msgstr "El documento no puede ser mostrado" - -#: ../midori/midori-view.c:3499 +#: ../midori/midori-view.c:4213 #, c-format msgid "No documentation installed" msgstr "No hay documentación instalada" -#: ../midori/midori-view.c:3618 +#: ../midori/midori-view.c:4289 +msgid "Midori doesn't store any personal data:" +msgstr "Midori no almacena información personal:" + +#: ../midori/midori-view.c:4290 +msgid "No history or web cookies are being saved." +msgstr "Ningún historial o cookies de web están siendo almacenadas." + +#: ../midori/midori-view.c:4291 +msgid "Extensions are disabled." +msgstr "Las extensiones están deshabilitadas." + +#: ../midori/midori-view.c:4292 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "El almacenamento de HTML5, las bases de datos locales y las cachés de aplicación están desactivadas." + +#: ../midori/midori-view.c:4293 +msgid "Midori prevents websites from tracking the user:" +msgstr "Midori evita que los sitios web rastreen al usuario:" + +#: ../midori/midori-view.c:4294 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "Las URLs de referencia estan reducidas al hostname." + +#: ../midori/midori-view.c:4295 +msgid "DNS prefetching is disabled." +msgstr "La prelectura de DNS esta desactivada." + +#: ../midori/midori-view.c:4296 +msgid "The language and timezone are not revealed to websites." +msgstr "El lenguaje y la zona horaria no son revelados a los sitios web." + +#: ../midori/midori-view.c:4297 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "Flash y otros complementos Netscape no pueden ser mostrados por los sitios web." + +#: ../midori/midori-view.c:4346 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "Los números en paréntesis corresponden a la versión que está usando en este momento." + +#: ../midori/midori-view.c:4402 msgid "Page loading delayed" msgstr "Carga de página retrasada" -#: ../midori/midori-view.c:3619 +#: ../midori/midori-view.c:4403 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "La carga se ha retrasado debido a un cuelgue reciente o a las preferencias de inicio" -#: ../midori/midori-view.c:3620 +#: ../midori/midori-view.c:4404 msgid "Load Page" msgstr "Cargar página" -#: ../midori/midori-view.c:3764 +#: ../midori/midori-view.c:4570 msgid "Blank page" msgstr "Página en blanco" -#: ../midori/midori-view.c:4018 +#: ../midori/midori-view.c:4832 msgid "_Duplicate Tab" msgstr "_Duplicar pestaña" -#: ../midori/midori-view.c:4023 -#, fuzzy +#: ../midori/midori-view.c:4837 msgid "Show Tab _Label" -msgstr "Mostrar el panel" +msgstr "Mostrar título de la pestaña" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4837 msgid "Show Tab _Icon Only" msgstr "Mostrar sólo el _icono del panel" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4843 msgid "Close ot_her Tabs" msgstr "Cerrar las o_tras pestañas" -#: ../midori/midori-view.c:4680 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5656 +msgid "previous" +msgstr "anterior" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5675 +msgid "next" +msgstr "siguiente" + +#: ../midori/midori-view.c:5688 msgid "Print background images" msgstr "Imprimir imágenes de fondo" -#: ../midori/midori-view.c:4681 +#: ../midori/midori-view.c:5689 msgid "Whether background images should be printed" msgstr "Si se deberían imprimir las imágenes de fondo" -#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:5721 msgid "Features" msgstr "Características" -#. Page "General" -#: ../midori/midori-preferences.c:301 -msgid "General" -msgstr "General" - -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Inicio" -#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Usar _página actual" + +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Usar la página actual como página de inicio" -#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Transferencias" - #. Page "Appearance" -#: ../midori/midori-preferences.c:352 -msgid "Appearance" -msgstr "Apariencia" - -#: ../midori/midori-preferences.c:353 -msgid "Font settings" -msgstr "Configuración de tipo de letra" - -#: ../midori/midori-preferences.c:355 -msgid "Default Font Family" -msgstr "Tipo de letra predeterminado" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Fuentes" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Familia de Fuente Proporcional" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "Tamaño de letra predeterminado utilizado para mostrar texto" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "Tamaño de letra predeterminado utilizado para mostrar texto" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Tipo de letra de ancho fijo" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "Tipo de letra utilizado para mostrar el texto de ancho fijo" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" msgstr "Tamaño de letra utilizado para mostrar el texto de ancho fijo" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Tamaño mínimo de fuente" -#: ../midori/midori-preferences.c:374 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "Mínimo tamaño de fuente utilizado para mostrar texto" #. Page "Behavior" -#: ../midori/midori-preferences.c:383 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Comportamiento" -#: ../midori/midori-preferences.c:396 -msgid "Enforce 96 dots per inch" -msgstr "Aplicar 96 puntos por pulgada" - -#: ../midori/midori-preferences.c:397 -msgid "Enforce a video dot density of 96 DPI" -msgstr "Aplicar densidad de puntos de video de 96 DPI" - -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Permitir ventanas emergentes de scripts" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Configura si se permite que los scripts puedan abrir ventanas emergentes automáticamente" -#: ../midori/midori-preferences.c:422 -msgid "Spell Checking" -msgstr "Corrector ortográfico" - -#: ../midori/midori-preferences.c:425 -msgid "Enable Spell Checking" -msgstr "Habilitar corrección ortográfica" - -#: ../midori/midori-preferences.c:426 -msgid "Enable spell checking while typing" -msgstr "Habilitar corrección ortográfica mientras se escribe" - -#: ../midori/midori-preferences.c:428 -msgid "Spelling dictionaries:" -msgstr "Diccionarios ortográficos:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:432 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "Lista de idiomas separados con comas que se utilizarán para la corrección ortográfica, por ejemplo \"en_GB,de_DE\"" - #. Page "Interface" -#: ../midori/midori-preferences.c:438 -msgid "Interface" -msgstr "Interfaz" - -#: ../midori/midori-preferences.c:439 -msgid "Navigationbar" -msgstr "Barra de navegación" - -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Navegación" -#. Page "Applications" -#: ../midori/midori-preferences.c:471 -msgid "Applications" -msgstr "Aplicaciones" - -#: ../midori/midori-preferences.c:472 -msgid "External applications" -msgstr "Aplicaciones externas" - #. Page "Network" -#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "Red" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:463 msgid "Hostname" msgstr "Nombre de host" -#. Page "Privacy" -#: ../midori/midori-preferences.c:514 -msgid "Privacy" -msgstr "Privacidad" - -#: ../midori/midori-preferences.c:515 -msgid "Web Cookies" -msgstr "Cookies web" - -#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 -msgid "days" -msgstr "días" - -#: ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Vacío" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "MB" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Añadir motor de búsqueda" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Editar motor de búsqueda" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Nombre:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Descripción:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "_Icono" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "_Abreviatura:" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "Administrar los motores de búsqueda" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "_Predeterminado" -#: ../midori/sokoke.c:1303 -msgid "_Bookmark" -msgstr "_Marcador" - -#: ../midori/sokoke.c:1304 -msgid "_Bookmarks" -msgstr "_Marcadores" - -#: ../midori/sokoke.c:1305 -msgid "Add Boo_kmark" -msgstr "Añadir _marcadores" - -#: ../midori/sokoke.c:1306 -msgid "_Console" -msgstr "_Consola" - -#: ../midori/sokoke.c:1307 -msgid "_Extensions" -msgstr "_Extensiones" - -#: ../midori/sokoke.c:1308 -msgid "_History" -msgstr "_Historial" - -#: ../midori/sokoke.c:1309 -msgid "_Homepage" -msgstr "_Página de inicio" - -#: ../midori/sokoke.c:1310 -msgid "_Userscripts" -msgstr "_Scripts de usuario" - -#: ../midori/sokoke.c:1311 -msgid "New _Tab" -msgstr "Nueva _pestaña" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "Abrir con" + +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Eliga una aplicación o comando para abir \"%s\":" + +#: ../midori/sokoke.c:403 +#: ../midori/sokoke.c:413 +#: ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 +#: ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "No se pudo ejecutar la aplicación externa." -#: ../midori/sokoke.c:1312 -msgid "_Transfers" -msgstr "_Transferencias" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d hora" +msgstr[1] "%d horas" + +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minuto" +msgstr[1] "%d minutos" + +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d segundo" +msgstr[1] "%d segundo" + +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 +#: ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s de %s" -#: ../midori/sokoke.c:1313 -msgid "Netscape p_lugins" -msgstr "C_omplementos de Netscape" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/sokoke.c:1316 -msgid "New _Folder" -msgstr "Nueva _carpeta" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr " - %s restantes" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:201 +#: ../toolbars/midori-findbar.c:291 msgid "_Inline Find:" msgstr "_Buscar:" -#: ../toolbars/midori-findbar.c:233 +#: ../toolbars/midori-findbar.c:317 msgid "Previous" msgstr "Anterior" -#: ../toolbars/midori-findbar.c:239 +#: ../toolbars/midori-findbar.c:323 msgid "Next" msgstr "Siguiente" -#: ../toolbars/midori-findbar.c:243 +#: ../toolbars/midori-findbar.c:327 msgid "Match Case" msgstr "Coincidir mayúsculas " -#: ../toolbars/midori-findbar.c:252 +#: ../toolbars/midori-findbar.c:336 msgid "Highlight Matches" msgstr "Destacar coincidencias" -#: ../toolbars/midori-findbar.c:263 +#: ../toolbars/midori-findbar.c:347 msgid "Close Findbar" msgstr "Cerrar la barra de búsqueda" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 -#, c-format -msgid "%s of %s" -msgstr "%s de %s" - -#: ../toolbars/midori-transferbar.c:123 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "El archivo '%s' ha sido descargado." -#: ../toolbars/midori-transferbar.c:126 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Transferencia completa" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "El archivo descargado es inválido." + +#: ../toolbars/midori-transferbar.c:194 +msgid "The checksum provided with the link did not match. This means the file is probably incomplete or was modified afterwards." +msgstr "El checksum provisto con el link no coincide. Esto significa que el archivo probablemente esté incompleto o fue modificado después de su descarga." + +#: ../toolbars/midori-transferbar.c:334 +#: ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Limpiar todo" -#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 +#: ../toolbars/midori-transferbar.c:371 +#: ../toolbars/midori-transferbar.c:373 msgid "Some files are being downloaded" msgstr "Se está descargando algunos archivos" -#: ../toolbars/midori-transferbar.c:306 +#: ../toolbars/midori-transferbar.c:377 msgid "_Quit Midori" msgstr "_Cerrar Midori" -#: ../toolbars/midori-transferbar.c:308 +#: ../toolbars/midori-transferbar.c:379 msgid "The transfers will be cancelled if Midori quits." msgstr "Se cancelarán las descargas si Midori se cierra." -#: ../panels/midori-bookmarks.c:116 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Marcadores" -#: ../panels/midori-bookmarks.c:275 -#, fuzzy, c-format +#: ../panels/midori-bookmarks.c:257 +#, c-format msgid "Failed to add bookmark item: %s\n" -msgstr "Fallo al añadir valor de formulario: %s\n" +msgstr "Error al añadir marcador: %s\n" -#: ../panels/midori-bookmarks.c:414 +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "Editar el marcador seleccionado" -#: ../panels/midori-bookmarks.c:422 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "Borrar el marcador seleccionado" -#: ../panels/midori-bookmarks.c:436 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" msgstr "Añadir una nueva carpeta" -#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 +#: ../panels/midori-bookmarks.c:594 +#: ../panels/midori-history.c:635 msgid "Separator" msgstr "Separador" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "Consola" - -#: ../panels/midori-console.c:361 -msgid "Copy _All" -msgstr "Copiar _todo" - -#: ../panels/midori-console.c:362 -msgid "Copy All" -msgstr "Copiar todo" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "Historial" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Extensiones" +#: ../panels/midori-history.c:158 +#: ../panels/midori-history.c:189 +msgid "Today" +msgstr "Hoy" -#: ../panels/midori-history.c:146 -msgid "A week ago" -msgstr "Hace una semana" +#: ../panels/midori-history.c:160 +#: ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "Ayer" -#: ../panels/midori-history.c:148 +#: ../panels/midori-history.c:162 +#: ../panels/midori-history.c:186 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "Hace %d día" msgstr[1] "Hace %d días" -#: ../panels/midori-history.c:151 -msgid "Today" -msgstr "Hoy" +#: ../panels/midori-history.c:165 +#: ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "Hace una semana" -#: ../panels/midori-history.c:153 -msgid "Yesterday" -msgstr "Ayer" +#: ../panels/midori-history.c:232 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "No se pudo quitar el elemento del historial: %s\n" -#: ../panels/midori-history.c:324 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" msgstr "¿Está seguro de que desea borrar todos los elementos del historial?" -#: ../panels/midori-history.c:369 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" msgstr "Añadir a marcadores el elemento seleccionado del historial" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" msgstr "Borrar el elemento seleccionado del historial" -#: ../panels/midori-history.c:386 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "Vaciar todo el historial" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Transferencias" + +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" msgstr "Abrir la _carpeta de destino" -#: ../panels/midori-transfers.c:484 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" msgstr "Copiar destino del _enlace" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Se requiere autentificación" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" @@ -2243,185 +2258,245 @@ "Un nombre de usuario y contraseña son necesarios\n" "para abrir ésta ubicación:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "Nombre de usuario" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "Contraseña" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "_Recordar contraseña" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "No se pudo cargar el ícono llamado «%s»" -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "No se pudo cargar el ícono stock «%s»" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "Los cuadros de animación están rotos" -#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 +#: ../katze/katze-utils.c:445 +#: ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propiedad «%s» no es válida para %s" -#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 -#: ../extensions/addons.c:119 +#: ../katze/katze-utils.c:491 +#: ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Elegir archivo" -#: ../katze/katze-utils.c:564 +#: ../katze/katze-utils.c:506 msgid "Choose folder" msgstr "Elegir carpeta" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "Ninguna" + +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "1 hora" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "1 día" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "1 semana" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "1 mes" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "1 año" + +#: ../katze/katze-preferences.c:91 +#: ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Preferencias de %s" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:473 msgid "Configure Advertisement filters" msgstr "Configurar los filtros de publicidad" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:504 #, 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 "Escriba la dirección de una lista de filtros preconfigurados en el cuadro de texto y haga clic en \"Añadir\" para añadirlo a la lista. Puede encontrar más listas en %s." -#: ../extensions/adblock.c:587 -msgid "Configure _Advertisement filters..." -msgstr "Configurar filtros de p_ublicidad..." - -#: ../extensions/adblock.c:841 +#: ../extensions/adblock.c:882 msgid "Edit rule" msgstr "Editar regla" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:896 msgid "_Rule:" msgstr "_Regla:" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:950 msgid "Bl_ock image" msgstr "Bl_oquear imagen" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:955 msgid "Bl_ock link" msgstr "Bl_oquear enlace" -#: ../extensions/adblock.c:1494 +#: ../extensions/adblock.c:1670 msgid "Advertisement blocker" msgstr "Bloqueador de publicidad" -#: ../extensions/adblock.c:1495 +#: ../extensions/adblock.c:1671 msgid "Block advertisements according to a filter list" msgstr "Bloquear publicidad de acuerdo a una lista de filtros" -#: ../extensions/addons.c:130 ../extensions/addons.c:377 +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "Esta página pareciera contener un script de usuario. ¿Desea instalarlo?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "_Instalar script de usuario" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "Esta página pareciera contener un estilo de usuario. ¿Desea instalarlo?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_Instalar estilo de usuario" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "No instalar" + +#: ../extensions/addons.c:319 +#: ../extensions/addons.c:681 msgid "Userscripts" msgstr "Scripts de usuario" -#: ../extensions/addons.c:135 ../extensions/addons.c:379 +#: ../extensions/addons.c:324 +#: ../extensions/addons.c:683 msgid "Userstyles" msgstr "Estilos de usuario" -#: ../extensions/addons.c:191 ../extensions/addons.c:267 +#: ../extensions/addons.c:380 +#: ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Error" -#: ../extensions/addons.c:231 -#, fuzzy, c-format +#: ../extensions/addons.c:421 +#, c-format msgid "Do you want to delete '%s'?" -msgstr "¿Está seguro que desea eliminar todas las cookies?" +msgstr "¿Está seguro que desea borrar \"%s\"?" -#: ../extensions/addons.c:237 -#, fuzzy +#: ../extensions/addons.c:427 msgid "Delete user script" -msgstr "Scripts de usuario" +msgstr "Eliminar script de usuario" -#: ../extensions/addons.c:238 -#, fuzzy +#: ../extensions/addons.c:428 msgid "Delete user style" -msgstr "Eliminar canal" +msgstr "Eliminar estilo de usuario" -#: ../extensions/addons.c:242 -#, fuzzy, c-format +#: ../extensions/addons.c:431 +#, c-format msgid "The file %s will be permanently deleted." -msgstr "El archivo '%s' ha sido descargado." +msgstr "El archivo %s será eliminado definitivamente." -#: ../extensions/addons.c:1299 -#, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "No se pudo guardar la configuración de la extensión '%s': %s\n" +#: ../extensions/addons.c:570 +#: ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "Abrir en editor de texto" + +#: ../extensions/addons.c:572 +#: ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "Abrir carpeta de destino" + +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "Añadir nuevo complemento" + +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "Eliminar complemento seleccionado" -#: ../extensions/addons.c:1300 ../extensions/addons.c:1465 +#: ../extensions/addons.c:1696 +#: ../extensions/addons.c:1914 msgid "User addons" msgstr "Complementos de usuario" -#: ../extensions/addons.c:1422 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "No se puede monitorizar el directorio '%s': %s" -#: ../extensions/addons.c:1466 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" msgstr "Soporte para scripts y estilos de usuario" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "Pestañas de colores" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Colorear pestañas de distintos colores" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Gestor de cookies" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "Eliminar todo" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 +#: ../extensions/cookie-manager/cookie-manager-page.c:105 msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." msgstr "Elimina todas las cookies. Si se establece un filtro, sólo se eliminarán las \"cookies\" que coincidan con el filtro." -#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "Expandir todo" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "Contraer todo" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" msgstr "¿Está seguro que desea eliminar todas las cookies?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Pregunta" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." msgstr "Sólo se eliminarán las cookies visibles que coinciden con el filtro." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "Al final de la sesión" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2438,15 +2513,15 @@ "Seguro: %s\n" "Expira: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Si" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "No" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" @@ -2455,58 +2530,42 @@ "Dominio: %s\n" "Cookies: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Nombre" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "_Expandir todo" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "_Contraer todo" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 msgid "Filter:" msgstr "Filtro:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "Introduzca una cadena de filtro para mostrar sólo las cookies cuyo nombre o dominio coincide con el filtro ingresado" -#: ../extensions/cookie-manager/main.c:40 -msgid "_Cookie Manager" -msgstr "_Gestor de cookies" - -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Listar, ver y eliminar cookies" -#: ../extensions/copy-tabs.c:39 -#, fuzzy +#: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" -msgstr "Copiar _dirección de imagen" +msgstr "Copiar _direcciones de las pestañas" -#: ../extensions/copy-tabs.c:98 -#, fuzzy +#: ../extensions/copy-tabs.c:95 msgid "Copy Addresses of Tabs" -msgstr "Abrir dirección en una nueva _pestaña " +msgstr "Copiar direcciones de las pestañas" -#: ../extensions/copy-tabs.c:99 +#: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Copiar las direcciones de todas las pestañas al portapapeles" -#: ../extensions/external-applications.vala:93 -#, fuzzy -msgid "External Applications" -msgstr "Aplicaciones externas" - -#: ../extensions/external-applications.vala:94 -#, fuzzy -msgid "Associate URL schemes with external commands" -msgstr "Asociar el esquema URL con comandos externos" - #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "No se han podido encontrar elementos necesarios de tipo \"entry\" Atom en los datos XML." @@ -2516,25 +2575,25 @@ msgstr "No se ha podido encontrar los elementos necesarios de tipo \"feed\" Atom en los datos XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Última actualización: %s." -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "Canales" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "Añadir nuevo canal" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "Eliminar canal" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "_Canales" @@ -2579,198 +2638,703 @@ msgid "Error loading feed '%s'" msgstr "Error al cargar el canal '%s'" -#: ../extensions/feed-panel/main.c:520 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "Panel de canales" -#: ../extensions/feed-panel/main.c:521 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Lector de canales Atom/RSS" -#: ../extensions/formhistory.c:142 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" msgstr "Fallo al añadir valor de formulario: %s\n" -#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "Historial" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Contraseña maestra necesaria\n" +"para abrir la base de datos de contraseñas" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "¿Recordar contraseña en esta página?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Recordar contraseña" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "Ahora no" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Nunca para esta página" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "Alternar estado del formulario de historial" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "Activar o desactivar el formulario de historial para la pestaña actual." + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "No se ha podido ejecutar sentencia en base de datos: %s\n" -#: ../extensions/formhistory.c:503 +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "Solamente activar el historial a través del atajo de teclado (Ctrl + Shift + F) por pestaña" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "Completador de historial de formularios" + +#: ../extensions/formhistory/formhistory.c:669 msgid "Stores history of entered form data" msgstr "Almacena el historial de datos introducidos en formularios" -#: ../extensions/formhistory.c:507 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 #, c-format -msgid "Not available: %s" -msgstr "No disponible: %s" +msgid "Failed to select suggestions\n" +msgstr "No se pudo seleccionar del historial\n" -#: ../extensions/formhistory.c:508 -msgid "Resource files not installed" -msgstr "Archivos de recursos no instalados" +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Todas las pestañas han sido visitadas" -#: ../extensions/formhistory.c:514 -msgid "Form history filler" -msgstr "Completador de historial de formularios" +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "Lista del Historial" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Comportamiento de cierre de pestañas" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "No hacer nada" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Cambiar a la última pestaña vista" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Cambiar a la pestaña más nueva" -#: ../extensions/history-list.vala:174 -msgid "Next Tab (History List)" +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" msgstr "Pestaña siguiente (historial de pestañas)" -#: ../extensions/history-list.vala:175 -msgid "Next tab from history" -msgstr "Siguente pestaña desde el historial" +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Pestaña siguiente desde el historial" -#: ../extensions/history-list.vala:184 -msgid "Previous Tab (History List)" +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" msgstr "Pestaña anterior (historial de pestañas)" -#: ../extensions/history-list.vala:185 -msgid "Previous tab from history" -msgstr "Anterior pestaña desde el historial" +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Pestaña anterior desde el historial" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Mostrar pestaña en el fondo (Lista del Historial)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Mostrar la pestaña actual seleccionada en el fondo" -#: ../extensions/history-list.vala:245 -#, fuzzy +#: ../extensions/history-list.vala:569 msgid "History List" msgstr "Lista de historial de pestañas" -#: ../extensions/history-list.vala:246 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Permite cambiar de pestaña eligiéndola de una lista ordenada por último uso" +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "Mover a la última pestaña se utiliza cuando se cambian o se cierran pestañas" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Gestos de ratón" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Controlar Midori moviendo el ratón" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 -msgid "Pageholder" -msgstr "Álbum de páginas" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "Álbum de _páginas" - -#: ../extensions/page-holder.c:178 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "Mantener una o múltiples páginas abiertas en paralelo junto con las pestañas" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "Recarga la página o detiene el proceso de carga" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "Personalizar los atajos del teclado" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "Personalizar los ac_cesos directos..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Accesos directos" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "Ver y editar los atajos de teclado" -#: ../extensions/status-clock.c:176 +#: ../extensions/status-clock.c:174 msgid "Statusbar Clock" msgstr "Reloj de barra de estado" -#: ../extensions/status-clock.c:177 +#: ../extensions/status-clock.c:175 msgid "Display date and time in the statusbar" msgstr "Mostrar fecha y hora en la barra de estado" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Imágenes" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Scripts" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Complementos de Netscape" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "Barra de funcionalidades" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" msgstr "Activar y desactivar fácilmente las características de páginas web" -#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 +#: ../extensions/tab-panel.c:593 +#: ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Panel de pestañas" -#: ../extensions/tab-panel.c:612 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "Panel de p_estañas" -#: ../extensions/tab-panel.c:629 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Mostrar las pestañas en un panel vertical" -#: ../extensions/tabs-minimized.c:79 +#: ../extensions/tabs-minimized.c:76 msgid "Only Icons on Tabs by default" msgstr "Sólo iconos en las pestañas por defecto" -#: ../extensions/tabs-minimized.c:80 +#: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" msgstr "Nuevas pestañas sin etiqueta por defecto" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Personalizar la barra de tareas" -#: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +#: ../extensions/toolbar-editor.c:409 +msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop." msgstr "Seleccione los elementos que se mostrarán en la barra de herramientas. Los elementos pueden ser reordenados arrastrando y soltando." -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Elementos disponibles" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Elementos utilizados" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "Personalizar la barra de _tareas..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Personalizar..." + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" msgstr "Editor de la barra de herramientas" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" msgstr "Editar fácilmente el diseño de la barra de herramienta" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "Cachear tráfico HTTP en disco" +#~ msgid "The bookmarks couldn't be saved. %s" +#~ msgstr "No se pudieron guardar los marcadores. %s" + +#~ msgid "Lightweight web browser" +#~ msgstr "Navegador web ligero" + +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "La carpeta de configuración especificada no es válida." + +#~ msgid "Cookies" +#~ msgstr "Cookies" + +#~ msgid "'Flash' Cookies" +#~ msgstr "Cookies 'Flash'" + +#~ msgid "HTML5 _Databases" +#~ msgstr "Activar soporte de base de _datos HTML5" + +#~ msgid "Offline Application Cache" +#~ msgstr "Activar caché local para aplicaciones web" + +#~ msgid "Not available: %s" +#~ msgstr "No disponible: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "Archivos de recursos no instalados" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "No guardar datos privados durante la navegación" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Añadir acceso directo a marcado rápido" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Añadir acceso directo en el escritorio" + +#~ msgid "Create a launcher" +#~ msgstr "Crear un lanzador" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "Suscribirse a este canal de noticias" + +#~ msgid "Close this window" +#~ msgstr "Cerrar esta ventana" + +#~ msgid "Close all open windows" +#~ msgstr "Cerrar todas las ventanas abiertas" + +#~ msgid "Undo the last modification" +#~ msgstr "Deshacer la última modificación" + +#~ msgid "Redo the last modification" +#~ msgstr "Rehacer la última modificación" + +#~ msgid "Cut the selected text" +#~ msgstr "Cortar el texto seleccionado" + +#~ msgid "Copy the selected text" +#~ msgstr "Copiar el texto seleccionado" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "Pegar texto del portapapeles" + +#~ msgid "Delete the selected text" +#~ msgstr "Borrar el texto seleccionado" + +#~ msgid "Select all text" +#~ msgstr "Seleccionar todo el texto" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Buscar la siguiente aparición de una palabra o una frase" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Buscar la anterior aparición de una palabra o una frase" + +#~ msgid "Reset the zoom level" +#~ msgstr "Restablecer el nivel de zoom" + +#~ msgid "View the source code of the page" +#~ msgstr "Ver el código fuente de la página" + +#~ msgid "Scroll to the left" +#~ msgstr "Desplazar hacia la izquierda" + +#~ msgid "Scroll down" +#~ msgstr "Desplazar hacia abajo" + +#~ msgid "Scroll up" +#~ msgstr "Desplazar hacia arriba" + +#~ msgid "Scroll to the right" +#~ msgstr "Desplazar hacia la derecha" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "Eliminar el contenido de la papelera" + +#~ msgid "Open the last closed tab" +#~ msgstr "Abrir la última pestaña cerrada" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Añadir un marcador nuevo" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Añadir, editar y quitar motores de búsqueda..." + +#~ msgid "Clear private data..." +#~ msgstr "Borrar datos privados" + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "" +#~ "Inspeccionar detalles de página y acceder a herramientas de desarrollo..." + +#~ msgid "Switch to the previous tab" +#~ msgstr "Cambiar a la pestaña anterior" + +#~ msgid "Switch to the next tab" +#~ msgstr "Cambiar a la pestaña siguiente" + +#~ msgid "Move tab behind the previous tab" +#~ msgstr "Mover pestaña detrás de la pestaña anterior" + +#~ msgid "Move tab in front of the next tab" +#~ msgstr "Mover pestaña en frente de la siguiente pestaña" + +#~ msgid "Focus the current tab" +#~ msgstr "Foco en la pestaña actual" + +#~ msgid "Cycle focus between views" +#~ msgstr "Ciclo de enfoque entre las vistas" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Solo mostrar el icono de la pestaña actual" + +#~ msgid "Duplicate the current tab" +#~ msgstr "Duplicar la pestaña actual" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Cerrar todas las pestañas excepto la actual" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Abrir las pestañas guardadas en la última sesión" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Mostrar las preguntas más frecuentes" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Abrir el sistema de seguimiento de errores de Midori" + +#~ msgid "Show information about the program" +#~ msgstr "Mostrar información sobre el programa" + +#~ msgid "Show menubar" +#~ msgstr "Mostrar la barra de menús" + +#~ msgid "Show navigationbar" +#~ msgstr "Mostrar la barra de navegación" + +#~ msgid "Show sidepanel" +#~ msgstr "Mostrar el panel lateral" + +#~ msgid "Show bookmarkbar" +#~ msgstr "Mostrar la barra de marcadores" + +#~ msgid "Show statusbar" +#~ msgstr "Mostrar la barra de estado" + +#~ msgid "MD5-Checksum:" +#~ msgstr "MD5-Checksum:" + +#~ msgid "SHA1-Checksum:" +#~ msgstr "SHA1-Checksum:" + +#~ msgid "No filename specified" +#~ msgstr "No se especificó el nombre del archivo" + +#~ msgid "Set number of columns and rows" +#~ msgstr "Establecer el número de columnas y filas" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Introduzca el número de columnas y filas:" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "Valores no válidos para el tamaño de la marcación rápida" + +#~ msgid "Thumb size:" +#~ msgstr "Tamaño de miniatura:" + +#~ msgid "Small" +#~ msgstr "Pequeño" + +#~ msgid "Medium" +#~ msgstr "Medio" + +#~ msgid "Big" +#~ msgstr "Grande" + +#~ msgid "Reset the last _session" +#~ msgstr "Restaurar la última _sesión" + +#~ msgid "Quit the application" +#~ msgstr "Salir de la aplicación" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "Fallo al ejecutar sentencia de base de datos\n" + +#~ msgid "Show Blank page" +#~ msgstr "Mostrar página en blanco" + +#~ msgid "All cookies" +#~ msgstr "Todas las cookies" + +#~ msgid "Session cookies" +#~ msgstr "Cookies de la sesión" + +#~ msgid "Show Transferbar" +#~ msgstr "Mostrar la barra de transferencias" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "Si se desea mostrar la barra de transferencias" + +#~ msgid "Search engines in location completion" +#~ msgstr "Motores de búsqueda en completamiento" + +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "" +#~ "Si se desea mostrar los motores de búsqueda en completamento de dirección" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "Mostrar los controles de operación en el panel" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "Si se desea mostrar los controles de operación en el panel" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Mostrar marcación rápida en nuevas pestañas" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Mostrar marcación rápida en la pestaña abierta recientemente" + +#~ msgid "Download Manager" +#~ msgstr "Gestor de descargas" + +#~ msgid "An external download manager" +#~ msgstr "Gestor de descargas externo" + +#~ msgid "Open external pages in:" +#~ msgstr "Abrir las páginas externas en:" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "Donde abrir las páginas externas" + +#~ msgid "Accept cookies" +#~ msgstr "Aceptar cookies" + +#~ msgid "What type of cookies to accept" +#~ msgstr "Qué tipos de cookies son aceptadas" + +#~ msgid "Maximum cookie age" +#~ msgstr "Duración máxima de las cookies" + +#~ msgid "Maximum history age" +#~ msgstr "Duración máxima del historial" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Recordar los últimos archivos descargados" + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "Si se desea que los archivos descargados sean recordados" + +#~ msgid "Not found - %s" +#~ msgstr "No se ha encontrado - %s" + +#~ msgid "Download with Download _Manager" +#~ msgstr "Descargar con el _gestor de descargas" + +#~ msgid "Document cannot be displayed" +#~ msgstr "El documento no puede ser mostrado" + +#~ msgid "General" +#~ msgstr "General" + +#~ msgid "Appearance" +#~ msgstr "Apariencia" + +#~ msgid "Font settings" +#~ msgstr "Configuración de tipo de letra" + +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "Aplicar 96 puntos por pulgada" + +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "Aplicar densidad de puntos de video de 96 DPI" + +#~ msgid "Interface" +#~ msgstr "Interfaz" + +#~ msgid "Navigationbar" +#~ msgstr "Barra de navegación" + +#~ msgid "Applications" +#~ msgstr "Aplicaciones" + +#~ msgid "External applications" +#~ msgstr "Aplicaciones externas" + +#~ msgid "Web Cookies" +#~ msgstr "Cookies web" + +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "Borrar cookies al salir de Midori" + +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "Eliminar cookies antiguas después de 1 hora" + +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "Eliminar cookies antiguas después de 1 semana" + +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "Eliminar cookies antiguas después de 1 mes" + +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "Eliminar cookies antiguas después de 1 año" + +#~ msgid "%s of %s, %s/s" +#~ msgstr "%s de %s, a %s/s" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Configurar filtros de p_ublicidad..." + +#~ msgid "Open target folder for selected addon" +#~ msgstr "Abrir carpeta de destino para el complemento seleccionado" + +#~ msgid "Next Tab (History List)" +#~ msgstr "Pestaña siguiente (historial de pestañas)" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "Pestaña anterior (historial de pestañas)" + +#~ msgid "Previous tab from history" +#~ msgstr "Anterior pestaña desde el historial" + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "" +#~ "Las pestañas se pueden ordenar desde su último uso a través de Ctrl+Tab" + +#~ msgid "Pageholder" +#~ msgstr "Álbum de páginas" + +#~ msgid "_Pageholder" +#~ msgstr "Álbum de _páginas" + +#~ msgid "Keep one or multiple pages open in parallel to your tabs" +#~ msgstr "" +#~ "Mantener una o múltiples páginas abiertas en paralelo junto con las " +#~ "pestañas" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% cargado" + +#~ msgid "_Contents" +#~ msgstr "_Contenido" + +#~ msgid "Show the documentation" +#~ msgstr "Mostrar la documentación" + +#~ msgid "_Transferbar" +#~ msgstr "_Barra de transferencias" + +#~ msgid "Show transferbar" +#~ msgstr "Mostrar la barra de transferencias" + +#~ msgid "Show progress in location entry" +#~ msgstr "Mostrar progreso en la barra de direcciones" + +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "Si se desea mostrar el progreso de carga en el lugar de entrada" + +#~ msgid "Ask for the destination folder" +#~ msgstr "Preguntar por la carpeta de destino" + +#~ msgid "Whether to ask for the destination folder when downloading a file" +#~ msgstr "" +#~ "Si se desea seleccionar la carpeta de destino cuando se descarga un " +#~ "archivo" + +#~ msgid "Whether to show a notification when a transfer has been completed" +#~ msgstr "" +#~ "Si se desea mostrar una notificación cuando se ha completado la " +#~ "transferencia" + +#~ msgid "_Save Link destination" +#~ msgstr "_Guardar enlace" + +#~ msgid "_Download Link destination" +#~ msgstr "_Descargar enlace" + +#~ msgid "Download I_mage" +#~ msgstr "Descargar i_magen" + +#~ msgid "Failed to clear search history: %s\n" +#~ msgstr "Fallo al insertar un nuevo elemento en el historial: %s\n" + +#~ msgid "Minimize _Current Tab" +#~ msgstr "_Minimizar pestaña" + +#~ msgid "Minimize the current tab" +#~ msgstr "Cerrar la pestaña actual" + +#~ msgid "Detach chosen panel from the window" +#~ msgstr "Separar el panel elegido de la ventana" + +#~ msgid "Hide operating controls" +#~ msgstr "Ocultar _controles de operación" + +#~ msgid "Spell Checking" +#~ msgstr "Corrector ortográfico" + +#~ msgid "Spelling dictionaries:" +#~ msgstr "Diccionarios ortográficos:" + +#~ msgid "" +#~ "A comma separated list of languages to be used for spell checking, for " +#~ "example \"en_GB,de_DE\"" +#~ msgstr "" +#~ "Lista de idiomas separados con comas que se utilizarán para la corrección " +#~ "ortográfica, por ejemplo \"en_GB,de_DE\"" + +#~ msgid "Console" +#~ msgstr "Consola" + +#~ msgid "Copy _All" +#~ msgstr "Copiar _todo" + +#~ msgid "Copy All" +#~ msgstr "Copiar todo" + +#~ msgid "_Cookie Manager" +#~ msgstr "_Gestor de cookies" + +#~ msgid "External Applications" +#~ msgstr "Aplicaciones externas" + +#~ msgid "Associate URL schemes with external commands" +#~ msgstr "Asociar el esquema URL con comandos externos" + #~ msgid "_Recently visited pages" #~ msgstr "_Últimas páginas visitadas" #~ msgid "Reopen pages that you visited earlier" #~ msgstr "Abre las páginas que usted visitó anteriormente" -#~ msgid "Show the saved bookmarks" -#~ msgstr "Mostrar los marcadores guardados." - #~ msgid "Original cookies only" #~ msgstr "Sólo cookies originales" -#~ msgid "Accept cookies from the original website only" -#~ msgstr "Sólo se aceptan las cookies del sitio web original" - #~ msgid "Remember last visited pages" #~ msgstr "Recordar las últimas páginas visitadas" @@ -2780,7 +3344,8 @@ #~ msgid "Detect proxy server automatically" #~ msgstr "Detectar automáticamente el servidor proxy" -#~ msgid "Whether to detect the proxy server automatically from the environment" +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" #~ msgstr "Si se desea detectar automáticamente el servidor proxy del entorno" #~ msgid "_Restore Tab" @@ -2789,14 +3354,20 @@ #~ msgid "Erroneous clock time" #~ msgstr "Hora del reloj errónea" -#~ msgid "The clock time lies in the past. Please check the current date and time." -#~ msgstr "La hora del reloj está en el pasado. Por favor, compruebe la fecha y la hora." +#~ msgid "" +#~ "The clock time lies in the past. Please check the current date and time." +#~ msgstr "" +#~ "La hora del reloj está en el pasado. Por favor, compruebe la fecha y la " +#~ "hora." #~ msgid "Copy %s to the folder %s." #~ msgstr "Copiar %s a la carpeta %s." -#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "Copiar scripts de usuario en la carpeta %s y copiar estilos de usuario en la carpeta %s." +#~ msgid "" +#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "" +#~ "Copiar scripts de usuario en la carpeta %s y copiar estilos de usuario en " +#~ "la carpeta %s." #~ msgid "Open _Link" #~ msgstr "Abrir en_lace" @@ -2852,21 +3423,12 @@ #~ msgid "Enable special extensions for developers" #~ msgstr "Habilitar extensiones especiales para desarrolladores" -#~ msgid "MB" -#~ msgstr "MB" - #~ msgid "User_styles" #~ msgstr "_Estilos de usuario" #~ msgid "Tint tabs distinctly" #~ msgstr "Pestañas de distintos colores" -#~ msgid "_Closed Tabs and Windows" -#~ msgstr "_Pestañas y ventanas cerradas" - -#~ msgid "Last open pages" -#~ msgstr "Últimas páginas visitadas" - #~ msgid "Both" #~ msgstr "Ambos" diff -Nru midori-0.2.8/po/eu.po midori-0.4.6/po/eu.po --- midori-0.2.8/po/eu.po 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/po/eu.po 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,2817 @@ +# Basque translation of the midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Asier Iturralde Sarasola , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: midori\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-03-07 14:06+0000\n" +"PO-Revision-Date: 2012-05-03 13:11+0000\n" +"Last-Translator: Asier Iturralde Sarasola \n" +"Language-Team: Librezale \n" +"Language: Basque\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 "Browse the Web" +msgstr "Arakatu sarea" + +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072 +#: ../midori/main.c:2086 ../midori/midori-websettings.c:312 +msgid "Midori" +msgstr "Midori" + +#: ../data/midori.desktop.in.h:4 +msgid "Web Browser" +msgstr "Web-arakatzailea" + +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Midori nabigatze pribatua" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Ireki nabigatze pribatuko leiho berri bat" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164 +msgid "Private Browsing" +msgstr "Nabigatze pribatua" + +#: ../midori/main.c:96 ../midori/main.c:102 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "Ezin izan da konfigurazioa kargatu: %s\n" + +#: ../midori/main.c:150 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "'%s' balioa baliogabea da %s-(r)entzat" + +#: ../midori/main.c:155 ../midori/main.c:259 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "Baliogabeko '%s' konfigurazio balioa" + +#: ../midori/main.c:380 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Ezin izan dira bilaketa-tresnak kargatu. %s\n" + +#: ../midori/main.c:434 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Huts egin du historia garbitzean: %s\n" + +#: ../midori/main.c:454 ../midori/main.c:581 +#: ../extensions/formhistory/formhistory.c:531 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "Huts egin du datu-basea irekitzean: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:524 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "Huts egin du historiako elementu zaharrak kentzean: %s\n" + +#: ../midori/main.c:564 ../panels/midori-history.c:232 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Huts egin du historiako elementua kentzean: %s\n" + +#: ../midori/main.c:611 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Ezin izan dira laster-markak gorde. %s" + +#: ../midori/main.c:633 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Ezin izan da konfigurazioa gorde. %s" + +#: ../midori/main.c:668 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Ezin izan dira bilaketa-tresnak gorde. %s" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:705 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Ezin izan da zakarrontzia gorde. %s" + +#: ../midori/main.c:746 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Hedapenak" + +#: ../midori/main.c:760 +msgid "Privacy" +msgstr "Pribatutasuna" + +#: ../midori/main.c:772 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" + +#: ../midori/main.c:828 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Ezin izan da saioa gorde. %s" + +#: ../midori/main.c:1046 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" + +#: ../midori/main.c:1115 +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:1115 +msgid "Modify _preferences" +msgstr "Aldatu _hobespenak" + +#: ../midori/main.c:1119 +msgid "Disable all _extensions" +msgstr "Desgaitu _hedapen guztiak" + +#: ../midori/main.c:1132 +msgid "Discard old tabs" +msgstr "Baztertu fitxa zaharrak" + +#: ../midori/main.c:1133 ../midori/midori-websettings.c:217 +msgid "Show last tabs without loading" +msgstr "Erakutsi azken fitxak kargatu gabe" + +#: ../midori/main.c:1134 ../midori/midori-websettings.c:216 +msgid "Show last open tabs" +msgstr "" + +#: ../midori/main.c:1342 ../midori/main.c:2399 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Ezin izan da saioa kargatu: %s\n" + +#: ../midori/main.c:1480 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Argazkia hona gorde da: %s\n" + +#: ../midori/main.c:1891 +msgid "Run ADDRESS as a web application" +msgstr "Exekutatu HELBIDEA web aplikazio bezala" + +#: ../midori/main.c:1891 +msgid "ADDRESS" +msgstr "HELBIDEA" + +#: ../midori/main.c:1894 +msgid "Use FOLDER as configuration folder" +msgstr "Erabili KARPETA konfigurazio karpeta bezala" + +#: ../midori/main.c:1894 +msgid "FOLDER" +msgstr "KARPETA" + +#: ../midori/main.c:1897 +msgid "Private browsing, no changes are saved" +msgstr "Nabigatze pribatua, aldaketak ez dira gordeko" + +#: ../midori/main.c:1899 +msgid "Show a diagnostic dialog" +msgstr "Erakutsi diagnostiko elkarrizketa-koadroa" + +#: ../midori/main.c:1901 +msgid "Run the specified filename as javascript" +msgstr "Exekutatu zehazturiko fitxategi-izena javascript bezala" + +#: ../midori/main.c:1903 +msgid "Take a snapshot of the specified URI" +msgstr "Hartu zehazturiko URI-aren argazki bat" + +#: ../midori/main.c:1905 +msgid "Execute the specified command" +msgstr "Exekutatu zehazturiko komandoa" + +#: ../midori/main.c:1907 +msgid "List available commands to execute with -e/ --execute" +msgstr "Zerrendatu exekuta daitezkeen komandoak honela: -e/ --execute" + +#: ../midori/main.c:1909 +msgid "Display program version" +msgstr "Bistaratu programaren bertsioa" + +#: ../midori/main.c:1911 +msgid "Addresses" +msgstr "Helbideak" + +#: ../midori/main.c:1913 +msgid "Block URIs according to regular expression PATTERN" +msgstr "" + +#: ../midori/main.c:1913 +msgid "PATTERN" +msgstr "" + +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:1917 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "" + +#: ../midori/main.c:1917 +msgid "SECONDS" +msgstr "" + +#: ../midori/main.c:1920 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "" + +#: ../midori/main.c:1920 +msgid "FILENAME" +msgstr "" + +#: ../midori/main.c:1985 +msgid "[Addresses]" +msgstr "[Helbideak]" + +#: ../midori/main.c:1995 +msgid "The specified configuration folder is invalid." +msgstr "" + +#: ../midori/main.c:2023 +msgid "Please report comments, suggestions and bugs to:" +msgstr "" + +#: ../midori/main.c:2025 +msgid "Check for new versions at:" +msgstr "" + +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2109 +msgid "Saved logins and _passwords" +msgstr "" + +#: ../midori/main.c:2111 +msgid "Cookies and Website data" +msgstr "" + +#: ../midori/main.c:2114 ../midori/midori-websettings.c:956 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Web cache-a" + +#: ../midori/main.c:2117 +msgid "Website icons" +msgstr "Webguneen ikonoak" + +#: ../midori/main.c:2224 +msgid "An unknown error occured" +msgstr "Errore ezezagun bat gertatu da" + +#: ../midori/main.c:2330 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "" + +#: ../midori/main.c:2366 +#, c-format +msgid "Bookmarks couldn't be loaded: %s\n" +msgstr "Ezin izan dira laster-markak kargatu: %s\n" + +#: ../midori/main.c:2414 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "Ezin izan da zakarrontzia kargatu: %s\n" + +#: ../midori/main.c:2427 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Ezin izan da historia kargatu: %s\n" + +#: ../midori/main.c:2443 +msgid "The following errors occured:" +msgstr "Ondorengo erroreak gertatu dira:" + +#: ../midori/main.c:2459 +msgid "_Ignore" +msgstr "Ez _ikusia egin" + +#: ../midori/midori-app.c:1331 +msgid "_Bookmark" +msgstr "_Laster-marka" + +#: ../midori/midori-app.c:1332 ../midori/midori-browser.c:5933 +msgid "_Bookmarks" +msgstr "_Laster-markak" + +#: ../midori/midori-app.c:1333 +msgid "Add Boo_kmark" +msgstr "Gehitu _laster-marka" + +#: ../midori/midori-app.c:1334 +msgid "_Console" +msgstr "Kontsola" + +#: ../midori/midori-app.c:1335 +msgid "_Extensions" +msgstr "_Hedapenak" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1336 ../midori/midori-browser.c:4502 +msgid "_History" +msgstr "_Historia" + +#: ../midori/midori-app.c:1337 +msgid "_Homepage" +msgstr "_Hasiera-orria" + +#: ../midori/midori-app.c:1338 +msgid "_Userscripts" +msgstr "_Erabiltzailearen script-ak" + +#: ../midori/midori-app.c:1339 +msgid "New _Tab" +msgstr "_Fitxa berria" + +#: ../midori/midori-app.c:1340 +msgid "_Transfers" +msgstr "_Transferentziak" + +#: ../midori/midori-app.c:1341 +msgid "Netscape p_lugins" +msgstr "Netscape-en pluginak" + +#: ../midori/midori-app.c:1342 +msgid "_Closed Tabs" +msgstr "_Itxitako fitxak" + +#: ../midori/midori-app.c:1343 ../midori/midori-browser.c:5088 +msgid "New _Window" +msgstr "_Leiho berria" + +#: ../midori/midori-app.c:1344 +msgid "New _Folder" +msgstr "_Karpeta berria" + +#: ../midori/midori-array.c:522 +msgid "File not found." +msgstr "Ez da fitxategia aurkitu." + +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +msgid "Malformed document." +msgstr "Gaizki osatutako dokumentua." + +#: ../midori/midori-array.c:628 +msgid "Unrecognized bookmark format." +msgstr "Laster-marka formatu ezezaguna." + +#: ../midori/midori-array.c:915 +msgid "Writing failed." +msgstr "Huts egin du idaztean." + +#: ../midori/midori-browser.c:321 ../midori/midori-browser.c:5170 +#: ../midori/midori-browser.c:5179 +msgid "Reload the current page" +msgstr "Birkargatu uneko orria" + +#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:5176 +msgid "Stop loading the current page" +msgstr "" + +#: ../midori/midori-browser.c:455 +#, c-format +msgid "Failed to update title: %s\n" +msgstr "Huts egin du izenburua eguneratzean: %s\n" + +#: ../midori/midori-browser.c:468 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Ezusteko ekintza '%s'." + +#: ../midori/midori-browser.c:558 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Nabigatze pribatua)" + +#: ../midori/midori-browser.c:668 ../midori/midori-browser.c:701 +msgid "Toplevel folder" +msgstr "" + +#: ../midori/midori-browser.c:758 +msgid "New folder" +msgstr "Karpeta berria" + +#: ../midori/midori-browser.c:758 +msgid "Edit folder" +msgstr "Editatu karpeta" + +#: ../midori/midori-browser.c:760 +msgid "New bookmark" +msgstr "Laster-marka berria" + +#: ../midori/midori-browser.c:760 +msgid "Edit bookmark" +msgstr "Editatu laster-marka" + +#: ../midori/midori-browser.c:791 +msgid "_Title:" +msgstr "_Izenburua:" + +#: ../midori/midori-browser.c:811 ../midori/midori-searchaction.c:961 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "_Helbidea:" + +#: ../midori/midori-browser.c:834 ../midori/midori-browser.c:4239 +msgid "_Folder:" +msgstr "_Karpeta:" + +#: ../midori/midori-browser.c:850 +msgid "Add to _Speed Dial" +msgstr "" + +#: ../midori/midori-browser.c:863 +msgid "Show in the tool_bar" +msgstr "Erakutsi _tresna-barran" + +#: ../midori/midori-browser.c:878 +msgid "Run as _web application" +msgstr "Exekutatu _web aplikazio bezala" + +#: ../midori/midori-browser.c:949 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Ezin da \"%s\" fitxategia karpetan honetan gorde" + +#: ../midori/midori-browser.c:951 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Ez daukazu kokaleku honetan idazteko baimenik." + +#: ../midori/midori-browser.c:958 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "Ez dago \"%s\" deskargatzeko adina leku libre." + +#: ../midori/midori-browser.c:961 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "Fitxategiak %s behar ditu baina %s daude libre." + +#: ../midori/midori-browser.c:999 ../midori/midori-browser.c:4308 +msgid "Save file as" +msgstr "Gorde fitxategia honela" + +#: ../midori/midori-browser.c:1293 +msgid "New Window" +msgstr "Leiho berria" + +#: ../midori/midori-browser.c:1293 +msgid "A new window has been opened" +msgstr "Leiho berri bat ireki da" + +#: ../midori/midori-browser.c:1296 +msgid "New Tab" +msgstr "Fitxa berria" + +#: ../midori/midori-browser.c:1296 +msgid "A new tab has been opened" +msgstr "Fitxa berri bat ireki da" + +#: ../midori/midori-browser.c:1331 +msgid "Error opening the image!" +msgstr "Errorea irudia irekitzean!" + +#: ../midori/midori-browser.c:1332 +msgid "Can not open selected image in a default viewer." +msgstr "Ezin da hautatutako irudia ireki ikustaile lehenetsian." + +#: ../midori/midori-browser.c:1338 +msgid "Error downloading the image!" +msgstr "Errorea irudia deskargatzean!" + +#: ../midori/midori-browser.c:1339 +msgid "Can not downlaod selected image." +msgstr "Ezin da hautatutako irudia deskargatu." + +#: ../midori/midori-browser.c:1442 +msgid "Save file" +msgstr "Gorde fitxategia" + +#: ../midori/midori-browser.c:2293 +msgid "Open file" +msgstr "Ireki fitxategia" + +#: ../midori/midori-browser.c:2425 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr "" + +#: ../midori/midori-browser.c:2431 ../extensions/feed-panel/main.c:365 +msgid "New feed" +msgstr "Jario berria" + +#: ../midori/midori-browser.c:2474 ../midori/midori-browser.c:5239 +#: ../panels/midori-bookmarks.c:426 +msgid "Add a new bookmark" +msgstr "Gehitu laster-marka berri bat" + +#: ../midori/midori-browser.c:2973 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "Hutsik" + +#: ../midori/midori-browser.c:3393 +msgid "Toggle text cursor navigation" +msgstr "" + +#: ../midori/midori-browser.c:3705 ../midori/midori-browser.c:5625 +#, c-format +msgid "Failed to insert new history item: %s\n" +msgstr "Huts egin du historiako elementu berri bat txertatzean: %s\n" + +#: ../midori/midori-browser.c:4036 ../panels/midori-bookmarks.c:742 +#: ../panels/midori-history.c:799 +msgid "Open all in _Tabs" +msgstr "Ireki guztia _fitxetan" + +#: ../midori/midori-browser.c:4043 ../panels/midori-bookmarks.c:748 +#: ../panels/midori-history.c:805 ../extensions/feed-panel/feed-panel.c:528 +msgid "Open in New _Tab" +msgstr "Ireki _fitxa berrian" + +#: ../midori/midori-browser.c:4046 ../midori/midori-view.c:2573 +#: ../midori/midori-view.c:4525 ../panels/midori-bookmarks.c:750 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:530 +msgid "Open in New _Window" +msgstr "Ireki leiho _berrian" + +#: ../midori/midori-browser.c:4126 +msgid "Arora" +msgstr "Arora" + +#: ../midori/midori-browser.c:4127 +msgid "Kazehakase" +msgstr "Kazehakase" + +#: ../midori/midori-browser.c:4128 +msgid "Opera" +msgstr "Opera" + +#: ../midori/midori-browser.c:4129 +msgid "Konqueror" +msgstr "Konqueror" + +#: ../midori/midori-browser.c:4130 +msgid "Epiphany" +msgstr "Epiphany" + +#: ../midori/midori-browser.c:4131 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4152 +msgid "Import bookmarks..." +msgstr "Inportatu laster-markak..." + +#: ../midori/midori-browser.c:4155 ../midori/midori-browser.c:5244 +msgid "_Import bookmarks" +msgstr "_Inportatu laster-markak" + +#: ../midori/midori-browser.c:4166 +msgid "_Application:" +msgstr "_Aplikazioa:" + +#: ../midori/midori-browser.c:4231 +msgid "Import from XBEL or HTML file" +msgstr "Inportatu XBEL edo HTML fitxategitik" + +#: ../midori/midori-browser.c:4266 +msgid "Import from a file" +msgstr "Inportatu fitxategi batetik" + +#: ../midori/midori-browser.c:4278 +msgid "Failed to import bookmarks" +msgstr "Huts egin du laster-markak inportatzean" + +#: ../midori/midori-browser.c:4313 +msgid "XBEL Bookmarks" +msgstr "XBEL laster-markak" + +#: ../midori/midori-browser.c:4318 +msgid "Netscape Bookmarks" +msgstr "Netscape-ren laster-markak" + +#: ../midori/midori-browser.c:4332 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "" + +#: ../midori/midori-browser.c:4347 +msgid "Failed to export bookmarks" +msgstr "Huts egin du laster-markak esportatzean" + +#. i18n: Dialog: Clear Private Data, in the Tools menu +#: ../midori/midori-browser.c:4469 +msgid "Clear Private Data" +msgstr "Garbitu datu pribatuak" + +#: ../midori/midori-browser.c:4473 +msgid "_Clear private data" +msgstr "_Garbitu datu pribatuak" + +#: ../midori/midori-browser.c:4486 +msgid "Clear the following data:" +msgstr "Garbitu ondorengo datuak:" + +#: ../midori/midori-browser.c:4496 +msgid "Last open _tabs" +msgstr "" + +#: ../midori/midori-browser.c:4522 +msgid "Clear private data when _quitting Midori" +msgstr "" + +#: ../midori/midori-browser.c:4698 +msgid "A lightweight web browser." +msgstr "Web-arakatzaile arin bat" + +#: ../midori/midori-browser.c:4699 +msgid "See about:version for version info." +msgstr "" + +#: ../midori/midori-browser.c:4701 +msgid "" +"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." +msgstr "" + +#: ../midori/midori-browser.c:4722 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Asier Iturralde Sarasola https://launchpad.net/~asier-iturralde" + +#: ../midori/midori-browser.c:5086 +msgid "_File" +msgstr "_Fitxategia" + +#: ../midori/midori-browser.c:5089 +msgid "Open a new window" +msgstr "Ireki leiho berri bat" + +#: ../midori/midori-browser.c:5092 +msgid "Open a new tab" +msgstr "Ireki fitxa berri bat" + +#: ../midori/midori-browser.c:5094 +msgid "New P_rivate Browsing Window" +msgstr "Nabigatze _pribatuko leiho berria" + +#: ../midori/midori-browser.c:5098 +msgid "Open a file" +msgstr "Ireki fitxategi bat" + +#: ../midori/midori-browser.c:5100 +msgid "_Save Page As..." +msgstr "_Gorde orria honela..." + +#: ../midori/midori-browser.c:5101 +msgid "Save to a file" +msgstr "Gorde fitxategi batera" + +#: ../midori/midori-browser.c:5103 +msgid "Add to Speed _dial" +msgstr "" + +#: ../midori/midori-browser.c:5107 +msgid "Add Shortcut to the _desktop" +msgstr "" + +#: ../midori/midori-browser.c:5109 +msgid "Create _Launcher" +msgstr "Sortu _abiarazlea" + +#: ../midori/midori-browser.c:5113 +msgid "Subscribe to News _feed" +msgstr "Harpidetu berrien _jariora" + +#: ../midori/midori-browser.c:5119 +msgid "_Close Tab" +msgstr "_Itxi fitxa" + +#: ../midori/midori-browser.c:5120 +msgid "Close the current tab" +msgstr "Itxi uneko fitxa" + +#: ../midori/midori-browser.c:5122 +msgid "C_lose Window" +msgstr "Itxi _leihoa" + +#: ../midori/midori-browser.c:5126 +msgid "Print the current page" +msgstr "Inprimatu uneko orria" + +#: ../midori/midori-browser.c:5128 +msgid "Close a_ll Windows" +msgstr "Itxi leiho _guztiak" + +#: ../midori/midori-browser.c:5131 +msgid "_Edit" +msgstr "_Editatu" + +#: ../midori/midori-browser.c:5154 +msgid "_Find..." +msgstr "_Bilatu..." + +#: ../midori/midori-browser.c:5155 +msgid "Find a word or phrase in the page" +msgstr "Bilatu hitz edo esaldi bat orrian" + +#: ../midori/midori-browser.c:5157 +msgid "Find _Next" +msgstr "Bilatu _hurrengoa" + +#: ../midori/midori-browser.c:5160 +msgid "Find _Previous" +msgstr "Bilatu _aurrekoa" + +#: ../midori/midori-browser.c:5164 +msgid "Configure the application preferences" +msgstr "Konfiguratu aplikazioaren hobespenak" + +#: ../midori/midori-browser.c:5166 +msgid "_View" +msgstr "_Ikusi" + +#: ../midori/midori-browser.c:5167 +msgid "_Toolbars" +msgstr "_Tresna-barrak" + +#: ../midori/midori-browser.c:5172 +msgid "Reload page without caching" +msgstr "" + +#: ../midori/midori-browser.c:5182 +msgid "Increase the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:5185 +msgid "Decrease the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:5189 +msgid "_Encoding" +msgstr "_Kodeketa" + +#: ../midori/midori-browser.c:5191 +msgid "View So_urce" +msgstr "Ikusi _iturburua" + +#: ../midori/midori-browser.c:5194 +msgid "Ca_ret Browsing" +msgstr "" + +#: ../midori/midori-browser.c:5198 +msgid "Toggle fullscreen view" +msgstr "Txandakatu pantaila osoko ikuspegia" + +#: ../midori/midori-browser.c:5200 +msgid "Scroll _Left" +msgstr "" + +#: ../midori/midori-browser.c:5203 +msgid "Scroll _Down" +msgstr "" + +#: ../midori/midori-browser.c:5206 +msgid "Scroll _Up" +msgstr "" + +#: ../midori/midori-browser.c:5209 +msgid "Scroll _Right" +msgstr "" + +#: ../midori/midori-browser.c:5212 +msgid "_Go" +msgstr "_Joan" + +#: ../midori/midori-browser.c:5215 +msgid "Go back to the previous page" +msgstr "Joan aurreko orrira" + +#: ../midori/midori-browser.c:5218 +msgid "Go forward to the next page" +msgstr "Joan hurrengo orrira" + +#. i18n: Visit the previous logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5222 +msgid "Go to the previous sub-page" +msgstr "Joan aurreko azpi-orrira" + +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5226 +msgid "Go to the next sub-page" +msgstr "Joan hurrengo azpi-orrira" + +#: ../midori/midori-browser.c:5229 +msgid "Go to your homepage" +msgstr "Joan zure hasiera-orrira" + +#: ../midori/midori-browser.c:5231 +msgid "Empty Trash" +msgstr "Hustu zakarrontzia" + +#: ../midori/midori-browser.c:5234 +msgid "Undo _Close Tab" +msgstr "Desegin fitxa _ixtea" + +#: ../midori/midori-browser.c:5241 +msgid "Add a new _folder" +msgstr "Gehitu _karpeta berri bat" + +#: ../midori/midori-browser.c:5247 +msgid "_Export bookmarks" +msgstr "_Esportatu laster-markak" + +#: ../midori/midori-browser.c:5250 ../midori/midori-searchaction.c:497 +msgid "_Manage Search Engines" +msgstr "_Kudeatu bilaketa-tresnak" + +#: ../midori/midori-browser.c:5253 +msgid "_Clear Private Data" +msgstr "_Garbitu datu pribatuak" + +#: ../midori/midori-browser.c:5256 +msgid "_Inspect Page" +msgstr "" + +#: ../midori/midori-browser.c:5260 +msgid "_Previous Tab" +msgstr "_Aurreko fitxa" + +#: ../midori/midori-browser.c:5263 +msgid "_Next Tab" +msgstr "_Hurrengo fitxa" + +#: ../midori/midori-browser.c:5265 +msgid "Move Tab _Backward" +msgstr "Mugitu fitxa _atzera" + +#: ../midori/midori-browser.c:5267 +msgid "_Move Tab Forward" +msgstr "_Mugitu fitxa aurrera" + +#: ../midori/midori-browser.c:5270 +msgid "Focus _Current Tab" +msgstr "" + +#: ../midori/midori-browser.c:5273 +msgid "Focus _Next view" +msgstr "" + +#: ../midori/midori-browser.c:5276 +msgid "Only show the Icon of the _Current Tab" +msgstr "" + +#: ../midori/midori-browser.c:5279 +msgid "_Duplicate Current Tab" +msgstr "_Bikoiztu uneko fitxa" + +#: ../midori/midori-browser.c:5282 +msgid "Close Ot_her Tabs" +msgstr "Itxi _beste fitxak" + +#: ../midori/midori-browser.c:5285 +msgid "Open last _session" +msgstr "Ireki azken _saioa" + +#: ../midori/midori-browser.c:5288 +msgid "_Help" +msgstr "_Laguntza" + +#: ../midori/midori-browser.c:5290 +msgid "_Frequent Questions" +msgstr "_Ohiko galderak" + +#: ../midori/midori-browser.c:5293 +msgid "_Report a Problem..." +msgstr "_Eman arazo baten berri..." + +#: ../midori/midori-browser.c:5305 +msgid "_Menubar" +msgstr "_Menu-barra" + +#: ../midori/midori-browser.c:5309 +msgid "_Navigationbar" +msgstr "_Nabigazio-barra" + +#: ../midori/midori-browser.c:5313 +msgid "Side_panel" +msgstr "Alboko _panela" + +#: ../midori/midori-browser.c:5314 +msgid "Sidepanel" +msgstr "Alboko panela" + +#: ../midori/midori-browser.c:5317 +msgid "_Bookmarkbar" +msgstr "_Laster-marka-barra" + +#: ../midori/midori-browser.c:5321 +msgid "_Statusbar" +msgstr "_Egoera-barra" + +#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:307 +msgid "_Automatic" +msgstr "_Automatikoa" + +#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:232 +msgid "Chinese (BIG5)" +msgstr "Txinera (BIG5)" + +#. i18n: A double underscore "__" is used to prevent the mnemonic +#: ../midori/midori-browser.c:5337 +msgid "Japanese (SHIFT__JIS)" +msgstr "Japoniera (SHIFT__JIS)" + +#: ../midori/midori-browser.c:5340 ../midori/midori-websettings.c:234 +msgid "Korean (EUC-KR)" +msgstr "Koreera (EUC-KR)" + +#: ../midori/midori-browser.c:5343 ../midori/midori-websettings.c:235 +msgid "Russian (KOI8-R)" +msgstr "Errusiera (KOI8-R)" + +#: ../midori/midori-browser.c:5346 ../midori/midori-websettings.c:236 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-browser.c:5349 ../midori/midori-websettings.c:237 +msgid "Western (ISO-8859-1)" +msgstr "Mendebaldekoa (ISO-8859-1)" + +#: ../midori/midori-browser.c:5352 ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:313 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "Pertsonalizatua..." + +#: ../midori/midori-browser.c:5858 +msgid "_Separator" +msgstr "_Banatzailea" + +#: ../midori/midori-browser.c:5865 +msgid "_Location..." +msgstr "_Kokalekua" + +#: ../midori/midori-browser.c:5867 +msgid "Open a particular location" +msgstr "Ireki kokaleku jakin bat" + +#: ../midori/midori-browser.c:5889 +msgid "_Web Search..." +msgstr "_Web bilaketa" + +#: ../midori/midori-browser.c:5891 +msgid "Run a web search" +msgstr "Exekutatu web bilaketa bat" + +#: ../midori/midori-browser.c:5918 +msgid "Reopen a previously closed tab or window" +msgstr "" + +#: ../midori/midori-browser.c:5935 +msgid "Show the saved bookmarks" +msgstr "Erakutsi gordetako laster-markak" + +#: ../midori/midori-browser.c:5952 +msgid "_Tools" +msgstr "_Tresnak" + +#: ../midori/midori-browser.c:5968 +msgid "_Window" +msgstr "_Leihoa" + +#: ../midori/midori-browser.c:5970 +msgid "Show a list of all open tabs" +msgstr "Erakutsi irekitako fitxa guztien zerrenda" + +#: ../midori/midori-browser.c:5984 +msgid "_Menu" +msgstr "_Menua" + +#: ../midori/midori-browser.c:5986 +msgid "Menu" +msgstr "Menua" + +#: ../midori/midori-browser.c:6659 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Ustekabeko ezarpena '%s'" + +#: ../midori/midori-extension.c:310 +#, c-format +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "Ezin izan da '%s' hedapenaren konfigurazioa kargatu: %s\n" + +#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1695 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Ezin izan da '%s' hedapenaren konfigurazioa gorde: %s\n" + +#: ../midori/midori-locationaction.c:472 +#, c-format +msgid "Failed to select from history\n" +msgstr "Huts egin du historiatik hautatzean\n" + +#: ../midori/midori-locationaction.c:558 +#, c-format +msgid "Search for %s" +msgstr "" + +#: ../midori/midori-locationaction.c:592 +#, c-format +msgid "Search with %s" +msgstr "" + +#. i18n: Right-click on Location, Open an URL from the clipboard +#: ../midori/midori-locationaction.c:1359 +msgid "Paste and p_roceed" +msgstr "Itsatsi eta _jarraitu" + +#: ../midori/midori-locationaction.c:1727 +msgid "Not verified" +msgstr "Egiaztatu gabea" + +#: ../midori/midori-locationaction.c:1747 +msgid "Verified and encrypted connection" +msgstr "Egiaztatu eta zifratutako konexioa" + +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 +msgid "Align sidepanel to the right" +msgstr "Lerrokatu alboko panela eskuinean" + +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 +msgid "Close panel" +msgstr "Itxi panela" + +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 +msgid "Align sidepanel to the left" +msgstr "Lerrokatu alboko panela ezkerrean" + +#: ../midori/midori-websettings.c:214 +msgid "Show Speed Dial" +msgstr "" + +#: ../midori/midori-websettings.c:215 +msgid "Show Homepage" +msgstr "Erakutsi hasiera-orria" + +#: ../midori/midori-websettings.c:233 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japoniera (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:253 +msgid "New tab" +msgstr "Fitxa berria" + +#: ../midori/midori-websettings.c:254 +msgid "New window" +msgstr "Leiho berria" + +#: ../midori/midori-websettings.c:255 +msgid "Current tab" +msgstr "Uneko fitxa" + +#: ../midori/midori-websettings.c:270 +msgid "Default" +msgstr "Lehenetsia" + +#: ../midori/midori-websettings.c:271 +msgid "Icons" +msgstr "Ikonoak" + +#: ../midori/midori-websettings.c:272 +msgid "Small icons" +msgstr "Ikono txikiak" + +#: ../midori/midori-websettings.c:273 +msgid "Text" +msgstr "Testua" + +#: ../midori/midori-websettings.c:274 +msgid "Icons and text" +msgstr "Ikonoak eta testua" + +#: ../midori/midori-websettings.c:275 +msgid "Text beside icons" +msgstr "Testua ikonoen ondoan" + +#: ../midori/midori-websettings.c:290 +msgid "Automatic (GNOME or environment)" +msgstr "Automatikoa (GNOME edo ingurunea)" + +#: ../midori/midori-websettings.c:291 +msgid "HTTP proxy server" +msgstr "HTTP proxy zerbitzaria" + +#: ../midori/midori-websettings.c:292 +msgid "No proxy server" +msgstr "Proxy zerbitzaririk ez" + +#: ../midori/midori-websettings.c:309 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:310 +msgid "iPhone" +msgstr "iPhone" + +#: ../midori/midori-websettings.c:311 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:312 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:365 +msgid "Remember last window size" +msgstr "Gogoratu azken leiho-tamaina" + +#: ../midori/midori-websettings.c:366 +msgid "Whether to save the last window size" +msgstr "Azken leiho-tamaina gordeko den ala ez" + +#: ../midori/midori-websettings.c:374 +msgid "Last window width" +msgstr "Azken leiho-zabalera" + +#: ../midori/midori-websettings.c:375 +msgid "The last saved window width" +msgstr "Gordetako azken leiho-zabalera" + +#: ../midori/midori-websettings.c:383 +msgid "Last window height" +msgstr "Azken leiho-altuera" + +#: ../midori/midori-websettings.c:384 +msgid "The last saved window height" +msgstr "Gordetako azken leiho-altuera" + +#: ../midori/midori-websettings.c:409 +msgid "Last panel position" +msgstr "Azken panel-posizioa" + +#: ../midori/midori-websettings.c:410 +msgid "The last saved panel position" +msgstr "Gordetako azken panel-posizioa" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:419 +msgid "Last panel page" +msgstr "Azken panel-orria" + +#: ../midori/midori-websettings.c:420 +msgid "The last saved panel page" +msgstr "Gordetako azken panel-orria" + +#: ../midori/midori-websettings.c:428 +msgid "Last Web search" +msgstr "Azken web bilaketa" + +#: ../midori/midori-websettings.c:429 +msgid "The last saved Web search" +msgstr "Gordetako azken web bilaketa" + +#: ../midori/midori-websettings.c:438 +msgid "Show Menubar" +msgstr "Erakutsi menu-barra" + +#: ../midori/midori-websettings.c:439 +msgid "Whether to show the menubar" +msgstr "Menu-barra erakutsiko den ala ez" + +#: ../midori/midori-websettings.c:447 +msgid "Show Navigationbar" +msgstr "Erakutsi nabigazio-barra" + +#: ../midori/midori-websettings.c:448 +msgid "Whether to show the navigationbar" +msgstr "Nabigazio-barra erakutsiko den ala ez" + +#: ../midori/midori-websettings.c:456 +msgid "Show Bookmarkbar" +msgstr "Erakutsi laster-marka-barra" + +#: ../midori/midori-websettings.c:457 +msgid "Whether to show the bookmarkbar" +msgstr "Laster-marka-barra erakutsiko den ala ez" + +#: ../midori/midori-websettings.c:465 +msgid "Show Panel" +msgstr "Erakutsi panela" + +#: ../midori/midori-websettings.c:466 +msgid "Whether to show the panel" +msgstr "Panela erakutsiko den ala ez" + +#: ../midori/midori-websettings.c:474 +msgid "Show Statusbar" +msgstr "Erakutsi egoera-barra" + +#: ../midori/midori-websettings.c:475 +msgid "Whether to show the statusbar" +msgstr "Egoera-barra erakutsiko den ala ez" + +#: ../midori/midori-websettings.c:484 +msgid "Toolbar Style:" +msgstr "Tresna-barraren estiloa:" + +#: ../midori/midori-websettings.c:485 +msgid "The style of the toolbar" +msgstr "Tresna-barraren estiloa" + +#: ../midori/midori-websettings.c:494 +msgid "Toolbar Items" +msgstr "Tresna-barraren elementuak" + +#: ../midori/midori-websettings.c:495 +msgid "The items to show on the toolbar" +msgstr "Tresna-barran erakutsiko diren elementuak" + +#: ../midori/midori-websettings.c:503 +msgid "Compact Sidepanel" +msgstr "Alboko panel trinkoa" + +#: ../midori/midori-websettings.c:504 +msgid "Whether to make the sidepanel compact" +msgstr "Alboko panela trinkotuko den ala ez" + +#: ../midori/midori-websettings.c:519 +msgid "Align sidepanel on the right" +msgstr "Lerrokatu alboko panela eskuinean" + +#: ../midori/midori-websettings.c:520 +msgid "Whether to align the sidepanel on the right" +msgstr "Alboko panela eskuinean lerrokatuko den ala ez" + +#: ../midori/midori-websettings.c:535 +msgid "Open panels in separate windows" +msgstr "Ireki panela leiho bereizietan" + +#: ../midori/midori-websettings.c:536 +msgid "Whether to always open panels in separate windows" +msgstr "Panelak beti leiho bereizietan irekiko diren ala ez" + +#: ../midori/midori-websettings.c:545 +msgid "When Midori starts:" +msgstr "Midori abiatzean:" + +#: ../midori/midori-websettings.c:546 +msgid "What to do when Midori starts" +msgstr "Zer egin Midori abiatzean" + +#: ../midori/midori-websettings.c:555 +msgid "Homepage:" +msgstr "Hasiera-orria" + +#: ../midori/midori-websettings.c:556 +msgid "The homepage" +msgstr "Hasiera-orria" + +#: ../midori/midori-websettings.c:571 +msgid "Show crash dialog" +msgstr "Erakutsi kraskatze elkarrizketa-koadroa" + +#: ../midori/midori-websettings.c:572 +msgid "Show a dialog after Midori crashed" +msgstr "Erakutsi elkarrizketa-koadro bat Midorik kraskatzean" + +#: ../midori/midori-websettings.c:580 +msgid "Save downloaded files to:" +msgstr "Gorde deskargatutako fitxategiak hona:" + +#: ../midori/midori-websettings.c:581 +msgid "The folder downloaded files are saved to" +msgstr "Deskargatutako fitxategiak gordeko diren karpeta" + +#: ../midori/midori-websettings.c:589 +msgid "Text Editor" +msgstr "Testu-editorea" + +#: ../midori/midori-websettings.c:590 +msgid "An external text editor" +msgstr "Kanpoko testu-editore bat" + +#: ../midori/midori-websettings.c:605 +msgid "News Aggregator" +msgstr "" + +#: ../midori/midori-websettings.c:606 +msgid "An external news aggregator" +msgstr "" + +#: ../midori/midori-websettings.c:614 +msgid "Location entry Search" +msgstr "" + +#: ../midori/midori-websettings.c:615 +msgid "The search to perform inside the location entry" +msgstr "" + +#: ../midori/midori-websettings.c:623 +msgid "Preferred Encoding" +msgstr "Hobetsitako kodeketa" + +#: ../midori/midori-websettings.c:624 +msgid "The preferred character encoding" +msgstr "Hobetsitako karaktere-kodeketa" + +#: ../midori/midori-websettings.c:634 +msgid "Always Show Tabbar" +msgstr "Beti erakutsi fitxa-barra" + +#: ../midori/midori-websettings.c:635 +msgid "Always show the tabbar" +msgstr "Beti erakutsi fitxa-barra" + +#: ../midori/midori-websettings.c:643 +msgid "Close Buttons on Tabs" +msgstr "Ixteko botoiak fitxetan" + +#: ../midori/midori-websettings.c:644 +msgid "Whether tabs have close buttons" +msgstr "Fitxek ixteko botoiak dituzten ala ez" + +#: ../midori/midori-websettings.c:669 +msgid "Open new pages in:" +msgstr "Ireki orri berriak hemen:" + +#: ../midori/midori-websettings.c:670 +msgid "Where to open new pages" +msgstr "Non ireki behar diren orri berriak" + +#: ../midori/midori-websettings.c:679 +msgid "Middle click opens Selection" +msgstr "" + +#: ../midori/midori-websettings.c:680 +msgid "Load an address from the selection via middle click" +msgstr "" + +#: ../midori/midori-websettings.c:688 +msgid "Open tabs in the background" +msgstr "Ireki fitxak atzeko planoan" + +#: ../midori/midori-websettings.c:689 +msgid "Whether to open new tabs in the background" +msgstr "Atzeko planoan fitxak irekiko diren ala ez" + +#: ../midori/midori-websettings.c:697 +msgid "Open Tabs next to Current" +msgstr "Ireki fitxak unekoaren ondoren" + +#: ../midori/midori-websettings.c:698 +msgid "" +"Whether to open new tabs next to the current tab or after the last one" +msgstr "Fitxa berriak uneko fitxaren ala azkenaren ondoren irekiko diren" + +#: ../midori/midori-websettings.c:706 +msgid "Open popups in tabs" +msgstr "" + +#: ../midori/midori-websettings.c:707 +msgid "Whether to open popup windows in tabs" +msgstr "" + +#: ../midori/midori-websettings.c:717 ../extensions/statusbar-features.c:134 +msgid "Load images automatically" +msgstr "Kargatu irudiak automatikoki" + +#: ../midori/midori-websettings.c:718 +msgid "Load and display images automatically" +msgstr "Kargatu eta bistaratu irudiak automatikoki" + +#: ../midori/midori-websettings.c:725 ../extensions/statusbar-features.c:143 +msgid "Enable scripts" +msgstr "Gaitu script-ak" + +#: ../midori/midori-websettings.c:726 +msgid "Enable embedded scripting languages" +msgstr "" + +#: ../midori/midori-websettings.c:733 ../extensions/statusbar-features.c:154 +msgid "Enable Netscape plugins" +msgstr "Gaitu Netscape pluginak" + +#: ../midori/midori-websettings.c:734 +msgid "Enable embedded Netscape plugin objects" +msgstr "" + +#: ../midori/midori-websettings.c:749 +msgid "Enable Spell Checking" +msgstr "" + +#: ../midori/midori-websettings.c:750 +msgid "Enable spell checking while typing" +msgstr "" + +#: ../midori/midori-websettings.c:756 +msgid "Enable HTML5 database support" +msgstr "Gaitu HTML5 datu-baseen euskarria" + +#: ../midori/midori-websettings.c:757 +msgid "Whether to enable HTML5 database support" +msgstr "HTML5 datu-baseen euskarria gaituko den ala ez" + +#: ../midori/midori-websettings.c:763 +msgid "Enable HTML5 local storage support" +msgstr "Gaitu HTML5 biltegiratze lokalaren euskarria" + +#: ../midori/midori-websettings.c:764 +msgid "Whether to enable HTML5 local storage support" +msgstr "HTML5 biltegiratze lokalaren euskarria gaituko den ala ez" + +#: ../midori/midori-websettings.c:770 +msgid "Enable offline web application cache" +msgstr "Gaitu lineaz kanpoko web aplikazioen cachea" + +#: ../midori/midori-websettings.c:771 +msgid "Whether to enable offline web application cache" +msgstr "Lineaz kanpoko web aplikazioen cachea gaituko den ala ez" + +#: ../midori/midori-websettings.c:787 +msgid "Flash window on background tabs" +msgstr "" + +#: ../midori/midori-websettings.c:788 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "" + +#: ../midori/midori-websettings.c:796 +msgid "Enable WebGL support" +msgstr "Gaitu WebGL euskarria" + +#: ../midori/midori-websettings.c:797 +msgid "Allow websites to use OpenGL rendering" +msgstr "Baimendu webguneek OpenGL errendatzea erabiltzea" + +#: ../midori/midori-websettings.c:823 +msgid "Zoom Text and Images" +msgstr "" + +#: ../midori/midori-websettings.c:824 +msgid "Whether to zoom text and images" +msgstr "" + +#: ../midori/midori-websettings.c:839 +msgid "Find inline while typing" +msgstr "" + +#: ../midori/midori-websettings.c:840 +msgid "Whether to automatically find inline while typing" +msgstr "" + +#: ../midori/midori-websettings.c:855 +msgid "Kinetic scrolling" +msgstr "" + +#: ../midori/midori-websettings.c:856 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "" + +#: ../midori/midori-websettings.c:864 +msgid "Delete old Cookies after:" +msgstr "" + +#: ../midori/midori-websettings.c:865 +msgid "The maximum number of days to save cookies for" +msgstr "" + +#: ../midori/midori-websettings.c:881 +msgid "Only accept Cookies from sites you visit" +msgstr "Bisitatutako guneetako cookie-ak soilik onartu" + +#: ../midori/midori-websettings.c:882 +msgid "Block cookies sent by third-party websites" +msgstr "Blokeatu hirugarrengo webguneek bidalitako cookie-ak" + +#: ../midori/midori-websettings.c:896 +msgid "Delete pages from history after:" +msgstr "" + +#: ../midori/midori-websettings.c:897 +msgid "The maximum number of days to save the history for" +msgstr "" + +#: ../midori/midori-websettings.c:912 +msgid "Proxy server" +msgstr "Proxy zerbitzaria" + +#: ../midori/midori-websettings.c:913 +msgid "The type of proxy server to use" +msgstr "Erabiliko den proxy zerbitzari mota" + +#: ../midori/midori-websettings.c:922 +msgid "HTTP Proxy Server" +msgstr "HTTP proxy zerbitzaria" + +#: ../midori/midori-websettings.c:923 +msgid "The proxy server used for HTTP connections" +msgstr "HTTP konexioetarako erabilitako proxy zerbitzaria" + +#: ../midori/midori-websettings.c:938 +msgid "Port" +msgstr "Ataka" + +#: ../midori/midori-websettings.c:939 +msgid "The proxy server port used for HTTP connections" +msgstr "HTTP konexioetarako erabilitako proxy zerbitzariaren ataka" + +#: ../midori/midori-websettings.c:957 +msgid "The maximum size of cached pages on disk" +msgstr "" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:974 +msgid "Identify as" +msgstr "" + +#: ../midori/midori-websettings.c:975 +msgid "What to identify as to web pages" +msgstr "" + +#: ../midori/midori-websettings.c:991 +msgid "Identification string" +msgstr "" + +#: ../midori/midori-websettings.c:992 +msgid "The application identification string" +msgstr "" + +#: ../midori/midori-websettings.c:1008 +msgid "Preferred languages" +msgstr "Hobetsitako hizkuntzak" + +#: ../midori/midori-websettings.c:1009 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" + +#: ../midori/midori-websettings.c:1024 +msgid "Clear private data" +msgstr "Garbitu datu pribatuak" + +#: ../midori/midori-websettings.c:1025 +msgid "The private data selected for deletion" +msgstr "Ezabatzeko hautatutako datu pribatuak" + +#: ../midori/midori-websettings.c:1040 +msgid "Clear data" +msgstr "Garbitu datuak" + +#: ../midori/midori-websettings.c:1041 +msgid "The data selected for deletion" +msgstr "Ezabatzeko hautatutako datuak" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1090 +msgid "Strip referrer details sent to websites" +msgstr "" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1092 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "" + +#: ../midori/midori-websettings.c:1106 +msgid "Always use my font choices" +msgstr "Beti erabili nire letra-tipo aukerak" + +#: ../midori/midori-websettings.c:1107 +msgid "Override fonts picked by websites with user preferences" +msgstr "" + +#: ../midori/midori-view.c:1307 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s-(e)k HTML5 datu-base bat gorde nahi du." + +#: ../midori/midori-view.c:1311 ../midori/midori-view.c:1343 +msgid "_Deny" +msgstr "_Ukatu" + +#: ../midori/midori-view.c:1311 ../midori/midori-view.c:1343 +msgid "_Allow" +msgstr "_Baimendu" + +#: ../midori/midori-view.c:1339 +#, c-format +msgid "%s wants to know your location." +msgstr "%s-(e)k zure kokapena ezagutu nahi du." + +#: ../midori/midori-view.c:1430 +#, c-format +msgid "Error - %s" +msgstr "Errorea - %s" + +#: ../midori/midori-view.c:1431 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "Ezin izan da '%s' orria kargatu." + +#: ../midori/midori-view.c:1433 +msgid "Try again" +msgstr "Saiatu berriro" + +#: ../midori/midori-view.c:1610 ../midori/midori-view.c:2514 +#, c-format +msgid "Send a message to %s" +msgstr "Mezu bat bidali %s-(r)i" + +#: ../midori/midori-view.c:2345 ../midori/midori-view.c:2663 +msgid "Inspect _Element" +msgstr "" + +#: ../midori/midori-view.c:2397 +msgid "Open Link in New _Tab" +msgstr "Ireki esteka _fitxa berrian" + +#: ../midori/midori-view.c:2401 +msgid "Open Link in _Foreground Tab" +msgstr "Ireki esteka _aurreko planoko fitxan" + +#: ../midori/midori-view.c:2402 +msgid "Open Link in _Background Tab" +msgstr "Ireki esteka a_tzeko planoko fitxan" + +#: ../midori/midori-view.c:2405 +msgid "Open Link in New _Window" +msgstr "Ireki esteka _leiho berrian" + +#: ../midori/midori-view.c:2408 +msgid "Open Link as Web A_pplication" +msgstr "Ireki esteka web _aplikazio bezala" + +#: ../midori/midori-view.c:2413 +msgid "Copy Link de_stination" +msgstr "Kopiatu estekaren helburua" + +#: ../midori/midori-view.c:2429 +msgid "Open _Image in New Tab" +msgstr "Ireki _irudia fitxa berrian" + +#: ../midori/midori-view.c:2432 +msgid "Copy Image _Address" +msgstr "Kopiatu irudiaren _helbidea" + +#: ../midori/midori-view.c:2435 +msgid "Save I_mage" +msgstr "Gorde i_rudia" + +#: ../midori/midori-view.c:2438 +msgid "Open in Image _Viewer" +msgstr "Ireki irudi-i_kustailean" + +#: ../midori/midori-view.c:2445 +msgid "Copy Video _Address" +msgstr "Kopiatu bideoaren _helbidea" + +#: ../midori/midori-view.c:2448 +msgid "Save _Video" +msgstr "Gorde _bideoa" + +#: ../midori/midori-view.c:2448 +msgid "Download _Video" +msgstr "Deskargatu _bideoa" + +#: ../midori/midori-view.c:2474 +msgid "Search _with" +msgstr "Bilatu _honekin" + +#: ../midori/midori-view.c:2506 +msgid "_Search the Web" +msgstr "_Bilatu sarean" + +#: ../midori/midori-view.c:2522 +msgid "Open Address in New _Tab" +msgstr "Ireki helbidea _fitxa berrian" + +#: ../midori/midori-view.c:2814 +msgid "Open or download file" +msgstr "Ireki edo deskargatu fitxategia" + +#: ../midori/midori-view.c:2833 +#, c-format +msgid "File Type: '%s'" +msgstr "Fitxategi-mota: '%s'" + +#: ../midori/midori-view.c:2835 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "Fitxategi-mota: %s ('%s')" + +#: ../midori/midori-view.c:2839 +#, c-format +msgid "File Name: %s" +msgstr "Fitxategi-izena: %s" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:2858 +#, c-format +msgid "Open %s" +msgstr "Ireki %s" + +#: ../midori/midori-view.c:3483 +#, c-format +msgid "Inspect page - %s" +msgstr "" + +#: ../midori/midori-view.c:3784 +msgid "Speed Dial" +msgstr "" + +#: ../midori/midori-view.c:3785 ../midori/midori-view.c:3881 +msgid "Click to add a shortcut" +msgstr "Klikatu lasterbide bat gehitzeko" + +#: ../midori/midori-view.c:3786 +msgid "Enter shortcut address" +msgstr "Sartu lasterbidearen helbidea" + +#: ../midori/midori-view.c:3787 +msgid "Enter shortcut title" +msgstr "Sartu lasterbidearen izenburua" + +#: ../midori/midori-view.c:3788 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Ziur zaude lasterbide hau ezabatu nahi duzula?" + +#: ../midori/midori-view.c:3950 +#, c-format +msgid "No documentation installed" +msgstr "" + +#: ../midori/midori-view.c:4026 +msgid "Midori doesn't store any personal data:" +msgstr "Midori-k ez du datu pertsonalik gordetzen:" + +#: ../midori/midori-view.c:4027 +msgid "No history or web cookies are being saved." +msgstr "Ez da gordetzen ez historiarik ez web cookie-rik." + +#: ../midori/midori-view.c:4028 +msgid "Extensions are disabled." +msgstr "Hedapenak desgaituta daude." + +#: ../midori/midori-view.c:4029 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "" +"HTML5 biltegiratzea, datu-base lokalak eta aplikazioen cache-a desgaituta " +"daude." + +#: ../midori/midori-view.c:4030 +msgid "Midori prevents websites from tracking the user:" +msgstr "" + +#: ../midori/midori-view.c:4031 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "" + +#: ../midori/midori-view.c:4032 +msgid "DNS prefetching is disabled." +msgstr "" + +#: ../midori/midori-view.c:4033 +msgid "The language and timezone are not revealed to websites." +msgstr "" + +#: ../midori/midori-view.c:4034 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "" + +#: ../midori/midori-view.c:4071 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "" + +#: ../midori/midori-view.c:4126 +msgid "Page loading delayed" +msgstr "Orria kargatzea atzeratuta" + +#: ../midori/midori-view.c:4127 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "" +"Kargatzea atzeratuta duela gutxiko kraskatze bat edo abioko hobespenak " +"direla eta." + +#: ../midori/midori-view.c:4128 +msgid "Load Page" +msgstr "Kargatu orria" + +#: ../midori/midori-view.c:4267 +msgid "Blank page" +msgstr "Orri hutsa" + +#: ../midori/midori-view.c:4529 +msgid "_Duplicate Tab" +msgstr "_Bikoiztu fitxa" + +#: ../midori/midori-view.c:4534 +msgid "Show Tab _Label" +msgstr "Erakutsi fitxaren _etiketa" + +#: ../midori/midori-view.c:4534 +msgid "Show Tab _Icon Only" +msgstr "Erakutsi fitxaren _ikonoa soilik" + +#: ../midori/midori-view.c:4540 +msgid "Close ot_her Tabs" +msgstr "Itxi _beste fitxak" + +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5311 +msgid "previous" +msgstr "aurrekoa" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5330 +msgid "next" +msgstr "hurrengoa" + +#: ../midori/midori-view.c:5343 +msgid "Print background images" +msgstr "Inprimatu atzeko planoko irudiak" + +#: ../midori/midori-view.c:5344 +msgid "Whether background images should be printed" +msgstr "Atzeko planoko irudiak inprimatu behar diren ala ez" + +#: ../midori/midori-view.c:5376 +msgid "Features" +msgstr "Ezaugarriak" + +#: ../midori/midori-preferences.c:297 +msgid "Startup" +msgstr "Abioa" + +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Erabili _uneko orria" + +#: ../midori/midori-preferences.c:314 +msgid "Use current page as homepage" +msgstr "Erabili uneko orria hasiera-orria bezala" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Letra-tipoak" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "" + +#: ../midori/midori-preferences.c:330 +msgid "The default font family used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:333 +msgid "The default font size used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:335 +msgid "Fixed-width Font Family" +msgstr "" + +#: ../midori/midori-preferences.c:339 +msgid "The font family used to display fixed-width text" +msgstr "" + +#: ../midori/midori-preferences.c:342 +msgid "The font size used to display fixed-width text" +msgstr "" + +#: ../midori/midori-preferences.c:344 +msgid "Minimum Font Size" +msgstr "Gutxieneko letra-tipoaren tamaina" + +#: ../midori/midori-preferences.c:348 +msgid "The minimum font size used to display text" +msgstr "Testua bistaratzeko erabilitako gutxieneko letra-tipoaren tamaina" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:359 +msgid "Behavior" +msgstr "Portaera" + +#: ../midori/midori-preferences.c:385 +msgid "Allow scripts to open popups" +msgstr "" + +#: ../midori/midori-preferences.c:386 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "" + +#. Page "Interface" +#: ../midori/midori-preferences.c:416 +msgid "Browsing" +msgstr "Arakatzen" + +#. Page "Network" +#: ../midori/midori-preferences.c:454 +msgid "Network" +msgstr "Sarea" + +#: ../midori/midori-preferences.c:461 +msgid "Hostname" +msgstr "Ostalari-izena" + +#: ../midori/midori-preferences.c:485 +msgid "MB" +msgstr "MB" + +#: ../midori/midori-searchaction.c:902 +msgid "Add search engine" +msgstr "Gehitu bilaketa-tresna" + +#: ../midori/midori-searchaction.c:902 +msgid "Edit search engine" +msgstr "Editatu bilaketa-tresna" + +#: ../midori/midori-searchaction.c:931 +msgid "_Name:" +msgstr "_Izena:" + +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "Deskribapena:" + +#: ../midori/midori-searchaction.c:981 +msgid "_Icon:" +msgstr "_Ikonoa:" + +#: ../midori/midori-searchaction.c:995 +msgid "_Token:" +msgstr "" + +#: ../midori/midori-searchaction.c:1295 +msgid "Manage Search Engines" +msgstr "Kudeatu bilaketa-tresnak" + +#: ../midori/midori-searchaction.c:1395 +msgid "Use as _default" +msgstr "Erabili _lehenetsi bezala" + +#: ../midori/sokoke.c:412 +msgid "Open with" +msgstr "Ireki honekin" + +#: ../midori/sokoke.c:420 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Aukeratu aplikazio edo komando bat \"%s\" irekitzeko:" + +#: ../midori/sokoke.c:461 ../midori/sokoke.c:471 ../midori/sokoke.c:499 +#: ../midori/sokoke.c:528 ../midori/sokoke.c:542 +msgid "Could not run external program." +msgstr "Ezin izan da kanpoko programa exekutatu." + +#: ../midori/sokoke.c:1653 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "ordu %d" +msgstr[1] "%d ordu" + +#: ../midori/sokoke.c:1654 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "minutu %d" +msgstr[1] "%d minutu" + +#: ../midori/sokoke.c:1655 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "segundo %d" +msgstr[1] "%d segundo" + +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1663 ../panels/midori-transfers.c:267 +#, c-format +msgid "%s of %s" +msgstr "%s / %s" + +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1672 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1675 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" + +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1692 +#, c-format +msgid " - %s remaining" +msgstr " - %s falta dira" + +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:263 +msgid "_Inline Find:" +msgstr "" + +#: ../toolbars/midori-findbar.c:289 +msgid "Previous" +msgstr "Aurrekoa" + +#: ../toolbars/midori-findbar.c:295 +msgid "Next" +msgstr "Hurrengoa" + +#: ../toolbars/midori-findbar.c:299 +msgid "Match Case" +msgstr "" + +#: ../toolbars/midori-findbar.c:308 +msgid "Highlight Matches" +msgstr "" + +#: ../toolbars/midori-findbar.c:319 +msgid "Close Findbar" +msgstr "Itxi bilaketa-barra" + +#: ../toolbars/midori-transferbar.c:122 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "'%s' fitxategia deskargatu da." + +#: ../toolbars/midori-transferbar.c:125 +msgid "Transfer completed" +msgstr "Transferentzia burututa" + +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "" + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" + +#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "Garbitu guztia" + +#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 +msgid "Some files are being downloaded" +msgstr "Zenbait fitxategi deskargatzen ari dira" + +#: ../toolbars/midori-transferbar.c:374 +msgid "_Quit Midori" +msgstr "_Irten Midori-tik" + +#: ../toolbars/midori-transferbar.c:376 +msgid "The transfers will be cancelled if Midori quits." +msgstr "" + +#: ../panels/midori-bookmarks.c:113 +msgid "Bookmarks" +msgstr "Laster-markak" + +#: ../panels/midori-bookmarks.c:256 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Huts egin du laster-marka elementua gehitzean: %s\n" + +#: ../panels/midori-bookmarks.c:434 +msgid "Edit the selected bookmark" +msgstr "Editatu hautatutako laster-marka" + +#: ../panels/midori-bookmarks.c:442 +msgid "Delete the selected bookmark" +msgstr "Ezabatu hautatutako laster-marka" + +#: ../panels/midori-bookmarks.c:457 +msgid "Add a new folder" +msgstr "Gehitu karpeta berri bat" + +#: ../panels/midori-bookmarks.c:591 ../panels/midori-history.c:631 +msgid "Separator" +msgstr "Banatzailea" + +#: ../panels/midori-history.c:110 +msgid "History" +msgstr "Historia" + +#: ../panels/midori-history.c:157 ../panels/midori-history.c:188 +msgid "Today" +msgstr "Gaur" + +#: ../panels/midori-history.c:159 ../panels/midori-history.c:190 +msgid "Yesterday" +msgstr "Atzo" + +#: ../panels/midori-history.c:161 ../panels/midori-history.c:185 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "Duela egun %d" +msgstr[1] "Duela %d egun" + +#: ../panels/midori-history.c:164 ../panels/midori-history.c:183 +msgid "A week ago" +msgstr "Duela aste bat" + +#: ../panels/midori-history.c:359 +msgid "Are you sure you want to remove all history items?" +msgstr "Ziur zaude historiako elementu guztiak kendu nahi dituzula?" + +#: ../panels/midori-history.c:405 +msgid "Bookmark the selected history item" +msgstr "Egin hautatutako historiako elementuaren laster-marka" + +#: ../panels/midori-history.c:414 +msgid "Delete the selected history item" +msgstr "Ezabatu hautatutako historiako elementua" + +#: ../panels/midori-history.c:422 +msgid "Clear the entire history" +msgstr "Garbitu historia osoa" + +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Transferentziak" + +#: ../panels/midori-transfers.c:467 +msgid "Open Destination _Folder" +msgstr "Ireki helburuko _karpeta" + +#: ../panels/midori-transfers.c:470 +msgid "Copy Link Loc_ation" +msgstr "Kopiatu estekaren _helbidea" + +#: ../katze/katze-http-auth.c:210 +msgid "Authentication Required" +msgstr "Autentifikazioa behar da" + +#: ../katze/katze-http-auth.c:226 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"Erabiltzaile-izen eta pasahitza behar dira\n" +"kokaleku hau irekitzeko:" + +#: ../katze/katze-http-auth.c:240 +msgid "Username" +msgstr "Erabiltzaile-izena" + +#: ../katze/katze-http-auth.c:253 +msgid "Password" +msgstr "Pasahitza" + +#: ../katze/katze-http-auth.c:267 +msgid "_Remember password" +msgstr "_Gogoratu pasahitza" + +#: ../katze/katze-throbber.c:949 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:962 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:1042 +msgid "Animation frames are broken" +msgstr "" + +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "" + +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 +#: ../extensions/addons.c:308 +msgid "Choose file" +msgstr "Aukeratu fitxategia" + +#: ../katze/katze-utils.c:500 +msgid "Choose folder" +msgstr "Aukeratu karpeta" + +#: ../katze/katze-utils.c:604 +msgid "None" +msgstr "Bat ere ez" + +#: ../katze/katze-utils.c:719 +msgid "1 hour" +msgstr "Ordu 1" + +#: ../katze/katze-utils.c:720 +msgid "1 day" +msgstr "Egun 1" + +#: ../katze/katze-utils.c:721 +msgid "1 week" +msgstr "Aste 1" + +#: ../katze/katze-utils.c:722 +msgid "1 month" +msgstr "Hilabete 1" + +#: ../katze/katze-utils.c:723 +msgid "1 year" +msgstr "Urte 1" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 +#, c-format +msgid "Preferences for %s" +msgstr "%s-(r)en hobespenak" + +#: ../extensions/adblock.c:467 +msgid "Configure Advertisement filters" +msgstr "Konfiguratu iragarkien iragazkiak" + +#: ../extensions/adblock.c:498 +#, 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:846 +msgid "Edit rule" +msgstr "Editatu araua" + +#: ../extensions/adblock.c:860 +msgid "_Rule:" +msgstr "_Araua:" + +#: ../extensions/adblock.c:914 +msgid "Bl_ock image" +msgstr "Bl_okeatu irudia" + +#: ../extensions/adblock.c:919 +msgid "Bl_ock link" +msgstr "Bl_okeatu esteka" + +#: ../extensions/adblock.c:1538 +msgid "Advertisement blocker" +msgstr "Iragarkien blokeatzailea" + +#: ../extensions/adblock.c:1539 +msgid "Block advertisements according to a filter list" +msgstr "Blokeatu iragarkiak iragazki zerrenda bat jarraituz" + +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "" +"This page appears to contain a user script. Do you wish to install it?" +msgstr "" +"Orri honek erabiltzaile-script bat duela dirudi. Exekutatu nahi duzu?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "_Instalatu erabiltzaile-script-a" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "" +"Orri honek erabiltzaile-estilo bat duela dirudi. Instalatu nahi duzu?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_Instalatu erabiltzaile-estiloa" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Ez instalatu" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 +msgid "Userscripts" +msgstr "Erabiltzaile-script-ak" + +#: ../extensions/addons.c:324 ../extensions/addons.c:683 +msgid "Userstyles" +msgstr "Erabiltzaile-estiloak" + +#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Errorea" + +#: ../extensions/addons.c:421 +#, c-format +msgid "Do you want to delete '%s'?" +msgstr "'%s' ezabatu nahi duzu?" + +#: ../extensions/addons.c:427 +msgid "Delete user script" +msgstr "Ezabatu erabiltzaile-script-a" + +#: ../extensions/addons.c:428 +msgid "Delete user style" +msgstr "Ezabatu erabiltzaile-estiloa" + +#: ../extensions/addons.c:431 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "%s fitxategia betirako ezabatuko da." + +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "Ireki testu-editorean" + +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "Ireki helburuko karpeta" + +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "Gehitu gehigarri berria" + +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "Kendu hautatutako gehigarria" + +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 +msgid "User addons" +msgstr "Erabiltzailearen gehigarriak" + +#: ../extensions/addons.c:1826 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "" + +#: ../extensions/addons.c:1915 +msgid "Support for userscripts and userstyles" +msgstr "Erabiltzaile-script eta erabiltzaile-estiloen euskarria" + +#: ../extensions/colorful-tabs.c:201 +msgid "Colorful Tabs" +msgstr "Fitxa koloretsuak" + +#: ../extensions/colorful-tabs.c:202 +msgid "Tint each tab distinctly" +msgstr "Tindatu fitxa bakoitza kolore desberdinarekin" + +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 +msgid "Cookie Manager" +msgstr "Cookie kudeatzailea" + +#: ../extensions/cookie-manager/cookie-manager-page.c:103 +msgid "Delete All" +msgstr "Ezabatu guztiak" + +#: ../extensions/cookie-manager/cookie-manager-page.c:105 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"Ezabatu erakutsitako cookie guztiak. Iragazkirik balego, iragazkiarekin bat " +"datozen cookie-ak soilik ezabatuko dira." + +#: ../extensions/cookie-manager/cookie-manager-page.c:120 +msgid "Expand All" +msgstr "Zabaldu guztiak" + +#: ../extensions/cookie-manager/cookie-manager-page.c:127 +msgid "Collapse All" +msgstr "Tolestu guztiak" + +#: ../extensions/cookie-manager/cookie-manager-page.c:572 +msgid "Do you really want to delete all cookies?" +msgstr "Ziur zaude cookie guztiak ezabatu nahi dituzula?" + +#: ../extensions/cookie-manager/cookie-manager-page.c:574 +msgid "Question" +msgstr "Galdera" + +#: ../extensions/cookie-manager/cookie-manager-page.c:583 +msgid "Only cookies which match the filter will be deleted." +msgstr "Iragazkiarekin bat datozen cookie-ak soilik ezabatuko dira." + +#: ../extensions/cookie-manager/cookie-manager-page.c:671 +msgid "At the end of the session" +msgstr "Saioaren amaieran" + +#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" +"Ostalaria: %s\n" +"Izena: %s\n" +"Balioa: %s\n" +"Bidea: %s\n" +"Segurua: %s\n" +"Iraungitze-data: %s" + +#: ../extensions/cookie-manager/cookie-manager-page.c:680 +msgid "Yes" +msgstr "Bai" + +#: ../extensions/cookie-manager/cookie-manager-page.c:680 +msgid "No" +msgstr "Ez" + +#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#, c-format +msgid "" +"Domain: %s\n" +"Cookies: %d" +msgstr "" +"Domeinua: %s\n" +"Cookie-ak: %d" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 +msgid "Name" +msgstr "Izena" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +msgid "_Expand All" +msgstr "_Zabaldu guztiak" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 +msgid "_Collapse All" +msgstr "_Tolestu guztiak" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +msgid "Filter:" +msgstr "Iragazi:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" + +#: ../extensions/cookie-manager/main.c:36 +msgid "List, view and delete cookies" +msgstr "Zerrendatu, ikusi eta ezabatu cookie-ak" + +#: ../extensions/copy-tabs.c:38 +msgid "Copy Tab _Addresses" +msgstr "Kopiatu fitxen _helbideak" + +#: ../extensions/copy-tabs.c:95 +msgid "Copy Addresses of Tabs" +msgstr "Kopiatu fitxen helbideak" + +#: ../extensions/copy-tabs.c:96 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Kopiatu fitxa guztien helbideak arbelera" + +#: ../extensions/feed-panel/feed-atom.c:209 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-atom.c:315 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "" + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:387 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "Azken eguneraketa: %s" + +#: ../extensions/feed-panel/feed-panel.c:653 +msgid "Feeds" +msgstr "Jarioak" + +#: ../extensions/feed-panel/feed-panel.c:706 +msgid "Add new feed" +msgstr "Gehitu jario berria" + +#: ../extensions/feed-panel/feed-panel.c:713 +msgid "Delete feed" +msgstr "Ezabatu jarioa" + +#: ../extensions/feed-panel/feed-panel.c:795 +msgid "_Feeds" +msgstr "_Jarioak" + +#: ../extensions/feed-panel/feed-parse.c:195 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "Ezin izan da jarioaren XML datuetako erro elementua aurkitu" + +#: ../extensions/feed-panel/feed-parse.c:235 +#, c-format +msgid "Unsupported feed format." +msgstr "Onartu gabeko jario formatua." + +#: ../extensions/feed-panel/feed-parse.c:265 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "Huts egin du XML jarioa analizatzean: %s" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "Huts egin du RSS XML datuetan \"channel\" elementua aurkitzean." + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "Onartu gabeko RSS bertsioa aurkitu da." + +#: ../extensions/feed-panel/feed-rss.c:148 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:248 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/main.c:131 +#, c-format +msgid "Feed '%s' already exists" +msgstr "'%s' jarioa dagoeneko existitzen da" + +#: ../extensions/feed-panel/main.c:208 +#, c-format +msgid "Error loading feed '%s'" +msgstr "Errorea '%s' jarioa deskargatzean" + +#: ../extensions/feed-panel/main.c:518 +msgid "Feed Panel" +msgstr "Jarioen panela" + +#: ../extensions/feed-panel/main.c:519 +msgid "Read Atom/ RSS feeds" +msgstr "Irakurri Atom/RSS jarioak" + +#: ../extensions/formhistory/formhistory.c:39 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "Formularioen historia" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:292 +msgid "Remember password on this page?" +msgstr "Pasahitza gogoratu orri honetan?" + +#: ../extensions/formhistory/formhistory.c:297 +msgid "Remember" +msgstr "Gogoratu" + +#: ../extensions/formhistory/formhistory.c:298 +msgid "Not now" +msgstr "Orain ez" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Never for this page" +msgstr "Inoiz ez orri honentzat" + +#: ../extensions/formhistory/formhistory.c:435 +msgid "Toggle form history state" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:436 +msgid "Activate or deactivate form history for the current tab." +msgstr "" + +#: ../extensions/formhistory/formhistory.c:547 +#: ../extensions/formhistory/formhistory.c:551 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:627 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:666 +msgid "Form history filler" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:667 +msgid "Stores history of entered form data" +msgstr "" + +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#, c-format +msgid "Failed to select suggestions\n" +msgstr "Huts egin du iradokizunak hautatzean\n" + +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Ez dago bisitatu gabeko fitxarik" + +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "Historia-Zerrenda" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Ez egin ezer" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Aldatu ikusitako azken fitxara" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Aldatu fitxa berrienera" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Hurrengo fitxa berria (Historia zerrenda)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Historiako hurrengo fitxa berria" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Aurreko fitxa berria (Historia zerrenda)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Historiako aurreko fitxa berria" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Bistaratu fitxa atzeko planoan (Historia zerrenda)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Bistaratu unean hautatutako fitxa atzeko planoan (Historia zerrenda)" + +#: ../extensions/history-list.vala:569 +msgid "History List" +msgstr "Historia zerrenda" + +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "Joan erabilitako azken fitxara fitxaz aldatzean edo fitxa ixtean" + +#: ../extensions/mouse-gestures.c:301 +msgid "Mouse Gestures" +msgstr "Saguaren keinuak" + +#: ../extensions/mouse-gestures.c:302 +msgid "Control Midori by moving the mouse" +msgstr "Kontrolatu Midori sagua mugituz" + +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "Birkargatu orria edo utzi kargatzeari" + +#: ../extensions/shortcuts.c:176 +msgid "Customize Keyboard shortcuts" +msgstr "Pertsonalizatu teklatuaren lasterbideak" + +#: ../extensions/shortcuts.c:283 +msgid "Customize Sh_ortcuts..." +msgstr "Pertsonalizatu _lasterbideak..." + +#: ../extensions/shortcuts.c:320 +msgid "Shortcuts" +msgstr "Lasterbideak" + +#: ../extensions/shortcuts.c:321 +msgid "View and edit keyboard shortcuts" +msgstr "Ikusi eta editatu teklatuko lasterbideak" + +#: ../extensions/status-clock.c:174 +msgid "Statusbar Clock" +msgstr "Egoera-barrako erlojua" + +#: ../extensions/status-clock.c:175 +msgid "Display date and time in the statusbar" +msgstr "Bistaratu data eta ordua egoera-barran" + +#: ../extensions/statusbar-features.c:131 +msgid "Images" +msgstr "Irudiak" + +#: ../extensions/statusbar-features.c:140 +msgid "Scripts" +msgstr "Script-ak" + +#: ../extensions/statusbar-features.c:151 +msgid "Netscape plugins" +msgstr "Netscape pluginak" + +#: ../extensions/statusbar-features.c:199 +msgid "Statusbar Features" +msgstr "Egoera-barraren ezaugarriak" + +#: ../extensions/statusbar-features.c:200 +msgid "Easily toggle features on web pages on and off" +msgstr "" + +#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683 +msgid "Tab Panel" +msgstr "Fitxen panela" + +#: ../extensions/tab-panel.c:666 +msgid "T_ab Panel" +msgstr "_Fitxen panela" + +#: ../extensions/tab-panel.c:684 +msgid "Show tabs in a vertical panel" +msgstr "Erakutsi fitxak panel bertikal batean" + +#: ../extensions/tabs-minimized.c:76 +msgid "Only Icons on Tabs by default" +msgstr "Ikonoak soilik fitxetan modu lehenetsian" + +#: ../extensions/tabs-minimized.c:77 +msgid "New tabs have no label by default" +msgstr "Fitxa berriek etiketarik ez edukitzea lehenesten da" + +#: ../extensions/toolbar-editor.c:393 +msgid "Customize Toolbar" +msgstr "Pertsonalizatu tresna-barra" + +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"Hautatu tresna-barran bistaratuko diren elementuak. Elementuak berrordenatu " +"daitezke arrastatu eta jareginez." + +#: ../extensions/toolbar-editor.c:425 +msgid "Available Items" +msgstr "Elementu erabilgarriak" + +#: ../extensions/toolbar-editor.c:446 +msgid "Displayed Items" +msgstr "Bistaratutako elementuak" + +#: ../extensions/toolbar-editor.c:581 +msgid "Customize _Toolbar..." +msgstr "Pertsonalizatu _tresna-barra..." + +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Pertsonalizatu..." + +#: ../extensions/toolbar-editor.c:627 +msgid "Toolbar Editor" +msgstr "Tresna-barra editorea" + +#: ../extensions/toolbar-editor.c:628 +msgid "Easily edit the toolbar layout" +msgstr "Editatu tresna-barraren diseinua modu errazean" + +#: ../extensions/web-cache.c:463 +msgid "Cache HTTP communication on disk" +msgstr "" diff -Nru midori-0.2.8/po/fi.po midori-0.4.6/po/fi.po --- midori-0.2.8/po/fi.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/fi.po 2012-05-14 22:13:42.000000000 +0000 @@ -1,15 +1,15 @@ # Finnish translations for Midori. -# Copyright (C) 2007-2010 Christian Dywan +# Copyright (C) 2007-2011 Christian Dywan # This file is distributed under the same license as the midori package. # Elias Julkunen , 2008 -# Jari Rahkonen , 2010 +# Jari Rahkonen , 2010-2011 # msgid "" msgstr "" "Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-14 16:07+0000\n" -"PO-Revision-Date: 2010-04-14 19:49+0300\n" +"POT-Creation-Date: 2011-01-30 05:15+0000\n" +"PO-Revision-Date: 2011-01-30 14:39+0200\n" "Last-Translator: Jari Rahkonen \n" "Language-Team: Finnish\n" "MIME-Version: 1.0\n" @@ -21,9 +21,9 @@ msgid "Lightweight web browser" msgstr "Kevyt verkkoselain" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1339 ../midori/main.c:1667 -#: ../midori/main.c:1675 ../midori/main.c:1691 -#: ../midori/midori-websettings.c:318 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1321 ../midori/main.c:1717 +#: ../midori/main.c:1725 ../midori/main.c:1741 +#: ../midori/midori-websettings.c:315 msgid "Midori" msgstr "Midori" @@ -31,65 +31,79 @@ msgid "Web Browser" msgstr "Verkkoselain" -#: ../midori/main.c:103 +#: ../midori/main.c:94 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Asetusten lataus epäonnistui: %s\n" -#: ../midori/main.c:152 +#: ../midori/main.c:142 #, c-format msgid "Value '%s' is invalid for %s" -msgstr "\"%s\" ei kelpaa asetuksen %s arvoksi" +msgstr "\"%s\" ei kelpaa asetuksen %s arvoksi." -#: ../midori/main.c:159 ../midori/main.c:245 +#: ../midori/main.c:147 ../midori/main.c:240 #, c-format msgid "Invalid configuration value '%s'" msgstr "Asetusarvo \"%s\" ei kelpaa" -#: ../midori/main.c:371 ../extensions/formhistory.c:446 +#: ../midori/main.c:345 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Hakukoneiden lataus epäonnistui. %s\n" + +#: ../midori/main.c:399 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Historian tyhjentäminen epäonnistui: %s\n" + +#: ../midori/main.c:421 ../midori/main.c:542 ../extensions/formhistory.c:443 #, c-format msgid "Failed to open database: %s\n" msgstr "Tietokannan avaus epäonnistui: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:426 +#: ../midori/main.c:485 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Vanhojen sivuhistorian kohteiden poistaminen epäonnistui: %s\n" -#: ../midori/main.c:446 +#: ../midori/main.c:525 ../panels/midori-history.c:180 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Kohteen poistaminen sivuhistoriasta epäonnistui: %s\n" + +#: ../midori/main.c:572 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Kirjanmerkkien tallennus epäonnistui. %s" + +#: ../midori/main.c:596 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Asetusten tallennus epäonnistui. %s" -#: ../midori/main.c:484 +#: ../midori/main.c:631 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Hakukoneiden tallennus epäonnistui. %s" -#: ../midori/main.c:503 ../midori/main.c:553 ../midori/main.c:573 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Kirjanmerkkien tallennus epäonnistui. %s" - #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:603 ../midori/main.c:626 +#: ../midori/main.c:648 ../midori/main.c:668 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Roskakorin tallennus epäonnistui. %s" -#: ../midori/main.c:690 ../midori/main.c:927 +#: ../midori/main.c:719 ../midori/main.c:957 #, c-format msgid "The session couldn't be saved. %s" msgstr "Istunnon tallennus epäonnistui. %s" -#: ../midori/main.c:872 +#: ../midori/main.c:904 msgid "" "No root certificate file is available. SSL certificates cannot be verified." -msgstr "" -"Juurisertifikaattia ei löydy. SSL-sertifikaatteja ei voi todentaa." +msgstr "Juurisertifikaattia ei löydy. SSL-sertifikaatteja ei voi todentaa." -#: ../midori/main.c:961 +#: ../midori/main.c:992 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." @@ -97,400 +111,408 @@ "Midori näyttää kaatuneen edellisellä käynnistyskerralla. Jos ongelma " "toistuu, voit kokeilla seuraavia keinoja sen ratkaisemiseksi." -#: ../midori/main.c:976 +#: ../midori/main.c:1008 msgid "Modify _preferences" msgstr "Muokkaa _asetuksia" -#: ../midori/main.c:980 +#: ../midori/main.c:1012 msgid "Reset the last _session" msgstr "Palauta _edellinen istunto" -#: ../midori/main.c:985 +#: ../midori/main.c:1017 msgid "Disable all _extensions" msgstr "Poista liitä_nnäiset käytöstä" -#: ../midori/main.c:1220 ../midori/main.c:1940 +#: ../midori/main.c:1200 ../midori/main.c:2005 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Istunnon lataus epäonnistui: %s\n" -#: ../midori/main.c:1339 +#: ../midori/main.c:1321 msgid "No filename specified" msgstr "Tiedostonimeä ei annettu" -#: ../midori/main.c:1358 +#: ../midori/main.c:1340 msgid "An unknown error occured." msgstr "Tapahtui tuntematon virhe." -#: ../midori/main.c:1389 +#: ../midori/main.c:1371 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Kuva tallennettu osoitteeseen: %s\n" -#: ../midori/main.c:1560 +#: ../midori/main.c:1607 msgid "Run ADDRESS as a web application" msgstr "Suorita OSOITE web-sovelluksena" -#: ../midori/main.c:1560 +#: ../midori/main.c:1607 msgid "ADDRESS" msgstr "OSOITE" -#: ../midori/main.c:1563 +#: ../midori/main.c:1610 msgid "Use FOLDER as configuration folder" msgstr "Lataa asetukset kohteesta KANSIO" -#: ../midori/main.c:1563 +#: ../midori/main.c:1610 msgid "FOLDER" msgstr "KANSIO" -#: ../midori/main.c:1566 +#: ../midori/main.c:1613 msgid "Show a diagnostic dialog" msgstr "Näytä vianetsintädialogi" -#: ../midori/main.c:1568 +#: ../midori/main.c:1615 msgid "Run the specified filename as javascript" msgstr "Suorita annettu tiedostonimi javascriptinä" -#: ../midori/main.c:1571 +#: ../midori/main.c:1618 msgid "Take a snapshot of the specified URI" msgstr "Kaappaa kuva kohteen URI sisällöstä" -#: ../midori/main.c:1574 +#: ../midori/main.c:1621 msgid "Execute the specified command" msgstr "Suorita määritetty komento" -#: ../midori/main.c:1576 +#: ../midori/main.c:1623 +msgid "List available commands to execute with -e/ --execute" +msgstr "Listaa valitsimella -e/--execute suoritettavat komennot" + +#: ../midori/main.c:1625 msgid "Display program version" msgstr "Näytä sovelluksen versio" -#: ../midori/main.c:1578 +#: ../midori/main.c:1627 msgid "Addresses" msgstr "Osoitteet" -#: ../midori/main.c:1580 +#: ../midori/main.c:1629 msgid "Block URIs according to regular expression PATTERN" msgstr "Estä säännöllistä LAUSEKEtta vastaavat URIt" -#: ../midori/main.c:1580 +#: ../midori/main.c:1629 msgid "PATTERN" msgstr "LAUSEKE" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1584 +#: ../midori/main.c:1633 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Palaa alkutilaan, kun käyttämättä SEKUNNIT sekuntia" -#: ../midori/main.c:1584 +#: ../midori/main.c:1633 msgid "SECONDS" msgstr "SEKUNNIT" -#: ../midori/main.c:1664 +#: ../midori/main.c:1714 msgid "[Addresses]" msgstr "[Osoitteet]" -#: ../midori/main.c:1692 +#: ../midori/main.c:1742 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentit, ehdotukset ja vikailmoitukset osoitteeseen:" -#: ../midori/main.c:1694 +#: ../midori/main.c:1744 msgid "Check for new versions at:" msgstr "Uudet versiot löydät osoitteesta:" -#: ../midori/main.c:1791 +#: ../midori/main.c:1805 +msgid "Website icons" +msgstr "Sivustojen kuvakkeet" + +#: ../midori/main.c:1807 +msgid "Cookies" +msgstr "Evästeet" + +#: ../midori/main.c:1810 +msgid "'Flash' Cookies" +msgstr "Flash-evästeet" + +#: ../midori/main.c:1814 +msgid "HTML5 _Databases" +msgstr "HTML5:n _tietokannat" + +#: ../midori/main.c:1888 msgid "The specified configuration folder is invalid." msgstr "Määritetty asetuskansio ei kelpaa." -#: ../midori/main.c:1839 +#: ../midori/main.c:1936 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori on jo käynnissä, muttei vastaa.\n" -#: ../midori/main.c:1894 +#: ../midori/main.c:1973 #, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "Hakukoneiden lataus epäonnistui. %s\n" - -#: ../midori/main.c:1923 -#, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Kirjanmerkkien lataus epäonnistui: %s\n" -#: ../midori/main.c:1955 +#: ../midori/main.c:2020 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Roskakorin lataus epäonnistui: %s\n" -#: ../midori/main.c:1969 +#: ../midori/main.c:2033 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historian lataus epäonnistui: %s\n" -#: ../midori/main.c:1983 +#: ../midori/main.c:2046 msgid "The following errors occured:" msgstr "Seuraavat virheet tapahtuivat:" -#: ../midori/main.c:1999 +#: ../midori/main.c:2062 msgid "_Ignore" msgstr "_Ohita" -#: ../midori/midori-array.c:428 +#: ../midori/midori-array.c:485 msgid "File not found." msgstr "Tiedostoa ei löytynyt." -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:510 ../midori/midori-array.c:549 +#: ../midori/midori-array.c:572 ../midori/midori-array.c:582 msgid "Malformed document." msgstr "Virheellinen asiakirja." -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:591 msgid "Unrecognized bookmark format." msgstr "Tunnistamaton kirjanmerkin muoto." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1120 -#, c-format +#: ../midori/midori-array.c:806 msgid "Writing failed." msgstr "Kirjoitus epäonnistui." -#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5430 -#: ../midori/midori-browser.c:5436 +#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:4887 +#: ../midori/midori-browser.c:4893 msgid "Reload the current page" msgstr "Lataa nykyinen sivu uudelleen" -#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:4890 msgid "Stop loading the current page" msgstr "Keskeytä nykyisen sivun lataaminen" -#: ../midori/midori-browser.c:454 +#: ../midori/midori-browser.c:448 #, c-format msgid "%d%% loaded" msgstr "%d %% ladattu" -#: ../midori/midori-browser.c:492 +#: ../midori/midori-browser.c:487 #, c-format msgid "Failed to update title: %s\n" msgstr "Otsikon päivitys epäonnistui: %s\n" -#: ../midori/midori-browser.c:506 +#: ../midori/midori-browser.c:500 #, c-format msgid "Unexpected action '%s'." msgstr "Odottamaton toimenpide \"%s\"." -#: ../midori/midori-browser.c:713 +#: ../midori/midori-browser.c:725 msgid "New folder" msgstr "Uusi kansio" -#: ../midori/midori-browser.c:713 +#: ../midori/midori-browser.c:725 msgid "Edit folder" msgstr "Muokkaa kansiota" -#: ../midori/midori-browser.c:715 +#: ../midori/midori-browser.c:727 msgid "New bookmark" msgstr "Uusi kirjanmerkki" -#: ../midori/midori-browser.c:715 +#: ../midori/midori-browser.c:727 msgid "Edit bookmark" msgstr "Muokkaa kirjanmerkkiä" -#: ../midori/midori-browser.c:746 +#: ../midori/midori-browser.c:758 msgid "_Title:" msgstr "_Nimi:" -#: ../midori/midori-browser.c:759 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:775 ../midori/midori-searchaction.c:966 msgid "_Description:" msgstr "Ku_vaus:" -#: ../midori/midori-browser.c:778 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:794 ../midori/midori-searchaction.c:980 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Osoite:" -#: ../midori/midori-browser.c:808 ../midori/midori-browser.c:4585 +#: ../midori/midori-browser.c:826 ../midori/midori-browser.c:4065 msgid "_Folder:" msgstr "_Kansio:" -#: ../midori/midori-browser.c:818 ../midori/midori-browser.c:898 -#: ../midori/midori-browser.c:4590 ../midori/midori-browser.c:4622 +#: ../midori/midori-browser.c:836 ../midori/midori-browser.c:927 +#: ../midori/midori-browser.c:4070 ../midori/midori-browser.c:4098 msgid "Toplevel folder" msgstr "Ylätason kansio" -#: ../midori/midori-browser.c:847 +#: ../midori/midori-browser.c:868 +msgid "Add to _Speed Dial" +msgstr "Lisää pikavali_ntaan" + +#: ../midori/midori-browser.c:881 msgid "Show in the tool_bar" msgstr "Näytä työkal_upalkissa" -#: ../midori/midori-browser.c:862 +#: ../midori/midori-browser.c:896 msgid "Run as _web application" msgstr "Suorita _web-sovelluksena" -#: ../midori/midori-browser.c:978 ../midori/midori-browser.c:4640 -#: ../midori/midori-browser.c:4672 -msgid "Save file as" -msgstr "Tallenna tiedosto nimellä" +#: ../midori/midori-browser.c:972 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Tiedostoa \"%s\" ei voi tallentaa tähän kansioon." -#: ../midori/midori-browser.c:1352 ../panels/midori-transfers.c:271 +#: ../midori/midori-browser.c:974 #, c-format -msgid "%s of %s" -msgstr "%s/%s" +msgid "You don't have permission to write in this location." +msgstr "Sinulla ei ole kirjoitusoikeutta tähän sijaintiin." -#: ../midori/midori-browser.c:1388 +#: ../midori/midori-browser.c:981 #, c-format -msgid "The file '%s' has been downloaded." -msgstr "Tiedoston \"%s\" lataus on valmis." +msgid "There is not enough free space to download \"%s\"." +msgstr "Tila ei riitä tiedoston \"%s\" lataamiseen." -#: ../midori/midori-browser.c:1392 -msgid "Transfer completed" -msgstr "Tiedosto siirretty" +#: ../midori/midori-browser.c:984 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "Tilaa tarvitaan %s mutta jäljellä on vain %s." -#: ../midori/midori-browser.c:1532 +#: ../midori/midori-browser.c:1050 ../midori/midori-browser.c:4145 +msgid "Save file as" +msgstr "Tallenna tiedosto nimellä" + +#: ../midori/midori-browser.c:1448 msgid "Save file" msgstr "Tallenna tiedosto" -#: ../midori/midori-browser.c:2255 +#: ../midori/midori-browser.c:2147 msgid "Open file" msgstr "Avaa tiedosto" -#: ../midori/midori-browser.c:2331 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2257 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr "" +"Avaa ylläoleva URI-osoite uutistenlukuohjelmassa. Tämä onnistuu" +"lukuohjelman toiminnolla \"Lisää tilaus\", \"Lisää syöte\" tms.\n" +"Vaihtoehtoisesti voit avata Midorin asetukset ja valita sovellukset-" +"välilehdeltä uutistenlukuohjelman. Tällöin uutissyötekuvakkeen " +"napsauttaminen lisää syötteen automaattisesti." + +#: ../midori/midori-browser.c:2263 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Uusi syöte" -#: ../midori/midori-browser.c:2372 ../midori/midori-browser.c:5495 -#: ../panels/midori-bookmarks.c:242 +#: ../midori/midori-browser.c:2306 ../midori/midori-browser.c:4952 +#: ../panels/midori-bookmarks.c:438 msgid "Add a new bookmark" msgstr "Lisää uusi kirjanmerkki" -#: ../midori/midori-browser.c:2930 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Tietokantakäskyn suoritus epäonnistui: %s\n" - -#: ../midori/midori-browser.c:3010 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:2861 ../midori/midori-searchaction.c:487 msgid "Empty" msgstr "Tyhjä" -#: ../midori/midori-browser.c:3631 ../midori/sokoke.c:403 -#: ../midori/sokoke.c:413 ../midori/sokoke.c:441 ../midori/sokoke.c:467 -#: ../midori/sokoke.c:481 +#: ../midori/midori-browser.c:3328 ../midori/sokoke.c:436 +#: ../midori/sokoke.c:446 ../midori/sokoke.c:474 ../midori/sokoke.c:503 +#: ../midori/sokoke.c:517 msgid "Could not run external program." msgstr "Ulkoisen ohjelman suoritus epäonnistui." -#: ../midori/midori-browser.c:3945 ../midori/midori-browser.c:5889 +#: ../midori/midori-browser.c:3571 ../midori/midori-browser.c:5349 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Kohteen lisääminen sivuhistoriaan epäonnistui: %s\n" -#: ../midori/midori-browser.c:4278 ../panels/midori-bookmarks.c:795 -#: ../panels/midori-history.c:751 +#: ../midori/midori-browser.c:3898 ../panels/midori-bookmarks.c:753 +#: ../panels/midori-history.c:729 msgid "Open all in _Tabs" msgstr "Avaa kaikki välile_hdissä" -#: ../midori/midori-browser.c:4285 ../panels/midori-bookmarks.c:801 -#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:3905 ../panels/midori-bookmarks.c:759 +#: ../panels/midori-history.c:735 ../extensions/feed-panel/feed-panel.c:536 msgid "Open in New _Tab" msgstr "Avaa uudessa _välilehdessä" -#: ../midori/midori-browser.c:4288 ../panels/midori-bookmarks.c:803 -#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:3908 ../midori/midori-view.c:2635 +#: ../midori/midori-view.c:4339 ../panels/midori-bookmarks.c:761 +#: ../panels/midori-history.c:737 ../extensions/feed-panel/feed-panel.c:538 msgid "Open in New _Window" msgstr "Avaa uudessa _ikkunassa" -#: ../midori/midori-browser.c:4511 +#: ../midori/midori-browser.c:3987 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4512 +#: ../midori/midori-browser.c:3988 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4513 +#: ../midori/midori-browser.c:3989 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4514 +#: ../midori/midori-browser.c:3990 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4515 +#: ../midori/midori-browser.c:3991 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4536 ../panels/midori-bookmarks.c:271 +#: ../midori/midori-browser.c:4016 msgid "Import bookmarks..." msgstr "Tuo kirjanmerkit..." -#: ../midori/midori-browser.c:4539 ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:4019 ../midori/midori-browser.c:4957 msgid "_Import bookmarks" msgstr "_Tuo kirjanmerkit" -#: ../midori/midori-browser.c:4550 +#: ../midori/midori-browser.c:4030 msgid "_Application:" msgstr "_Sovellus:" -#: ../midori/midori-browser.c:4577 ../midori/midori-browser.c:5604 -#: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323 -#: ../katze/katze-utils.c:688 -msgid "Custom..." -msgstr "Mukautettu..." +#: ../midori/midori-browser.c:4057 ../midori/midori-browser.c:4106 +msgid "Import from a file" +msgstr "Tuo tiedostosta" -#: ../midori/midori-browser.c:4651 +#: ../midori/midori-browser.c:4118 msgid "Failed to import bookmarks" msgstr "Kirjanmerkkien tuonti epäonnistui" -#: ../midori/midori-browser.c:4687 +#: ../midori/midori-browser.c:4163 msgid "Failed to export bookmarks" msgstr "Kirjanmerkkien vienti epäonnistui" -#: ../midori/midori-browser.c:4741 ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Kohteen poistaminen sivuhistoriasta epäonnistui: %s\n" - #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4848 +#: ../midori/midori-browser.c:4281 msgid "Clear Private Data" msgstr "Poista yksityisyystietoja" -#: ../midori/midori-browser.c:4852 +#: ../midori/midori-browser.c:4285 msgid "_Clear private data" msgstr "_Poista yksityisyystietoja" -#: ../midori/midori-browser.c:4866 +#: ../midori/midori-browser.c:4299 msgid "Clear the following data:" msgstr "Poista seuraavat tiedot:" -#: ../midori/midori-browser.c:4877 ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 -msgid "History" -msgstr "Historia" - -#: ../midori/midori-browser.c:4883 -msgid "Cookies" -msgstr "Evästeet" - -#: ../midori/midori-browser.c:4888 -msgid "'Flash' Cookies" -msgstr "Flash-evästeet" - -#: ../midori/midori-browser.c:4893 -msgid "Website icons" -msgstr "Sivustojen kuvakkeet" +#. i18n: Browsing history, visited web pages +#: ../midori/midori-browser.c:4310 ../midori/sokoke.c:1411 +msgid "_History" +msgstr "_Historia" -#: ../midori/midori-browser.c:4898 ../midori/sokoke.c:1310 +#: ../midori/midori-browser.c:4315 ../midori/sokoke.c:1417 msgid "_Closed Tabs" msgstr "Suljetut _välilehdet" -#: ../midori/midori-browser.c:4903 ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "Välimuisti" - -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:4335 msgid "Clear private data when _quitting Midori" msgstr "Poista yksityisyystietoja, kun _Midori suljetaan" -#: ../midori/midori-browser.c:5013 +#: ../midori/midori-browser.c:4476 msgid "A lightweight web browser." msgstr "Kevyt verkkoselain" -#: ../midori/midori-browser.c:5015 +#: ../midori/midori-browser.c:4478 msgid "" "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 " @@ -501,1157 +523,1139 @@ "Foundationin julkaiseman GNU LGPL -lisenssin version 2.1 tai (halutessasi) " "uudemman ehtojen rajoissa." -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:4497 msgid "translator-credits" msgstr "" "Elias Julkunen \n" "Jari Rahkonen " -#: ../midori/midori-browser.c:5343 +#: ../midori/midori-browser.c:4803 msgid "_File" msgstr "_Tiedosto" -#: ../midori/midori-browser.c:5345 ../midori/sokoke.c:1311 +#: ../midori/midori-browser.c:4805 ../midori/sokoke.c:1418 msgid "New _Window" msgstr "Uusi i_kkuna" -#: ../midori/midori-browser.c:5346 +#: ../midori/midori-browser.c:4806 msgid "Open a new window" msgstr "Avaa uusi ikkuna" -#: ../midori/midori-browser.c:5349 +#: ../midori/midori-browser.c:4809 msgid "Open a new tab" msgstr "Avaa uusi välilehti" -#: ../midori/midori-browser.c:5351 +#: ../midori/midori-browser.c:4811 msgid "P_rivate Browsing" msgstr "_Yksityinen selaaminen" -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:4812 msgid "Don't save any private data while browsing" msgstr "Älä tallenna yksityisyystietoja selatessa" -#: ../midori/midori-browser.c:5356 +#: ../midori/midori-browser.c:4816 msgid "Open a file" msgstr "Avaa tiedosto" -#: ../midori/midori-browser.c:5359 +#: ../midori/midori-browser.c:4819 msgid "Save to a file" msgstr "Tallenna tiedostoon" -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:4821 msgid "Add to Speed _dial" msgstr "Lisää pikavali_ntaan" -#: ../midori/midori-browser.c:5362 +#: ../midori/midori-browser.c:4822 msgid "Add shortcut to speed dial" msgstr "Lisää sivu pikavalintaruutuun" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:4824 msgid "Add Shortcut to the _desktop" msgstr "Luo pikak_uvake työpöydälle" -#: ../midori/midori-browser.c:5365 +#: ../midori/midori-browser.c:4825 msgid "Add shortcut to the desktop" msgstr "Luo pikakuvake työpöydälle" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:4827 msgid "Subscribe to News _feed" msgstr "_Tilaa uutissyöte" -#: ../midori/midori-browser.c:5368 +#: ../midori/midori-browser.c:4828 msgid "Subscribe to this news feed" msgstr "Tilaa tämä uutissyöte" -#: ../midori/midori-browser.c:5373 +#: ../midori/midori-browser.c:4833 msgid "_Close Tab" msgstr "Sulje _välilehti" -#: ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:4834 msgid "Close the current tab" msgstr "Sulje avoin välilehti" -#: ../midori/midori-browser.c:5376 +#: ../midori/midori-browser.c:4836 msgid "C_lose Window" msgstr "Sulje i_kkuna" -#: ../midori/midori-browser.c:5377 +#: ../midori/midori-browser.c:4837 msgid "Close this window" msgstr "Sulje tämä ikkuna" -#: ../midori/midori-browser.c:5380 +#: ../midori/midori-browser.c:4840 msgid "Print the current page" msgstr "Tulosta nykyinen sivu" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:4843 msgid "Quit the application" msgstr "Poistu sovelluksesta" -#: ../midori/midori-browser.c:5385 +#: ../midori/midori-browser.c:4845 msgid "_Edit" msgstr "_Muokkaa" -#: ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:4849 msgid "Undo the last modification" msgstr "Peru viimeisin muutos" -#: ../midori/midori-browser.c:5392 +#: ../midori/midori-browser.c:4852 msgid "Redo the last modification" msgstr "Toista viimeisin muutos" -#: ../midori/midori-browser.c:5396 +#: ../midori/midori-browser.c:4856 msgid "Cut the selected text" msgstr "Leikkaa valittu teksti" -#: ../midori/midori-browser.c:5399 ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:4859 msgid "Copy the selected text" msgstr "Kopioi valittu teksti" -#: ../midori/midori-browser.c:5405 +#: ../midori/midori-browser.c:4862 msgid "Paste text from the clipboard" msgstr "Liitä teksti leikepöydältä" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:4865 msgid "Delete the selected text" msgstr "Poista valittu teksti" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:4868 msgid "Select all text" msgstr "Valitse kaikki teksti" -#: ../midori/midori-browser.c:5414 +#: ../midori/midori-browser.c:4871 msgid "Find a word or phrase in the page" msgstr "Etsi sanaa tai merkkijonoa sivulta" -#: ../midori/midori-browser.c:5416 +#: ../midori/midori-browser.c:4873 msgid "Find _Next" msgstr "Etsi _seuraava" -#: ../midori/midori-browser.c:5417 +#: ../midori/midori-browser.c:4874 msgid "Find the next occurrence of a word or phrase" msgstr "Etsi sanan tai merkkijonon seuraava esiintymä" -#: ../midori/midori-browser.c:5419 +#: ../midori/midori-browser.c:4876 msgid "Find _Previous" msgstr "Etsi _edellinen" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:4877 msgid "Find the previous occurrence of a word or phrase" msgstr "Etsi sanan tai merkkijonon edellinen esiintymä" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:4881 msgid "Configure the application preferences" msgstr "Muokkaa sovelluksen asetuksia" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:4883 msgid "_View" msgstr "_Näytä" -#: ../midori/midori-browser.c:5427 +#: ../midori/midori-browser.c:4884 msgid "_Toolbars" msgstr "_Työkalupalkit" -#: ../midori/midori-browser.c:5439 +#: ../midori/midori-browser.c:4896 msgid "Increase the zoom level" msgstr "Suurenna" -#: ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:4899 msgid "Decrease the zoom level" msgstr "Pienennä" -#: ../midori/midori-browser.c:5445 +#: ../midori/midori-browser.c:4902 msgid "Reset the zoom level" msgstr "Palauta suurennustaso" -#: ../midori/midori-browser.c:5446 +#: ../midori/midori-browser.c:4903 msgid "_Encoding" msgstr "_Merkistö" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:4905 msgid "View So_urce" msgstr "Näytä lä_hdekoodi" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:4906 msgid "View the source code of the page" msgstr "Näytä sivun lähdekoodi" -#: ../midori/midori-browser.c:5452 +#: ../midori/midori-browser.c:4909 msgid "Toggle fullscreen view" msgstr "Kokoruututila päälle/pois" -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:4912 msgid "Scroll _Left" msgstr "Vieritä _vasempaan" -#: ../midori/midori-browser.c:5456 +#: ../midori/midori-browser.c:4913 msgid "Scroll to the left" msgstr "Vieritä näkymää vasempaan" -#: ../midori/midori-browser.c:5458 +#: ../midori/midori-browser.c:4915 msgid "Scroll _Down" msgstr "Vieritä _alas" -#: ../midori/midori-browser.c:5459 +#: ../midori/midori-browser.c:4916 msgid "Scroll down" msgstr "Vieritä näkymää alaspäin" -#: ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:4918 msgid "Scroll _Up" msgstr "Vieritä yl_ös" -#: ../midori/midori-browser.c:5462 +#: ../midori/midori-browser.c:4919 msgid "Scroll up" msgstr "Vieritä näkymää ylöspäin" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:4921 msgid "Scroll _Right" msgstr "Vieritä oikeaan" -#: ../midori/midori-browser.c:5465 +#: ../midori/midori-browser.c:4922 msgid "Scroll to the right" msgstr "Vieritä näkymää oikeaan" -#: ../midori/midori-browser.c:5468 +#: ../midori/midori-browser.c:4925 msgid "_Go" msgstr "_Siirry" -#: ../midori/midori-browser.c:5471 +#: ../midori/midori-browser.c:4928 msgid "Go back to the previous page" msgstr "Siirry takaisin edelliselle sivulle" -#: ../midori/midori-browser.c:5474 +#: ../midori/midori-browser.c:4931 msgid "Go forward to the next page" msgstr "Siirry eteenpäin seuraavalle sivulle" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5478 +#: ../midori/midori-browser.c:4935 msgid "Go to the previous sub-page" msgstr "Siirry edelliselle alasivulle" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5482 +#: ../midori/midori-browser.c:4939 msgid "Go to the next sub-page" msgstr "Siirry seuraavalle alasivulle" -#: ../midori/midori-browser.c:5485 +#: ../midori/midori-browser.c:4942 msgid "Go to your homepage" msgstr "Siirry kotisivullesi" -#: ../midori/midori-browser.c:5487 +#: ../midori/midori-browser.c:4944 msgid "Empty Trash" msgstr "Tyhjennä roskakori" -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:4945 msgid "Delete the contents of the trash" msgstr "Poista roskakorin sisältö" -#: ../midori/midori-browser.c:5490 +#: ../midori/midori-browser.c:4947 msgid "Undo _Close Tab" msgstr "Palauta _välilehti" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:4948 msgid "Open the last closed tab" msgstr "Avaa viimeksi suljettu välilehti" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:4954 msgid "Add a new _folder" msgstr "Luo uusi _kansio" -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:4955 msgid "Add a new bookmark folder" msgstr "Luo uusi kirjanmerkkikansio" -#: ../midori/midori-browser.c:5503 +#: ../midori/midori-browser.c:4960 msgid "_Export bookmarks" msgstr "_Vie kirjanmerkkejä" -#: ../midori/midori-browser.c:5506 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4963 ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "_Hallitse hakukoneita" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:4964 msgid "Add, edit and remove search engines..." msgstr "Lisää, muokkaa ja poista hakukoneita..." -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:4967 msgid "_Clear Private Data" msgstr "_Poista yksityisyystietoja" -#: ../midori/midori-browser.c:5511 +#: ../midori/midori-browser.c:4968 msgid "Clear private data..." msgstr "Poista yksityisyystietoja..." -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:4972 msgid "_Inspect Page" msgstr "_Tutki sivua" -#: ../midori/midori-browser.c:5516 +#: ../midori/midori-browser.c:4973 msgid "Inspect page details and access developer tools..." msgstr "Tutki sivun ominaisuuksia ja käytä kehitystyökaluja..." -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:4978 msgid "_Previous Tab" msgstr "_Edellinen välilehti" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:4979 msgid "Switch to the previous tab" msgstr "Vaihda edelliselle välilehdelle" -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:4981 msgid "_Next Tab" msgstr "_Seuraava välilehti" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:4982 msgid "Switch to the next tab" msgstr "Vaihda seuraavalle välilehdelle" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:4984 msgid "Focus _Current Tab" msgstr "Koh_dista avoimeen välilehteen" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:4985 msgid "Focus the current tab" msgstr "Kohdista avoimeen välilehteen" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:4987 +msgid "Only show the Icon of the _Current Tab" +msgstr "Näytä vain _avoimen välilehden kuvake" + +#: ../midori/midori-browser.c:4988 +msgid "Only show the icon of the current tab" +msgstr "Näytä vain avoimen välilehden kuvake" + +#: ../midori/midori-browser.c:4990 +msgid "_Duplicate Current Tab" +msgstr "_Monista välilehti" + +#: ../midori/midori-browser.c:4991 +msgid "Duplicate the current tab" +msgstr "Monista avoin välilehti" + +#: ../midori/midori-browser.c:4993 +msgid "Close Ot_her Tabs" +msgstr "Sulje _muut välilehdet" + +#: ../midori/midori-browser.c:4994 +msgid "Close all tabs except the current tab" +msgstr "Sulje välilehdet avointa lukuunottamatta" + +#: ../midori/midori-browser.c:4996 msgid "Open last _session" msgstr "Avaa _edellinen istunto" -#: ../midori/midori-browser.c:5531 +#: ../midori/midori-browser.c:4997 msgid "Open the tabs saved in the last session" msgstr "Avaa edellisellä käyttökerralla tallennetut sivut" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:4999 msgid "_Help" msgstr "_Ohje" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5001 msgid "_Contents" msgstr "_Sisältö" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5002 msgid "Show the documentation" msgstr "Näytä dokumentaatio" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5004 msgid "_Frequent Questions" msgstr "_Usein kysytyt kysymykset" -#: ../midori/midori-browser.c:5539 +#: ../midori/midori-browser.c:5005 msgid "Show the Frequently Asked Questions" msgstr "Näytä usein kysytyt kysymykset" -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5007 msgid "_Report a Bug" msgstr "Il_moita ohjelmavirheestä" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5008 msgid "Open Midori's bug tracker" msgstr "Avaa Midorin vikojen seurantajärjestelmä" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5011 msgid "Show information about the program" msgstr "Näytä tietoja sovelluksesta" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5019 msgid "_Menubar" msgstr "_Valikkopalkki" -#: ../midori/midori-browser.c:5554 +#: ../midori/midori-browser.c:5020 msgid "Show menubar" msgstr "Näytä valikkopalkki" -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:5023 msgid "_Navigationbar" msgstr "_Navigointipalkki" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5024 msgid "Show navigationbar" msgstr "Näytä navigointipalkki" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5027 msgid "Side_panel" msgstr "_Sivupaneeli" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5028 msgid "Show sidepanel" msgstr "Näytä sivupaneeli" -#: ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:5031 msgid "_Bookmarkbar" msgstr "_Kirjanmerkkipalkki" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5032 msgid "Show bookmarkbar" msgstr "Näytä kirjanmerkkipalkki" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5035 msgid "_Transferbar" msgstr "_Latauspalkki" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5036 msgid "Show transferbar" msgstr "Näytä latauspalkki" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5039 msgid "_Statusbar" msgstr "_Tilapalkki" -#: ../midori/midori-browser.c:5574 +#: ../midori/midori-browser.c:5040 msgid "Show statusbar" msgstr "Näytä tilapalkki" -#: ../midori/midori-browser.c:5582 +#: ../midori/midori-browser.c:5048 msgid "_Automatic" msgstr "_Automaattinen" -#: ../midori/midori-browser.c:5585 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5051 ../midori/midori-websettings.c:223 msgid "Chinese (BIG5)" msgstr "Kiinalainen (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:5055 msgid "Japanese (SHIFT__JIS)" msgstr "Japanilainen (SHIFT__JIS)" -#: ../midori/midori-browser.c:5592 ../midori/midori-websettings.c:228 +#: ../midori/midori-browser.c:5058 ../midori/midori-websettings.c:225 msgid "Korean (EUC-KR)" msgstr "Korealainen (EUC-KR)" -#: ../midori/midori-browser.c:5595 ../midori/midori-websettings.c:229 +#: ../midori/midori-browser.c:5061 ../midori/midori-websettings.c:226 msgid "Russian (KOI8-R)" msgstr "Venäläinen (KOI8-R)" -#: ../midori/midori-browser.c:5598 ../midori/midori-websettings.c:230 +#: ../midori/midori-browser.c:5064 ../midori/midori-websettings.c:227 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5601 ../midori/midori-websettings.c:231 +#: ../midori/midori-browser.c:5067 ../midori/midori-websettings.c:228 msgid "Western (ISO-8859-1)" msgstr "Länsimainen (ISO-8859-1)" -#: ../midori/midori-browser.c:6149 +#: ../midori/midori-browser.c:5070 ../midori/midori-websettings.c:229 +#: ../midori/midori-websettings.c:320 ../katze/katze-utils.c:706 +msgid "Custom..." +msgstr "Mukautettu..." + +#: ../midori/midori-browser.c:5591 msgid "_Separator" msgstr "_Erotin" -#: ../midori/midori-browser.c:6156 +#: ../midori/midori-browser.c:5598 msgid "_Location..." msgstr "_Sijainti..." -#: ../midori/midori-browser.c:6158 +#: ../midori/midori-browser.c:5600 msgid "Open a particular location" msgstr "Avaa tarkka sijainti" -#: ../midori/midori-browser.c:6182 +#: ../midori/midori-browser.c:5624 msgid "_Web Search..." msgstr "_Verkkohaku" -#: ../midori/midori-browser.c:6184 +#: ../midori/midori-browser.c:5626 msgid "Run a web search" msgstr "Hae verkkosivua" -#: ../midori/midori-browser.c:6205 +#: ../midori/midori-browser.c:5647 msgid "Reopen a previously closed tab or window" msgstr "Avaa uudelleen aikaisemmin suljettu välilehti tai ikkuna" -#: ../midori/midori-browser.c:6220 -msgid "_Recently visited pages" -msgstr "_Usein vieraillut sivut" - -#: ../midori/midori-browser.c:6222 -msgid "Reopen pages that you visited earlier" -msgstr "Avaa uudelleen sivut, joilla vierailit aikaisemmin" - -#: ../midori/midori-browser.c:6237 ../midori/sokoke.c:1300 +#: ../midori/midori-browser.c:5660 ../midori/sokoke.c:1407 msgid "_Bookmarks" msgstr "_Kirjanmerkit" -#: ../midori/midori-browser.c:6239 +#: ../midori/midori-browser.c:5662 msgid "Show the saved bookmarks" msgstr "Näytä tallennetut kirjanmerkit" -#: ../midori/midori-browser.c:6254 +#: ../midori/midori-browser.c:5676 msgid "_Tools" msgstr "_Työkalut" -#: ../midori/midori-browser.c:6267 +#: ../midori/midori-browser.c:5691 msgid "_Window" msgstr "I_kkuna" -#: ../midori/midori-browser.c:6269 +#: ../midori/midori-browser.c:5693 msgid "Show a list of all open tabs" msgstr "Näytä luettelo kaikista avoimista välilehdistä" -#: ../midori/midori-browser.c:6283 +#: ../midori/midori-browser.c:5707 msgid "_Menu" msgstr "_Valikko" -#: ../midori/midori-browser.c:6285 +#: ../midori/midori-browser.c:5709 msgid "Menu" msgstr "Valikko" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6489 -msgid "_Inline Find:" -msgstr "_Hakupalkki:" - -#: ../midori/midori-browser.c:6520 -msgid "Previous" -msgstr "_Edellinen" - -#: ../midori/midori-browser.c:6525 -msgid "Next" -msgstr "Seu_raava" - -#: ../midori/midori-browser.c:6530 -msgid "Match Case" -msgstr "Huomioi kirjainkoko" - -#: ../midori/midori-browser.c:6539 -msgid "Highlight Matches" -msgstr "Korosta osumat" - -#: ../midori/midori-browser.c:6551 -msgid "Close Findbar" -msgstr "Sulje hakupalkki" - -#: ../midori/midori-browser.c:6597 ../panels/midori-transfers.c:142 -msgid "Clear All" -msgstr "Tyhjennä" - -#: ../midori/midori-browser.c:6955 +#: ../midori/midori-browser.c:6289 #, c-format msgid "Unexpected setting '%s'" msgstr "Odottamaton asetus \"%s\"" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-extension.c:286 +#, c-format +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "Lisäosan \"%s\" asetusten lataus epäonnistui: %s\n" + +#: ../midori/midori-extension.c:668 ../midori/midori-extension.c:765 +#: ../midori/midori-extension.c:862 ../midori/midori-extension.c:974 +#: ../extensions/addons.c:1638 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Lisäosan \"%s\" asetusten tallennus epäonnistui. %s\n" + +#: ../midori/midori-locationaction.c:393 #, c-format msgid "Failed to select from history\n" msgstr "Valinta historiasta epäonnistui\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-locationaction.c:477 #, c-format msgid "Search for %s" msgstr "Etsi verkosta: %s" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:500 #, c-format msgid "Search with %s" msgstr "Käytä hakua %s" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:1311 #, c-format msgid "Failed to execute database statement\n" msgstr "Tietokantakomennon suoritus epäonnistui\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1367 msgid "Paste and p_roceed" msgstr "_Liitä ja siirry" -#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435 -msgid "Detach chosen panel from the window" -msgstr "Irrota valittu paneeli ikkunasta" - -#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447 -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 -msgid "Align sidepanel to the right" -msgstr "Sivupaneeli oikealla" +#: ../midori/midori-locationaction.c:1819 +msgid "Not verified" +msgstr "Varmentamaton" + +#: ../midori/midori-locationaction.c:1830 +msgid "Verified and encrypted connection" +msgstr "Varmennettu ja salattu yhteys" -#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458 +#: ../midori/midori-panel.c:390 ../midori/midori-panel.c:391 msgid "Close panel" msgstr "Sulje paneeli" -#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644 -msgid "Align sidepanel to the left" -msgstr "Sivupaneeli vasemmalla" - -#: ../midori/midori-panel.c:798 -msgid "Hide operating controls" -msgstr "Piilota käyttöpainikkeet" - -#: ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:203 msgid "Show Blank page" msgstr "Näytä tyhjä sivu" -#: ../midori/midori-websettings.c:210 +#: ../midori/midori-websettings.c:204 msgid "Show Homepage" msgstr "Näytä kotisivu" -#: ../midori/midori-websettings.c:211 +#: ../midori/midori-websettings.c:205 msgid "Show last open tabs" msgstr "Näytä viimeksi avoimet välilehdet" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:207 +msgid "Show last tabs without loading" +msgstr "Näytä viimeksi avoimet välilehdet lataamatta niitä" + +#: ../midori/midori-websettings.c:224 msgid "Japanese (SHIFT_JIS)" msgstr "Japanilainen (SHIFT_JIS)" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:244 msgid "New tab" msgstr "Uusi välilehti" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:245 msgid "New window" msgstr "Uusi ikkuna" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:246 msgid "Current tab" msgstr "Nykyinen välilehti" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:261 msgid "Default" msgstr "Oletus" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:262 msgid "Icons" msgstr "Kuvakkeet" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:263 msgid "Small icons" msgstr "Pienet kuvakkeet" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:264 msgid "Text" msgstr "Teksti" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:265 msgid "Icons and text" msgstr "Kuvakkeet ja teksti" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:266 msgid "Text beside icons" msgstr "Teksti kuvakkeiden vierellä" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:281 msgid "Automatic (GNOME or environment)" msgstr "Automaattinen (GNOME tai ympäristö)" -#: ../midori/midori-websettings.c:285 +#: ../midori/midori-websettings.c:282 msgid "HTTP proxy server" msgstr "HTTP-välipalvelin" -#: ../midori/midori-websettings.c:286 +#: ../midori/midori-websettings.c:283 msgid "No proxy server" msgstr "Ei välipalvelinta" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:298 msgid "All cookies" msgstr "Kaikki evästeet" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:299 msgid "Session cookies" msgstr "Istunnon evästeet" -#: ../midori/midori-websettings.c:303 ../panels/midori-addons.c:98 -#: ../katze/katze-utils.c:664 +#: ../midori/midori-websettings.c:300 ../katze/katze-utils.c:675 msgid "None" msgstr "Ei mitään" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:316 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:317 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:318 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:322 +#: ../midori/midori-websettings.c:319 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:372 msgid "Remember last window size" msgstr "Muista ikkunan koko" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:373 msgid "Whether to save the last window size" msgstr "Tallennetaanko ikkunan koko lopetettaessa" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:381 msgid "Last window width" msgstr "Edellinen ikkunan leveys" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:382 msgid "The last saved window width" msgstr "Viimeisin tallennettu Ikkunan leveys" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:390 msgid "Last window height" msgstr "Edellinen ikkunan korkeus" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:391 msgid "The last saved window height" msgstr "Viimeisin tallennettu ikkunan korkeus" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:416 msgid "Last panel position" msgstr "Edellinen paneelin sijainti" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:417 msgid "The last saved panel position" msgstr "Viimeisin tallennettu paneelin paikka" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:426 msgid "Last panel page" msgstr "Edellinen paneelin sivu" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:427 msgid "The last saved panel page" msgstr "Viimeisin tallennettu paneelin sivu" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:435 msgid "Last Web search" msgstr "Viimeisin verkkohaku" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:436 msgid "The last saved Web search" msgstr "Viimeisin tallennettu verkkohaku" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:445 msgid "Show Menubar" msgstr "Näytä valikkopalkki" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:446 msgid "Whether to show the menubar" msgstr "Näytetäänkö valikkopalkki" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:454 msgid "Show Navigationbar" msgstr "Näytä navigointipalkki" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:455 msgid "Whether to show the navigationbar" msgstr "Näytetäänkö navigointipalkki" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:463 msgid "Show Bookmarkbar" msgstr "Näytä kirjanmerkkipalkki" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:464 msgid "Whether to show the bookmarkbar" msgstr "Näytetäänkö kirjanmerkkipalkki" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:472 msgid "Show Panel" msgstr "Näytä paneeli" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:473 msgid "Whether to show the panel" msgstr "Näytetäänkö paneeli" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:488 msgid "Show Transferbar" msgstr "Näytä latauspalkki" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:489 msgid "Whether to show the transferbar" msgstr "Näytetäänkö latauspalkki" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:497 msgid "Show Statusbar" msgstr "Näytä tilapalkki" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:498 msgid "Whether to show the statusbar" msgstr "Näytetäänkö tilapalkki" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:507 msgid "Toolbar Style:" msgstr "Työkalupalkin tyyli:" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:508 msgid "The style of the toolbar" msgstr "Työkalupalkin painikkeiden tyyli" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:524 msgid "Show progress in location entry" msgstr "Näytä eteneminen osoitekentässä" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:525 msgid "Whether to show loading progress in the location entry" msgstr "Näytetäänkö latauksen eteneminen osoitekentässä" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:540 msgid "Search engines in location completion" msgstr "Osoitteen täydennyksen hakukoneet" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:541 msgid "Whether to show search engines in the location completion" msgstr "Näytetäänkö hakukoneet osoitteen täydennysvaihtoehdoissa" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:549 msgid "Toolbar Items" msgstr "Työkakupalkin painikkeet" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:550 msgid "The items to show on the toolbar" msgstr "Työkalupalkissa näytettävät painikkeet" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:558 msgid "Compact Sidepanel" msgstr "Tiivis sivupaneeli" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:559 msgid "Whether to make the sidepanel compact" msgstr "Tiivistetäänkö sivupaneelia" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:576 msgid "Show operating controls of the panel" msgstr "Näytä paneelin käyttöpainikkeet" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:577 msgid "Whether to show the operating controls of the panel" msgstr "Näytetäänkö paneelissa sen käyttöpanikkeet" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:592 msgid "Align sidepanel on the right" msgstr "Sijoita sivupaneeli oikealle" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:593 msgid "Whether to align the sidepanel on the right" msgstr "Sijoitetaanko sivupaneeli ikkunan oikeaan reunaan" -#: ../midori/midori-websettings.c:609 +#: ../midori/midori-websettings.c:608 msgid "Open panels in separate windows" msgstr "Avaa paneelit omissa ikkunoissaan" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:609 msgid "Whether to always open panels in separate windows" msgstr "Avataanko paneelit aina erillisiksi ikkunoiksi" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:618 msgid "When Midori starts:" msgstr "Kun Midori käynnistyy:" -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:619 msgid "What to do when Midori starts" msgstr "Mitä tehdään, kun Midori käynnistyy" -#: ../midori/midori-websettings.c:629 +#: ../midori/midori-websettings.c:628 msgid "Homepage:" msgstr "Kotisivu:" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:629 msgid "The homepage" msgstr "Kotisivu" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:644 msgid "Show crash dialog" msgstr "Näytä kaatumisdialogi" -#: ../midori/midori-websettings.c:646 +#: ../midori/midori-websettings.c:645 msgid "Show a dialog after Midori crashed" msgstr "Näytä dialogi, jos Midori on kaatunut" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:661 msgid "Show speed dial in new tabs" msgstr "Näytä pikavalinta uusissa välilehdissä" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:662 msgid "Show speed dial in newly opened tabs" msgstr "Näytä pikavalinta, kun uusia välilehtiä avataan" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:670 msgid "Save downloaded files to:" msgstr "Tiedostojen tallennuskohde:" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:671 msgid "The folder downloaded files are saved to" msgstr "Kansio, johon ladatut tiedostot tallennetaan" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:694 msgid "Ask for the destination folder" msgstr "Kysy kohdekansiota" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:695 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Kysytäänkö kohdekansiota, kun tiedosto ladataan" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:716 msgid "Notify when a transfer has been completed" msgstr "Ilmoita latauksen valmistumisesta" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:717 msgid "Whether to show a notification when a transfer has been completed" msgstr "Näytä huomautus. kun tiedoston lataus tulee valmiiksi" -#: ../midori/midori-websettings.c:726 +#: ../midori/midori-websettings.c:729 msgid "Download Manager" msgstr "Lataussovellus" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:730 msgid "An external download manager" msgstr "Ulkoinen latauksien hallintasovellus" -#: ../midori/midori-websettings.c:735 +#: ../midori/midori-websettings.c:738 msgid "Text Editor" msgstr "Tekstieditori" -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:739 msgid "An external text editor" msgstr "Ulkoinen tekstieditori" -#: ../midori/midori-websettings.c:751 +#: ../midori/midori-websettings.c:754 msgid "News Aggregator" msgstr "Uutistenlukija" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:755 msgid "An external news aggregator" msgstr "Ulkoinen uutissyötteiden lukuohjelma" -#: ../midori/midori-websettings.c:760 +#: ../midori/midori-websettings.c:763 msgid "Location entry Search" msgstr "Osoitekentän haku" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:764 msgid "The search to perform inside the location entry" msgstr "Osoitekentässä käytettävä hakukone" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:772 msgid "Preferred Encoding" msgstr "Oletusmerkistö" -#: ../midori/midori-websettings.c:770 +#: ../midori/midori-websettings.c:773 msgid "The preferred character encoding" msgstr "Oletusarvoisesti käytettävä merkistökoodaus" -#: ../midori/midori-websettings.c:780 +#: ../midori/midori-websettings.c:783 msgid "Always Show Tabbar" msgstr "Näytä aina välilehtipalkki" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:784 msgid "Always show the tabbar" msgstr "Näytä välilehtipalkki aina" -#: ../midori/midori-websettings.c:789 +#: ../midori/midori-websettings.c:792 msgid "Close Buttons on Tabs" msgstr "Sulkemispainikkeet välilehdissä" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:793 msgid "Whether tabs have close buttons" msgstr "Onko välilehdissä sulkemispainikkeet" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:801 msgid "Open new pages in:" msgstr "Avaa uudet sivut:" -#: ../midori/midori-websettings.c:799 +#: ../midori/midori-websettings.c:802 msgid "Where to open new pages" msgstr "Miten uudet sivut avataan" -#: ../midori/midori-websettings.c:808 +#: ../midori/midori-websettings.c:811 msgid "Open external pages in:" msgstr "Avaa ulkoiset sivut:" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:812 msgid "Where to open externally opened pages" msgstr "Miten ulkoisesti avatut sivut avataan" -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:821 msgid "Middle click opens Selection" msgstr "Keskipainike avaa valinnan" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:822 msgid "Load an address from the selection via middle click" msgstr "Lataa valittuna olevan osoitteen hiiren keskipainikkeella" -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:830 msgid "Open tabs in the background" msgstr "Avaa välilehdet taustalla" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:831 msgid "Whether to open new tabs in the background" msgstr "Avataanko uudet välilehdet taustalla" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:839 msgid "Open Tabs next to Current" msgstr "Avaa välilehdet nykyisen vierelle" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:840 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" "Avataanko uudet välilehdet nykyistä välilehteä seuraavaksi vai viimeiseksi" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:848 msgid "Open popups in tabs" msgstr "Avaa ponnahdusikkunat välilehdille" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:849 msgid "Whether to open popup windows in tabs" msgstr "Avataanko ponnahdusikkunat välilehdille" -#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Lataa kuvat automaattisesti" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:860 msgid "Load and display images automatically" msgstr "Lataa ja näytä kuvat automaattisesti" -#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:97 msgid "Enable scripts" msgstr "Salli skriptit" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:868 msgid "Enable embedded scripting languages" msgstr "Salli upotetut skriptauskielet" -#: ../midori/midori-websettings.c:872 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:875 ../extensions/statusbar-features.c:106 msgid "Enable Netscape plugins" msgstr "Salli Netscape-liitännäiset" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:876 msgid "Enable embedded Netscape plugin objects" msgstr "Lataa upotetut Netscapen liitännäisobjektit" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:892 +msgid "Enable Spell Checking" +msgstr "Ota oikoluku käyttöön" + +#: ../midori/midori-websettings.c:893 +msgid "Enable spell checking while typing" +msgstr "Käytä oikolukua kirjoittaessa" + +#: ../midori/midori-websettings.c:901 msgid "Enable HTML5 database support" msgstr "Ota käyttöön HTML5:n tietokantatuki" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:902 msgid "Whether to enable HTML5 database support" msgstr "Otetaanko HTML5-merkkauksen tietokantatuki käyttöön" -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:908 msgid "Enable HTML5 local storage support" msgstr "Ota käyttöön HTML5:n paikallinen tallennus" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:909 msgid "Whether to enable HTML5 local storage support" msgstr "Otetaanko HTML5:n paikallisen tallennuksen tuki käyttöön" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:917 msgid "Enable offline web application cache" msgstr "Tallenna verkkosovellukset paikallisesti" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:918 msgid "Whether to enable offline web application cache" msgstr "Tallennetaanko verkkosovellukset paikalliseen välimuistiin" -#: ../midori/midori-websettings.c:931 +#: ../midori/midori-websettings.c:943 msgid "Zoom Text and Images" msgstr "Suurenna tekstiä ja kuvia" -#: ../midori/midori-websettings.c:932 +#: ../midori/midori-websettings.c:944 msgid "Whether to zoom text and images" msgstr "Suurennetaanko sekä tekstiä että kuvia" -#: ../midori/midori-websettings.c:947 +#: ../midori/midori-websettings.c:959 msgid "Find inline while typing" msgstr "Etsi sivulta kirjoittaessa" -#: ../midori/midori-websettings.c:948 +#: ../midori/midori-websettings.c:960 msgid "Whether to automatically find inline while typing" msgstr "Etsitäänkö kirjoitettua tekstiä automaattisesti sivulta" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:975 msgid "Kinetic scrolling" msgstr "Kineettinen vieritys" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:976 msgid "Whether scrolling should kinetically move according to speed" msgstr "Vieritetäänkö sivua kineettisesti vieritysnopeuden mukaan" -#: ../midori/midori-websettings.c:972 +#: ../midori/midori-websettings.c:984 msgid "Accept cookies" msgstr "Salli evästeet" -#: ../midori/midori-websettings.c:973 +#: ../midori/midori-websettings.c:985 msgid "What type of cookies to accept" msgstr "Minkälaiset evästeet sallitaan" -#: ../midori/midori-websettings.c:989 -msgid "Original cookies only" -msgstr "Alkuperäiset evästeet" - -#: ../midori/midori-websettings.c:990 -msgid "Accept cookies from the original website only" -msgstr "Sallii vain alkuperäisen sivuston evästeet" - -#: ../midori/midori-websettings.c:998 +#: ../midori/midori-websettings.c:994 msgid "Maximum cookie age" msgstr "Evästeiden enimmäisikä" -#: ../midori/midori-websettings.c:999 +#: ../midori/midori-websettings.c:995 msgid "The maximum number of days to save cookies for" msgstr "Evästetietojen enimmäissäilytysaika päivinä" -#: ../midori/midori-websettings.c:1016 -msgid "Remember last visited pages" -msgstr "Muista sivut, joilla on vierailtu" - -#: ../midori/midori-websettings.c:1017 -msgid "Whether the last visited pages are saved" -msgstr "Tallennetaanko sivut, joilla on vierailtu viimeksi" - -#: ../midori/midori-websettings.c:1025 +#: ../midori/midori-websettings.c:1004 msgid "Maximum history age" msgstr "Historian enimmäisikä" -#: ../midori/midori-websettings.c:1026 +#: ../midori/midori-websettings.c:1005 msgid "The maximum number of days to save the history for" msgstr "Montako päivää sivuja säilytetään sivuhistoriassa " -#: ../midori/midori-websettings.c:1034 +#: ../midori/midori-websettings.c:1020 msgid "Remember last downloaded files" msgstr "Muista ladatut tiedostot" -#: ../midori/midori-websettings.c:1035 +#: ../midori/midori-websettings.c:1021 msgid "Whether the last downloaded files are saved" msgstr "Tallennetaanko ladattujen tiedostojen lista" -#: ../midori/midori-websettings.c:1052 +#: ../midori/midori-websettings.c:1038 msgid "Proxy server" msgstr "Välipalvelin" -#: ../midori/midori-websettings.c:1053 +#: ../midori/midori-websettings.c:1039 msgid "The type of proxy server to use" msgstr "Käytettävän välipalvelimen tyyppi" -#: ../midori/midori-websettings.c:1062 +#: ../midori/midori-websettings.c:1048 msgid "HTTP Proxy Server" msgstr "HTTP-välipalvelin" -#: ../midori/midori-websettings.c:1063 +#: ../midori/midori-websettings.c:1049 msgid "The proxy server used for HTTP connections" msgstr "HTTP-yhteyksille käytettävä välipalvelin" -#: ../midori/midori-websettings.c:1078 -msgid "Detect proxy server automatically" -msgstr "Tunnista välipalvelin automaattisesti" - -#: ../midori/midori-websettings.c:1079 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Tunnistetaanko välipalvelin automaattisesti ympäristömuuttujista" - #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1095 +#: ../midori/midori-websettings.c:1065 msgid "Identify as" msgstr "Tunnistautuminen" -#: ../midori/midori-websettings.c:1096 +#: ../midori/midori-websettings.c:1066 msgid "What to identify as to web pages" msgstr "Mitä selain ilmoittaa itsestään verkkoselaimille" -#: ../midori/midori-websettings.c:1112 +#: ../midori/midori-websettings.c:1082 msgid "Identification string" msgstr "Tunnistautumismerkkijono" -#: ../midori/midori-websettings.c:1113 +#: ../midori/midori-websettings.c:1083 msgid "The application identification string" msgstr "Sovelluksen tunnistautumismerkkijono" -#: ../midori/midori-websettings.c:1128 +#: ../midori/midori-websettings.c:1099 msgid "Preferred languages" msgstr "Ensisijaiset kielet" -#: ../midori/midori-websettings.c:1129 +#: ../midori/midori-websettings.c:1100 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1659,536 +1663,647 @@ "Pilkuin erotettu lista kielistä, joilla monikieliset sivut pitäisi esittää. " "Esimerkiksi \"fi\", \"fi,en\" tai \"fi-fi;q=1.0, en-us;q=0.667\"" -#: ../midori/midori-websettings.c:1144 +#: ../midori/midori-websettings.c:1115 msgid "Clear private data" msgstr "Poista yksityisyystietoja" -#: ../midori/midori-websettings.c:1145 +#: ../midori/midori-websettings.c:1116 msgid "The private data selected for deletion" msgstr "Poistettavaksi valitut yksityisyystiedot" +#: ../midori/midori-websettings.c:1131 +msgid "Clear data" +msgstr "Poista tietoja" + +#: ../midori/midori-websettings.c:1132 +msgid "The data selected for deletion" +msgstr "Poistettavaksi valitut tiedot" + +#: ../midori/midori-view.c:1269 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s haluaa tallentaa HTML5-tietokannan-" + +#: ../midori/midori-view.c:1273 ../midori/midori-view.c:1303 +msgid "_Deny" +msgstr "_Estä" + +#: ../midori/midori-view.c:1273 ../midori/midori-view.c:1303 +msgid "_Allow" +msgstr "_Salli" + +#: ../midori/midori-view.c:1299 +#, c-format +msgid "%s wants to know your location." +msgstr "%s haluaa tietää sijaintisi." + #. 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:1185 ../midori/midori-view.c:4450 -#: ../midori/midori-view.c:4454 +#: ../midori/midori-view.c:1400 ../midori/midori-view.c:4771 +#: ../midori/midori-view.c:4775 #, c-format msgid "Error - %s" msgstr "Virhe - %s" -#: ../midori/midori-view.c:1186 +#: ../midori/midori-view.c:1401 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Sivun \"%s\" lataus epäonnistui." -#: ../midori/midori-view.c:1191 +#: ../midori/midori-view.c:1403 msgid "Try again" msgstr "Yritä uudelleen" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1232 +#: ../midori/midori-view.c:1422 #, c-format msgid "Not found - %s" msgstr "Ei löydy - %s" -#: ../midori/midori-view.c:1454 ../midori/midori-view.c:2274 +#: ../midori/midori-view.c:1607 ../midori/midori-view.c:2576 #, c-format msgid "Send a message to %s" msgstr "Lähetä viesti osoitteeseen %s" -#: ../midori/midori-view.c:2056 ../midori/midori-view.c:2436 +#: ../midori/midori-view.c:2355 ../midori/midori-view.c:2743 msgid "Inspect _Element" msgstr "Tutki _elementtiä" -#: ../midori/midori-view.c:2108 ../midori/midori-view.c:2178 +#: ../midori/midori-view.c:2407 ../midori/midori-view.c:2477 msgid "Open Link in New _Tab" msgstr "Avaa linkki uudelle _välilehdelle" -#: ../midori/midori-view.c:2112 +#: ../midori/midori-view.c:2411 msgid "Open Link in _Foreground Tab" msgstr "Avaa linkki välilehdelle _etualalla" -#: ../midori/midori-view.c:2113 +#: ../midori/midori-view.c:2412 msgid "Open Link in _Background Tab" msgstr "Avaa linkki välilehdelle t_austalla" -#: ../midori/midori-view.c:2116 ../midori/midori-view.c:2185 +#: ../midori/midori-view.c:2415 ../midori/midori-view.c:2484 msgid "Open Link in New _Window" msgstr "Avaa linkki uudessa i_kkunassa" -#: ../midori/midori-view.c:2119 +#: ../midori/midori-view.c:2418 msgid "Open Link as Web A_pplication" msgstr "Avaa linkki _verkkosovelluksena" -#: ../midori/midori-view.c:2122 +#: ../midori/midori-view.c:2421 msgid "Copy Link de_stination" msgstr "K_opioi linkin kohde" -#: ../midori/midori-view.c:2125 ../midori/midori-view.c:2197 +#: ../midori/midori-view.c:2424 ../midori/midori-view.c:2496 msgid "_Save Link destination" msgstr "_Tallenna linkin kohde" -#: ../midori/midori-view.c:2126 ../midori/midori-view.c:2191 +#: ../midori/midori-view.c:2425 ../midori/midori-view.c:2490 msgid "_Download Link destination" msgstr "_Lataa linkin kohde" -#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2160 -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2429 ../midori/midori-view.c:2459 +#: ../midori/midori-view.c:2501 msgid "Download with Download _Manager" msgstr "Lataa latau_ssovelluksella" -#: ../midori/midori-view.c:2139 +#: ../midori/midori-view.c:2438 msgid "Open _Image in New Tab" msgstr "Avaa kuva uudelle _välilehdelle" -#: ../midori/midori-view.c:2142 +#: ../midori/midori-view.c:2441 msgid "Copy Image _Address" msgstr "Kopioi kuvan _osoite" -#: ../midori/midori-view.c:2145 +#: ../midori/midori-view.c:2444 msgid "Save I_mage" msgstr "Tallenna _kuva" -#: ../midori/midori-view.c:2146 +#: ../midori/midori-view.c:2445 msgid "Download I_mage" msgstr "Lataa _kuva" -#: ../midori/midori-view.c:2153 +#: ../midori/midori-view.c:2452 msgid "Copy Video _Address" msgstr "Kopioi videon _osoite" -#: ../midori/midori-view.c:2156 +#: ../midori/midori-view.c:2455 msgid "Save _Video" msgstr "Tallenna _video" -#: ../midori/midori-view.c:2156 +#: ../midori/midori-view.c:2455 msgid "Download _Video" msgstr "Lataa _video" -#: ../midori/midori-view.c:2219 +#: ../midori/midori-view.c:2521 msgid "Search _with" msgstr "_Etsi sanalla" -#: ../midori/midori-view.c:2254 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2556 ../midori/midori-view.c:2563 msgid "_Search the Web" msgstr "_Hae verkosta" -#: ../midori/midori-view.c:2282 +#: ../midori/midori-view.c:2584 msgid "Open Address in New _Tab" msgstr "Avaa osoite uudelle _välilehdelle" -#: ../midori/midori-view.c:2586 +#: ../midori/midori-view.c:2885 msgid "Open or download file" msgstr "Avaa tai lataa tiedosto" -#: ../midori/midori-view.c:2609 +#: ../midori/midori-view.c:2904 #, c-format msgid "File Type: '%s'" msgstr "Tiedostotyyppi: \"%s\"" -#: ../midori/midori-view.c:2612 +#: ../midori/midori-view.c:2907 #, c-format msgid "File Type: %s ('%s')" msgstr "Tiedostotyyppi: %s (\"%s\")" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2616 +#: ../midori/midori-view.c:2911 #, c-format msgid "Open %s" msgstr "Avaa %s" -#: ../midori/midori-view.c:3150 +#: ../midori/midori-view.c:3480 #, c-format msgid "Inspect page - %s" msgstr "Tutki sivua - %s" -#: ../midori/midori-view.c:3411 -msgid "Speed dial" +#: ../midori/midori-view.c:3769 +msgid "Speed Dial" msgstr "Pikavalinta" -#: ../midori/midori-view.c:3412 +#: ../midori/midori-view.c:3770 msgid "Click to add a shortcut" msgstr "Lisää pikavalinta napsauttamalla" -#: ../midori/midori-view.c:3413 +#: ../midori/midori-view.c:3771 msgid "Enter shortcut address" msgstr "Syötä pikavalinnan osoite" -#: ../midori/midori-view.c:3414 +#: ../midori/midori-view.c:3772 msgid "Enter shortcut title" msgstr "Lisää pikavalinnan otsake" -#: ../midori/midori-view.c:3415 +#: ../midori/midori-view.c:3773 msgid "Are you sure you want to delete this shortcut?" msgstr "Haluatko varmasti postaa pikavalinnan?" -#: ../midori/midori-view.c:3452 +#: ../midori/midori-view.c:3774 +msgid "Set number of columns and rows" +msgstr "Aseta sarakkeiden ja rivien määrä" + +#: ../midori/midori-view.c:3775 +msgid "Enter number of columns and rows:" +msgstr "Syötä sarakkeiden ja rivien määrä:" + +#: ../midori/midori-view.c:3776 +msgid "Invalid input for the size of the speed dial" +msgstr "Arvo ei ole käyttökelpoinen pikavalinnan koko" + +#: ../midori/midori-view.c:3777 +msgid "Thumb size:" +msgstr "Pienoiskuvan koko:" + +#: ../midori/midori-view.c:3778 +msgid "Small" +msgstr "Pieni" + +#: ../midori/midori-view.c:3779 +msgid "Medium" +msgstr "Keskisuuri" + +#: ../midori/midori-view.c:3780 +msgid "Big" +msgstr "Suuri" + +#: ../midori/midori-view.c:3805 #, c-format msgid "Document cannot be displayed" msgstr "Asiakirjaa ei voi näyttää" -#: ../midori/midori-view.c:3475 +#: ../midori/midori-view.c:3828 #, c-format msgid "No documentation installed" msgstr "Dokumentaatiota ei ole asennettu" -#: ../midori/midori-view.c:3725 +#: ../midori/midori-view.c:3948 +msgid "Page loading delayed" +msgstr "Sivun lataus viivästetty" + +#: ../midori/midori-view.c:3949 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "" +"Viivästetty lataus sovelluksen kaatumisen tai käynnistysasetusten vuoksi." + +#: ../midori/midori-view.c:3950 +msgid "Load Page" +msgstr "Lataa sivu" + +#: ../midori/midori-view.c:4091 msgid "Blank page" msgstr "Tyhjä sivu" -#: ../midori/midori-view.c:3985 +#: ../midori/midori-view.c:4343 msgid "_Duplicate Tab" msgstr "_Monista välilehti" -#: ../midori/midori-view.c:3990 -msgid "_Restore Tab" -msgstr "_Palauta välilehti" - -#: ../midori/midori-view.c:3990 -msgid "_Minimize Tab" -msgstr "Pi_enennä välilehti" +#: ../midori/midori-view.c:4348 +msgid "Show Tab _Label" +msgstr "Näytä välilehden t_eksti" + +#: ../midori/midori-view.c:4348 +msgid "Show Tab _Icon Only" +msgstr "Näytä vain välilehden k_uvake" -#: ../midori/midori-view.c:3996 +#: ../midori/midori-view.c:4354 msgid "Close ot_her Tabs" msgstr "Sulje _muut välilehdet" -#: ../midori/midori-view.c:4622 +#: ../midori/midori-view.c:4949 msgid "Print background images" msgstr "Tulosta taustakuvat" -#: ../midori/midori-view.c:4623 +#: ../midori/midori-view.c:4950 msgid "Whether background images should be printed" msgstr "Tulosta myös verkkosivujen taustakuvat" -#: ../midori/midori-view.c:4675 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4986 ../midori/midori-preferences.c:412 msgid "Features" msgstr "Ominaisuudet" #. Page "General" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:329 msgid "General" msgstr "Yleiset" -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:330 msgid "Startup" msgstr "Käynnistys" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:345 ../midori/midori-preferences.c:352 msgid "Use current page as homepage" msgstr "Aseta nykyinen sivu kotisivuksi" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:362 ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Lataukset" #. Page "Appearance" -#: ../midori/midori-preferences.c:349 +#: ../midori/midori-preferences.c:380 msgid "Appearance" msgstr "Ulkoasu" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:381 msgid "Font settings" msgstr "Kirjasinasetukset" -#: ../midori/midori-preferences.c:352 +#: ../midori/midori-preferences.c:383 msgid "Default Font Family" msgstr "Oletuskirjasin" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:386 msgid "The default font family used to display text" msgstr "Tekstin esittämiseen oletusarvoisesti käytettävä kirjasin" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:389 msgid "The default font size used to display text" msgstr "Tekstin esittämiseen käytettävän kirjasimen oletuskoko" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:391 msgid "Fixed-width Font Family" msgstr "Tasavälinen kirjasin" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:394 msgid "The font family used to display fixed-width text" msgstr "Tasavälisen tekstin esittämiseen käytettävä kirjasin" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:397 msgid "The font size used to display fixed-width text" msgstr "Tasavälisen tekstin oletuskirjasinkoko" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:399 msgid "Minimum Font Size" msgstr "Kirjasimen vähimmäiskoko" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:402 msgid "The minimum font size used to display text" msgstr "Pienin tekstin esittämiseen käytettävä koko" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:411 msgid "Behavior" msgstr "Käytös" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:420 msgid "Enforce 96 dots per inch" msgstr "Pakota 96 pistettä tuumalle" -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:421 msgid "Enforce a video dot density of 96 DPI" msgstr "Pakota näytön pistetarkkuudeksi 96 DPI" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:433 msgid "Allow scripts to open popups" msgstr "Salli skriptien ponnahdusikkunat" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:434 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Avaa ponnahdusikkunat skripteistä automaattisesti" -#: ../midori/midori-preferences.c:419 -msgid "Spell Checking" -msgstr "Oikoluku" - -#: ../midori/midori-preferences.c:422 -msgid "Enable Spell Checking" -msgstr "Ota oikoluku käyttöön" - -#: ../midori/midori-preferences.c:423 -msgid "Enable spell checking while typing" -msgstr "Käytä oikolukua kirjoittaessa" - -#: ../midori/midori-preferences.c:425 -msgid "Spelling dictionaries:" -msgstr "Oikolukusanastot:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" -msgstr "" -"Pilkuin erotettu lista kielistä, joita käytetään oikolukemiseen. Esimerkiksi " -"\"fi_FI,sv_SE,en_EN\"" - #. Page "Interface" -#: ../midori/midori-preferences.c:435 +#: ../midori/midori-preferences.c:453 msgid "Interface" msgstr "Käyttöliittymä" -#: ../midori/midori-preferences.c:436 +#: ../midori/midori-preferences.c:454 msgid "Navigationbar" msgstr "Navigointipalkki" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:464 msgid "Browsing" msgstr "Selaaminen" #. Page "Applications" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:482 msgid "Applications" msgstr "Sovellukset" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:483 msgid "External applications" msgstr "Ulkoiset sovellukset" #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:499 ../midori/midori-preferences.c:500 msgid "Network" msgstr "Verkko" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:506 msgid "Hostname" msgstr "Isäntänimi" #. Page "Privacy" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:520 msgid "Privacy" msgstr "Yksityisyys" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:521 msgid "Web Cookies" msgstr "Evästeet" -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:522 +msgid "Delete cookies when quitting Midori" +msgstr "Poista evästeet, kun Midori suljetaan" + +#: ../midori/midori-preferences.c:529 +msgid "Delete old cookies after 1 hour" +msgstr "Säilytä evästeitä yksi tunti" + +#: ../midori/midori-preferences.c:530 +msgid "Delete old cookies after 1 day" +msgstr "Säilytä evästeitä yksi päivä" + +#: ../midori/midori-preferences.c:531 +msgid "Delete old cookies after 1 week" +msgstr "Säilytä evästeitä yksi viikko" + +#: ../midori/midori-preferences.c:532 +msgid "Delete old cookies after 1 month" +msgstr "Säilytä evästeitä yksi kuukausi" + +#: ../midori/midori-preferences.c:533 +msgid "Delete old cookies after 1 year" +msgstr "Säilytä evästeitä yksi vuosi" + +#: ../midori/midori-preferences.c:554 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"Evästeisiin tallennetaan kirjautumistietoja, pelitilanteita sekä " +"käyttäjäprofiileja mainostajille." + +#: ../midori/midori-preferences.c:570 ../panels/midori-history.c:114 +msgid "History" +msgstr "Historia" + +#: ../midori/midori-preferences.c:575 msgid "days" msgstr "vrk" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:921 msgid "Add search engine" msgstr "Lisää hakukone" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:921 msgid "Edit search engine" msgstr "Muokkaa hakukonetta" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:950 msgid "_Name:" msgstr "_Nimi:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:994 msgid "_Icon:" msgstr "_Kuvake:" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:1008 msgid "_Token:" msgstr "_Merkki:" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1240 msgid "Manage Search Engines" msgstr "Hallitse hakukoneita" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1340 msgid "Use as _default" msgstr "Aseta _oletukseksi" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:390 +msgid "Open with" +msgstr "Avaa sovelluksessa" + +#: ../midori/sokoke.c:395 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Valitse sovellus tai komento, jolla \"%s\" avataan:" + +#: ../midori/sokoke.c:1406 msgid "_Bookmark" msgstr "_Kirjanmerkki" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1408 msgid "Add Boo_kmark" msgstr "Luo ki_rjanmerkki" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1409 msgid "_Console" msgstr "K_onsoli" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1410 msgid "_Extensions" msgstr "_Liitännäiset" -#: ../midori/sokoke.c:1304 -msgid "_History" -msgstr "_Historia" - -#: ../midori/sokoke.c:1305 +#: ../midori/sokoke.c:1412 msgid "_Homepage" msgstr "_Kotisivu" -#: ../midori/sokoke.c:1306 +#: ../midori/sokoke.c:1413 msgid "_Userscripts" msgstr "Käyttäjän _skriptit" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1414 msgid "New _Tab" msgstr "Uusi _välilehti" -#: ../midori/sokoke.c:1308 +#: ../midori/sokoke.c:1415 msgid "_Transfers" msgstr "_Lataukset" -#: ../midori/sokoke.c:1309 +#: ../midori/sokoke.c:1416 msgid "Netscape p_lugins" msgstr "_Netscape-liitännäiset" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:144 -msgid "Userscripts" -msgstr "Käyttäjän skriptit" +#: ../midori/sokoke.c:1419 +msgid "New _Folder" +msgstr "Uusi ka_nsio" -#: ../panels/midori-addons.c:100 -msgid "Userstyles" -msgstr "Käyttäjän tyylit" +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:228 +msgid "_Inline Find:" +msgstr "_Hakupalkki:" + +#: ../toolbars/midori-findbar.c:262 +msgid "Previous" +msgstr "_Edellinen" + +#: ../toolbars/midori-findbar.c:268 +msgid "Next" +msgstr "Seu_raava" + +#: ../toolbars/midori-findbar.c:272 +msgid "Match Case" +msgstr "Huomioi kirjainkoko" + +#: ../toolbars/midori-findbar.c:281 +msgid "Highlight Matches" +msgstr "Korosta osumat" + +#: ../toolbars/midori-findbar.c:292 +msgid "Close Findbar" +msgstr "Sulje hakupalkki" -#: ../panels/midori-addons.c:305 +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 #, c-format -msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -msgstr "Kopioi käyttäjän skriptit kansioon %s ja käyttäjän tyylit kansioon %s." +msgid "%s of %s" +msgstr "%s/%s" -#: ../panels/midori-addons.c:911 +#: ../toolbars/midori-transferbar.c:123 #, c-format -msgid "Can't monitor folder '%s': %s" -msgstr "Kansiota \"%s\" ei voi valvoa: %s" +msgid "The file '%s' has been downloaded." +msgstr "Tiedoston \"%s\" lataus on valmis." + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "Tiedosto siirretty" -#: ../panels/midori-bookmarks.c:111 +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 +msgid "Clear All" +msgstr "Tyhjennä" + +#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 +msgid "Some files are being downloaded" +msgstr "Tiedostojen lataus on kesken" + +#: ../toolbars/midori-transferbar.c:306 +msgid "_Quit Midori" +msgstr "_Sulje Midori" + +#: ../toolbars/midori-transferbar.c:308 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Lataukset peruuntuvat, jos midori suljetaan." + +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Kirjanmerkit" -#: ../panels/midori-bookmarks.c:250 +#: ../panels/midori-bookmarks.c:276 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Kirjanmerkin lisääminen epäonnistui: %s\n" + +#: ../panels/midori-bookmarks.c:446 msgid "Edit the selected bookmark" msgstr "Muokkaa valittua kirjanmerkkiä" -#: ../panels/midori-bookmarks.c:258 +#: ../panels/midori-bookmarks.c:454 msgid "Delete the selected bookmark" msgstr "Poista valittu kirjanmerkki" -#: ../panels/midori-bookmarks.c:278 +#: ../panels/midori-bookmarks.c:468 msgid "Add a new folder" msgstr "Lisää uusi kansio" -#: ../panels/midori-bookmarks.c:608 +#: ../panels/midori-bookmarks.c:602 ../panels/midori-history.c:565 msgid "Separator" msgstr "Erotin" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "Konsoli" - #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Liitännäiset" -#: ../panels/midori-history.c:273 -msgid "Erroneous clock time" -msgstr "Virheellinen kellonaika" - -#: ../panels/midori-history.c:274 -msgid "" -"The clock time lies in the past. Please check the current date and time." -msgstr "Kello ei ole ajassa. Tarkista kellonaika ja päiväys." - -#: ../panels/midori-history.c:286 +#: ../panels/midori-history.c:146 msgid "A week ago" msgstr "Viikko sitten" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:148 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d päivä sitten" msgstr[1] "%d päivää sitten" -#: ../panels/midori-history.c:291 +#: ../panels/midori-history.c:151 msgid "Today" msgstr "Tänään" -#: ../panels/midori-history.c:293 +#: ../panels/midori-history.c:153 msgid "Yesterday" msgstr "Eilen" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:305 msgid "Are you sure you want to remove all history items?" msgstr "Haluatko varmasti tyhjentää koko sivuhistorian?" -#: ../panels/midori-history.c:438 +#: ../panels/midori-history.c:350 msgid "Bookmark the selected history item" msgstr "Luo kirjanmerkki sivuhistorian kohteeseen" -#: ../panels/midori-history.c:447 +#: ../panels/midori-history.c:359 msgid "Delete the selected history item" msgstr "Poista valittu kohde sivuhistoriasta" -#: ../panels/midori-history.c:455 +#: ../panels/midori-history.c:367 msgid "Clear the entire history" msgstr "Tyhjennä koko sivuhistoria" -#: ../panels/midori-history.c:953 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Suodata:" - -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:481 msgid "Open Destination _Folder" msgstr "Avaa _kohdekansio" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:484 msgid "Copy Link Loc_ation" msgstr "Kopioi linkin ko_hde" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:213 msgid "Authentication Required" msgstr "Ole hyvä ja tunnistaudu" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:229 msgid "" "A username and a password are required\n" "to open this location:" @@ -2196,42 +2311,43 @@ "Sijainnin avaamiseen tarvitaan\n" "käyttäjätunnus ja salasana:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:243 msgid "Username" msgstr "Tunnus" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:256 msgid "Password" msgstr "Salasana" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:270 msgid "_Remember password" msgstr "_Muista salasana" -#: ../katze/katze-throbber.c:842 +#: ../katze/katze-throbber.c:879 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Nimetyn kuvakkeen \"%s\" lataus epäonnistui" -#: ../katze/katze-throbber.c:855 +#: ../katze/katze-throbber.c:892 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Vakiokuvakkeen \"%s\" lataus epäonnistui" -#: ../katze/katze-throbber.c:923 +#: ../katze/katze-throbber.c:964 msgid "Animation frames are broken" msgstr "Animaation kuvissa on vikaa" -#: ../katze/katze-utils.c:495 ../katze/katze-utils.c:890 +#: ../katze/katze-utils.c:510 ../katze/katze-utils.c:918 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Ominaisuus \"%s\" ei kelpaa kohteelle %s" -#: ../katze/katze-utils.c:541 ../katze/katze-utils.c:570 +#: ../katze/katze-utils.c:556 ../katze/katze-utils.c:585 +#: ../extensions/addons.c:313 msgid "Choose file" msgstr "Valitse tiedosto" -#: ../katze/katze-utils.c:556 +#: ../katze/katze-utils.c:571 msgid "Choose folder" msgstr "Valitse kansio" @@ -2240,11 +2356,11 @@ msgid "Preferences for %s" msgstr "????Kohteen %s asetukset" -#: ../extensions/adblock.c:409 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "Säädä mainossuodattimia" -#: ../extensions/adblock.c:441 +#: ../extensions/adblock.c:447 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2253,44 +2369,130 @@ "Kirjoita valmiin suodatinlistan osoite tekstikenttään ja ota se käyttöön " "napsauttamalla \"Lisää\". Löydät lisää listoja osoitteesta %s." -#: ../extensions/adblock.c:581 +#: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." msgstr "Säädä _mainossuodattimia..." -#: ../extensions/adblock.c:835 +#: ../extensions/adblock.c:841 msgid "Edit rule" msgstr "Muokkaa sääntöä" -#: ../extensions/adblock.c:848 +#: ../extensions/adblock.c:854 msgid "_Rule:" msgstr "_Nimi:" -#: ../extensions/adblock.c:902 +#: ../extensions/adblock.c:908 msgid "Bl_ock image" msgstr "_Estä kuva" -#: ../extensions/adblock.c:907 +#: ../extensions/adblock.c:913 msgid "Bl_ock link" msgstr "_Estä linkki" -#: ../extensions/adblock.c:1481 +#: ../extensions/adblock.c:1492 msgid "Advertisement blocker" msgstr "Mainosten estäjä" -#: ../extensions/adblock.c:1482 +#: ../extensions/adblock.c:1493 msgid "Block advertisements according to a filter list" msgstr "Estä mainosten lataaminen suodatinlistan avulla" -#: ../extensions/colorful-tabs.c:204 +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:223 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "Sivu näyttää sisältävän käyttäjän skriptin. Asennetaanko se?" + +#: ../extensions/addons.c:224 +msgid "_Install user script" +msgstr "_Asenna käyttäjän skripti" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:229 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "Sivu näyttää sisältävän käyttäjän tyylimäärityksiä. Asennetaanko ne?" + +#: ../extensions/addons.c:230 +msgid "_Install user style" +msgstr "_Asenna käyttäjän tyylit" + +#: ../extensions/addons.c:238 +msgid "Don't install" +msgstr "Älä asenna" + +#: ../extensions/addons.c:324 ../extensions/addons.c:685 +msgid "Userscripts" +msgstr "Käyttäjän skriptit" + +#: ../extensions/addons.c:329 ../extensions/addons.c:687 +msgid "Userstyles" +msgstr "Käyttäjän tyylit" + +#: ../extensions/addons.c:385 ../extensions/addons.c:461 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Virhe" + +#: ../extensions/addons.c:425 +#, c-format +msgid "Do you want to delete '%s'?" +msgstr "Poistetaanko \"%s\"?" + +#: ../extensions/addons.c:431 +msgid "Delete user script" +msgstr "Poista käyttäjän skripti" + +#: ../extensions/addons.c:432 +msgid "Delete user style" +msgstr "Poista käyttäjän tyyli" + +#: ../extensions/addons.c:436 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "Tiedoston %s poistetaan pysyvästi." + +#: ../extensions/addons.c:572 ../extensions/addons.c:649 +msgid "Open in Text Editor" +msgstr "Avaa tekstieditorissa" + +#: ../extensions/addons.c:574 ../extensions/addons.c:658 +msgid "Open Target Folder" +msgstr "Avaa kohdekansio" + +#: ../extensions/addons.c:640 +msgid "Add new addon" +msgstr "Lisää lisäosa" + +#: ../extensions/addons.c:667 +msgid "Open target folder for selected addon" +msgstr "Avaa valitun lisäosan kohdekansio" + +#: ../extensions/addons.c:668 +msgid "Remove selected addon" +msgstr "Poista valittu lisäosa" + +#: ../extensions/addons.c:1639 ../extensions/addons.c:1801 +msgid "User addons" +msgstr "Käyttäjän lisäosat" + +#: ../extensions/addons.c:1760 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "Kansiota \"%s\" ei voi valvoa: %s" + +#: ../extensions/addons.c:1802 +msgid "Support for userscripts and userstyles" +msgstr "Käyttäjän skriptien ja tyylien tuki" + +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Värikkäät välilehdet" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "Sävytä välilehdet eri väreillä" #: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Evästeiden hallinta" @@ -2376,6 +2578,10 @@ msgid "_Collapse All" msgstr "_Supista kaikki" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "Suodata:" + #: ../extensions/cookie-manager/cookie-manager-page.c:1149 msgid "" "Enter a filter string to show only cookies whose name or domain field match " @@ -2384,14 +2590,22 @@ "Syötä suodatin nähdäksesi ainoastaan evästeet, joiden nimi tai verkkkotunnus " "vastaavat syötettyä merkkijonoa" -#: ../extensions/cookie-manager/main.c:40 -msgid "_Cookie Manager" -msgstr "_Evästeiden hallinta" - -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Selaa, katsele ja poista evästeitä" +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "Kopioi välilehtien _osoitteet" + +#: ../extensions/copy-tabs.c:96 +msgid "Copy Addresses of Tabs" +msgstr "Kopioi osoitteet välilehdiltä" + +#: ../extensions/copy-tabs.c:97 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Kopioi kaikkien välilehtien osoitteet leikepöydälle" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "XML ei sisällä tarvittavia Atom \"entry\"-elementtejä." @@ -2401,39 +2615,39 @@ msgstr "XML ei sisällä tarvittavia Atom \"feed\"-elementtejä." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:392 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Päivitetty: %s." -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:661 msgid "Feeds" msgstr "Syötteet" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:714 msgid "Add new feed" msgstr "Lisää syöte" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:721 msgid "Delete feed" msgstr "Poista syöte" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:803 msgid "_Feeds" msgstr "Syött_eet" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Syötteen XML ei sisällä juurielementtiä." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Syöttemuotoa ei tueta." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "XML-syötteen jäsennys epäonnistui: %s" @@ -2454,68 +2668,118 @@ msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "XML ei sisällä tarvittavia RSS \"channel\"-elementtejä." -#: ../extensions/feed-panel/main.c:132 -msgid "Error" -msgstr "Virhe" - -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "Syöte \"%s\" on jo olemassa" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Virhe ladattaessa syötettä \"%s\"." -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "Syötepaneeli" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Lue Atom/RSS-syötteitä" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory.c:146 #, c-format msgid "Failed to add form value: %s\n" msgstr "Lomakkeen arvon lisääminen epäonnistui: %s\n" -#: ../extensions/formhistory.c:510 +#: ../extensions/formhistory.c:458 ../extensions/formhistory.c:462 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Tietokantakäskyn suoritus epäonnistui: %s\n" + +#: ../extensions/formhistory.c:520 msgid "Stores history of entered form data" msgstr "Muistaa syötetyt lomaketiedot" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory.c:524 #, c-format msgid "Not available: %s" msgstr "Ei saatavilla: %s" -#: ../extensions/formhistory.c:515 +#: ../extensions/formhistory.c:525 msgid "Resource files not installed" msgstr "Resurssitiedostoja ei ole asennettu" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:531 msgid "Form history filler" msgstr "Lomakehistorian täyttäjä" -#: ../extensions/mouse-gestures.c:288 +#. i18n: Data entered into web forms by the user +#: ../extensions/formhistory.c:543 +msgid "_Form History" +msgstr "_Lomakehistoria" + +#: ../extensions/history-list.vala:149 +msgid "There are no unvisited tabs" +msgstr "Kaikilla välilehdillä on jo vierailtu" + +#: ../extensions/history-list.vala:231 +msgid "Next Tab (History List)" +msgstr "Seuraava välilehti (historialista)" + +#: ../extensions/history-list.vala:232 +msgid "Next tab from history" +msgstr "Seuraava välilehti sivuhistoriasta" + +#: ../extensions/history-list.vala:241 +msgid "Previous Tab (History List)" +msgstr "Edellinen välilehti (historialista)" + +#: ../extensions/history-list.vala:242 +msgid "Previous tab from history" +msgstr "Edellinen välilehti sivuhistoriasta" + +#: ../extensions/history-list.vala:251 +msgid "Next new Tab (History List)" +msgstr "Seuraava uusi välilehti (historialista)" + +#: ../extensions/history-list.vala:252 +msgid "Next new tab from history" +msgstr "Seuraava uusi välilehti sivuhistoriasta" + +#: ../extensions/history-list.vala:261 +msgid "Previous new Tab (History List)" +msgstr "Edellinen uusi välilehti (historialista)" + +#: ../extensions/history-list.vala:262 +msgid "Previous new tab from history" +msgstr "Edellinen uusi välilehti sivuhistoriasta" + +#: ../extensions/history-list.vala:347 +msgid "History List" +msgstr "Historialista" + +#: ../extensions/history-list.vala:348 +msgid "Switch tabs with Ctrl+Tab sorted by last usage" +msgstr "Selaa välilehtiä käyttöjärjestyksessä painamalla Ctrl+Tab" + +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Hiirieleet" -#: ../extensions/mouse-gestures.c:289 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Ohjaa Midoria hiiren liikkeillä" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:128 ../extensions/page-holder.c:174 msgid "Pageholder" msgstr "Sivusäilö" -#: ../extensions/page-holder.c:161 +#: ../extensions/page-holder.c:158 msgid "_Pageholder" msgstr "_Sivusäilö" -#: ../extensions/page-holder.c:178 +#: ../extensions/page-holder.c:175 msgid "Keep one or multiple pages open in parallel to your tabs" msgstr "Pidä yksi tai useampi sivu avoinna välilehtien vierellä" @@ -2527,95 +2791,98 @@ msgid "Customize Sh_ortcuts..." msgstr "Muokkaa pika_näppäimiä,,," -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:313 msgid "Shortcuts" msgstr "Pikanäppäimet" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:314 msgid "View and edit keyboard shortcuts" msgstr "Näytä ja muokkaa toimintojen pikanäppäimiä" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/status-clock.c:174 +msgid "Statusbar Clock" +msgstr "Tilapalkin kello" + +#: ../extensions/status-clock.c:175 +msgid "Display date and time in the statusbar" +msgstr "Näytä päiväys ja aika tilapalkissa" + +#: ../extensions/statusbar-features.c:85 msgid "Images" msgstr "Kuvat" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:94 msgid "Scripts" msgstr "Skriptit" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:103 msgid "Netscape plugins" msgstr "Netscape-liitännäiset" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:140 msgid "Statusbar Features" msgstr "Tilapalkin ominaisuudet" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:141 msgid "Easily toggle features on web pages on and off" msgstr "Hallitse verkkosivujen käyttämiä ominaisuuksia vaivattomasti" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:585 ../extensions/tab-panel.c:643 msgid "Tab Panel" msgstr "Välilehtipaneeli" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:626 msgid "T_ab Panel" msgstr "_Välilehtipaneeli" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:644 msgid "Show tabs in a vertical panel" msgstr "Näytä välilehdet pystypaneelissa" -#: ../extensions/tab-switcher.c:395 -msgid "Tab History List" -msgstr "Välilehtihistoria" - -#: ../extensions/tab-switcher.c:396 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Vaihda välilehteä edellisen käytön mukaan järjestetyn listan avulla" +#: ../extensions/tabs-minimized.c:77 +msgid "Only Icons on Tabs by default" +msgstr "Uusissa välilehdissä vain kuvakkeet" + +#: ../extensions/tabs-minimized.c:78 +msgid "New tabs have no label by default" +msgstr "Uusien välilehtien otsaketta ei näytetä oletusarvoisesti" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:387 msgid "Customize Toolbar" msgstr "Mukauta työkalupalkkia" -#: ../extensions/toolbar-editor.c:405 +#: ../extensions/toolbar-editor.c:403 msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " +"Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" "Valitse työkalupalkissa näkyvät kohteet. Voit järjestää kohteita raahaamalla " "ja pudottamalla." -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:419 msgid "Available Items" msgstr "Käytettävissä" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:440 msgid "Displayed Items" msgstr "Käytössä" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:575 msgid "Customize _Toolbar..." msgstr "Mukauta työ_kalupalkkia..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:604 msgid "Toolbar Editor" msgstr "Työkalupalkin muokkain" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:605 msgid "Easily edit the toolbar layout" msgstr "Muokkaa työkalupalkin asettelua vaivattomasti" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:472 ../extensions/web-cache.c:481 +msgid "Web Cache" +msgstr "Välimuisti" + +#: ../extensions/web-cache.c:473 msgid "Cache HTTP communication on disk" msgstr "Välimuistita HTTP-liikenne levylle" - -#~ msgid "Open _Link" -#~ msgstr "Avaa li_nkki" - -#~ msgid "Open Image in New Wi_ndow" -#~ msgstr "Avaa kuva uuteen ikku_naan" - -#~ msgid "REGEX" -#~ msgstr "LAUSEKE" diff -Nru midori-0.2.8/po/fr.po midori-0.4.6/po/fr.po --- midori-0.2.8/po/fr.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/fr.po 2012-05-14 22:13:42.000000000 +0000 @@ -8,1142 +8,1191 @@ # Jérôme Geulfucci 2009 # Stéphane Marguet 2009-2010 # Patrick Douart 2010 -# +# msgid "" msgstr "" "Project-Id-Version: midori 0.2.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 10:11+0000\n" -"PO-Revision-Date: 2010-09-05 14:26+0200\n" -"Last-Translator: Benjamin Maisonnas \n" +"POT-Creation-Date: 2012-04-13 17:33+0000\n" +"PO-Revision-Date: 2012-04-14 01:20+0100\n" +"Last-Translator: Iliyas Jorio \n" "Language-Team: French \n" +"Language: fr\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" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Navigateur Internet léger" +msgid "Browse the Web" +msgstr "Rechercher sur Internet" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1322 ../midori/main.c:1651 -#: ../midori/main.c:1659 ../midori/main.c:1675 +#: ../data/midori.desktop.in.h:2 +#, fuzzy +msgid "Internet;WWW;Explorer" +msgstr "Internet;WWW;Explorer" + +#: ../data/midori.desktop.in.h:3 +#: ../midori/main.c:2048 +#: ../midori/main.c:2072 +#: ../midori/main.c:2086 #: ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Navigateur Internet" -#: ../midori/main.c:99 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Midori (Navigation privée)" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Ouvrir une nouvelle fenêtre (Navigation privée)" + +#: ../data/midori-private.desktop.in.h:3 +#: ../midori/midori-view.c:4166 +msgid "Private Browsing" +msgstr "Navigation privée" + +#: ../midori/main.c:96 +#: ../midori/main.c:102 #, 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:148 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "La valeur « %s » n'est pas valide pour %s" -#: ../midori/main.c:155 ../midori/main.c:241 +#: ../midori/main.c:155 +#: ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valeur de paramètre non valide « %s »" -#: ../midori/main.c:366 ../midori/main.c:470 ../extensions/formhistory.c:439 +#: ../midori/main.c:380 +#, 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:434 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Impossible de supprimer l'historique : %s\n" + +#: ../midori/main.c:454 +#: ../midori/main.c:581 +#: ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" msgstr "Impossible d'ouvrir la base de données : %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:422 +#: ../midori/main.c:524 #, 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:453 ../panels/midori-history.c:169 -#: ../panels/midori-history.c:199 +#: ../midori/main.c:564 +#: ../panels/midori-history.c:232 #, 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:498 +#: ../midori/main.c:611 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Les signets n'ont pas pu être enregistrés. %s" -#: ../midori/main.c:525 +#: ../midori/main.c:633 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "La configuration n'a pas pu être enregistrée. %s" -#: ../midori/main.c:563 +#: ../midori/main.c:668 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Les moteurs de recherche n'ont pas pu être enregistrés. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:583 ../midori/main.c:606 +#: ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" msgstr "La corbeille n'a pas pu être enregistrée. %s" -#: ../midori/main.c:665 ../midori/main.c:905 +#: ../midori/main.c:746 +#: ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Extensions" + +#: ../midori/main.c:760 +msgid "Privacy" +msgstr "Vie privée" + +#: ../midori/main.c:772 +msgid "Cookies store login data, saved games, or user profiles for advertisement purposes." +msgstr "" +"Les cookies peuvent contenir des informations de login, des sauvegardes de jeu ou des profils informations\n" +" sur vous utilisées à des fins publicitaires." + +#: ../midori/main.c:828 #, c-format msgid "The session couldn't be saved. %s" msgstr "La session n'a pas pu être enregistrée. %s" -#: ../midori/main.c:849 +#: ../midori/main.c:1046 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Aucun fichier de certificat racine disponible. Les certificats SSL ne peuvent être vérifiés." -#: ../midori/main.c:939 +#: ../midori/main.c:1115 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 semble s'être interrompu de façon inattendue lors de la dernière 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:954 +#: ../midori/main.c:1134 msgid "Modify _preferences" msgstr "Modifier les _préférences" -#: ../midori/main.c:958 -msgid "Reset the last _session" -msgstr "Réinitialiser la dernière _session" - -#: ../midori/main.c:963 +#: ../midori/main.c:1138 msgid "Disable all _extensions" msgstr "Désactiver toutes les _extensions" -#: ../midori/main.c:1202 ../midori/main.c:1946 +#: ../midori/main.c:1151 +msgid "Discard old tabs" +msgstr "Ignorer les derniers onglets" + +#: ../midori/main.c:1152 +#: ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "Afficher les derniers onglets sans les charger" + +#: ../midori/main.c:1153 +#: ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "Afficher les derniers onglets ouverts" + +#: ../midori/main.c:1400 +#: ../midori/main.c:2464 #, 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:1322 -msgid "No filename specified" -msgstr "Aucun nom de fichier spécifié" - -#: ../midori/main.c:1341 -msgid "An unknown error occured." -msgstr "Une erreur inconnue est survenue." - -#: ../midori/main.c:1372 +#: ../midori/main.c:1538 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Capture enregistrée sous : %s\n" -#: ../midori/main.c:1544 +#: ../midori/main.c:1951 msgid "Run ADDRESS as a web application" msgstr "Lancer l'ADRESSE comme une application internet" -#: ../midori/main.c:1544 +#: ../midori/main.c:1951 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1547 +#: ../midori/main.c:1954 msgid "Use FOLDER as configuration folder" msgstr "Utiliser DOSSIER comme dossier de configuration" -#: ../midori/main.c:1547 +#: ../midori/main.c:1954 msgid "FOLDER" msgstr "DOSSIER" -#: ../midori/main.c:1550 +#: ../midori/main.c:1957 +msgid "Private browsing, no changes are saved" +msgstr "Navigation privée, les modifications ne sont pas enregistrées" + +#: ../midori/main.c:1959 msgid "Show a diagnostic dialog" msgstr "Afficher une fenêtre de diagnostic" -#: ../midori/main.c:1552 +#: ../midori/main.c:1961 msgid "Run the specified filename as javascript" msgstr "Lancer le fichier spécifié en tant que javascript" -#: ../midori/main.c:1555 +#: ../midori/main.c:1963 msgid "Take a snapshot of the specified URI" msgstr "Prendre une capture de l'URI spécifiée" -#: ../midori/main.c:1558 +#: ../midori/main.c:1965 msgid "Execute the specified command" msgstr "Exécuter la commande spécifiée" -#: ../midori/main.c:1560 +#: ../midori/main.c:1967 +msgid "List available commands to execute with -e/ --execute" +msgstr "Lister les commandes disponibles avec l'option -e/ --execute" + +#: ../midori/main.c:1969 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:1562 +#: ../midori/main.c:1971 msgid "Addresses" msgstr "Adresses" -#: ../midori/main.c:1564 +#: ../midori/main.c:1973 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquer les URIs conformément au MODÈLE d'expression régulière" -#: ../midori/main.c:1564 +#: ../midori/main.c:1973 msgid "PATTERN" msgstr "MODÈLE" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1568 +#: ../midori/main.c:1977 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Réinitialiser Midori après SECONDES secondes d'inactivité" -#: ../midori/main.c:1568 +#: ../midori/main.c:1977 msgid "SECONDS" msgstr "SECONDES" -#: ../midori/main.c:1648 +#: ../midori/main.c:1980 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Redirige les avertissements console dans le FICHIER spécifié" + +#: ../midori/main.c:1980 +msgid "FILENAME" +msgstr "FICHIER" + +#: ../midori/main.c:2045 msgid "[Addresses]" msgstr "[Adresses]" -#: ../midori/main.c:1676 +#: ../midori/main.c:2087 msgid "Please report comments, suggestions and bugs to:" msgstr "Merci d'envoyer vos commentaires, suggestions et rapports d'anomalies à :" -#: ../midori/main.c:1678 +#: ../midori/main.c:2089 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions à :" -#: ../midori/main.c:1795 -msgid "The specified configuration folder is invalid." -msgstr "Le dossier de configuration specifié n'est pas valide." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2173 +msgid "Saved logins and _passwords" +msgstr "Mots de _passe et identifiants enregistrés" + +#: ../midori/main.c:2175 +msgid "Cookies and Website data" +msgstr "Cookies et données des sites web" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2179 +#: ../midori/midori-websettings.c:996 +#: ../extensions/web-cache.c:462 +#: ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Cache internet" + +#: ../midori/main.c:2182 +msgid "Website icons" +msgstr "Icônes des pages Internet" + +#: ../midori/main.c:2288 +msgid "An unknown error occured" +msgstr "Une erreur inconnue est survenue." -#: ../midori/main.c:1843 +#: ../midori/main.c:2395 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:1898 -#, 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:1919 +#: ../midori/main.c:2431 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Les signets n'ont pas pu être chargés : %s\n" -#: ../midori/main.c:1961 +#: ../midori/main.c:2479 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "La corbeille n'a pas pu être chargée : %s\n" -#: ../midori/main.c:1974 +#: ../midori/main.c:2492 #, 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:1988 +#: ../midori/main.c:2508 msgid "The following errors occured:" msgstr "Les erreurs suivantes sont survenues :" -#: ../midori/main.c:2004 +#: ../midori/main.c:2524 msgid "_Ignore" msgstr "_Ignorer" -#: ../midori/midori-array.c:429 +#: ../midori/midori-app.c:1334 +msgid "_Bookmark" +msgstr "_Signet" + +#: ../midori/midori-app.c:1335 +#: ../midori/midori-browser.c:6042 +msgid "_Bookmarks" +msgstr "_Signets" + +#: ../midori/midori-app.c:1336 +msgid "Add Boo_kmark" +msgstr "Ajouter un s_ignet" + +#: ../midori/midori-app.c:1337 +msgid "_Console" +msgstr "_Console" + +#: ../midori/midori-app.c:1338 +msgid "_Extensions" +msgstr "_Extensions" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1339 +#: ../midori/midori-browser.c:4569 +msgid "_History" +msgstr "_Historique" + +#: ../midori/midori-app.c:1340 +msgid "_Homepage" +msgstr "Page d'a_ccueil" + +#: ../midori/midori-app.c:1341 +msgid "_Userscripts" +msgstr "Scripts _utilisateur" + +#: ../midori/midori-app.c:1342 +msgid "New _Tab" +msgstr "Nouvel o_nglet" + +#: ../midori/midori-app.c:1343 +msgid "_Transfers" +msgstr "_Transferts" + +#: ../midori/midori-app.c:1344 +msgid "Netscape p_lugins" +msgstr "Greffons _Netscape" + +#: ../midori/midori-app.c:1345 +msgid "_Closed Tabs" +msgstr "Onglets _fermés" + +#: ../midori/midori-app.c:1346 +#: ../midori/midori-browser.c:5198 +msgid "New _Window" +msgstr "Nouvelle _fenêtre" + +#: ../midori/midori-app.c:1347 +msgid "New _Folder" +msgstr "Nouveau dossier" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "Fichier non trouvé." -#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 -#: ../midori/midori-array.c:496 +#: ../midori/midori-array.c:547 +#: ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 +#: ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Document mal formé." -#: ../midori/midori-array.c:505 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "Format de signets inconnus." -#: ../midori/midori-array.c:716 +#: ../midori/midori-array.c:915 msgid "Writing failed." msgstr "L'écriture a échoué." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4926 -#: ../midori/midori-browser.c:4932 +#: ../midori/midori-browser.c:331 +#: ../midori/midori-browser.c:5280 +#: ../midori/midori-browser.c:5289 msgid "Reload the current page" msgstr "Actualiser la page courante" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4929 +#: ../midori/midori-browser.c:340 +#: ../midori/midori-browser.c:5286 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page courante" -#: ../midori/midori-browser.c:453 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% chargés" - -#: ../midori/midori-browser.c:491 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" msgstr "Impossible de mettre à jour le titre : %s\n" -#: ../midori/midori-browser.c:504 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." msgstr "Action inattendue « %s »." -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:579 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Navigation privée)" + +#: ../midori/midori-browser.c:693 +#: ../midori/midori-browser.c:726 +msgid "Toplevel folder" +msgstr "Dossier supérieur" + +#: ../midori/midori-browser.c:784 msgid "New folder" msgstr "Nouveau dossier" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:784 msgid "Edit folder" msgstr "Modifier le dossier" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:786 msgid "New bookmark" msgstr "Nouveau signet" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:786 msgid "Edit bookmark" msgstr "Modifier le signet" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:828 msgid "_Title:" msgstr "_Titre :" -#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:958 -msgid "_Description:" -msgstr "_Description :" - -#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:972 +#: ../midori/midori-browser.c:848 +#: ../midori/midori-searchaction.c:961 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Adresse :" # manque un raccourcis Alt+X -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4046 +#: ../midori/midori-browser.c:871 +#: ../midori/midori-browser.c:4306 msgid "_Folder:" msgstr "_Dossier :" -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 -#: ../midori/midori-browser.c:4051 ../midori/midori-browser.c:4079 -msgid "Toplevel folder" -msgstr "Dossier supérieur" - -#: ../midori/midori-browser.c:872 +#: ../midori/midori-browser.c:887 msgid "Add to _Speed Dial" msgstr "Ajouter à la page d'appel rapide" -#: ../midori/midori-browser.c:885 +#: ../midori/midori-browser.c:900 msgid "Show in the tool_bar" msgstr "Afficher dans la _barre d'outils" -#: ../midori/midori-browser.c:900 +#: ../midori/midori-browser.c:915 msgid "Run as _web application" msgstr "Lancer comme une application _internet" -#: ../midori/midori-browser.c:979 +#: ../midori/midori-browser.c:986 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Le fichier \"%s\" ne peut être sauvé dans ce répertoire." + +#: ../midori/midori-browser.c:988 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Vous n'avez pas la permission pour écrire à cet endroit." + +#: ../midori/midori-browser.c:995 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Il n'y a pas assez d'espace libre pour télécharger \"%s\"." -#: ../midori/midori-browser.c:983 +#: ../midori/midori-browser.c:998 #, c-format msgid "The file needs %s but only %s are left." msgstr "Le fichier à besoin de %s, mais seulement %s est disponible." -#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4087 -#: ../midori/midori-browser.c:4122 +#: ../midori/midori-browser.c:1036 +#: ../midori/midori-browser.c:4375 msgid "Save file as" msgstr "Enregistrer le fichier sous" -#: ../midori/midori-browser.c:1438 +#: ../midori/midori-browser.c:1330 +msgid "New Window" +msgstr "Nouvelle fenêtre" + +#: ../midori/midori-browser.c:1330 +msgid "A new window has been opened" +msgstr "Une nouvelle fenêtre a été ouverte" + +#: ../midori/midori-browser.c:1333 +msgid "New Tab" +msgstr "Nouvel onglet" + +#: ../midori/midori-browser.c:1333 +msgid "A new tab has been opened" +msgstr "Un nouvel onglet a été ouvert" + +#: ../midori/midori-browser.c:1368 +msgid "Error opening the image!" +msgstr "Erreur pendant l'ouverture de l'image !" + +#: ../midori/midori-browser.c:1369 +msgid "Can not open selected image in a default viewer." +msgstr "Impossible d'ouvrir l'image sélectionnée dans la visionneuse par défaut." + +#: ../midori/midori-browser.c:1375 +msgid "Error downloading the image!" +msgstr "Erreur lors du téléchargement de l'image !" + +#: ../midori/midori-browser.c:1376 +msgid "Can not download selected image." +msgstr "Ne peut pas télécharger l'image sélectionnez." + +#: ../midori/midori-browser.c:1481 msgid "Save file" msgstr "Enregistrer le fichier" -#: ../midori/midori-browser.c:2154 +#: ../midori/midori-browser.c:2349 msgid "Open file" msgstr "Ouvrir le fichier" -#: ../midori/midori-browser.c:2232 +#: ../midori/midori-browser.c:2481 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." msgstr "Pour utiliser l'URI ci-dessus ouvrez un agrégateur de flux. Il y a habituellement un menu ou un bouton \"Nouvel abonnement\", \"Nouvelles RSS \" ou similaires. \\ nAlternativement allez dans Préférences, Applications de Midori, et sélectionnez un agrégateur de flux. La prochaine fois que vous cliquerez sur l'icône de fil de nouvelles, il sera ajouté automatiquement." -#: ../midori/midori-browser.c:2238 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2487 +#: ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nouveau flux" -#: ../midori/midori-browser.c:2281 ../midori/midori-browser.c:4991 -#: ../panels/midori-bookmarks.c:400 +#: ../midori/midori-browser.c:2530 +#: ../midori/midori-browser.c:5349 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:2850 ../midori/midori-searchaction.c:481 +#: ../midori/midori-browser.c:3029 +#: ../midori/midori-searchaction.c:488 msgid "Empty" msgstr "Vide" -#: ../midori/midori-browser.c:3323 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "Impossible de lancer le programme externe." +#: ../midori/midori-browser.c:3449 +msgid "Toggle text cursor navigation" +msgstr "Activer ou désactiver la navigation au curseur" -#: ../midori/midori-browser.c:3566 ../midori/midori-browser.c:5382 +#: ../midori/midori-browser.c:3765 +#: ../midori/midori-browser.c:5735 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Impossible d'ajouter l'élément de l'historique : %s\n" -#: ../midori/midori-browser.c:3881 ../panels/midori-bookmarks.c:713 -#: ../panels/midori-history.c:736 +#: ../midori/midori-browser.c:4094 +#: ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 msgid "Open all in _Tabs" msgstr "Tout ouvrir dans des _onglets" -#: ../midori/midori-browser.c:3888 ../panels/midori-bookmarks.c:719 -#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:542 +#: ../midori/midori-browser.c:4101 +#: ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 +#: ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:3891 ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:744 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4104 +#: ../midori/midori-view.c:2648 +#: ../midori/midori-view.c:4706 +#: ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 +#: ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:3969 +#: ../midori/midori-browser.c:4193 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3970 +#: ../midori/midori-browser.c:4194 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3971 +#: ../midori/midori-browser.c:4195 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3972 +#: ../midori/midori-browser.c:4196 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:4197 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3997 +#: ../midori/midori-browser.c:4198 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4219 msgid "Import bookmarks..." msgstr "Importer des signets..." -#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:4222 +#: ../midori/midori-browser.c:5354 msgid "_Import bookmarks" msgstr "_Importer des signets" -#: ../midori/midori-browser.c:4011 +#: ../midori/midori-browser.c:4233 msgid "_Application:" msgstr "_Application :" -#: ../midori/midori-browser.c:4038 ../midori/midori-browser.c:5109 -#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 -#: ../katze/katze-utils.c:696 -msgid "Custom..." -msgstr "Personnalisé..." +#: ../midori/midori-browser.c:4298 +msgid "Import from XBEL or HTML file" +msgstr "Importer depuis un fichier XBEL ou HTML" + +#: ../midori/midori-browser.c:4333 +msgid "Import from a file" +msgstr "Importer depuis un fichier" -#: ../midori/midori-browser.c:4098 +#: ../midori/midori-browser.c:4345 msgid "Failed to import bookmarks" msgstr "Impossible d'importer les signets" -#: ../midori/midori-browser.c:4139 +#: ../midori/midori-browser.c:4380 +msgid "XBEL Bookmarks" +msgstr "Signets XBEL" + +#: ../midori/midori-browser.c:4385 +msgid "Netscape Bookmarks" +msgstr "Signets Netscape" + +#: ../midori/midori-browser.c:4399 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "Midori peut exporter uniquement vers les formats XBEL (*.xbel) et Netscape (*.html)." + +#: ../midori/midori-browser.c:4414 msgid "Failed to export bookmarks" msgstr "Impossible d'exporter les signets" -#: ../midori/midori-browser.c:4192 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "Impossible de supprimer l'historique : %s\n" - -#: ../midori/midori-browser.c:4200 -#, c-format -msgid "Failed to clear search history: %s\n" -msgstr "Impossible de supprimer l'historique de recherche : %s\n" - #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4307 +#: ../midori/midori-browser.c:4536 msgid "Clear Private Data" msgstr "Effacer les informations privées" -#: ../midori/midori-browser.c:4311 +#: ../midori/midori-browser.c:4540 msgid "_Clear private data" msgstr "_Effacer les informations privées" -#: ../midori/midori-browser.c:4325 +#: ../midori/midori-browser.c:4553 msgid "Clear the following data:" msgstr "Effacer les informations suivantes :" -#: ../midori/midori-browser.c:4335 ../midori/midori-preferences.c:532 -#: ../panels/midori-history.c:114 -msgid "History" -msgstr "Historique" - -#: ../midori/midori-browser.c:4340 -msgid "Cookies" -msgstr "Fichiers témoins / Cookies" +#: ../midori/midori-browser.c:4563 +msgid "Last open _tabs" +msgstr "Derniers ongle_ts ouverts" -#: ../midori/midori-browser.c:4345 -msgid "'Flash' Cookies" -msgstr "Cookies « Flash »" - -#: ../midori/midori-browser.c:4350 -msgid "Website icons" -msgstr "Icônes des pages Internet" - -#: ../midori/midori-browser.c:4355 ../midori/sokoke.c:1314 -msgid "_Closed Tabs" -msgstr "Onglets _fermés" - -#: ../midori/midori-browser.c:4360 ../extensions/web-cache.c:462 -msgid "Web Cache" -msgstr "Cache internet" - -#: ../midori/midori-browser.c:4368 +#: ../midori/midori-browser.c:4589 msgid "Clear private data when _quitting Midori" msgstr "Effacer les informations privées en _quittant Midori" -#: ../midori/midori-browser.c:4509 +#: ../midori/midori-browser.c:4784 msgid "A lightweight web browser." msgstr "Un navigateur Internet léger." -#: ../midori/midori-browser.c:4511 +#: ../midori/midori-browser.c:4785 +msgid "See about:version for version info." +msgstr "Consultez about:version pour obtenir des informations à propos de la version de Midori." + +#: ../midori/midori-browser.c:4787 msgid "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." msgstr "Cette bibliothèque est un logiciel libre, vous pouvez le redistribuer et/ou le modifier selon les termes de la GNU Lesser General Public License telle que publiée par la Free Software Foundation; soit la version 2.1 de la licence ou, à votre choix, toutes versions ultérieures." -#: ../midori/midori-browser.c:4530 +#: ../midori/midori-browser.c:4808 msgid "translator-credits" msgstr "" "Christian Dywan \n" "Adrien Nader \n" "Robert-André Mauchin \n" "Pascal Gervais \n" -"Jérôme Geulfucci " +"Jérôme Geulfucci \n" +"Iliyas Jorio " -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:5196 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:4841 ../midori/sokoke.c:1315 -msgid "New _Window" -msgstr "Nouvelle _fenêtre" - -#: ../midori/midori-browser.c:4842 +#: ../midori/midori-browser.c:5199 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:4845 +#: ../midori/midori-browser.c:5202 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:4847 -msgid "P_rivate Browsing" -msgstr "Navigation en mode _privé" - -#: ../midori/midori-browser.c:4848 -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:5204 +msgid "New P_rivate Browsing Window" +msgstr "Nouvelle fenêtre (Navigation _privée)" -#: ../midori/midori-browser.c:4852 +#: ../midori/midori-browser.c:5208 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:4855 +#: ../midori/midori-browser.c:5210 +msgid "_Save Page As..." +msgstr "_Sauvegarder la page sous..." + +#: ../midori/midori-browser.c:5211 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:4857 +#: ../midori/midori-browser.c:5213 msgid "Add to Speed _dial" msgstr "Ajouter à la page d'appel rapi_de" -#: ../midori/midori-browser.c:4858 -msgid "Add shortcut to speed dial" -msgstr "Ajouter un raccourci à la page d'appel rapide" - -#: ../midori/midori-browser.c:4860 +#: ../midori/midori-browser.c:5217 msgid "Add Shortcut to the _desktop" msgstr "Ajouter un raccourci sur le _bureau" -#: ../midori/midori-browser.c:4861 -msgid "Add shortcut to the desktop" -msgstr "Ajouter un raccourci sur le bureau" +#: ../midori/midori-browser.c:5219 +msgid "Create _Launcher" +msgstr "Créer un _lanceur" -#: ../midori/midori-browser.c:4863 +#: ../midori/midori-browser.c:5223 msgid "Subscribe to News _feed" msgstr "Souscrire au flux de _nouvelles" -#: ../midori/midori-browser.c:4864 -msgid "Subscribe to this news feed" -msgstr "Souscrire à ce flux de _nouvelles" - -#: ../midori/midori-browser.c:4869 +#: ../midori/midori-browser.c:5229 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:4870 +#: ../midori/midori-browser.c:5230 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:4872 +#: ../midori/midori-browser.c:5232 msgid "C_lose Window" msgstr "Fer_mer la fenêtre" -#: ../midori/midori-browser.c:4873 -msgid "Close this window" -msgstr "Fermer cette fenêtre" - -#: ../midori/midori-browser.c:4876 +#: ../midori/midori-browser.c:5236 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:4879 -msgid "Quit the application" -msgstr "Quitter le programme" +#: ../midori/midori-browser.c:5238 +msgid "Close a_ll Windows" +msgstr "Fermer _toutes les fenêtres" -#: ../midori/midori-browser.c:4881 +#: ../midori/midori-browser.c:5241 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:4885 -msgid "Undo the last modification" -msgstr "Annuler la dernière modification" - -#: ../midori/midori-browser.c:4888 -msgid "Redo the last modification" -msgstr "Refaire la dernière modification" - -#: ../midori/midori-browser.c:4892 -msgid "Cut the selected text" -msgstr "Couper le texte sélectionné" - -#: ../midori/midori-browser.c:4895 ../midori/midori-browser.c:4898 -msgid "Copy the selected text" -msgstr "Copier le texte sélectionné" - -#: ../midori/midori-browser.c:4901 -msgid "Paste text from the clipboard" -msgstr "Coller le texte à partir du presse-papiers" - -#: ../midori/midori-browser.c:4904 -msgid "Delete the selected text" -msgstr "Supprimer le texte sélectionné" - -#: ../midori/midori-browser.c:4907 -msgid "Select all text" -msgstr "Sélectionner tout le texte" +#: ../midori/midori-browser.c:5264 +msgid "_Find..." +msgstr "_Trouver" -#: ../midori/midori-browser.c:4910 +#: ../midori/midori-browser.c:5265 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:4912 +#: ../midori/midori-browser.c:5267 msgid "Find _Next" msgstr "Rechercher le sui_vant" -#: ../midori/midori-browser.c:4913 -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:4915 +#: ../midori/midori-browser.c:5270 msgid "Find _Previous" msgstr "Rechercher le _précédent" -#: ../midori/midori-browser.c:4916 -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:4920 +#: ../midori/midori-browser.c:5274 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:4922 +#: ../midori/midori-browser.c:5276 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:5277 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:5282 +msgid "Reload page without caching" +msgstr "Actualiser la page sans mettre en cache" + +#: ../midori/midori-browser.c:5292 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:4938 +#: ../midori/midori-browser.c:5295 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:4941 -msgid "Reset the zoom level" -msgstr "Réinitialiser le niveau d'agrandissement" - -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:5299 msgid "_Encoding" msgstr "_Encodage" -#: ../midori/midori-browser.c:4944 +#: ../midori/midori-browser.c:5301 msgid "View So_urce" msgstr "Afficher le code so_urce" -#: ../midori/midori-browser.c:4945 -msgid "View the source code of the page" -msgstr "Affiche le code source de la page" +#: ../midori/midori-browser.c:5304 +msgid "Ca_ret Browsing" +msgstr "Navigation au _curseur" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:5308 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:4951 +#: ../midori/midori-browser.c:5310 msgid "Scroll _Left" msgstr "Défilement à _gauche" -#: ../midori/midori-browser.c:4952 -msgid "Scroll to the left" -msgstr "Défilement vers la gauche" - -#: ../midori/midori-browser.c:4954 +#: ../midori/midori-browser.c:5313 msgid "Scroll _Down" msgstr "Défilement en _bas" -#: ../midori/midori-browser.c:4955 -msgid "Scroll down" -msgstr "Défilement vers le bas" - -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:5316 msgid "Scroll _Up" msgstr "Défilement en _haut" -#: ../midori/midori-browser.c:4958 -msgid "Scroll up" -msgstr "Défilement vers le haut" - -#: ../midori/midori-browser.c:4960 +#: ../midori/midori-browser.c:5319 msgid "Scroll _Right" msgstr "Défilement à _droite" -#: ../midori/midori-browser.c:4961 -msgid "Scroll to the right" -msgstr "Défilement vers la droite" - -#: ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:5322 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:5325 msgid "Go back to the previous page" msgstr "Aller à la page précédente" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:5328 msgid "Go forward to the next page" msgstr "Aller à la page suivante" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:5332 msgid "Go to the previous sub-page" msgstr "Aller à la sous-page précédente" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4978 +#: ../midori/midori-browser.c:5336 msgid "Go to the next sub-page" msgstr "Aller à la sous-page suivante" -#: ../midori/midori-browser.c:4981 +#: ../midori/midori-browser.c:5339 msgid "Go to your homepage" msgstr "Aller à la page d'accueil" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:5341 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:4984 -msgid "Delete the contents of the trash" -msgstr "Supprimer le contenu de la corbeille" - -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:5344 msgid "Undo _Close Tab" msgstr "A_nnuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:4987 -msgid "Open the last closed tab" -msgstr "Ouvrir le dernier onglet fermé" - -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:5351 msgid "Add a new _folder" msgstr "Ajouter un nouveau _dossier" -#: ../midori/midori-browser.c:4994 -msgid "Add a new bookmark folder" -msgstr "Ajouter un nouveau dossier de signets" - -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:5357 msgid "_Export bookmarks" msgstr "_Exporter des signets" -#: ../midori/midori-browser.c:5002 ../midori/midori-searchaction.c:490 +#: ../midori/midori-browser.c:5360 +#: ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:5003 -msgid "Add, edit and remove search engines..." -msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." - -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:5363 msgid "_Clear Private Data" msgstr "_Effacer les informations privées" -#: ../midori/midori-browser.c:5007 -msgid "Clear private data..." -msgstr "Effacer les informations privées..." - -#: ../midori/midori-browser.c:5011 +#: ../midori/midori-browser.c:5366 msgid "_Inspect Page" msgstr "_Inspecter la page" -#: ../midori/midori-browser.c:5012 -msgid "Inspect page details and access developer tools..." -msgstr "Inspecter les détails de la page et accéder aux outils développeur..." - -#: ../midori/midori-browser.c:5017 +#: ../midori/midori-browser.c:5370 msgid "_Previous Tab" msgstr "Onglet _précédent" -#: ../midori/midori-browser.c:5018 -msgid "Switch to the previous tab" -msgstr "Bascule vers l'onglet précédent" - -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:5373 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:5021 -msgid "Switch to the next tab" -msgstr "Bascule vers l'onglet suivant" +#: ../midori/midori-browser.c:5375 +msgid "Move Tab _Backward" +msgstr "Déplacer l'onglet en _arrière" + +#: ../midori/midori-browser.c:5377 +msgid "_Move Tab Forward" +msgstr "_Déplacer l'onglet en avant" -#: ../midori/midori-browser.c:5023 +#: ../midori/midori-browser.c:5380 msgid "Focus _Current Tab" -msgstr "_Focaliser l'onglet actuel" - -#: ../midori/midori-browser.c:5024 -msgid "Focus the current tab" -msgstr "Focaliser l'onglet actuel" +msgstr "Mettre le focus sur l'onglet _actuel" -#: ../midori/midori-browser.c:5026 -msgid "Minimize _Current Tab" -msgstr "Minimiser l'onglet _actuel" +#: ../midori/midori-browser.c:5383 +msgid "Focus _Next view" +msgstr "Mettre le focus sur la vue _suivante" -#: ../midori/midori-browser.c:5027 -msgid "Minimize the current tab" -msgstr "Minimiser l'onglet actuel" +#: ../midori/midori-browser.c:5386 +msgid "Only show the Icon of the _Current Tab" +msgstr "Afficher uniquement l'icône de l'onglet _courant" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5389 msgid "_Duplicate Current Tab" msgstr "_Dupliquer l'onglet actif" -#: ../midori/midori-browser.c:5030 -msgid "Duplicate the current tab" -msgstr "Duplique l'onglet actif" - -#: ../midori/midori-browser.c:5032 +#: ../midori/midori-browser.c:5392 msgid "Close Ot_her Tabs" msgstr "Fermer les _autres onglets" -#: ../midori/midori-browser.c:5033 -msgid "Close all tabs except the current tab" -msgstr "Fermer tous les onglets sauf l'onglet actuel" - -#: ../midori/midori-browser.c:5035 +#: ../midori/midori-browser.c:5395 msgid "Open last _session" msgstr "Ouvrir la _dernière session" -#: ../midori/midori-browser.c:5036 -msgid "Open the tabs saved in the last session" -msgstr "Ouvrir les onglets enregistrés dans la dernière session" - -#: ../midori/midori-browser.c:5038 +#: ../midori/midori-browser.c:5398 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:5040 -msgid "_Contents" -msgstr "_Sommaire" - -#: ../midori/midori-browser.c:5041 -msgid "Show the documentation" -msgstr "Afficher la documentation" - -#: ../midori/midori-browser.c:5043 +#: ../midori/midori-browser.c:5400 msgid "_Frequent Questions" msgstr "_Questions fréquentes" -#: ../midori/midori-browser.c:5044 -msgid "Show the Frequently Asked Questions" -msgstr "Afficher la foire aux questions" - -#: ../midori/midori-browser.c:5046 -msgid "_Report a Bug" -msgstr "Signaler une _anomalie" - -#: ../midori/midori-browser.c:5047 -msgid "Open Midori's bug tracker" -msgstr "Ouvrir l'outil de suivi d'anomalies de Midori" - -#: ../midori/midori-browser.c:5050 -msgid "Show information about the program" -msgstr "Afficher les informations sur le programme" +#: ../midori/midori-browser.c:5403 +msgid "_Report a Problem..." +msgstr "_Signaler un _problème" -#: ../midori/midori-browser.c:5058 +#: ../midori/midori-browser.c:5415 msgid "_Menubar" msgstr "Barre de _menu" -#: ../midori/midori-browser.c:5059 -msgid "Show menubar" -msgstr "Afficher la barre de menu" - -#: ../midori/midori-browser.c:5062 +#: ../midori/midori-browser.c:5419 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:5063 -msgid "Show navigationbar" -msgstr "Afficher la barre de navigation" - -#: ../midori/midori-browser.c:5066 +#: ../midori/midori-browser.c:5423 msgid "Side_panel" msgstr "Panneau la_téral" -#: ../midori/midori-browser.c:5067 -msgid "Show sidepanel" -msgstr "Afficher le panneau latéral" +#: ../midori/midori-browser.c:5424 +msgid "Sidepanel" +msgstr "Panneau latéral" -#: ../midori/midori-browser.c:5070 +#: ../midori/midori-browser.c:5427 msgid "_Bookmarkbar" msgstr "Barre des _signets" -#: ../midori/midori-browser.c:5071 -msgid "Show bookmarkbar" -msgstr "Afficher la barre des signets" - -#: ../midori/midori-browser.c:5074 -msgid "_Transferbar" -msgstr "Barre des _transferts" - -#: ../midori/midori-browser.c:5075 -msgid "Show transferbar" -msgstr "Afficher la barre des transferts" - -#: ../midori/midori-browser.c:5078 +#: ../midori/midori-browser.c:5431 msgid "_Statusbar" msgstr "Barre d'ét_at" -#: ../midori/midori-browser.c:5079 -msgid "Show statusbar" -msgstr "Afficher la barre d'état" - -#: ../midori/midori-browser.c:5087 +#: ../midori/midori-browser.c:5440 +#: ../midori/midori-websettings.c:311 msgid "_Automatic" msgstr "_Automatique" -#: ../midori/midori-browser.c:5090 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5443 +#: ../midori/midori-websettings.c:236 msgid "Chinese (BIG5)" msgstr "Chinois (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:5447 msgid "Japanese (SHIFT__JIS)" msgstr "Japonais (SHIFT__JIS)" -#: ../midori/midori-browser.c:5097 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5450 +#: ../midori/midori-websettings.c:238 msgid "Korean (EUC-KR)" msgstr "Coréen (EUC-KR)" -#: ../midori/midori-browser.c:5100 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5453 +#: ../midori/midori-websettings.c:239 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../midori/midori-browser.c:5103 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5456 +#: ../midori/midori-websettings.c:240 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5106 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5459 +#: ../midori/midori-websettings.c:241 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5625 +#: ../midori/midori-browser.c:5462 +#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:317 +#: ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "Personnalisé..." + +#: ../midori/midori-browser.c:5967 msgid "_Separator" msgstr "_Séparateur" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5974 msgid "_Location..." msgstr "_Emplacement..." -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5976 msgid "Open a particular location" msgstr "Ouvrir un emplacement particulier" -#: ../midori/midori-browser.c:5658 +#: ../midori/midori-browser.c:5998 msgid "_Web Search..." msgstr "Recherche _Internet..." -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:6000 msgid "Run a web search" msgstr "Lancer une recherche sur Internet" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:6027 msgid "Reopen a previously closed tab or window" msgstr "Rouvrir un onglet ou une fenêtre précédemment fermé" -#: ../midori/midori-browser.c:5696 ../midori/sokoke.c:1304 -msgid "_Bookmarks" -msgstr "_Signets" - -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:6044 msgid "Show the saved bookmarks" msgstr "Afficher les signets sauvegardés" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:6061 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:5731 +#: ../midori/midori-browser.c:6077 msgid "_Window" msgstr "Fe_nêtre" -#: ../midori/midori-browser.c:5733 +#: ../midori/midori-browser.c:6079 msgid "Show a list of all open tabs" msgstr "Afficher une liste de tous les onglets ouverts" -#: ../midori/midori-browser.c:5747 +#: ../midori/midori-browser.c:6093 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:5749 +#: ../midori/midori-browser.c:6095 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:6314 +#: ../midori/midori-browser.c:6909 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" -#: ../midori/midori-locationaction.c:390 +#: ../midori/midori-extension.c:329 #, c-format -msgid "Failed to select from history\n" -msgstr "Impossible de sélectionner dans l'historique\n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "La configuration de l'extension « %s » n'a pas pu être lue : %s\n" -#: ../midori/midori-locationaction.c:474 +#: ../midori/midori-extension.c:747 +#: ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 +#: ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "Rechercher %s" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "La configuration de l'extension « %s » n'a pas pu être enregistrée: %s\n" -#: ../midori/midori-locationaction.c:497 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "Rechercher avec %s" -#: ../midori/midori-locationaction.c:1305 +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Rechercher avec..." + +#: ../midori/midori-locationaction.c:537 #, c-format -msgid "Failed to execute database statement\n" -msgstr "Impossible d'exécuter l'instruction de base de données\n" +msgid "Failed to select from history\n" +msgstr "Impossible de sélectionner dans l'historique\n" + +#: ../midori/midori-locationaction.c:624 +#, c-format +msgid "Search for %s" +msgstr "Rechercher %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1361 +#: ../midori/midori-locationaction.c:1400 msgid "Paste and p_roceed" msgstr "Coller et continue_r" -#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 -msgid "Detach chosen panel from the window" -msgstr "Détacher le panneau choisi de la fenêtre" - -#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 -#: ../midori/midori-panel.c:596 ../midori/midori-panel.c:599 +#: ../midori/midori-locationaction.c:1768 +msgid "Not verified" +msgstr "Non vérifié" + +#: ../midori/midori-locationaction.c:1788 +msgid "Verified and encrypted connection" +msgstr "Connection sécurisée" + +#: ../midori/midori-panel.c:397 +#: ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 +#: ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" msgstr "Aligner le panneau latéral sur la droite" -#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 +#: ../midori/midori-panel.c:409 +#: ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-panel.c:597 ../midori/midori-panel.c:600 +#: ../midori/midori-panel.c:563 +#: ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Aligner le panneau latéral sur la gauche" -#: ../midori/midori-panel.c:754 -msgid "Hide operating controls" -msgstr "Cacher les contrôles" - -#: ../midori/midori-websettings.c:200 -msgid "Show Blank page" -msgstr "Afficher une page vierge" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "Montrer l'Appel rapide" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" msgstr "Afficher la page d'accueil" -#: ../midori/midori-websettings.c:202 -msgid "Show last open tabs" -msgstr "Afficher les derniers onglets ouverts" - -#: ../midori/midori-websettings.c:204 -msgid "Show last tabs without loading" -msgstr "Afficher les derniers onglets sans les charger" - -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:237 msgid "Japanese (SHIFT_JIS)" msgstr "Japonais (SHIFT_JIS)" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:257 msgid "New tab" msgstr "Nouvel onglet" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:258 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:259 msgid "Current tab" msgstr "Onglet actuel" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:274 msgid "Default" msgstr "Par défaut" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:275 msgid "Icons" msgstr "Icônes" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:276 msgid "Small icons" msgstr "Petites icônes" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:277 msgid "Text" msgstr "Texte" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:278 msgid "Icons and text" msgstr "Icônes et texte" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:279 msgid "Text beside icons" msgstr "Texte à côté des icônes" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:294 msgid "Automatic (GNOME or environment)" msgstr "Automatique (GNOME ou de l'environnement)" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:295 msgid "HTTP proxy server" msgstr "Serveur mandataire HTTP" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:296 msgid "No proxy server" msgstr "Pas de serveur mandataire" -#: ../midori/midori-websettings.c:295 -msgid "All cookies" -msgstr "Tous les fichiers témoins" - -#: ../midori/midori-websettings.c:296 -msgid "Session cookies" -msgstr "Témoins de session" - -#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 -msgid "None" -msgstr "Aucun" - #: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" @@ -1160,1079 +1209,1045 @@ msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:400 msgid "Remember last window size" msgstr "Se souvenir de la taille de la fenêtre" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:401 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:378 +#: ../midori/midori-websettings.c:409 msgid "Last window width" msgstr "Dernière largeur de la fenêtre" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:410 msgid "The last saved window width" msgstr "La dernière largeur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:418 msgid "Last window height" msgstr "Dernière hauteur de la fenêtre" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:419 msgid "The last saved window height" msgstr "La dernière hauteur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:444 msgid "Last panel position" msgstr "Dernière position du panneau" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:445 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:423 +#: ../midori/midori-websettings.c:454 msgid "Last panel page" msgstr "Dernière page du panneau" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:455 msgid "The last saved panel page" msgstr "La dernière page enregistrée du panneau" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:463 msgid "Last Web search" msgstr "Dernière recherche sur Internet" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:464 msgid "The last saved Web search" msgstr "La dernière recherche sur Internet enregistrée" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:473 msgid "Show Menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:474 msgid "Whether to show the menubar" msgstr "Indique s'il faut afficher la barre de menu" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:482 msgid "Show Navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:483 msgid "Whether to show the navigationbar" msgstr "Indique s'il faut afficher la barre de navigation" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:491 msgid "Show Bookmarkbar" msgstr "Afficher la barre des _signets" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:492 msgid "Whether to show the bookmarkbar" msgstr "Indique s'il faut afficher la barre des signets" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:500 msgid "Show Panel" msgstr "Afficher le panneau" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:501 msgid "Whether to show the panel" msgstr "Indique s'il faut afficher le panneau" -#: ../midori/midori-websettings.c:485 -msgid "Show Transferbar" -msgstr "Afficher la barre des transferts" - -#: ../midori/midori-websettings.c:486 -msgid "Whether to show the transferbar" -msgstr "Indique s'il faut afficher la barre des transferts" - -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:509 msgid "Show Statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:510 msgid "Whether to show the statusbar" msgstr "Indique s'il faut afficher la barre d'état" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:519 msgid "Toolbar Style:" msgstr "Style de la barre d'outils" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:520 msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" -#: ../midori/midori-websettings.c:521 -msgid "Show progress in location entry" -msgstr "Progression dans la barre d'adresse" - -#: ../midori/midori-websettings.c:522 -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:537 -msgid "Search engines in location completion" -msgstr "Moteurs de recherche dans la complétion" - -#: ../midori/midori-websettings.c:538 -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:546 +#: ../midori/midori-websettings.c:529 msgid "Toolbar Items" msgstr "Éléments de la barre d'outils" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:530 msgid "The items to show on the toolbar" msgstr "Les éléments à afficher dans la barre d'outils" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:538 msgid "Compact Sidepanel" msgstr "Panneau latéral compact" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:539 msgid "Whether to make the sidepanel compact" msgstr "Indique s'il faut mettre le panneau latéral compact" -#: ../midori/midori-websettings.c:571 -msgid "Show operating controls of the panel" -msgstr "Afficher les élements de contrôle du panneau" - -#: ../midori/midori-websettings.c:572 -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:587 +#: ../midori/midori-websettings.c:554 msgid "Align sidepanel on the right" msgstr "Aligner le panneau latéral sur la droite" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:555 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:603 +#: ../midori/midori-websettings.c:570 msgid "Open panels in separate windows" msgstr "Ouvrir les panneaux dans une fenêtre séparée" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:571 msgid "Whether to always open panels in separate windows" msgstr "Indique s'il faut toujours ouvrir les panneaux dans des fenêtres séparées" -#: ../midori/midori-websettings.c:613 +#: ../midori/midori-websettings.c:580 msgid "When Midori starts:" msgstr "Au lancement de Midori :" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:581 msgid "What to do when Midori starts" msgstr "Que faire au lancement de Midori" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:590 msgid "Homepage:" msgstr "Page d'accueil :" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:591 msgid "The homepage" msgstr "La page d'accueil" -#: ../midori/midori-websettings.c:639 +#: ../midori/midori-websettings.c:606 msgid "Show crash dialog" msgstr "Fenêtre de fermeture inattendue" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:607 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:656 -msgid "Show speed dial in new tabs" -msgstr "Appel rapide dans les nouveaux onglets" - -#: ../midori/midori-websettings.c:657 -msgid "Show speed dial in newly opened tabs" -msgstr "Afficher la page d'appel rapide dans les nouveaux onglets" - -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:615 msgid "Save downloaded files to:" -msgstr "Enregistrer les téléchargements sous :" +msgstr "Enregistrer les téléchargements dans :" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:616 msgid "The folder downloaded files are saved to" msgstr "Le dossier où enregistrer les fichiers téléchargés" -#: ../midori/midori-websettings.c:687 -msgid "Ask for the destination folder" -msgstr "Demander le dossier de destination" - -#: ../midori/midori-websettings.c:688 -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:707 -msgid "Notify when a transfer has been completed" -msgstr "Signaler la fin des transferts" - -#: ../midori/midori-websettings.c:708 -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:720 -msgid "Download Manager" -msgstr "Gestionnaire de téléchargements" - -#: ../midori/midori-websettings.c:721 -msgid "An external download manager" -msgstr "Un gestionnaire de téléchargements externe" - -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:624 msgid "Text Editor" msgstr "Éditeur de texte" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:625 msgid "An external text editor" msgstr "Un éditeur de texte externe" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:640 msgid "News Aggregator" msgstr "Agrégateur de flux" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:641 msgid "An external news aggregator" msgstr "Un agrégateur de flux externe" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:649 msgid "Location entry Search" msgstr "Recherche depuis la barre d'adresse" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:650 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:763 +#: ../midori/midori-websettings.c:658 msgid "Preferred Encoding" msgstr "Encodage favori" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:659 msgid "The preferred character encoding" msgstr "Encodage favori des caractères" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:669 msgid "Always Show Tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:670 msgid "Always show the tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:783 +#: ../midori/midori-websettings.c:683 msgid "Close Buttons on Tabs" msgstr "Boutons de fermeture sur les onglets" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:684 msgid "Whether tabs have close buttons" msgstr "Indique s'il faut afficher un bouton de fermeture sur les onglets" -#: ../midori/midori-websettings.c:792 +#: ../midori/midori-websettings.c:709 msgid "Open new pages in:" msgstr "Ouvrir les nouvelles pages dans :" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:710 msgid "Where to open new pages" msgstr "Lieu où les nouvelles pages doivent être ouvertes" -#: ../midori/midori-websettings.c:802 -msgid "Open external pages in:" -msgstr "Ouvrir les pages externes dans :" - -#: ../midori/midori-websettings.c:803 -msgid "Where to open externally opened pages" -msgstr "Lieu où les pages externes doivent être ouvertes" - -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:719 msgid "Middle click opens Selection" msgstr "Un clic milieu ouvre la sélection" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:720 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:821 +#: ../midori/midori-websettings.c:728 msgid "Open tabs in the background" msgstr "Ouvrir les onglets en arrière-plan" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:729 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:830 +#: ../midori/midori-websettings.c:737 msgid "Open Tabs next to Current" msgstr "Ouvrir les onglets à côté de l'onglet actif" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:738 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 actif ou après le dernier" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:746 msgid "Open popups in tabs" msgstr "Ouvrir les fenêtre intempestives dans des onglets" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:747 msgid "Whether to open popup windows in tabs" msgstr "Indique s'il faut ouvrir les fenêtres intempestives (popups) dans des onglets" -#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:757 +#: ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Charger les images automatiquement" -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:758 msgid "Load and display images automatically" msgstr "Charger et afficher les images automatiquement" -#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:765 +#: ../extensions/statusbar-features.c:143 msgid "Enable scripts" msgstr "Activer les scripts" -#: ../midori/midori-websettings.c:859 +#: ../midori/midori-websettings.c:766 msgid "Enable embedded scripting languages" msgstr "Active la prise en charge interne des scripts" -#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:773 +#: ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" msgstr "Activer les greffons Netscape" -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:774 msgid "Enable embedded Netscape plugin objects" msgstr "Active la prise en charge interne des greffons Netscape" -#: ../midori/midori-websettings.c:883 +#: ../midori/midori-websettings.c:789 +msgid "Enable Spell Checking" +msgstr "Activer la vérification de l'orthographe" + +#: ../midori/midori-websettings.c:790 +msgid "Enable spell checking while typing" +msgstr "Activer la vérification de l'orthographe lors de la saisie" + +#: ../midori/midori-websettings.c:796 msgid "Enable HTML5 database support" msgstr "Activer le support de base de données HTML5" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:797 msgid "Whether to enable HTML5 database support" msgstr "Indique s'il faut activer le support de base de données de HTML5" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:803 msgid "Enable HTML5 local storage support" msgstr "Activer le support de stockage local de HTML5" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:804 msgid "Whether to enable HTML5 local storage support" msgstr "Indique s'il faut activer le support de stockage local de HTML5" -#: ../midori/midori-websettings.c:899 +#: ../midori/midori-websettings.c:810 msgid "Enable offline web application cache" msgstr "Activer le cache d'applications web hors ligne" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:811 msgid "Whether to enable offline web application cache" msgstr "Indique s'il faut activer le cache des applications web hors ligne" -#: ../midori/midori-websettings.c:925 +#: ../midori/midori-websettings.c:827 +msgid "Flash window on background tabs" +msgstr "Clignoter en cas d'onglet en arrière-plan" + +#: ../midori/midori-websettings.c:828 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "Faire clignoter la fenêtre du navigateur si un onglet a été ouvert en arrière-plan" + +#: ../midori/midori-websettings.c:836 +msgid "Enable WebGL support" +msgstr "Activer le support WebGL" + +#: ../midori/midori-websettings.c:837 +msgid "Allow websites to use OpenGL rendering" +msgstr "Permettre aux sites d'utiliser le rendu OpenGL" + +#: ../midori/midori-websettings.c:863 msgid "Zoom Text and Images" msgstr "Agrandir le texte et les images" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:864 msgid "Whether to zoom text and images" msgstr "Indique s'il faut agrandir le texte et les images" -#: ../midori/midori-websettings.c:941 +#: ../midori/midori-websettings.c:879 msgid "Find inline while typing" msgstr "Chercher pendant la saisie" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:880 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:957 +#: ../midori/midori-websettings.c:895 msgid "Kinetic scrolling" msgstr "Défilement cinétique" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:896 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:966 -msgid "Accept cookies" -msgstr "Accepter les cookies" - -#: ../midori/midori-websettings.c:967 -msgid "What type of cookies to accept" -msgstr "Type de fichiers témoins (cookies) à accepter" - -#: ../midori/midori-websettings.c:976 -msgid "Maximum cookie age" -msgstr "Âge maximal des cookies" +#: ../midori/midori-websettings.c:904 +msgid "Delete old Cookies after:" +msgstr "Effacer les anciens cookies après :" -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:905 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:986 -msgid "Maximum history age" -msgstr "Âge maximal de l'historique" +#: ../midori/midori-websettings.c:921 +msgid "Only accept Cookies from sites you visit" +msgstr "N'accepter les cookies que de sites que vous visitez" + +#: ../midori/midori-websettings.c:922 +msgid "Block cookies sent by third-party websites" +msgstr "Bloquer les cookies envoyés par des sites tiers" + +#: ../midori/midori-websettings.c:936 +msgid "Delete pages from history after:" +msgstr "Effacer les pages de l'historique après :" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:937 msgid "The maximum number of days to save the history for" msgstr "Le nombre maximal de jours durant lesquels conserver l'historique" -#: ../midori/midori-websettings.c:995 -msgid "Remember last downloaded files" -msgstr "Se souvenir des derniers fichiers téléchargés" - -#: ../midori/midori-websettings.c:996 -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:1013 +#: ../midori/midori-websettings.c:952 msgid "Proxy server" msgstr "Serveur mandataire" -#: ../midori/midori-websettings.c:1014 +#: ../midori/midori-websettings.c:953 msgid "The type of proxy server to use" msgstr "Le type de serveur mandataire à utiliser" -#: ../midori/midori-websettings.c:1023 +#: ../midori/midori-websettings.c:962 msgid "HTTP Proxy Server" msgstr "Serveur mandataire HTTP" -#: ../midori/midori-websettings.c:1024 +#: ../midori/midori-websettings.c:963 msgid "The proxy server used for HTTP connections" msgstr "Le serveur mandataire (proxy) pour les connexions HTTP" +#: ../midori/midori-websettings.c:978 +msgid "Port" +msgstr "Port" + +#: ../midori/midori-websettings.c:979 +msgid "The proxy server port used for HTTP connections" +msgstr "Le port utilisé pour contacter le serveur mandataire (proxy) pour les connexions HTTP" + +#: ../midori/midori-websettings.c:997 +msgid "The maximum size of cached pages on disk" +msgstr "La taille maximale des pages mises en cache sur le disque" + #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1040 +#: ../midori/midori-websettings.c:1014 msgid "Identify as" msgstr "S'identifier comme" -#: ../midori/midori-websettings.c:1041 +#: ../midori/midori-websettings.c:1015 msgid "What to identify as to web pages" msgstr "Comment s'identifier sur les pages Internet" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1031 msgid "Identification string" msgstr "Chaîne d'identification" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1032 msgid "The application identification string" msgstr "La chaîne d'identification de l'application" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1048 msgid "Preferred languages" msgstr "Langues préférés" -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:1049 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Une liste des langues préférées séparées par une virgule pour le rendu des pages multilingues, par exemple \"de\", \"fr,en\" ou \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1089 +#: ../midori/midori-websettings.c:1064 msgid "Clear private data" msgstr "Effacer les informations privées" -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1065 msgid "The private data selected for deletion" msgstr "Les informations privées sélectionnées pour la suppression" -#. 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:1227 ../midori/midori-view.c:4442 -#: ../midori/midori-view.c:4446 +#: ../midori/midori-websettings.c:1080 +msgid "Clear data" +msgstr "Effacer les informations" + +#: ../midori/midori-websettings.c:1081 +msgid "The data selected for deletion" +msgstr "Les informations sélectionnées pour la suppression" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1130 +msgid "Strip referrer details sent to websites" +msgstr "Raccourcir l'en-tête « Referer » envoyée aux sites" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1132 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Si l'en-tête « Referer » (qui fournit des informations à propos de la page précédente où vous vous trouviez) doit être raccourcie au nom d'hôte" + +#: ../midori/midori-websettings.c:1146 +msgid "Always use my font choices" +msgstr "Toujours utiliser les polices choisies" + +#: ../midori/midori-websettings.c:1147 +msgid "Override fonts picked by websites with user preferences" +msgstr "Forcer toute page web à utiliser les polices ci-dessus" + +#: ../midori/midori-view.c:1353 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s veut enregistrer une base de donnée HTML5." + +#: ../midori/midori-view.c:1357 +#: ../midori/midori-view.c:1389 +msgid "_Deny" +msgstr "_Refuser" + +#: ../midori/midori-view.c:1357 +#: ../midori/midori-view.c:1389 +msgid "_Allow" +msgstr "_Autoriser" + +#: ../midori/midori-view.c:1385 +#, c-format +msgid "%s wants to know your location." +msgstr "%s veut connaître votre position" + +#: ../midori/midori-view.c:1476 #, c-format msgid "Error - %s" msgstr "Erreur - %s" -#: ../midori/midori-view.c:1228 +#: ../midori/midori-view.c:1477 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "La page « %s » n'a pu être chargée." -#: ../midori/midori-view.c:1230 +#: ../midori/midori-view.c:1479 msgid "Try again" -msgstr "Essayer une autre fois" - -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1249 -#, c-format -msgid "Not found - %s" -msgstr "Non trouvé - %s" +msgstr "Réessayer" -#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 +#: ../midori/midori-view.c:1676 +#: ../midori/midori-view.c:2589 #, c-format msgid "Send a message to %s" msgstr "Envoyer un message à %s" -#: ../midori/midori-view.c:2060 ../midori/midori-view.c:2446 +#: ../midori/midori-view.c:2419 +#: ../midori/midori-view.c:2738 msgid "Inspect _Element" msgstr "Inspecter l'élé_ment" -#: ../midori/midori-view.c:2112 ../midori/midori-view.c:2182 +#: ../midori/midori-view.c:2471 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-view.c:2116 +#: ../midori/midori-view.c:2475 msgid "Open Link in _Foreground Tab" msgstr "Ouvrir le lien en a_vant plan" -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2476 msgid "Open Link in _Background Tab" msgstr "Ouvrir le lien en a_rrière plan" -#: ../midori/midori-view.c:2120 ../midori/midori-view.c:2189 +#: ../midori/midori-view.c:2479 msgid "Open Link in New _Window" msgstr "Ouvrir le lien dans une nouvelle _fenêtre" -#: ../midori/midori-view.c:2123 +#: ../midori/midori-view.c:2482 msgid "Open Link as Web A_pplication" msgstr "Ouvrir le lien comme une appli_cation internet" -#: ../midori/midori-view.c:2126 +#: ../midori/midori-view.c:2487 msgid "Copy Link de_stination" msgstr "Copier l'adre_sse du lien" -#: ../midori/midori-view.c:2129 ../midori/midori-view.c:2201 -msgid "_Save Link destination" -msgstr "_Enregistrer la cible du lien" - -#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2195 -msgid "_Download Link destination" -msgstr "_Télécharger la cible du lien" - -#: ../midori/midori-view.c:2134 ../midori/midori-view.c:2164 -#: ../midori/midori-view.c:2206 -msgid "Download with Download _Manager" -msgstr "Télécharger avec le _gestionnaire de téléchargements" - -#: ../midori/midori-view.c:2143 +#: ../midori/midori-view.c:2503 msgid "Open _Image in New Tab" msgstr "Ouvrir l'image dans un _nouvel onglet" -#: ../midori/midori-view.c:2146 +#: ../midori/midori-view.c:2506 msgid "Copy Image _Address" msgstr "Copier l'_adresse de l'image" -#: ../midori/midori-view.c:2149 +#: ../midori/midori-view.c:2509 msgid "Save I_mage" msgstr "Enregistrer l'i_mage" -#: ../midori/midori-view.c:2150 -msgid "Download I_mage" -msgstr "Téléc_harger l'image" +#: ../midori/midori-view.c:2512 +msgid "Open in Image _Viewer" +msgstr "Ouvrir dans la _Visionneuse d'images" -#: ../midori/midori-view.c:2157 +#: ../midori/midori-view.c:2519 msgid "Copy Video _Address" msgstr "Copier l'_adresse de la vidéo" -#: ../midori/midori-view.c:2160 +#: ../midori/midori-view.c:2522 msgid "Save _Video" msgstr "Enregistrer la _vidéo" -#: ../midori/midori-view.c:2160 +#: ../midori/midori-view.c:2522 msgid "Download _Video" msgstr "Télécharger la _vidéo" -#: ../midori/midori-view.c:2223 +#: ../midori/midori-view.c:2548 msgid "Search _with" msgstr "Rechercher _avec" -#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2580 msgid "_Search the Web" msgstr "_Rechercher sur Internet" -#: ../midori/midori-view.c:2287 +#: ../midori/midori-view.c:2597 msgid "Open Address in New _Tab" msgstr "Ouvrir l'adresse dans un nouvel _onglet" -#: ../midori/midori-view.c:2591 +#: ../midori/midori-view.c:2887 msgid "Open or download file" msgstr "Ouvrir ou télécharger le fichier" -#: ../midori/midori-view.c:2610 +#: ../midori/midori-view.c:2906 #, c-format msgid "File Type: '%s'" msgstr "Type de fichier : « %s »" -#: ../midori/midori-view.c:2613 +#: ../midori/midori-view.c:2908 #, c-format msgid "File Type: %s ('%s')" msgstr "Type de fichier : %s (« %s »)" +#: ../midori/midori-view.c:2913 +#, c-format +msgid "File Name: %s" +msgstr "Nom du fichier : %s" + #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2617 +#: ../midori/midori-view.c:2932 #, c-format msgid "Open %s" msgstr "Ouvrir %s" -#: ../midori/midori-view.c:3158 +#: ../midori/midori-view.c:3578 #, c-format msgid "Inspect page - %s" msgstr "Analyser la page - %s" -#: ../midori/midori-view.c:3439 -msgid "Speed dial" +#: ../midori/midori-view.c:3925 +msgid "Speed Dial" msgstr "Appel rapide" -#: ../midori/midori-view.c:3440 +#: ../midori/midori-view.c:3926 +#: ../midori/midori-view.c:4022 msgid "Click to add a shortcut" msgstr "Cliquez pour ajouter un raccourci" -#: ../midori/midori-view.c:3441 +#: ../midori/midori-view.c:3927 msgid "Enter shortcut address" msgstr "Entrez l'adresse du raccourci" -#: ../midori/midori-view.c:3442 +#: ../midori/midori-view.c:3928 msgid "Enter shortcut title" msgstr "Entrez le titre du raccourci" -#: ../midori/midori-view.c:3443 +#: ../midori/midori-view.c:3929 msgid "Are you sure you want to delete this shortcut?" msgstr "Ètes-vous certain de vouloir supprimer ce raccourci ?" -#: ../midori/midori-view.c:3444 -msgid "Set number of columns and rows" -msgstr "Choisir le nombre de colonnes et de lignes" - -#: ../midori/midori-view.c:3445 -msgid "Enter number of columns and rows:" -msgstr "Entrer le nombre de colonnes et de lignes" - -#: ../midori/midori-view.c:3446 -msgid "Invalid input for the size of the speed dial" -msgstr "Entrée invalide pour la taille de la page d'appel rapide" - -#: ../midori/midori-view.c:3447 -msgid "Thumb size:" -msgstr "Taille des vignettes :" - -#: ../midori/midori-view.c:3448 -msgid "Small" -msgstr "Petites" - -#: ../midori/midori-view.c:3449 -msgid "Medium" -msgstr "Moyennes" - -#: ../midori/midori-view.c:3450 -msgid "Big" -msgstr "Grandes" - -#: ../midori/midori-view.c:3476 -#, c-format -msgid "Document cannot be displayed" -msgstr "Le document ne peut être affiché" - -#: ../midori/midori-view.c:3499 +#: ../midori/midori-view.c:4091 #, c-format msgid "No documentation installed" msgstr "Pas de documentation installée" -#: ../midori/midori-view.c:3618 +#: ../midori/midori-view.c:4167 +msgid "Midori doesn't store any personal data:" +msgstr "Midori ne stocke aucune donnée personnelle :" + +#: ../midori/midori-view.c:4168 +msgid "No history or web cookies are being saved." +msgstr "Aucun historique ou cookie n'est enregistré." + +#: ../midori/midori-view.c:4169 +msgid "Extensions are disabled." +msgstr "Les extensions sont désactivées." + +#: ../midori/midori-view.c:4170 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "Le stockage HTML5, la base de donnée locale et le cache de l'application sont désactivés." + +#: ../midori/midori-view.c:4171 +msgid "Midori prevents websites from tracking the user:" +msgstr "Midori empêche les sites web de traquer l'utilisateur :" + +#: ../midori/midori-view.c:4172 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "Les URL référantes sont réduites au nom d'hôte." + +#: ../midori/midori-view.c:4173 +#, fuzzy +msgid "DNS prefetching is disabled." +msgstr "Le DNS prefetching est désactivé." + +#: ../midori/midori-view.c:4174 +msgid "The language and timezone are not revealed to websites." +msgstr "La langue et le fuseau horaire ne sont pas révélés aux sites web." + +#: ../midori/midori-view.c:4175 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "Les sites web ne peuvent pas connaître les greffons Netscape (tels que Flash) installés." + +#: ../midori/midori-view.c:4224 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "Les numéros de version entre parenthèses montrent la version que vous utilisez." + +#: ../midori/midori-view.c:4280 msgid "Page loading delayed" msgstr "Chargement de la page différé" -#: ../midori/midori-view.c:3619 +#: ../midori/midori-view.c:4281 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Chargement différé, soit en raison d'un incident récent soit des préférences de démarrage." -#: ../midori/midori-view.c:3620 +#: ../midori/midori-view.c:4282 msgid "Load Page" msgstr "Charger la page" -#: ../midori/midori-view.c:3764 +#: ../midori/midori-view.c:4448 msgid "Blank page" msgstr "Page vierge" -#: ../midori/midori-view.c:4018 +#: ../midori/midori-view.c:4710 msgid "_Duplicate Tab" msgstr "_Dupliquer l'onglet" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4715 msgid "Show Tab _Label" msgstr "Afficher l'intitulé de l'onglet" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4715 msgid "Show Tab _Icon Only" msgstr "Afficher l'icône de l'onglet uniquement" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4721 msgid "Close ot_her Tabs" msgstr "Fermer les _autres onglets" -#: ../midori/midori-view.c:4680 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5534 +msgid "previous" +msgstr "précedent" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5553 +msgid "next" +msgstr "suivant" + +#: ../midori/midori-view.c:5566 msgid "Print background images" msgstr "Imprimer les images d'arrière-plan" -#: ../midori/midori-view.c:4681 +#: ../midori/midori-view.c:5567 msgid "Whether background images should be printed" msgstr "Indique s'il faut imprimer les images d'arrière-plan" -#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:5599 msgid "Features" msgstr "Fonctionnalités" -#. Page "General" -#: ../midori/midori-preferences.c:301 -msgid "General" -msgstr "Général" - -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Démarrage" -#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Utiliser la page _actuelle" + +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Utiliser la page courante comme page d'accueil" -#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Transferts" - #. Page "Appearance" -#: ../midori/midori-preferences.c:352 -msgid "Appearance" -msgstr "Apparence" - -#: ../midori/midori-preferences.c:353 -msgid "Font settings" -msgstr "Paramètres des polices" - -#: ../midori/midori-preferences.c:355 -msgid "Default Font Family" -msgstr "Police par défaut" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Polices" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Police proportionnelle" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:330 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:361 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "La taille par défaut de la police utilisée pour afficher les textes" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Police à largeur fixe" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "Famille de la police utilisée pour afficher les textes à largeur fixe" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:342 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:371 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Taille minimale de la police" -#: ../midori/midori-preferences.c:374 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "La taille minimale de la police utilisée pour afficher les textes" #. Page "Behavior" -#: ../midori/midori-preferences.c:383 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Comportement" -#: ../midori/midori-preferences.c:396 -msgid "Enforce 96 dots per inch" -msgstr "Forcer 96 points par pouce" - -#: ../midori/midori-preferences.c:397 -msgid "Enforce a video dot density of 96 DPI" -msgstr "Force une densité visuelle de 96 DPI" - -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" -msgstr "Autorisés les scripts à ouvrir des popups" +msgstr "Autoriser les scripts à ouvrir des popups" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Indique si les scripts sont autorisés à ouvrir des fenêtres intempestives (popups) automatiquement" -#: ../midori/midori-preferences.c:422 -msgid "Spell Checking" -msgstr "Vérificateur d'orthographe" - -#: ../midori/midori-preferences.c:424 -msgid "Enable Spell Checking" -msgstr "Activer la vérification de l'orthographe" - -#: ../midori/midori-preferences.c:425 -msgid "Enable spell checking while typing" -msgstr "Activer la vérification de l'orthographe lors de la saisie" - -#: ../midori/midori-preferences.c:427 -msgid "Spelling dictionaries:" -msgstr "Dictionnaires d'orthographe :" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:431 -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é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:437 -msgid "Interface" -msgstr "Interface" - -#: ../midori/midori-preferences.c:438 -msgid "Navigationbar" -msgstr "Barre de navigation" - -#: ../midori/midori-preferences.c:448 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Navigation" -#. Page "Applications" -#: ../midori/midori-preferences.c:470 -msgid "Applications" -msgstr "Applications" - -#: ../midori/midori-preferences.c:471 -msgid "External applications" -msgstr "Applications externes" - #. Page "Network" -#: ../midori/midori-preferences.c:487 ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "Réseau" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:463 msgid "Hostname" msgstr "Nom de l'hôte" -#. Page "Privacy" -#: ../midori/midori-preferences.c:513 -msgid "Privacy" -msgstr "Vie privée" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "Mo" -#: ../midori/midori-preferences.c:514 -msgid "Web Cookies" -msgstr "Fichiers témoins" - -#: ../midori/midori-preferences.c:523 ../midori/midori-preferences.c:537 -msgid "days" -msgstr "jours" - -#: ../midori/midori-searchaction.c:914 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Ajouter un moteur de recherche" -#: ../midori/midori-searchaction.c:914 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Modifier le moteur de recherche" -#: ../midori/midori-searchaction.c:942 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Nom :" -#: ../midori/midori-searchaction.c:986 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Description :" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "_Icône :" -#: ../midori/midori-searchaction.c:1000 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "_Identifiant :" -#: ../midori/midori-searchaction.c:1231 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "Gestion des moteurs de recherche" -#: ../midori/midori-searchaction.c:1332 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "Par dé_faut" -#: ../midori/sokoke.c:1303 -msgid "_Bookmark" -msgstr "_Signet" - -#: ../midori/sokoke.c:1305 -msgid "Add Boo_kmark" -msgstr "Ajouter un s_ignet" - -#: ../midori/sokoke.c:1306 -msgid "_Console" -msgstr "_Console" - -#: ../midori/sokoke.c:1307 -msgid "_Extensions" -msgstr "_Extensions" - -#: ../midori/sokoke.c:1308 -msgid "_History" -msgstr "_Historique" - -#: ../midori/sokoke.c:1309 -msgid "_Homepage" -msgstr "Page d'a_ccueil" - -#: ../midori/sokoke.c:1310 -msgid "_Userscripts" -msgstr "Scripts _utilisateur" - -#: ../midori/sokoke.c:1311 -msgid "New _Tab" -msgstr "Nouvel o_nglet" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "Ouvrir avec" + +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Choisir une application ou une commande pour ouvrir \"%s\":" + +#: ../midori/sokoke.c:403 +#: ../midori/sokoke.c:413 +#: ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 +#: ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "Impossible de lancer le programme externe." -#: ../midori/sokoke.c:1312 -msgid "_Transfers" -msgstr "_Transferts" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d heure" +msgstr[1] "%d heures" + +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minute" +msgstr[1] "%d minutes" + +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d seconed" +msgstr[1] "%d secondes" + +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 +#: ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s sur %s" -#: ../midori/sokoke.c:1313 -msgid "Netscape p_lugins" -msgstr "Greffons _Netscape" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "?o" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr "(%s/s)" -#: ../midori/sokoke.c:1316 -msgid "New _Folder" -msgstr "Nouveau dossier" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr " - %s restantes" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:213 +#: ../toolbars/midori-findbar.c:291 msgid "_Inline Find:" msgstr "_Recherche rapide :" -#: ../toolbars/midori-findbar.c:245 +#: ../toolbars/midori-findbar.c:317 msgid "Previous" msgstr "Précedent" -#: ../toolbars/midori-findbar.c:251 +#: ../toolbars/midori-findbar.c:323 msgid "Next" msgstr "Suivant" -#: ../toolbars/midori-findbar.c:255 +#: ../toolbars/midori-findbar.c:327 msgid "Match Case" msgstr "Sensible à la casse" -#: ../toolbars/midori-findbar.c:264 +#: ../toolbars/midori-findbar.c:336 msgid "Highlight Matches" msgstr "Surligner les résultats" -#: ../toolbars/midori-findbar.c:275 +#: ../toolbars/midori-findbar.c:347 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 -#, c-format -msgid "%s of %s" -msgstr "%s sur %s" - -#: ../toolbars/midori-transferbar.c:123 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "Le fichier « %s » a été téléchargé." -#: ../toolbars/midori-transferbar.c:126 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Transfert terminé" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "Le fichier téléchargé est erroné." + +#: ../toolbars/midori-transferbar.c:194 +msgid "The checksum provided with the link did not match. This means the file is probably incomplete or was modified afterwards." +msgstr "L'emprunte fournie avec le lien ne correspond pas. Cela signifie que le fichier est probablement incomplet ou a été modifié par la suite." + +#: ../toolbars/midori-transferbar.c:334 +#: ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Effacer tout" -#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 +#: ../toolbars/midori-transferbar.c:371 +#: ../toolbars/midori-transferbar.c:373 msgid "Some files are being downloaded" msgstr "Des fichiers sont en cours de téléchargement" -#: ../toolbars/midori-transferbar.c:306 +#: ../toolbars/midori-transferbar.c:377 msgid "_Quit Midori" msgstr "_Quitter Midori" -#: ../toolbars/midori-transferbar.c:308 +#: ../toolbars/midori-transferbar.c:379 msgid "The transfers will be cancelled if Midori quits." msgstr "Les transferts seront annulés si Midori se ferme." -#: ../panels/midori-bookmarks.c:116 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Signets" -#: ../panels/midori-bookmarks.c:269 +#: ../panels/midori-bookmarks.c:257 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Échec de l'ajout du signet : %s\n" -#: ../panels/midori-bookmarks.c:408 +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "Modifier le signet sélectionné" -#: ../panels/midori-bookmarks.c:416 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "Supprimer le signet sélectionné" -#: ../panels/midori-bookmarks.c:430 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" msgstr "Ajouter un nouveau dossier" -#: ../panels/midori-bookmarks.c:562 ../panels/midori-history.c:572 +#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-history.c:633 msgid "Separator" msgstr "Séparateur" -#: ../panels/midori-console.c:90 -msgid "Console" -msgstr "Console" - -#: ../panels/midori-console.c:351 -msgid "Copy _All" -msgstr "Tout copier" - -#: ../panels/midori-console.c:352 -msgid "Copy All" -msgstr "Copie tout" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "Historique" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Extensions" +#: ../panels/midori-history.c:158 +#: ../panels/midori-history.c:189 +msgid "Today" +msgstr "Aujourd'hui" -#: ../panels/midori-history.c:146 -msgid "A week ago" -msgstr "Il y a une semaine" +#: ../panels/midori-history.c:160 +#: ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "Hier" -#: ../panels/midori-history.c:148 +#: ../panels/midori-history.c:162 +#: ../panels/midori-history.c:186 #, 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:151 -msgid "Today" -msgstr "Aujourd'hui" - -#: ../panels/midori-history.c:153 -msgid "Yesterday" -msgstr "Hier" +#: ../panels/midori-history.c:165 +#: ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "Il y a une semaine" -#: ../panels/midori-history.c:324 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" msgstr "Ètes-vous certain de vouloir effacer tout l'historique ?" -#: ../panels/midori-history.c:369 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" msgstr "Ajouter un signet pour l'élément sélectionné dans l'historique" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" msgstr "Supprimer l'élément sélectionné dans l'historique" -#: ../panels/midori-history.c:386 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "Effacer tout l'historique" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Transferts" + +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" msgstr "Ouvrir le _dossier de destination" -#: ../panels/midori-transfers.c:484 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" msgstr "Copier l'_adresse du lien" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Authentification requise" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" @@ -2240,203 +2255,245 @@ "Un nom d'utilisateur et un mot de passe sont requis\n" "pour l'ouverture de cet emplacement :" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "Nom d'utilisateur" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "Mot de passe" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "Se _souvenir du mot de passe" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "L'icône nommée « %s » n'a pu être chargée." -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "L'icône prédéfinie « %s » n'a pu être chargée." -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "Les trames d'animation sont corrompues" -#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 +#: ../katze/katze-utils.c:445 +#: ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propriété « %s » n'est pas valide pour %s" -#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 -#: ../extensions/addons.c:119 +#: ../katze/katze-utils.c:491 +#: ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Choisissez un fichier" -#: ../katze/katze-utils.c:564 +#: ../katze/katze-utils.c:506 msgid "Choose folder" msgstr "Choisissez un dossier" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "Aucun" + +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "1 heure" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "1 jour" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "1 semaine" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "1 mois" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "1 an" + +#: ../katze/katze-preferences.c:91 +#: ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Préférences pour %s" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:473 msgid "Configure Advertisement filters" msgstr "Configurer les filtres de publicité" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:504 #, 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:587 -msgid "Configure _Advertisement filters..." -msgstr "Configurer les filtres de _publicité" - -#: ../extensions/adblock.c:841 +#: ../extensions/adblock.c:873 msgid "Edit rule" msgstr "Modifier les règles" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:887 msgid "_Rule:" msgstr "_Règles :" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:941 msgid "Bl_ock image" msgstr "_Bloquer l'image" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:946 msgid "Bl_ock link" msgstr "B_loquer le lien" -#: ../extensions/adblock.c:1492 +#: ../extensions/adblock.c:1662 msgid "Advertisement blocker" msgstr "Bloqueur de publicités" -#: ../extensions/adblock.c:1493 +#: ../extensions/adblock.c:1663 msgid "Block advertisements according to a filter list" msgstr "Bloquer les publicités en fonction d'une liste de filtres" -#: ../extensions/addons.c:130 ../extensions/addons.c:490 +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "Cette page semble contenir un script utilisateur. Voulez-vous l'installer?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "_Installer le script utilisateur" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "Cette page semble contenir un style utilisateur. Voulez-vous l'installer?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_Installer un style utilisateur" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Ne pas installer" + +#: ../extensions/addons.c:319 +#: ../extensions/addons.c:681 msgid "Userscripts" msgstr "Scripts utilisateur" -#: ../extensions/addons.c:135 ../extensions/addons.c:492 +#: ../extensions/addons.c:324 +#: ../extensions/addons.c:683 msgid "Userstyles" msgstr "Styles utilisateur" -#: ../extensions/addons.c:191 ../extensions/addons.c:267 +#: ../extensions/addons.c:380 +#: ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Erreur" -#: ../extensions/addons.c:231 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "Ètes-vous certain de vouloir supprimer '%s' ?" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "Supprime le script utilisateur" -#: ../extensions/addons.c:238 +#: ../extensions/addons.c:428 msgid "Delete user style" msgstr "Supprimer un style utilisateur" -#: ../extensions/addons.c:242 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." msgstr "Le fichier « %s » sera définitivement supprimé." -#: ../extensions/addons.c:377 ../extensions/addons.c:454 +#: ../extensions/addons.c:570 +#: ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "Ouvrir dans l'éditeur de texte" -#: ../extensions/addons.c:379 ../extensions/addons.c:463 +#: ../extensions/addons.c:572 +#: ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Ouvrir le _dossier de destination" -#: ../extensions/addons.c:445 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "Ajouter une extension" -#: ../extensions/addons.c:472 -msgid "Open target folder for selected addon" -msgstr "Ouvrir le dossier de destination pour l'extension sélectionnée" - -#: ../extensions/addons.c:473 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "Supprimer l'extension sélectionnée" -#: ../extensions/addons.c:1420 -#, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "La configuration de l'extension « %s » n'a pas pu être enregistrée: %s\n" - -#: ../extensions/addons.c:1421 ../extensions/addons.c:1583 +#: ../extensions/addons.c:1696 +#: ../extensions/addons.c:1914 msgid "User addons" msgstr "Extensions utilisateur" -#: ../extensions/addons.c:1542 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Impossible de surveiller le dossier « %s » : %s" -#: ../extensions/addons.c:1584 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" msgstr "Support des scripts et styles utilisateur" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "Onglets colorés" -#: ../extensions/colorful-tabs.c:203 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Donner une couleur distincte à chaque onglet" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Gestionnaire de cookies" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "Supprimer tous" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 +#: ../extensions/cookie-manager/cookie-manager-page.c:105 msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." msgstr "Supprimer tous les fichiers 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:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "Afficher tous" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "Masquer tous" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" msgstr "Ètes-vous certain de vouloir effacer tout les cookies ?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Question" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." msgstr "Seuls les fichiers témoins correspondant au filtre seront effacés." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "À la fin de la session" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2453,15 +2510,15 @@ "Sécuritaire : %s\n" "Expire : %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Oui" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "Non" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" @@ -2470,55 +2527,43 @@ "Domaine : %s\n" "Fichiers témoins: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Nom" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "_Afficher tous" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "_Masquer tous" # manque un raccourcis Alt+X -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 msgid "Filter:" msgstr "Filtre :" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "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" -msgstr "Gestionnaire de _cookies" - -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Lister, afficher et supprimer les fichiers témoins" -#: ../extensions/copy-tabs.c:39 +#: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" msgstr "Copier l'_adresse des onglets" -#: ../extensions/copy-tabs.c:96 +#: ../extensions/copy-tabs.c:95 msgid "Copy Addresses of Tabs" msgstr "Copie l'adresse des onglets" -#: ../extensions/copy-tabs.c:97 +#: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Copier les adresses de tous les onglets vers le presse-papiers" -#: ../extensions/external-applications.vala:93 -msgid "External Applications" -msgstr "Applications externes" - -#: ../extensions/external-applications.vala:94 -msgid "Associate URL schemes with external commands" -msgstr "Associer des modèles d'URL avec des applications externes" - #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Impossible de trouver les éléments ATOM \"entry\" requis dans les données XML." @@ -2528,25 +2573,25 @@ msgstr "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:396 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." -msgstr "Dernière mise à jour : %s." +msgstr "Dernière mise à jour : %s." -#: ../extensions/feed-panel/feed-panel.c:668 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "Flux" -#: ../extensions/feed-panel/feed-panel.c:721 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "Ajouter un nouveau flux" -#: ../extensions/feed-panel/feed-panel.c:728 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "Supprimer un flux" -#: ../extensions/feed-panel/feed-panel.c:810 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "_Flux" @@ -2599,56 +2644,127 @@ msgid "Read Atom/ RSS feeds" msgstr "Lire des flux Atom et RSS" -#: ../extensions/formhistory.c:142 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" msgstr "Impossible d'ajouter la valeur de formulaire : %s\n" -#: ../extensions/formhistory.c:454 ../extensions/formhistory.c:458 +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "Historique des formulaires" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Le mot de passe maître est requis\n" +"pour ouvrir la base de mots de passe" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "Se souvenir du mot de passe sur cette page ?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Mémoriser" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "Pas maintenant" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Jamais sur cette page" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "" + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, 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" -#: ../extensions/formhistory.c:501 +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "Autocomplétion des formulaires" + +#: ../extensions/formhistory/formhistory.c:669 msgid "Stores history of entered form data" msgstr "Stocke l'historique des saisies de formulaire" -#: ../extensions/formhistory.c:505 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 #, c-format -msgid "Not available: %s" -msgstr "Non disponible : %s" +msgid "Failed to select suggestions\n" +msgstr "Impossible de sélectionner les suggestions\n" -#: ../extensions/formhistory.c:506 -msgid "Resource files not installed" -msgstr "Fichiers ressources non installés" +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Ils n'y a pas d'onglets qui n'ont pas été visités" -#: ../extensions/formhistory.c:512 -msgid "Form history filler" -msgstr "Autocomplétion des formulaires" +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "" -#: ../extensions/history-list.vala:174 -msgid "Next Tab (History List)" -msgstr "Onglet suivant (historique)" - -#: ../extensions/history-list.vala:175 -msgid "Next tab from history" -msgstr "Onglet suivant de l'historique" - -#: ../extensions/history-list.vala:184 -msgid "Previous Tab (History List)" -msgstr "Onglet précédent (historique)" - -#: ../extensions/history-list.vala:185 -msgid "Previous tab from history" -msgstr "Onglet précédent de l'historique" +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Comportement de la fermeture d'onglet" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Ne rien faire" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Basculer vers le dernier onglet vu" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Basculer vers l'onglet le plus récent" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Nouvel onglet suivant (depuis l'historique)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Onglet suivant dans l'historique" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Nouvel onglet précédent (depuis l'historique)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Onglet précédent dans l'historique" -#: ../extensions/history-list.vala:245 +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "" + +#: ../extensions/history-list.vala:569 msgid "History List" msgstr "Liste de l'historique des onglets" -#: ../extensions/history-list.vala:246 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Permettre de changer d'onglet en choisissant dans une liste triée par dernière utilisation" +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "" #: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" @@ -2658,32 +2774,23 @@ msgid "Control Midori by moving the mouse" msgstr "Contrôler Midori par des mouvements de la souris" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:175 -msgid "Pageholder" -msgstr "Cadre de pages" - -#: ../extensions/page-holder.c:159 -msgid "_Pageholder" -msgstr "Cadre de _pages" - -#: ../extensions/page-holder.c:176 -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:109 +msgid "Reload page or stop loading" +msgstr "Actualiser la page ou arrêter le chargement" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "Personnaliser les raccourcis clavier" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "_Personnaliser les raccourcis..." -#: ../extensions/shortcuts.c:313 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Raccourcis" -#: ../extensions/shortcuts.c:314 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "Afficher et modifier les raccourcis clavier" @@ -2695,73 +2802,78 @@ msgid "Display date and time in the statusbar" msgstr "Afficher la date et l'heure dans la barre d'état" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Images" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Scripts" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Greffons Netscape" -#: ../extensions/statusbar-features.c:147 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "Fonctionnalités dans la barre d'état" -#: ../extensions/statusbar-features.c:148 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" msgstr "Activer et désactiver facilement des fonctionnalités sur les pages Internet" -#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:593 +#: ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Panneau d'onglets" -#: ../extensions/tab-panel.c:610 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "P_anneau d'onglets" -#: ../extensions/tab-panel.c:627 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Afficher les onglets dans un panneau vertical" -#: ../extensions/tabs-minimized.c:77 +#: ../extensions/tabs-minimized.c:76 msgid "Only Icons on Tabs by default" msgstr "Onglets sans intitulé" -#: ../extensions/tabs-minimized.c:78 +#: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" msgstr "Les nouveaux onglets n'ont qu'une icône par défaut" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Personnaliser la barre d'outils" -#: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +#: ../extensions/toolbar-editor.c:409 +msgid "Select items to be displayed on the toolbar. Items can be reordered 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:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Éléments disponibles" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Éléments affichés" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "Personnaliser la barre d'outi_ls..." -#: ../extensions/toolbar-editor.c:606 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Personnaliser..." + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" msgstr "Éditeur de barre d'outils" -#: ../extensions/toolbar-editor.c:607 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" msgstr "Éditer facilement la disposition de la barre d'outils" @@ -2769,131 +2881,319 @@ msgid "Cache HTTP communication on disk" msgstr "Mettre en cache les communication HTTP sur le disque" -#~ msgid "_Recently visited pages" -#~ msgstr "Pages _récemment visitées" +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "Le dossier de configuration specifié n'est pas valide." + +#~ msgid "Lightweight web browser" +#~ msgstr "Navigateur Internet léger" + +#~ msgid "Cookies" +#~ msgstr "Fichiers témoins / Cookies" + +#~ msgid "'Flash' Cookies" +#~ msgstr "Cookies « Flash »" + +#~ msgid "HTML5 _Databases" +#~ msgstr "_Base de données HTML5" + +#~ msgid "Offline Application Cache" +#~ msgstr "Cache des applications hors-ligne" + +#~ msgid "Not available: %s" +#~ msgstr "Non disponible : %s" + +#~ msgid "Resource files not installed" +#~ msgstr "Fichiers ressources non installés" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "Ne pas enregistrer de données privées durant la navigation" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Ajouter un raccourci à la page d'appel rapide" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Ajouter un raccourci sur le bureau" + +#~ msgid "Create a launcher" +#~ msgstr "Créer un lanceur" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "Souscrire à ce flux de _nouvelles" + +#~ msgid "Close this window" +#~ msgstr "Fermer cette fenêtre" + +#~ msgid "Close all open windows" +#~ msgstr "Fermer toutes les fenêtres ouvertes" + +#~ msgid "Undo the last modification" +#~ msgstr "Annuler la dernière modification" + +#~ msgid "Redo the last modification" +#~ msgstr "Refaire la dernière modification" + +#~ msgid "Cut the selected text" +#~ msgstr "Couper le texte sélectionné" + +#~ msgid "Copy the selected text" +#~ msgstr "Copier le texte sélectionné" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "Coller le texte à partir du presse-papiers" + +#~ msgid "Delete the selected text" +#~ msgstr "Supprimer le texte sélectionné" + +#~ msgid "Select all text" +#~ msgstr "Sélectionner tout le texte" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase" + +#~ msgid "Reset the zoom level" +#~ msgstr "Réinitialiser le niveau d'agrandissement" + +#~ msgid "View the source code of the page" +#~ msgstr "Affiche le code source de la page" + +#~ msgid "Scroll to the left" +#~ msgstr "Défilement vers la gauche" + +#~ msgid "Scroll down" +#~ msgstr "Défilement vers le bas" + +#~ msgid "Scroll up" +#~ msgstr "Défilement vers le haut" + +#~ msgid "Scroll to the right" +#~ msgstr "Défilement vers la droite" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "Supprimer le contenu de la corbeille" + +#~ msgid "Open the last closed tab" +#~ msgstr "Ouvrir le dernier onglet fermé" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Ajouter un nouveau dossier de signets" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." + +#~ msgid "Clear private data..." +#~ msgstr "Effacer les informations privées..." + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "" +#~ "Inspecter les détails de la page et accéder aux outils développeur..." + +#~ msgid "Switch to the previous tab" +#~ msgstr "Bascule vers l'onglet précédent" + +#~ msgid "Switch to the next tab" +#~ msgstr "Bascule vers l'onglet suivant" + +#~ msgid "Move tab behind the previous tab" +#~ msgstr "Basculer vers l'onglet précédent" + +#~ msgid "Move tab in front of the next tab" +#~ msgstr "Basculer vers l'onglet suivant" + +#~ msgid "Focus the current tab" +#~ msgstr "Mettre le focus sur l'onglet actuel" + +#~ msgid "Cycle focus between views" +#~ msgstr "Changer le focus d'une vue à l'autre, en boucle" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Afficher uniquement l'icône de l'onglet courant" + +#~ msgid "Duplicate the current tab" +#~ msgstr "Duplique l'onglet actif" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Fermer tous les onglets sauf l'onglet actuel" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Ouvrir les onglets enregistrés dans la dernière session" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Afficher la foire aux questions" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Ouvrir l'outil de suivi d'anomalies de Midori" + +#~ msgid "Show information about the program" +#~ msgstr "Afficher les informations sur le programme" + +#~ msgid "Show menubar" +#~ msgstr "Afficher la barre de menu" + +#~ msgid "Show navigationbar" +#~ msgstr "Afficher la barre de navigation" + +#~ msgid "Show sidepanel" +#~ msgstr "Afficher le panneau latéral" + +#~ msgid "Show bookmarkbar" +#~ msgstr "Afficher la barre des signets" + +#~ msgid "Show statusbar" +#~ msgstr "Afficher la barre d'état" + +#~ msgid "MD5-Checksum:" +#~ msgstr "Emprunte MD5 :" + +#~ msgid "SHA1-Checksum:" +#~ msgstr "Emprunte SHA1 :" + +#~ msgid "Web Cookies" +#~ msgstr "Fichiers témoins" + +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "Effacer les anciens cookies après 1 heure" + +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "Effacer les anciens cookies après 1 semaine" + +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "Effacer les anciens cookies après 1 mois" + +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "Effacer les anciens cookies après 1 an" + +#~ msgid "days" +#~ msgstr "jours" -#~ msgid "Reopen pages that you visited earlier" -#~ msgstr "Rouvrir des pages précédemment visitées" +#~ msgid "Reset the last _session" +#~ msgstr "Réinitialiser la dernière _session" -#~ msgid "Original cookies only" -#~ msgstr "Uniquement les cookies d'origine" +#~ msgid "No filename specified" +#~ msgstr "Aucun nom de fichier spécifié" -#~ msgid "Accept cookies from the original website only" -#~ msgstr "Accepter les fichiers témoins du site d'origine uniquement" +#~ msgid "All cookies" +#~ msgstr "Tous les fichiers témoins" -#~ msgid "Remember last visited pages" -#~ msgstr "Se souvenir des dernières pages visitées" +#~ msgid "Session cookies" +#~ msgstr "Témoins de session" -#~ msgid "Whether the last visited pages are saved" -#~ msgstr "Indique s'il faut enregistrer les dernières pages visitées" +#~ msgid "Show Transferbar" +#~ msgstr "Afficher la barre des transferts" -#~ msgid "Detect proxy server automatically" -#~ msgstr "Détecter le serveur mandataire automatiquement" +#~ msgid "Whether to show the transferbar" +#~ msgstr "Indique s'il faut afficher la barre des transferts" -#~ msgid "Whether to detect the proxy server automatically from the environment" -#~ msgstr "Indique s'il faut détecter le serveur mandataire (proxy) automatiquement" +#~ msgid "Search engines in location completion" +#~ msgstr "Moteurs de recherche dans la complétion" -#~ msgid "_Restore Tab" -#~ msgstr "_Restorer l'onglet" +#~ 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" -#~ msgid "Erroneous clock time" -#~ msgstr "Heure de l'horloge incorrecte" +#~ msgid "Show operating controls of the panel" +#~ msgstr "Afficher les élements de contrôle du panneau" -#~ 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." +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "Indique s'il faut afficher les élements de contrôle du panneau" -#~ msgid "Copy %s to the folder %s." -#~ msgstr "Copier %s dans le dossier %s." +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Appel rapide dans les nouveaux onglets" -#~ msgid "Open _Link" -#~ msgstr "Ouvrir le _lien" +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Afficher la page d'appel rapide dans les nouveaux onglets" -#~ msgid "Open Image in New Wi_ndow" -#~ msgstr "Ouvrir l'image dans une nouvelle fe_nêtre" +#~ msgid "Download Manager" +#~ msgstr "Gestionnaire de téléchargements" -#~ 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." +#~ msgid "An external download manager" +#~ msgstr "Un gestionnaire de téléchargements externe" -#~ msgid "Failed to get current time: %s\n" -#~ msgstr "Impossible d'obtenir l'heure actuelle : %s\n" +#~ msgid "Open external pages in:" +#~ msgstr "Ouvrir les pages externes dans :" -#~ msgid "Not available on this platform" -#~ msgstr "Non disponible sur cette plate-forme" +#~ msgid "Where to open externally opened pages" +#~ msgstr "Lieu où les pages externes doivent être ouvertes" -#~ msgid "View Selection Source" -#~ msgstr "Afficher la source de la sélection" +#~ msgid "Accept cookies" +#~ msgstr "Accepter les cookies" -#~ msgid "View the source code of the selection" -#~ msgstr "Afficher le code source de la sélection" +#~ msgid "What type of cookies to accept" +#~ msgstr "Type de fichiers témoins (cookies) à accepter" -#~ msgid "Show panel _titles" -#~ msgstr "Afficher le _titre des panneaux" +#~ msgid "Maximum cookie age" +#~ msgstr "Âge maximal des cookies" -#~ msgid "Options" -#~ msgstr "Options" +#~ msgid "Maximum history age" +#~ msgstr "Âge maximal de l'historique" -#~ msgid "Shrink images automatically" -#~ msgstr "Réduire la taille des images" +#~ msgid "Remember last downloaded files" +#~ msgstr "Se souvenir des derniers fichiers téléchargés" -#~ msgid "Automatically shrink standalone images to fit" -#~ msgstr "Réduire automatiquement la taille des images pour les adapter à la fenêtre" +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "" +#~ "Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" -#~ msgid "Enable developer tools" -#~ msgstr "Activer les outils de développement" +#~ msgid "Not found - %s" +#~ msgstr "Page introuvable - %s" -#~ msgid "Enable special extensions for developers" -#~ msgstr "Activer les extensions spécifiques pour les développeurs" +#~ msgid "Set number of columns and rows" +#~ msgstr "Choisir le nombre de colonnes et de lignes" -#~ msgid "Tint tabs distinctly" -#~ msgstr "Colorer les onglets" +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Entrer le nombre de colonnes et de lignes" -#~ msgid "DNS prefetching" -#~ msgstr "Préchargement de DNS" +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "Entrée invalide pour la taille de la page d'appel rapide" -#~ msgid "Prefetch IP addresses of hovered links" -#~ msgstr "Précharge l'adresse IP de liens survolés" +#~ msgid "Thumb size:" +#~ msgstr "Taille des vignettes :" -#~ msgid "_Closed Tabs and Windows" -#~ msgstr "Onglets et fenêtres _fermés" +#~ msgid "Small" +#~ msgstr "Petites" -#~ msgid "Last open pages" -#~ msgstr "Dernières pages ouvertes" +#~ msgid "Medium" +#~ msgstr "Moyennes" -#~ msgid "Both" -#~ msgstr "Les deux" +#~ msgid "Big" +#~ msgstr "Grandes" -#~ msgid "Both horizontal" -#~ msgstr "Les deux horizontalement" +#~ msgid "Document cannot be displayed" +#~ msgstr "Le document ne peut être affiché" -#~ msgid "Load on Startup" -#~ msgstr "Charger au démarrage" +#~ msgid "General" +#~ msgstr "Général" -#~ msgid "Remember last form inputs" -#~ msgstr "Se souvenir du contenu des derniers formulaires remplis" +#~ msgid "Appearance" +#~ msgstr "Apparence" -#~ msgid "Whether the last form inputs are saved" -#~ msgstr "Indique s'il faut enregistrer le contenu des derniers formulaires remplis" +#~ msgid "Font settings" +#~ msgstr "Paramètres des polices" -#~ msgid "Cache size" -#~ msgstr "Taille du cache" +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "Forcer 96 points par pouce" -#~ msgid "The allowed size of the cache" -#~ msgstr "La taille de l'antémémoire permise" +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "Force une densité visuelle de 96 DPI" -#~ msgid "Encoding" -#~ msgstr "Encodage" +#~ msgid "Interface" +#~ msgstr "Interface" -#~ msgid "The character encoding to use by default" -#~ msgstr "Encodage par défaut des caractères" +#~ msgid "Navigationbar" +#~ msgstr "Barre de navigation" -#~ msgid "Resizable text areas" -#~ msgstr "Zones de texte redimensionnables" +#~ msgid "Applications" +#~ msgstr "Applications" -#~ msgid "Whether text areas are resizable" -#~ msgstr "Indique si les zones de texte peuvent être redimensionnées" +#~ msgid "External applications" +#~ msgstr "Applications externes" -#~ msgid "MB" -#~ msgstr "Mo" +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Configurer les filtres de _publicité" -#~ msgid "User_styles" -#~ msgstr "_Styles utilisateur" +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "" +#~ "Changer d'onglet par ordre de dernière utilisation en utilisant Ctrl+Tab" diff -Nru midori-0.2.8/po/gl.po midori-0.4.6/po/gl.po --- midori-0.2.8/po/gl.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/gl.po 2012-05-14 22:13:42.000000000 +0000 @@ -13,1124 +13,1162 @@ msgstr "" "Project-Id-Version: midori-0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-09 10:08+0000\n" -"PO-Revision-Date: 2010-02-08 21:51+0100\n" -"Last-Translator: Leandro Regueiro \n" +"POT-Creation-Date: 2012-05-04 06:24+0000\n" +"PO-Revision-Date: 2011-11-30 19:29+0100\n" +"Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Poedit-Language: Galician\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Navegador web lixeiro" +msgid "Browse the Web" +msgstr "Buscar na rede" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 -#: ../midori/main.c:1665 ../midori/main.c:1681 -#: ../midori/midori-websettings.c:312 +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "Internet;WWW;Explorer" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072 +#: ../midori/main.c:2086 ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Navegador web" -#: ../midori/main.c:99 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Midori, navegación privada" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Abrir unha nova xanela de navegación privada" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164 +msgid "Private Browsing" +msgstr "Navegación privada" + +#: ../midori/main.c:96 ../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 foi posíbel cargar a configuración: %s\n" -#: ../midori/main.c:148 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "O valor «%s» non é válido para %s" -#: ../midori/main.c:155 ../midori/main.c:241 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr "O valor de configuración «%s» non é válido" -#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 +#: ../midori/main.c:380 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Non foi posíbel cargar os motores de busca. %s\n" + +#: ../midori/main.c:434 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Produciuse un erro ao limpar o historial: %s\n" + +#: ../midori/main.c:454 ../midori/main.c:581 +#: ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" -msgstr "Fallou ao abrir a base de datos: %s\n" +msgstr "Produciuse un fallo ao abrir a base de datos: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:424 +#: ../midori/main.c:524 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "Fallou ao eliminar elementos antigos do historial: %s\n" +msgstr "Produciuse un fallo ao eliminar elementos antigos do historial: %s\n" -#: ../midori/main.c:455 ../panels/midori-history.c:169 -#: ../panels/midori-history.c:199 +#: ../midori/main.c:564 ../panels/midori-history.c:232 #, c-format msgid "Failed to remove history item: %s\n" -msgstr "Fallou ao eliminar o elemento do historial: %s\n" +msgstr "Produciuse un fallo ao eliminar o elemento do historial: %s\n" -#: ../midori/main.c:500 +#: ../midori/main.c:611 #, c-format msgid "The bookmarks couldn't be saved. %s" -msgstr "Non se puideron gardar os marcadores. %s" +msgstr "Non foi posíbel gardar os marcadores. %s" -#: ../midori/main.c:528 +#: ../midori/main.c:633 #, c-format msgid "The configuration couldn't be saved. %s" -msgstr "Non se puido gardar a configuración. %s" +msgstr "Non foi posíbel gardar a configuración. %s" -#: ../midori/main.c:566 +#: ../midori/main.c:668 #, c-format msgid "The search engines couldn't be saved. %s" -msgstr "Non se puideron gardar os motores de busca. %s" +msgstr "Non foi posíbel gardar os motores de busca. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:586 ../midori/main.c:609 +#: ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" -msgstr "Non se puido gardar o lixo. %s" +msgstr "Non foi posíbel gardar o lixo. %s" + +#: ../midori/main.c:746 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Extensións" + +#: ../midori/main.c:760 +msgid "Privacy" +msgstr "Intimidade" + +#: ../midori/main.c:772 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"As «cookies» almacenan datos de sesión e gardan xogos ou perfís de usuario " +"para publicidade." -#: ../midori/main.c:668 ../midori/main.c:908 +#: ../midori/main.c:828 #, c-format msgid "The session couldn't be saved. %s" -msgstr "Non se puido gardar a sesión. %s" +msgstr "Non foi posíbel gardar a sesión. %s" -#: ../midori/main.c:852 -msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "Non hai ningún ficheiro de certificado raíz dispoñible. Non se pode verificar os certificados SSL." +#: ../midori/main.c:1046 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" +"Non hai ningún ficheiro de certificado raíz dispoñíbel. Non é posíbel " +"verificar os certificados SSL." -#: ../midori/main.c:942 -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:1115 +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:957 +#: ../midori/main.c:1134 msgid "Modify _preferences" msgstr "Modificar as _preferencias" -#: ../midori/main.c:961 -msgid "Reset the last _session" -msgstr "Restablecer a última _sesión" - -#: ../midori/main.c:966 +#: ../midori/main.c:1138 msgid "Disable all _extensions" -msgstr "Desactivar tódalas _extensións" +msgstr "Desactivar todas as _extensións" -#: ../midori/main.c:1206 ../midori/main.c:1952 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "Non se puido cargar a sesión: %s\n" +#: ../midori/main.c:1151 +msgid "Discard old tabs" +msgstr "Desbotar as lapelas antigas" -#: ../midori/main.c:1328 -msgid "No filename specified" -msgstr "Nome de ficheiro sen especificar" +#: ../midori/main.c:1152 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "Mostrar as últimas lapelas sen cargalas" + +#: ../midori/main.c:1153 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "Mostrar as últimas lapelas abertas" -#: ../midori/main.c:1347 -msgid "An unknown error occured." -msgstr "Produciuse un erro descoñecido:" +#: ../midori/main.c:1400 ../midori/main.c:2464 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Non foi posíbel cargar a sesión: %s\n" -#: ../midori/main.c:1378 +#: ../midori/main.c:1538 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captura gardada en: %s\n" -#: ../midori/main.c:1550 +#: ../midori/main.c:1951 msgid "Run ADDRESS as a web application" msgstr "Executar ENDEREZO como un aplicativo web" -#: ../midori/main.c:1550 +#: ../midori/main.c:1951 msgid "ADDRESS" msgstr "ENDEREZO" -#: ../midori/main.c:1553 +#: ../midori/main.c:1954 msgid "Use FOLDER as configuration folder" msgstr "Usar CARTAFOL como cartafol de configuración" -#: ../midori/main.c:1553 +#: ../midori/main.c:1954 msgid "FOLDER" msgstr "CARTAFOL" -#: ../midori/main.c:1556 +#: ../midori/main.c:1957 +msgid "Private browsing, no changes are saved" +msgstr "Navegación privada, non se garda ningún cambio" + +#: ../midori/main.c:1959 msgid "Show a diagnostic dialog" msgstr "Mostrar un diálogo de diagnóstico" -#: ../midori/main.c:1558 +#: ../midori/main.c:1961 msgid "Run the specified filename as javascript" msgstr "Execute o nome de ficheiro especificado como JavaScript" -#: ../midori/main.c:1561 +#: ../midori/main.c:1963 msgid "Take a snapshot of the specified URI" -msgstr "Facer unha captura do URI específicado" +msgstr "Facer unha captura do URI especificado" -#: ../midori/main.c:1564 +#: ../midori/main.c:1965 msgid "Execute the specified command" -msgstr "Executar o comando especificado" +msgstr "Executar a orde especificada" -#: ../midori/main.c:1566 +#: ../midori/main.c:1967 +msgid "List available commands to execute with -e/ --execute" +msgstr "Liste as ordes dispoñíbeis para executar con -e/ --execute" + +#: ../midori/main.c:1969 msgid "Display program version" msgstr "Mostrar a versión do programa" -#: ../midori/main.c:1568 +#: ../midori/main.c:1971 msgid "Addresses" msgstr "Enderezos" -#: ../midori/main.c:1570 +#: ../midori/main.c:1973 msgid "Block URIs according to regular expression PATTERN" -msgstr "Bloquear os URIs de acordo ca expresión regular PATRÓN" +msgstr "Bloquear os URI de acordo ca expresión regular PATRÓN" -#: ../midori/main.c:1570 +#: ../midori/main.c:1973 msgid "PATTERN" msgstr "PATRÓN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1574 +#: ../midori/main.c:1977 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Restabelecer Midori despois de SEGUNDOS segundos de inactividade" -#: ../midori/main.c:1574 +#: ../midori/main.c:1977 msgid "SECONDS" msgstr "SEGUNDOS" -#: ../midori/main.c:1654 +#: ../midori/main.c:1980 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Redirixir os avisos ao NOMEFICHEIRO indicado" + +#: ../midori/main.c:1980 +msgid "FILENAME" +msgstr "NOMEFICHEIRO" + +#: ../midori/main.c:2045 msgid "[Addresses]" msgstr "[Enderezos]" -#: ../midori/main.c:1682 +#: ../midori/main.c:2087 msgid "Please report comments, suggestions and bugs to:" -msgstr "Por favor, envíe comentarios, suxestións e erros a:" +msgstr "Envíe comentarios, suxestións e fallos a:" -#: ../midori/main.c:1684 +#: ../midori/main.c:2089 msgid "Check for new versions at:" msgstr "Comprobar se existen novas versións en:" -#: ../midori/main.c:1801 -msgid "The specified configuration folder is invalid." -msgstr "O cartafol de configuración especificado non é correcto." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2173 +msgid "Saved logins and _passwords" +msgstr "Gardar os nomes de usuario e os _contrasinais" + +#: ../midori/main.c:2175 +msgid "Cookies and Website data" +msgstr "Cookies e datos do sitio web" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2179 ../midori/midori-websettings.c:996 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Caché web" + +#: ../midori/main.c:2182 +msgid "Website icons" +msgstr "Iconas de sitios web" -#: ../midori/main.c:1849 -msgid "An instance of Midori is already running but not responding.\n" -msgstr "Xa se está a executar outra instancia de Midori pero non responde.\n" +#: ../midori/main.c:2288 +msgid "An unknown error occured" +msgstr "Produciuse un erro descoñecido" -#: ../midori/main.c:1904 -#, 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:2395 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Xa se está a executar outra instancia de Midori mais non responde.\n" -#: ../midori/main.c:1925 +#: ../midori/main.c:2431 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" -msgstr "Non foi posible cargar os marcadores: %s\n" +msgstr "Non foi posíbel cargar os marcadores: %s\n" -#: ../midori/main.c:1967 +#: ../midori/main.c:2479 #, c-format msgid "The trash couldn't be loaded: %s\n" -msgstr "Non se puido cargar o lixo: %s\n" +msgstr "Non foi posíbel cargar o lixo: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:2492 #, c-format msgid "The history couldn't be loaded: %s\n" -msgstr "Non se puido cargar o historial: %s\n" +msgstr "Non foi posíbel cargar o historial: %s\n" -#: ../midori/main.c:1994 +#: ../midori/main.c:2508 msgid "The following errors occured:" msgstr "Producíronse os seguintes erros:" -#: ../midori/main.c:2010 +#: ../midori/main.c:2524 msgid "_Ignore" msgstr "_Ignorar" -#: ../midori/midori-array.c:429 +#: ../midori/midori-app.c:1334 +msgid "_Bookmark" +msgstr "_Marcador" + +#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060 +msgid "_Bookmarks" +msgstr "_Marcadores" + +#: ../midori/midori-app.c:1336 +msgid "Add Boo_kmark" +msgstr "Engadir mar_cador…" + +#: ../midori/midori-app.c:1337 +msgid "_Console" +msgstr "_Consola" + +#: ../midori/midori-app.c:1338 +msgid "_Extensions" +msgstr "_Extensións" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589 +msgid "_History" +msgstr "_Historial" + +#: ../midori/midori-app.c:1340 +msgid "_Homepage" +msgstr "P_áxina de inicio" + +#: ../midori/midori-app.c:1341 +msgid "_Userscripts" +msgstr "_Scripts de usuario" + +#: ../midori/midori-app.c:1342 +msgid "New _Tab" +msgstr "Nova _lapela" + +#: ../midori/midori-app.c:1343 +msgid "_Transfers" +msgstr "_Transferencias" + +#: ../midori/midori-app.c:1344 +msgid "Netscape p_lugins" +msgstr "En_gadidos de Netscape" + +#: ../midori/midori-app.c:1345 +msgid "_Closed Tabs" +msgstr "_Lapelas pechadas" + +#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216 +msgid "New _Window" +msgstr "Nova _xanela" + +#: ../midori/midori-app.c:1347 +msgid "New _Folder" +msgstr "Cartafol _novo" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "Non se atopou o ficheiro." -#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 -#: ../midori/midori-array.c:496 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." -msgstr "Documento malformado." +msgstr "Documento mal construído." -#: ../midori/midori-array.c:505 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "Formato de marcador non recoñecido." -#: ../midori/midori-array.c:719 +#: ../midori/midori-array.c:915 msgid "Writing failed." -msgstr "Fallou a escritura." +msgstr "Produciuse un fallo de escritura." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 -#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298 +#: ../midori/midori-browser.c:5307 msgid "Reload the current page" msgstr "Recargar a páxina actual" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 +#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304 msgid "Stop loading the current page" msgstr "Deter a carga da páxina" -#: ../midori/midori-browser.c:453 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% cargada" - -#: ../midori/midori-browser.c:491 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" msgstr "Produciuse un erro ao actualizar o título: %s\n" -#: ../midori/midori-browser.c:504 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." msgstr "Acción inesperada «%s»" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:569 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Navegación privada)" + +#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716 +msgid "Toplevel folder" +msgstr "Cartafol principal" + +#: ../midori/midori-browser.c:774 msgid "New folder" -msgstr "Cartafol novo" +msgstr "Novo cartafol" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:774 msgid "Edit folder" -msgstr "Editar cartafol" +msgstr "Editar o cartafol" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "New bookmark" msgstr "Novo marcador" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "Edit bookmark" msgstr "Editar o marcador" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:818 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "_Descrición" - -#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Enderezo:" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326 msgid "_Folder:" msgstr "_Cartafol:" -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 -#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 -msgid "Toplevel folder" -msgstr "Cartafol principal" - -#: ../midori/midori-browser.c:872 +#: ../midori/midori-browser.c:877 msgid "Add to _Speed Dial" msgstr "Enga_dir a marcación rápida" -#: ../midori/midori-browser.c:885 +#: ../midori/midori-browser.c:890 msgid "Show in the tool_bar" msgstr "Mostrar na _barra de ferramentas" -#: ../midori/midori-browser.c:900 +#: ../midori/midori-browser.c:905 msgid "Run as _web application" msgstr "Executar como aplicativo _web" -#: ../midori/midori-browser.c:979 +#: ../midori/midori-browser.c:976 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Non é posíbel gardar o ficheiro «%s» neste cartafol." + +#: ../midori/midori-browser.c:978 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Non ten permiso para escribir nesta localización." + +#: ../midori/midori-browser.c:985 #, c-format msgid "There is not enough free space to download \"%s\"." -msgstr "Non hai espazo libre dabondo para descargar \"%s\"." +msgstr "Non hai espazo libre abondo para descargar «%s»." -#: ../midori/midori-browser.c:983 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "O ficheiro precisa %s pero só quedan %s." -#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 -#: ../midori/midori-browser.c:4085 +#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395 msgid "Save file as" msgstr "Gardar o ficheiro como" -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1320 +msgid "New Window" +msgstr "Nova xanela" + +#: ../midori/midori-browser.c:1320 +msgid "A new window has been opened" +msgstr "Abriuse unha nova xanela" + +#: ../midori/midori-browser.c:1323 +msgid "New Tab" +msgstr "Nova lapela" + +#: ../midori/midori-browser.c:1323 +msgid "A new tab has been opened" +msgstr "Abriuse unha nova lapela" + +#: ../midori/midori-browser.c:1358 +msgid "Error opening the image!" +msgstr "Produciuse un erro ao abrir a imaxe!" + +#: ../midori/midori-browser.c:1359 +msgid "Can not open selected image in a default viewer." +msgstr "Non é posíbel abrir a imaxe no visor predeterminado" + +#: ../midori/midori-browser.c:1365 +msgid "Error downloading the image!" +msgstr "Produciuse un erro ao descargar a imaxe!" + +#: ../midori/midori-browser.c:1366 +msgid "Can not download selected image." +msgstr "Non foi posíbel descargar a imaxe seleccionada." + +#: ../midori/midori-browser.c:1492 msgid "Save file" msgstr "Gardar ficheiro" -#: ../midori/midori-browser.c:2150 +#: ../midori/midori-browser.c:2367 msgid "Open file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:2228 +#: ../midori/midori-browser.c:2499 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." msgstr "" -"Ao usar o URI de enriba ábrese un agregador de novas. Normalmente hai un menú ou un butón chamado \"Nova subscrición\", \"Nova fonte de novas\" ou algo semellante.\n" -"En Midori tamén pode ir a Preferencias, Aplicativos e seleccionar un Agregador de novas. A seguinte vez que prema na icona da fonte de novas engadirase automaticamente." +"Ao usar o URI de enriba ábrese un agregador de novas. Normalmente hai un " +"menú ou un botón chamado «Nova subscrición», «Nova fonte de novas» ou algo " +"semellante.\n" +"En Midori tamén pode ir a Preferencias, Aplicativos e seleccionar un " +"Agregador de novas. A seguinte vez que prema na icona da fonte de novas " +"engadirase automaticamente." -#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nova fonte" -#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 -#: ../panels/midori-bookmarks.c:406 +#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "Engadir novo marcador" -#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "Non se puido executar o programa externo." +#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "Baleiro" -#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:3467 +msgid "Toggle text cursor navigation" +msgstr "Activar/desactivar a navegación con cursor" + +#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Produciuse un erro ao inserir un novo elemento no historial: %s\n" -#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:737 +#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 msgid "Open all in _Tabs" msgstr "Abrir todo en _lapelas" -#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 -#: ../panels/midori-history.c:743 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Abrir nunha nova _lapela" -#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 -#: ../panels/midori-history.c:745 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657 +#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" -msgstr "Abrir nunha nova _fiestra" +msgstr "Abrir nunha nova _xanela" -#: ../midori/midori-browser.c:3931 +#: ../midori/midori-browser.c:4213 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3932 +#: ../midori/midori-browser.c:4214 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:4215 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:4216 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3935 +#: ../midori/midori-browser.c:4217 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3959 +#: ../midori/midori-browser.c:4218 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4239 msgid "Import bookmarks..." msgstr "Importar marcadores..." -#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372 msgid "_Import bookmarks" msgstr "_Importar marcadores" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:4253 msgid "_Application:" msgstr "_Aplicativo:" -#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 -#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 -#: ../katze/katze-utils.c:696 -msgid "Custom..." -msgstr "Personalizado..." +#: ../midori/midori-browser.c:4318 +msgid "Import from XBEL or HTML file" +msgstr "Importar desde un ficheiro XBEL ou HTML" + +#: ../midori/midori-browser.c:4353 +msgid "Import from a file" +msgstr "Importar desde un ficheiro" -#: ../midori/midori-browser.c:4061 +#: ../midori/midori-browser.c:4365 msgid "Failed to import bookmarks" msgstr "Produciuse un erro ao importar os marcadores" -#: ../midori/midori-browser.c:4102 +#: ../midori/midori-browser.c:4400 +msgid "XBEL Bookmarks" +msgstr "Marcadores XBEL" + +#: ../midori/midori-browser.c:4405 +msgid "Netscape Bookmarks" +msgstr "Marcadores de Netscape" + +#: ../midori/midori-browser.c:4419 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "Midori só pode exportar a XBEL (*.xbel) e Netscape (*.html)" + +#: ../midori/midori-browser.c:4434 msgid "Failed to export bookmarks" msgstr "Produciuse un erro ao exportar os marcadores" -#: ../midori/midori-browser.c:4155 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "Produciuse un erro ao limpar o historial: %s\n" - -#: ../midori/midori-browser.c:4163 -#, c-format -msgid "Failed to clear search history: %s\n" -msgstr "Produciuse un erro ao limpar o historial de buscas: %s\n" - #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4270 +#: ../midori/midori-browser.c:4556 msgid "Clear Private Data" msgstr "Limpar os datos privados" -#: ../midori/midori-browser.c:4274 +#: ../midori/midori-browser.c:4560 msgid "_Clear private data" msgstr "_Limpar os datos privados" -#: ../midori/midori-browser.c:4288 +#: ../midori/midori-browser.c:4573 msgid "Clear the following data:" msgstr "Limpar os seguintes datos:" -#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:114 -msgid "History" -msgstr "Historial" - -#: ../midori/midori-browser.c:4303 -msgid "Cookies" -msgstr "Cookies" - -#: ../midori/midori-browser.c:4308 -msgid "'Flash' Cookies" -msgstr "Cookies de «Flash»" - -#: ../midori/midori-browser.c:4313 -msgid "Website icons" -msgstr "Iconas de sitios web" - -#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 -msgid "_Closed Tabs" -msgstr "_Lapelas pechadas" - -#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "Caché web" +#: ../midori/midori-browser.c:4583 +msgid "Last open _tabs" +msgstr "Últimas lapelas abertas" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4609 msgid "Clear private data when _quitting Midori" msgstr "_Limpar os datos privados ao saír de Midori" -#: ../midori/midori-browser.c:4472 +#: ../midori/midori-browser.c:4804 msgid "A lightweight web browser." msgstr "Un navegador moi lixeiro" -#: ../midori/midori-browser.c:4474 -msgid "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." +#: ../midori/midori-browser.c:4805 +msgid "See about:version for version info." +msgstr "Ver a información de versión en about:version" + +#: ../midori/midori-browser.c:4807 +msgid "" +"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." msgstr "" +"Esta biblioteca é software libre; pode redistribuíla e/ou modificala baixo " +"os termos da GNU Lesser General Public License conforme foi publicada pola " +"Free Software Foundation; tanto na versión 2.1 ou, opcionalmente, calquera " +"versión posterior." -#: ../midori/midori-browser.c:4493 +#: ../midori/midori-browser.c:4828 msgid "translator-credits" msgstr "" -"Miguel Anxo Bouzada, 2008, 2009\n" +"Miguel Anxo Bouzada, 2008, 2009, 2010, 2011\n" "Leandro Regueiro , 2009, 2010\n" "\n" "Proxecto Trasno http://trasno.net" -#: ../midori/midori-browser.c:4802 +#: ../midori/midori-browser.c:5214 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 -msgid "New _Window" -msgstr "Nova _fiestra" - -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:5217 msgid "Open a new window" -msgstr "Abrir unha nova fiestra" +msgstr "Abrir unha nova xanela" -#: ../midori/midori-browser.c:4808 +#: ../midori/midori-browser.c:5220 msgid "Open a new tab" msgstr "Abrir unha nova lapela" -#: ../midori/midori-browser.c:4810 -msgid "P_rivate Browsing" -msgstr "Navegación p_rivada" - -#: ../midori/midori-browser.c:4811 -msgid "Don't save any private data while browsing" -msgstr "Non gardar datos privados durante a navegación" +#: ../midori/midori-browser.c:5222 +msgid "New P_rivate Browsing Window" +msgstr "Nova xanela de navegación p_rivada" -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:5226 msgid "Open a file" msgstr "Abrir un ficheiro" -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:5228 +msgid "_Save Page As..." +msgstr "_Gardar a páxina como..." + +#: ../midori/midori-browser.c:5229 msgid "Save to a file" msgstr "Gardar nun ficheiro" -#: ../midori/midori-browser.c:4820 +#: ../midori/midori-browser.c:5231 msgid "Add to Speed _dial" msgstr "Enga_dir a marcación rápida" -#: ../midori/midori-browser.c:4821 -msgid "Add shortcut to speed dial" -msgstr "Engadir atallo á marcación rápida" - -#: ../midori/midori-browser.c:4823 +#: ../midori/midori-browser.c:5235 msgid "Add Shortcut to the _desktop" -msgstr "Engadir atallo no _escritorio" +msgstr "Engadir un atallo no _escritorio" -#: ../midori/midori-browser.c:4824 -msgid "Add shortcut to the desktop" -msgstr "Engadir un atallo no escritorio" +#: ../midori/midori-browser.c:5237 +msgid "Create _Launcher" +msgstr "Crear _iniciador" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:5241 msgid "Subscribe to News _feed" msgstr "Subscribirse á _fonte de novas" -#: ../midori/midori-browser.c:4827 -msgid "Subscribe to this news feed" -msgstr "Subscribirse a esta fonte de novas" - -#: ../midori/midori-browser.c:4832 +#: ../midori/midori-browser.c:5247 msgid "_Close Tab" -msgstr "Pechar _lapela" +msgstr "Pechar a _lapela" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:5248 msgid "Close the current tab" msgstr "Pechar a lapela actual" -#: ../midori/midori-browser.c:4835 +#: ../midori/midori-browser.c:5250 msgid "C_lose Window" -msgstr "_Pechar a fiestra" - -#: ../midori/midori-browser.c:4836 -msgid "Close this window" -msgstr "Pechar esta fiestra" +msgstr "_Pechar a xanela" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:5254 msgid "Print the current page" msgstr "Imprimir a páxina actual" -#: ../midori/midori-browser.c:4842 -msgid "Quit the application" -msgstr "Saír do aplicativo" +#: ../midori/midori-browser.c:5256 +msgid "Close a_ll Windows" +msgstr "Pechar todas as xane_las" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:5259 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:4848 -msgid "Undo the last modification" -msgstr "Desfacer a última modificación" - -#: ../midori/midori-browser.c:4851 -msgid "Redo the last modification" -msgstr "Refacer a última modificación" - -#: ../midori/midori-browser.c:4855 -msgid "Cut the selected text" -msgstr "Cortar o texto seleccionado" - -#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 -msgid "Copy the selected text" -msgstr "Copiar o texto seleccionado" - -#: ../midori/midori-browser.c:4864 -msgid "Paste text from the clipboard" -msgstr "Pegar o texto seleccionado no portarretallos" - -#: ../midori/midori-browser.c:4867 -msgid "Delete the selected text" -msgstr "Borrar o texto seleccionado" - -#: ../midori/midori-browser.c:4870 -msgid "Select all text" -msgstr "Seleccionar todo o texto" +#: ../midori/midori-browser.c:5282 +msgid "_Find..." +msgstr "_Buscar..." -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:5283 msgid "Find a word or phrase in the page" msgstr "Buscar unha palabra ou frase nesta páxina" -#: ../midori/midori-browser.c:4875 +#: ../midori/midori-browser.c:5285 msgid "Find _Next" msgstr "Buscar _seguinte" -#: ../midori/midori-browser.c:4876 -msgid "Find the next occurrence of a word or phrase" -msgstr "Buscar a seguinte coincidencia de palabra ou frase" - -#: ../midori/midori-browser.c:4878 +#: ../midori/midori-browser.c:5288 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../midori/midori-browser.c:4879 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Buscar a anterior coincidencia de palabra ou frase" - -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:5292 msgid "Configure the application preferences" msgstr "Configurar as preferencias do aplicativo" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:5294 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:4886 +#: ../midori/midori-browser.c:5295 msgid "_Toolbars" msgstr "_Barra de ferramentas" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:5300 +msgid "Reload page without caching" +msgstr "Recargar a páxina sen usar a caché" + +#: ../midori/midori-browser.c:5310 msgid "Increase the zoom level" msgstr "Aumentar o nivel de zoom" -#: ../midori/midori-browser.c:4901 +#: ../midori/midori-browser.c:5313 msgid "Decrease the zoom level" msgstr "Diminuír o nivel de zoom" -#: ../midori/midori-browser.c:4904 -msgid "Reset the zoom level" -msgstr "Restablecer o nivel de zoom" - -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:5317 msgid "_Encoding" msgstr "_Codificación" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:5319 msgid "View So_urce" msgstr "Ver o códi_go da páxina" -#: ../midori/midori-browser.c:4908 -msgid "View the source code of the page" -msgstr "Ver o código fonte da páxina" +#: ../midori/midori-browser.c:5322 +msgid "Ca_ret Browsing" +msgstr "Navegación con cu_rsor" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:5326 msgid "Toggle fullscreen view" -msgstr "Activar/desactivar pantalla completa" +msgstr "Activar/desactivar a pantalla completa" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:5328 msgid "Scroll _Left" msgstr "Desprazar cara á _esquerda" -#: ../midori/midori-browser.c:4915 -msgid "Scroll to the left" -msgstr "Desprazar cara á esquerda" - -#: ../midori/midori-browser.c:4917 +#: ../midori/midori-browser.c:5331 msgid "Scroll _Down" msgstr "Desprazar cara a_baixo" -#: ../midori/midori-browser.c:4918 -msgid "Scroll down" -msgstr "Desprazar cara abaixo" - -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:5334 msgid "Scroll _Up" msgstr "Desprazar cara _arriba" -#: ../midori/midori-browser.c:4921 -msgid "Scroll up" -msgstr "Desprazar cara arriba" - -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:5337 msgid "Scroll _Right" msgstr "Desprazar cara á _dereita" -#: ../midori/midori-browser.c:4924 -msgid "Scroll to the right" -msgstr "Desprazar cara á dereita" - -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:5340 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:5343 msgid "Go back to the previous page" msgstr "Ir á páxina anterior" -#: ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:5346 msgid "Go forward to the next page" msgstr "Ir á seguinte páxina" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4937 +#: ../midori/midori-browser.c:5350 msgid "Go to the previous sub-page" msgstr "Ir á anterior subpáxina" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:5354 msgid "Go to the next sub-page" msgstr "Ir á seguinte subpáxina" -#: ../midori/midori-browser.c:4944 +#: ../midori/midori-browser.c:5357 msgid "Go to your homepage" msgstr "Ir á súa páxina de inicio" -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:5359 msgid "Empty Trash" msgstr "Baleirar o lixo" -#: ../midori/midori-browser.c:4947 -msgid "Delete the contents of the trash" -msgstr "Borrar o contido do lixo" - -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:5362 msgid "Undo _Close Tab" -msgstr "Desfa_cer pechar lapela" - -#: ../midori/midori-browser.c:4950 -msgid "Open the last closed tab" -msgstr "Abrir a última lapela pechada" +msgstr "Desfa_cer o pechar lapela" -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:5369 msgid "Add a new _folder" msgstr "Engadir un carta_fol novo" -#: ../midori/midori-browser.c:4957 -msgid "Add a new bookmark folder" -msgstr "Engadir un novo cartafol de marcadores" - -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:5375 msgid "_Export bookmarks" msgstr "_Exportar os marcadores" -#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Xestor de motores de busca" -#: ../midori/midori-browser.c:4966 -msgid "Add, edit and remove search engines..." -msgstr "Engadir, editar ou eliminar motores de busca..." - -#: ../midori/midori-browser.c:4969 +#: ../midori/midori-browser.c:5381 msgid "_Clear Private Data" msgstr "_Limpar datos privados" -#: ../midori/midori-browser.c:4970 -msgid "Clear private data..." -msgstr "Limpar os datos privados..." - -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:5384 msgid "_Inspect Page" msgstr "_Inspeccionar a páxina" -#: ../midori/midori-browser.c:4975 -msgid "Inspect page details and access developer tools..." -msgstr "Inspeccionar os detalles de páxina e acceder ás ferramentas de desenvolvemento..." - -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:5388 msgid "_Previous Tab" msgstr "Lapela _anterior" -#: ../midori/midori-browser.c:4981 -msgid "Switch to the previous tab" -msgstr "Cambiar á lapela anterior" - -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:5391 msgid "_Next Tab" msgstr "Lapela _seguinte" -#: ../midori/midori-browser.c:4984 -msgid "Switch to the next tab" -msgstr "Cambiar á lapela seguinte" +#: ../midori/midori-browser.c:5393 +msgid "Move Tab _Backward" +msgstr "Mover a lapela cara _atrás" + +#: ../midori/midori-browser.c:5395 +msgid "_Move Tab Forward" +msgstr "_Mover a lapela cara adiante" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:5398 msgid "Focus _Current Tab" msgstr "Enfocar a lapela a_ctual" -#: ../midori/midori-browser.c:4987 -msgid "Focus the current tab" -msgstr "Enfocar a lapela actual" - -#: ../midori/midori-browser.c:4989 -msgid "Minimize _Current Tab" -msgstr "Minimizar a lapela a_ctual" - -#: ../midori/midori-browser.c:4990 -msgid "Minimize the current tab" -msgstr "Minimizar a lapela actual" +#: ../midori/midori-browser.c:5401 +msgid "Focus _Next view" +msgstr "Enfocar a _seguinte vista" + +#: ../midori/midori-browser.c:5404 +msgid "Only show the Icon of the _Current Tab" +msgstr "Mostrar só a icona da lapela a_ctual" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:5407 msgid "_Duplicate Current Tab" msgstr "_Duplicar a lapela actual" -#: ../midori/midori-browser.c:4993 -msgid "Duplicate the current tab" -msgstr "Duplicar a lapela actual" - -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:5410 msgid "Close Ot_her Tabs" msgstr "Pechar ou_tras lapelas" -#: ../midori/midori-browser.c:4996 -msgid "Close all tabs except the current tab" -msgstr "Pechar todas as lapelas agás a lapela actual" - -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5413 msgid "Open last _session" msgstr "Abrir a última _sesión" -#: ../midori/midori-browser.c:4999 -msgid "Open the tabs saved in the last session" -msgstr "Abre as lapelas gardadas na última sesión" - -#: ../midori/midori-browser.c:5001 +#: ../midori/midori-browser.c:5416 msgid "_Help" msgstr "_Axuda" -#: ../midori/midori-browser.c:5003 -msgid "_Contents" -msgstr "_Contido" - -#: ../midori/midori-browser.c:5004 -msgid "Show the documentation" -msgstr "Mostrar a documentación" - -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:5418 msgid "_Frequent Questions" msgstr "Preguntas _frecuentes" -#: ../midori/midori-browser.c:5007 -msgid "Show the Frequently Asked Questions" -msgstr "Mostrar as preguntas frecuentes" - -#: ../midori/midori-browser.c:5009 -msgid "_Report a Bug" -msgstr "_Comunicar un erro" - -#: ../midori/midori-browser.c:5010 -msgid "Open Midori's bug tracker" -msgstr "Abrir o xestor de reporte de fallos de Midori" - -#: ../midori/midori-browser.c:5013 -msgid "Show information about the program" -msgstr "Mostrar información sobre o programa" +#: ../midori/midori-browser.c:5421 +msgid "_Report a Problem..." +msgstr "_Informar dun problema..." -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:5433 msgid "_Menubar" msgstr "Barra de _menú" -#: ../midori/midori-browser.c:5022 -msgid "Show menubar" -msgstr "Mostrar barra de menú" - -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:5437 msgid "_Navigationbar" msgstr "Barra de _navegación" -#: ../midori/midori-browser.c:5026 -msgid "Show navigationbar" -msgstr "Mostrar a barra de navegación" - -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5441 msgid "Side_panel" msgstr "_Panel lateral" -#: ../midori/midori-browser.c:5030 -msgid "Show sidepanel" -msgstr "Mostrar panel lateral" +#: ../midori/midori-browser.c:5442 +msgid "Sidepanel" +msgstr "Panel lateral" -#: ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:5445 msgid "_Bookmarkbar" msgstr "Barra de marcadores" -#: ../midori/midori-browser.c:5034 -msgid "Show bookmarkbar" -msgstr "Mostrar a barra de marcadores" - -#: ../midori/midori-browser.c:5037 -msgid "_Transferbar" -msgstr "Barra de _transferencias" - -#: ../midori/midori-browser.c:5038 -msgid "Show transferbar" -msgstr "Mostrar a barra de transferencias" - -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:5449 msgid "_Statusbar" msgstr "Barra de es_tado" -#: ../midori/midori-browser.c:5042 -msgid "Show statusbar" -msgstr "Mostrar a barra de estado" - -#: ../midori/midori-browser.c:5050 +#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236 msgid "Chinese (BIG5)" msgstr "Chinés (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5465 msgid "Japanese (SHIFT__JIS)" msgstr "Xaponés (SHIFT__JIS)" -#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239 msgid "Russian (KOI8-R)" msgstr "Ruso (KOI8-R)" -#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "Personalizado..." + +#: ../midori/midori-browser.c:5985 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5992 msgid "_Location..." -msgstr "Localización..." +msgstr "Lugar" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5994 msgid "Open a particular location" msgstr "Abrir un enderezo determinado" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:6016 msgid "_Web Search..." -msgstr "Buscar na _web..." +msgstr "Buscar no _web..." -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:6018 msgid "Run a web search" -msgstr "Executar unha busca na web" +msgstr "Executar unha busca no web" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:6045 msgid "Reopen a previously closed tab or window" -msgstr "Volver abrir fiestras ou lapelas pechadas" +msgstr "Volver abrir xanelas ou lapelas pechadas" -#: ../midori/midori-browser.c:5659 +#: ../midori/midori-browser.c:6062 +msgid "Show the saved bookmarks" +msgstr "Mostrar os marcadores gardados" + +#: ../midori/midori-browser.c:6079 msgid "_Tools" msgstr "_Ferramentas" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:6095 msgid "_Window" -msgstr "_Fiestra" +msgstr "_Xanela" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:6097 msgid "Show a list of all open tabs" -msgstr "Mostrar unha lista de tódalas lapelas abertas" +msgstr "Mostrar unha lista de todas as lapelas abertas" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:6111 msgid "_Menu" msgstr "_Menú" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:6113 msgid "Menu" msgstr "Menú" -#: ../midori/midori-browser.c:6262 +#: ../midori/midori-browser.c:6927 #, c-format msgid "Unexpected setting '%s'" msgstr "Opción inesperada «%s»" -#: ../midori/midori-locationaction.c:390 +#: ../midori/midori-extension.c:329 #, c-format -msgid "Failed to select from history\n" -msgstr "Produciuse un erro ao seleccionar do historial\n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "Non foi posíbel cargar a configuración da extensión «%s»: %s\n" -#: ../midori/midori-locationaction.c:474 +#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "Buscar %s" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Non foi posíbel gardar a configuración da extensión «%s»: %s\n" -#: ../midori/midori-locationaction.c:497 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "Buscar con %s" -#: ../midori/midori-locationaction.c:1306 +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Buscar con..." + +#: ../midori/midori-locationaction.c:537 +#, c-format +msgid "Failed to select from history\n" +msgstr "Produciuse un erro ao seleccionar do historial\n" + +#: ../midori/midori-locationaction.c:624 #, c-format -msgid "Failed to execute database statement\n" -msgstr "Produciuse un erro ao executar a instrución de base de datos\n" +msgid "Search for %s" +msgstr "Buscar %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1362 +#: ../midori/midori-locationaction.c:1398 msgid "Paste and p_roceed" msgstr "Pegar e _continuar" -#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 -msgid "Detach chosen panel from the window" -msgstr "Separar o panel seleccionado da fiestra " +#: ../midori/midori-locationaction.c:1739 +msgid "Not verified" +msgstr "Non verificada" + +#: ../midori/midori-locationaction.c:1759 +msgid "Verified and encrypted connection" +msgstr "Conexión verificada e cifrada" + +#: ../midori/midori-locationaction.c:1771 +msgid "Open, unencrypted connection" +msgstr "Conexión aberta e non cifrada" -#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 -#: ../midori/midori-panel.c:596 ../midori/midori-panel.c:599 +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" msgstr "Aliñar o panel lateral á dereita" -#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Pechar o panel" -#: ../midori/midori-panel.c:597 ../midori/midori-panel.c:600 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Aliñar o panel lateral á esquerda" -#: ../midori/midori-panel.c:754 -msgid "Hide operating controls" -msgstr "Ocultar os controis de operación" - -#: ../midori/midori-websettings.c:200 -msgid "Show Blank page" -msgstr "Mostrar unha páxina en branco" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "Mostrar a marcación rápida" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" msgstr "Mostrar a páxina inicial" -#: ../midori/midori-websettings.c:202 -msgid "Show last open tabs" -msgstr "Mostrar as últimas lapelas abertas" - -#: ../midori/midori-websettings.c:204 -msgid "Show last tabs without loading" -msgstr "Mostrar as últimas lapelas sen cargalas" - -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:237 msgid "Japanese (SHIFT_JIS)" msgstr "Xaponés (SHIFT_JIS)" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:257 msgid "New tab" msgstr "Nova lapela" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:258 msgid "New window" -msgstr "Nova fiestra" +msgstr "Nova xanela" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:259 msgid "Current tab" msgstr "Lapela actual" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:274 msgid "Default" msgstr "Predeterminada" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:275 msgid "Icons" msgstr "Iconas" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:276 msgid "Small icons" msgstr "Iconas pequenas" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:277 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:278 msgid "Icons and text" msgstr "Iconas e texto" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:279 msgid "Text beside icons" msgstr "Texto a carón das iconas" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:294 msgid "Automatic (GNOME or environment)" -msgstr "Automático (GNOME ou contorno)" +msgstr "Automático (GNOME ou entorno)" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:295 msgid "HTTP proxy server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:296 msgid "No proxy server" msgstr "Sen servidor proxy" -#: ../midori/midori-websettings.c:295 -msgid "All cookies" -msgstr "Todas as cookies" - -#: ../midori/midori-websettings.c:296 -msgid "Session cookies" -msgstr "As cookies desta sesión" - -#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 -msgid "None" -msgstr "Ningunha" - #: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" @@ -1147,1087 +1185,1042 @@ msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:400 msgid "Remember last window size" -msgstr "Lembrar o último tamaño de fiestra" +msgstr "Lembrar o último tamaño de xanela" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:401 msgid "Whether to save the last window size" -msgstr "Gardar (ou non) o último tamaño de fiestra" +msgstr "Gardar (ou non) o último tamaño de xanela" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:409 msgid "Last window width" -msgstr "Última largura da fiestra" +msgstr "Última largura da xanela" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:410 msgid "The last saved window width" -msgstr "Última largura da fiestra gardada" +msgstr "Última largura da xanela gardada" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:418 msgid "Last window height" -msgstr "Última altura da fiestra" +msgstr "Última altura da xanela" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:419 msgid "The last saved window height" -msgstr "Última altura da fiestra gardada" +msgstr "Última altura da xanela gardada" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:444 msgid "Last panel position" msgstr "Última posición do panel" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:445 msgid "The last saved panel position" msgstr "Última posición gardada do panel" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:454 msgid "Last panel page" msgstr "Última páxina do panel" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:455 msgid "The last saved panel page" msgstr "Última páxina gardada do panel" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:463 msgid "Last Web search" -msgstr "Última busca na web" +msgstr "Última busca no web" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:464 msgid "The last saved Web search" -msgstr "Última busca na web gardada" +msgstr "Última busca no web gardada" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:473 msgid "Show Menubar" msgstr "Mostrar a barra de menú" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:474 msgid "Whether to show the menubar" msgstr "Mostrar (ou non) a barra de menú" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:482 msgid "Show Navigationbar" msgstr "Mostrar a barra de navegación" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:483 msgid "Whether to show the navigationbar" msgstr "Mostrar (ou non) a barra de navegación" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:491 msgid "Show Bookmarkbar" msgstr "Mostrar a barra de marcadores" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:492 msgid "Whether to show the bookmarkbar" msgstr "Mostrar (ou non) a barra de marcadores" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:500 msgid "Show Panel" msgstr "Mostrar o panel" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:501 msgid "Whether to show the panel" msgstr "Mostrar (ou non) o panel" -#: ../midori/midori-websettings.c:485 -msgid "Show Transferbar" -msgstr "Mostrar a barra de transferencias" - -#: ../midori/midori-websettings.c:486 -msgid "Whether to show the transferbar" -msgstr "Mostrar (ou non) a barra de transferencias" - -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:509 msgid "Show Statusbar" msgstr "Mostrar a barra de estado" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:510 msgid "Whether to show the statusbar" msgstr "Mostrar (ou non) a barra de estado" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:519 msgid "Toolbar Style:" msgstr "Estilo da barra de ferramentas:" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:520 msgid "The style of the toolbar" msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:521 -msgid "Show progress in location entry" -msgstr "Mostrar o progreso da carga na barra de navegación" - -#: ../midori/midori-websettings.c:522 -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:537 -msgid "Search engines in location completion" -msgstr "Motor de busca na barra de navegación" - -#: ../midori/midori-websettings.c:538 -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:546 +#: ../midori/midori-websettings.c:529 msgid "Toolbar Items" msgstr "Elementos da barra de ferramentas" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:530 msgid "The items to show on the toolbar" msgstr "Elementos que se van mostrar na barra de ferramentas" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:538 msgid "Compact Sidepanel" msgstr "Panel lateral compacto" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:539 msgid "Whether to make the sidepanel compact" msgstr "Facer (ou non) o panel lateral compacto" -#: ../midori/midori-websettings.c:571 -msgid "Show operating controls of the panel" -msgstr "Mostrar os controis de operación do panel" - -#: ../midori/midori-websettings.c:572 -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:587 +#: ../midori/midori-websettings.c:554 msgid "Align sidepanel on the right" msgstr "Aliñar á dereita o panel lateral" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:555 msgid "Whether to align the sidepanel on the right" msgstr "Aliñar (ou non) á dereita o panel lateral" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:570 msgid "Open panels in separate windows" -msgstr "Abrir os paneis en fiestras separadas" +msgstr "Abrir os paneis en xanelas separadas" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:571 msgid "Whether to always open panels in separate windows" -msgstr "Indica se os paneis se abren sempre en fiestras separadas" +msgstr "Indica se os paneis se abren sempre en xanelas separadas" -#: ../midori/midori-websettings.c:613 +#: ../midori/midori-websettings.c:580 msgid "When Midori starts:" msgstr "Cando se inicia Midori:" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:581 msgid "What to do when Midori starts" msgstr "Que facer ao iniciar Midori" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:590 msgid "Homepage:" msgstr "Páxina de inicio:" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:591 msgid "The homepage" msgstr "A páxina de inicio" -#: ../midori/midori-websettings.c:639 +#: ../midori/midori-websettings.c:606 msgid "Show crash dialog" msgstr "Mostrar o diálogo de fallo" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:607 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:656 -msgid "Show speed dial in new tabs" -msgstr "Mostrar a marcación rápida nas novas lapelas" - -#: ../midori/midori-websettings.c:657 -msgid "Show speed dial in newly opened tabs" -msgstr "Mostrar a marcación rápida nas novas lapelas que se abran" - -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:615 msgid "Save downloaded files to:" msgstr "Gardar os ficheiros descargados en:" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:616 msgid "The folder downloaded files are saved to" msgstr "O cartafol de descargas foi gardado en" -#: ../midori/midori-websettings.c:687 -msgid "Ask for the destination folder" -msgstr "Preguntar polo cartafol de destino" - -#: ../midori/midori-websettings.c:688 -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:707 -msgid "Notify when a transfer has been completed" -msgstr "Notificar cando se complete unha transferencia" - -#: ../midori/midori-websettings.c:708 -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:720 -msgid "Download Manager" -msgstr "Xestor de descargas" - -#: ../midori/midori-websettings.c:721 -msgid "An external download manager" -msgstr "Xestor de descargas externo" - -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:624 msgid "Text Editor" msgstr "Editor de texto" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:625 msgid "An external text editor" msgstr "Un editor de texto externo" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:640 msgid "News Aggregator" msgstr "Agregador de novas" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:641 msgid "An external news aggregator" msgstr "Un agregador de novas externo" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:649 msgid "Location entry Search" msgstr "Busca de barra de enderezos" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:650 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:763 +#: ../midori/midori-websettings.c:658 msgid "Preferred Encoding" msgstr "Codificación preferida" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:659 msgid "The preferred character encoding" -msgstr "Codificación de carácteres preferida" +msgstr "Codificación de caracteres preferida" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:669 msgid "Always Show Tabbar" msgstr "Mostrar sempre a barra de lapelas" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:670 msgid "Always show the tabbar" msgstr "Mostrar sempre a barra de lapelas" -#: ../midori/midori-websettings.c:783 +#: ../midori/midori-websettings.c:683 msgid "Close Buttons on Tabs" msgstr "Botón de pechar nas lapelas" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:684 msgid "Whether tabs have close buttons" msgstr "Cada unha das lapelas terá o seu botón para pechala" -#: ../midori/midori-websettings.c:792 +#: ../midori/midori-websettings.c:709 msgid "Open new pages in:" msgstr "Abrir as páxinas novas en:" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:710 msgid "Where to open new pages" msgstr "Onde se van abrir as páxinas novas" -#: ../midori/midori-websettings.c:802 -msgid "Open external pages in:" -msgstr "Abrir as páxinas externas en:" - -#: ../midori/midori-websettings.c:803 -msgid "Where to open externally opened pages" -msgstr "Onde se van abrir as páxinas abertas dende o exterior" - -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:719 msgid "Middle click opens Selection" msgstr "Prema no botón central para abrir a selección" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:720 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:821 +#: ../midori/midori-websettings.c:728 msgid "Open tabs in the background" msgstr "Abrir as lapelas en segundo plano" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:729 msgid "Whether to open new tabs in the background" msgstr "Abrir (ou non) as novas lapelas en segundo plano" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:737 msgid "Open Tabs next to Current" msgstr "Abrir lapelas xunto á actual" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:738 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Abrir as novas lapelas xunto á lapela actual ou despois da última" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:746 msgid "Open popups in tabs" -msgstr "Abrir «emerxentes» en lapelas" +msgstr "Abrir as xanelas emerxentes en lapelas" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:747 msgid "Whether to open popup windows in tabs" -msgstr "Abrir (ou non) as fiestras emerxentes en lapelas" +msgstr "Abrir (ou non) as xanelas emerxentes en lapelas" -#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Cargar as imaxes automaticamente" -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:758 msgid "Load and display images automatically" msgstr "Cargar e mostrar as imaxes automaticamente" -#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 msgid "Enable scripts" msgstr "Activar scripts" -#: ../midori/midori-websettings.c:859 +#: ../midori/midori-websettings.c:766 msgid "Enable embedded scripting languages" msgstr "Activar linguaxes de script incrustadas" -#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" msgstr "Activar os engadidos de Netscape" -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:774 msgid "Enable embedded Netscape plugin objects" msgstr "Activar o engadido de obxectos incrustados de Netscape" -#: ../midori/midori-websettings.c:883 +#: ../midori/midori-websettings.c:789 +msgid "Enable Spell Checking" +msgstr "Activar a corrección ortográfica" + +#: ../midori/midori-websettings.c:790 +msgid "Enable spell checking while typing" +msgstr "Activar o corrector ortográfico ao escribir" + +#: ../midori/midori-websettings.c:796 msgid "Enable HTML5 database support" -msgstr "Activar o soporte de base de datos HTML5" +msgstr "Activar a compatibilidade de base de datos HTML5" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:797 msgid "Whether to enable HTML5 database support" -msgstr "Activar ou desactivar o soporte de base de datos HTML5" +msgstr "Activar ou desactivar a compatibilidade de base de datos HTML5" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:803 msgid "Enable HTML5 local storage support" -msgstr "Activar o soporte de almacenamento local de HTML5" +msgstr "Activar a opción de almacenamento local de HTML5" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:804 msgid "Whether to enable HTML5 local storage support" -msgstr "Activar ou desactivar o soporte de almacenamento local de HTML5" +msgstr "" +"Activar ou desactivar a compatibilidade de almacenamento local de HTML5" -#: ../midori/midori-websettings.c:899 +#: ../midori/midori-websettings.c:810 msgid "Enable offline web application cache" msgstr "Activar a caché de aplicativos web sen conexión" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:811 msgid "Whether to enable offline web application cache" msgstr "Activar ou desactivar a caché de aplicativos web sen conexión" -#: ../midori/midori-websettings.c:925 -msgid "Zoom Text and Images" -msgstr "Zoom sobre o texto e imaxes" +#: ../midori/midori-websettings.c:827 +msgid "Flash window on background tabs" +msgstr "Xanela intermitente nas lapelas en segundo plano" -#: ../midori/midori-websettings.c:926 -msgid "Whether to zoom text and images" -msgstr "Aplicar zoom (ou non) ao texto e ás imaxes" +#: ../midori/midori-websettings.c:828 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "" +"Xanela do navegador intermitente se foi aberta unha nova lapela en segundo " +"plano" -#: ../midori/midori-websettings.c:941 +#: ../midori/midori-websettings.c:836 +msgid "Enable WebGL support" +msgstr "Activar a compatibilidade para WebGL" + +#: ../midori/midori-websettings.c:837 +msgid "Allow websites to use OpenGL rendering" +msgstr "" + +#: ../midori/midori-websettings.c:863 +msgid "Zoom Text and Images" +msgstr "Zoom sobre o texto e as imaxes" + +#: ../midori/midori-websettings.c:864 +msgid "Whether to zoom text and images" +msgstr "Aplicar zoom (ou non) ao texto e ás imaxes" + +#: ../midori/midori-websettings.c:879 msgid "Find inline while typing" msgstr "Buscar en liña ao escribir" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:880 msgid "Whether to automatically find inline while typing" msgstr "Buscar en liña automaticamente (ou non) mentres se escribe" -#: ../midori/midori-websettings.c:957 +#: ../midori/midori-websettings.c:895 msgid "Kinetic scrolling" msgstr "Desprazamento cinético" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:896 msgid "Whether scrolling should kinetically move according to speed" msgstr "O desprazamento móvese de acordo ca velocidade" -#: ../midori/midori-websettings.c:966 -msgid "Accept cookies" -msgstr "Aceptar as «cookies»" - -#: ../midori/midori-websettings.c:967 -msgid "What type of cookies to accept" -msgstr "Que tipos de «cookies» se van aceptar" - -#: ../midori/midori-websettings.c:976 -msgid "Maximum cookie age" -msgstr "Persistencia máxima das «cookies»" +#: ../midori/midori-websettings.c:904 +msgid "Delete old Cookies after:" +msgstr "Eliminar as «cookies» antigas despois de:" -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:905 msgid "The maximum number of days to save cookies for" msgstr "Tempo máximo, en días, durante os que se gardaran as «cookies»" -#: ../midori/midori-websettings.c:986 -msgid "Maximum history age" -msgstr "Persistencia máxima do historial" +#: ../midori/midori-websettings.c:921 +msgid "Only accept Cookies from sites you visit" +msgstr "Só se aceptan as «cookies» dos sitios que visite" + +#: ../midori/midori-websettings.c:922 +msgid "Block cookies sent by third-party websites" +msgstr "Bloquear as «cookies» dos sitios de terceiros" + +#: ../midori/midori-websettings.c:936 +msgid "Delete pages from history after:" +msgstr "Eliminar as páxinas do historial despois de:" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:937 msgid "The maximum number of days to save the history for" msgstr "Tempo máximo, en días, durante os que se gardará un dato do historial" -#: ../midori/midori-websettings.c:995 -msgid "Remember last downloaded files" -msgstr "Lembrar os últimos ficheiros descargados" - -#: ../midori/midori-websettings.c:996 -msgid "Whether the last downloaded files are saved" -msgstr "Lembrar (ou non) a lista de descargas realizadas ultimamente" - -#: ../midori/midori-websettings.c:1013 +#: ../midori/midori-websettings.c:952 msgid "Proxy server" msgstr "Servidor proxy" -#: ../midori/midori-websettings.c:1014 +#: ../midori/midori-websettings.c:953 msgid "The type of proxy server to use" msgstr "O tipo de servidor proxy a usar" -#: ../midori/midori-websettings.c:1023 +#: ../midori/midori-websettings.c:962 msgid "HTTP Proxy Server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:1024 +#: ../midori/midori-websettings.c:963 msgid "The proxy server used for HTTP connections" msgstr "Servidor proxy que se usa para as conexións HTTP" +#: ../midori/midori-websettings.c:978 +msgid "Port" +msgstr "Porto" + +#: ../midori/midori-websettings.c:979 +msgid "The proxy server port used for HTTP connections" +msgstr "Servidor proxy que se usa para as conexións HTTP" + +#: ../midori/midori-websettings.c:997 +msgid "The maximum size of cached pages on disk" +msgstr "O tamaño máximo da caché de páxinas no disco" + #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1040 +#: ../midori/midori-websettings.c:1014 msgid "Identify as" msgstr "Identificarse como" -#: ../midori/midori-websettings.c:1041 +#: ../midori/midori-websettings.c:1015 msgid "What to identify as to web pages" msgstr "Como se identifica nas páxinas web" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1031 msgid "Identification string" msgstr "Cadea de identificación" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1032 msgid "The application identification string" msgstr "Cadea de identificación do aplicativo" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1048 msgid "Preferred languages" msgstr "Idiomas preferidos" -#: ../midori/midori-websettings.c:1074 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "Un lista separada por comas de idiomas preferidos para mostrar páxinas web multiidioma, por exemplo \"de\", \"ru,nl\" ou \"en-us;q=1.0, fr-fr;q=0.667\"" +#: ../midori/midori-websettings.c:1049 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"Un lista separada por comas de idiomas preferidos para mostrar páxinas web " +"multiidioma, por exemplo «de», «ru,nl» ou «en-us;q=1.0, fr-fr;q=0.667»" -#: ../midori/midori-websettings.c:1089 +#: ../midori/midori-websettings.c:1064 msgid "Clear private data" msgstr "Limpar a información persoal" -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1065 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:1227 ../midori/midori-view.c:4442 -#: ../midori/midori-view.c:4446 +#: ../midori/midori-websettings.c:1080 +msgid "Clear data" +msgstr "Limpar os datos" + +#: ../midori/midori-websettings.c:1081 +msgid "The data selected for deletion" +msgstr "Os datos seleccionados para eliminar" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1130 +msgid "Strip referrer details sent to websites" +msgstr "Recortar os detalles de referencia enviados para sitios externos" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1132 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Se a cabeceira «Referencia» debe limitarse ao nome da máquina" + +#: ../midori/midori-websettings.c:1146 +msgid "Always use my font choices" +msgstr "Utilizar sempre as miñas escollas de tipo de letras" + +#: ../midori/midori-websettings.c:1147 +msgid "Override fonts picked by websites with user preferences" +msgstr "" +"Substituír os tipos de letras dos sitios web polos preferidos do usuario" + +#: ../midori/midori-view.c:1360 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s desexa gardar unha base de datos HTML5." + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Deny" +msgstr "_Denegar" + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Allow" +msgstr "_Permitir" + +#: ../midori/midori-view.c:1392 +#, c-format +msgid "%s wants to know your location." +msgstr "%s desexa coñecer a súa localización." + +#: ../midori/midori-view.c:1485 #, c-format msgid "Error - %s" msgstr "Erro - %s" -#: ../midori/midori-view.c:1228 +#: ../midori/midori-view.c:1486 #, c-format msgid "The page '%s' couldn't be loaded." -msgstr "Non se puido cargar a páxina «%s»." +msgstr "Non foi posíbel cargar a páxina «%s»." -#: ../midori/midori-view.c:1230 +#: ../midori/midori-view.c:1488 msgid "Try again" -msgstr "Inténteo de novo" +msgstr "Ténteo de novo" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1249 -#, c-format -msgid "Not found - %s" -msgstr "Non se atopou - %s" - -#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 +#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598 #, c-format msgid "Send a message to %s" msgstr "Enviarlle unha mensaxe a %s" -#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 +#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747 msgid "Inspect _Element" msgstr "Inspeccionar _elemento" -#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2480 msgid "Open Link in New _Tab" msgstr "Abrir a ligazón nunha nova _lapela" -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2484 msgid "Open Link in _Foreground Tab" msgstr "Abrir a ligazón na lapela de _primeiro plano" -#: ../midori/midori-view.c:2118 +#: ../midori/midori-view.c:2485 msgid "Open Link in _Background Tab" -msgstr "Abrir a ligazón na lapela de _fondo" +msgstr "Abrir a ligazón na lapela de _segundo plano" -#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2488 msgid "Open Link in New _Window" -msgstr "Abrir a ligazón nunha _fiestra nova" +msgstr "Abrir a ligazón nunha _xanela nova" -#: ../midori/midori-view.c:2124 +#: ../midori/midori-view.c:2491 msgid "Open Link as Web A_pplication" -msgstr "Abrir a ligazón como a_plicativo web" +msgstr "Abrir a ligazón como aplicativo _web" -#: ../midori/midori-view.c:2127 +#: ../midori/midori-view.c:2496 msgid "Copy Link de_stination" msgstr "Copiar o de_stino da ligazón" -#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 -msgid "_Save Link destination" -msgstr "_Gardar ligazón de destino" - -#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 -msgid "_Download Link destination" -msgstr "_Descargar ligazón de destino" - -#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 -#: ../midori/midori-view.c:2207 -msgid "Download with Download _Manager" -msgstr "Descargar co _Xestor de descargas" - -#: ../midori/midori-view.c:2144 +#: ../midori/midori-view.c:2512 msgid "Open _Image in New Tab" msgstr "Abrir a _imaxe nunha nova lapela" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2515 msgid "Copy Image _Address" msgstr "Copiar o _enderezo da imaxe" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2518 msgid "Save I_mage" -msgstr "Gardar a _imaxe" +msgstr "Gardar a i_maxe" -#: ../midori/midori-view.c:2151 -msgid "Download I_mage" -msgstr "Descargar a i_maxe" +#: ../midori/midori-view.c:2521 +msgid "Open in Image _Viewer" +msgstr "Abrir no _visor de imaxes" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2528 msgid "Copy Video _Address" msgstr "Copiar o _enderezo do vídeo" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2531 msgid "Save _Video" msgstr "Gardar o _vídeo" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2531 msgid "Download _Video" msgstr "Descargar o _vídeo" -#: ../midori/midori-view.c:2224 +#: ../midori/midori-view.c:2557 msgid "Search _with" msgstr "Buscar _con: " -#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2589 msgid "_Search the Web" msgstr "_Buscar na rede" -#: ../midori/midori-view.c:2287 +#: ../midori/midori-view.c:2606 msgid "Open Address in New _Tab" msgstr "Abrir o enderezo nunha nova _lapela" -#: ../midori/midori-view.c:2591 +#: ../midori/midori-view.c:2909 msgid "Open or download file" msgstr "Abrir ou descargar o ficheiro" -#: ../midori/midori-view.c:2610 +#: ../midori/midori-view.c:2929 #, c-format msgid "File Type: '%s'" msgstr "Tipo de ficheiro: «%s»" -#: ../midori/midori-view.c:2613 +#: ../midori/midori-view.c:2931 #, 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:2617 +#: ../midori/midori-view.c:2935 +#, c-format +msgid "File Name: %s" +msgstr "Nome de ficheiro: «%s»" + +#: ../midori/midori-view.c:2955 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:3158 +#: ../midori/midori-view.c:3576 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar a páxina - %s" -#: ../midori/midori-view.c:3439 -msgid "Speed dial" +#: ../midori/midori-view.c:3923 +msgid "Speed Dial" msgstr "Marcación rápida" -#: ../midori/midori-view.c:3440 +#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020 msgid "Click to add a shortcut" msgstr "Prema para engadir un atallo" -#: ../midori/midori-view.c:3441 +#: ../midori/midori-view.c:3925 msgid "Enter shortcut address" msgstr "Introduza o enderezo do atallo" -#: ../midori/midori-view.c:3442 +#: ../midori/midori-view.c:3926 msgid "Enter shortcut title" msgstr "Introduza o título do atallo" -#: ../midori/midori-view.c:3443 +#: ../midori/midori-view.c:3927 msgid "Are you sure you want to delete this shortcut?" msgstr "Está seguro de que desexa eliminar este atallo?" -#: ../midori/midori-view.c:3444 -msgid "Set number of columns and rows" -msgstr "Definir o número de columnas e filas" +#: ../midori/midori-view.c:4089 +#, c-format +msgid "No documentation installed" +msgstr "A documentación non está instalada" -#: ../midori/midori-view.c:3445 -msgid "Enter number of columns and rows:" -msgstr "Introduza o número de columnas e filas:" +#: ../midori/midori-view.c:4165 +msgid "Midori doesn't store any personal data:" +msgstr "Midori non almacena ningún dato persoal:" + +#: ../midori/midori-view.c:4166 +msgid "No history or web cookies are being saved." +msgstr "Non se gardan cookies nin historiais." + +#: ../midori/midori-view.c:4167 +msgid "Extensions are disabled." +msgstr "Os complementos están desactivados." -#: ../midori/midori-view.c:3446 -msgid "Invalid input for the size of the speed dial" -msgstr "Tamaño de entrada non válido para a marcación rápida" +#: ../midori/midori-view.c:4168 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "" -#: ../midori/midori-view.c:3447 -msgid "Thumb size:" -msgstr "Tamaño da miniatura:" +#: ../midori/midori-view.c:4169 +msgid "Midori prevents websites from tracking the user:" +msgstr "" -#: ../midori/midori-view.c:3448 -msgid "Small" -msgstr "Pequeno" +#: ../midori/midori-view.c:4170 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "" -#: ../midori/midori-view.c:3449 -msgid "Medium" -msgstr "Mediano" +#: ../midori/midori-view.c:4171 +msgid "DNS prefetching is disabled." +msgstr "" -#: ../midori/midori-view.c:3450 -msgid "Big" -msgstr "Grande" +#: ../midori/midori-view.c:4172 +msgid "The language and timezone are not revealed to websites." +msgstr "O idioma e o fuso horario non se revelan aos sitios web." -#: ../midori/midori-view.c:3476 -#, c-format -msgid "Document cannot be displayed" -msgstr "Non se pode mostrar o documento" +#: ../midori/midori-view.c:4173 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "" -#: ../midori/midori-view.c:3499 -#, c-format -msgid "No documentation installed" -msgstr "A documentación non está instalada" +#: ../midori/midori-view.c:4222 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "" +"Os números de versión entre os corchetes mostran a versión en tempo de " +"execución." -#: ../midori/midori-view.c:3618 +#: ../midori/midori-view.c:4278 msgid "Page loading delayed" msgstr "Pospúxose a carga da páxina" -#: ../midori/midori-view.c:3619 +#: ../midori/midori-view.c:4279 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "Pospúxose a carga debido a un fallo recente ou ao inicio das preferencias." +msgstr "" +"Pospúxose a carga debido a un fallo recente ou ao inicio das preferencias." -#: ../midori/midori-view.c:3620 +#: ../midori/midori-view.c:4280 msgid "Load Page" msgstr "Cargar a páxina" -#: ../midori/midori-view.c:3764 +#: ../midori/midori-view.c:4446 msgid "Blank page" msgstr "Páxina en branco" -#: ../midori/midori-view.c:4018 +#: ../midori/midori-view.c:4708 msgid "_Duplicate Tab" msgstr "_Duplicar a lapela" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4713 msgid "Show Tab _Label" msgstr "Mostrar a _etiqueta da lapela" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4713 msgid "Show Tab _Icon Only" msgstr "Só mostrar a _icona da lapela" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4719 msgid "Close ot_her Tabs" msgstr "Pechar ou_tras lapelas" -#: ../midori/midori-view.c:4680 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5532 +msgid "previous" +msgstr "anterior" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5551 +msgid "next" +msgstr "seguinte" + +#: ../midori/midori-view.c:5564 msgid "Print background images" msgstr "Imprimir imaxes de fondo" -#: ../midori/midori-view.c:4681 +#: ../midori/midori-view.c:5565 msgid "Whether background images should be printed" msgstr "Se se imprimen (ou non) as imaxes de fondo" -#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:5597 msgid "Features" msgstr "Funcionalidades" -#. Page "General" -#: ../midori/midori-preferences.c:301 -msgid "General" -msgstr "Xeral" - -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Inicio" -#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Usar a páxina a_ctual" + +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Usar a páxina actual como páxina de inicio" -#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Transferencias" - #. Page "Appearance" -#: ../midori/midori-preferences.c:352 -msgid "Appearance" -msgstr "Aparencia" - -#: ../midori/midori-preferences.c:353 -msgid "Font settings" -msgstr "Axustes de tipo de letra" - -#: ../midori/midori-preferences.c:355 -msgid "Default Font Family" -msgstr "Tipo de letra predeterminado" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Tipos de letra" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Familia de letras proporcionais" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "Tipo de letra predeterminado utilizada para mostrar o texto" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:333 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:363 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Tipo de letra de ancho fixo" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:339 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:369 +#: ../midori/midori-preferences.c:342 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:371 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Tamaño mínimo do tipo de letra" -#: ../midori/midori-preferences.c:374 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "Tamaño mínimo do tipo de letra para mostrar texto" #. Page "Behavior" -#: ../midori/midori-preferences.c:383 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:396 -msgid "Enforce 96 dots per inch" -msgstr "Aplicar 96 puntos por polgada" - -#: ../midori/midori-preferences.c:397 -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:417 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" -msgstr "Permitir que os scripts abran fiestras emerxentes" +msgstr "Permitir que os «scripts» abran xanelas emerxentes" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "Definir se os scripts teñen permiso ou non para abrir fiestras emerxentes automaticamente" - -#: ../midori/midori-preferences.c:422 -msgid "Spell Checking" -msgstr "Corrección ortográfica" - -#: ../midori/midori-preferences.c:425 -msgid "Enable Spell Checking" -msgstr "Activar a corrección ortográfica" - -#: ../midori/midori-preferences.c:426 -msgid "Enable spell checking while typing" -msgstr "Activar o corrector ortográfico ao escribir" - -#: ../midori/midori-preferences.c:428 -msgid "Spelling dictionaries:" -msgstr "Dicionarios de ortografía:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:432 -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»" +msgstr "" +"Definir se os scripts teñen permiso ou non para abrir xanelas emerxentes " +"automaticamente" #. Page "Interface" -#: ../midori/midori-preferences.c:438 -msgid "Interface" -msgstr "Interface" - -#: ../midori/midori-preferences.c:439 -msgid "Navigationbar" -msgstr "Barra de navegación" - -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Navegación" -#. Page "Applications" -#: ../midori/midori-preferences.c:471 -msgid "Applications" -msgstr "Aplicativos" - -#: ../midori/midori-preferences.c:472 -msgid "External applications" -msgstr "Aplicativos externos" - #. Page "Network" -#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "Rede" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:463 msgid "Hostname" msgstr "Nome de máquina" -#. Page "Privacy" -#: ../midori/midori-preferences.c:514 -msgid "Privacy" -msgstr "Privacidade" - -#: ../midori/midori-preferences.c:515 -msgid "Web Cookies" -msgstr "Cookies" - -#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 -msgid "days" -msgstr "días" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "MB" -#: ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Baleiro" - -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Engadir un motor de busca" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Editar o motor de busca" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Nome:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Descrición" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "_Icona" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" -msgstr "«_Marca»" +msgstr "_Marca" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "Xestionar os motores de busca" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "Usar como pre_determinado" -#: ../midori/sokoke.c:1303 -msgid "_Bookmark" -msgstr "_Marcador" - -#: ../midori/sokoke.c:1304 -msgid "_Bookmarks" -msgstr "_Marcadores" - -#: ../midori/sokoke.c:1305 -msgid "Add Boo_kmark" -msgstr "Engadir mar_cador…" - -#: ../midori/sokoke.c:1306 -msgid "_Console" -msgstr "_Consola" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "Abrir con" -#: ../midori/sokoke.c:1307 -msgid "_Extensions" -msgstr "_Extensións" +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Escoller un aplicativo ou orde para abrir «%s»:" -#: ../midori/sokoke.c:1308 -msgid "_History" -msgstr "_Historial" +#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "Non foi posíbel executar o programa externo." -#: ../midori/sokoke.c:1309 -msgid "_Homepage" -msgstr "P_áxina de inicio" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d hora" +msgstr[1] "%d horas" -#: ../midori/sokoke.c:1310 -msgid "_Userscripts" -msgstr "_Scripts de usuario" +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minuto" +msgstr[1] "%d minutos" -#: ../midori/sokoke.c:1311 -msgid "New _Tab" -msgstr "Nova _lapela" +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d segundo" +msgstr[1] "%d segundos" -#: ../midori/sokoke.c:1312 -msgid "_Transfers" -msgstr "_Transferencias" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s de %s" -#: ../midori/sokoke.c:1313 -msgid "Netscape p_lugins" -msgstr "En_gadidos de Netscape" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr "(%s/s)" -#: ../midori/sokoke.c:1316 -msgid "New _Folder" -msgstr "Cartafol _novo" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr "- restan %s" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:213 +#: ../toolbars/midori-findbar.c:291 msgid "_Inline Find:" msgstr "_Busca en liña:" -#: ../toolbars/midori-findbar.c:245 +#: ../toolbars/midori-findbar.c:317 msgid "Previous" msgstr "Anterior" -#: ../toolbars/midori-findbar.c:251 +#: ../toolbars/midori-findbar.c:323 msgid "Next" msgstr "Seguinte" -#: ../toolbars/midori-findbar.c:255 +#: ../toolbars/midori-findbar.c:327 msgid "Match Case" msgstr "Diferenciar maiúsculas de minúsculas" -#: ../toolbars/midori-findbar.c:264 +#: ../toolbars/midori-findbar.c:336 msgid "Highlight Matches" msgstr "Resaltar coincidencias" -#: ../toolbars/midori-findbar.c:275 +#: ../toolbars/midori-findbar.c:347 msgid "Close Findbar" msgstr "Pechar a barra de buscas" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 -#, c-format -msgid "%s of %s" -msgstr "%s de %s" - -#: ../toolbars/midori-transferbar.c:123 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." -msgstr "Descargouse o ficheiro '%s'." +msgstr "Descargouse o ficheiro «%s»." -#: ../toolbars/midori-transferbar.c:126 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Transferencia completada" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "O ficheiro descargado é erróneo." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"A suma de verificación que se fornece coa ligazón non coincide. " +"Probabelmente isto signfica que o ficheiro está incompleto ou que foi " +"modificado despois do cálculo." + +#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Limpar todo" -#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 +#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 msgid "Some files are being downloaded" msgstr "Estanse a descargar algúns ficheiros" -#: ../toolbars/midori-transferbar.c:306 +#: ../toolbars/midori-transferbar.c:377 msgid "_Quit Midori" msgstr "Saír de Midori" -#: ../toolbars/midori-transferbar.c:308 +#: ../toolbars/midori-transferbar.c:379 msgid "The transfers will be cancelled if Midori quits." msgstr "Se sae de Midori hanse cancelar as transferencias." -#: ../panels/midori-bookmarks.c:116 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Marcadores" -#: ../panels/midori-bookmarks.c:275 +#: ../panels/midori-bookmarks.c:257 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Produciuse un erro engadir o elemento ao marcadores: %s\n" -#: ../panels/midori-bookmarks.c:414 +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "Editar o marcador seleccionado" -#: ../panels/midori-bookmarks.c:422 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" -msgstr "Borrar o marcador seleccionado" +msgstr "Eliminar o marcador seleccionado" -#: ../panels/midori-bookmarks.c:436 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" msgstr "Engadir un cartafol novo" -#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:572 +#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 msgid "Separator" msgstr "Separador" -#: ../panels/midori-console.c:90 -msgid "Console" -msgstr "Consola" - -#: ../panels/midori-console.c:351 -msgid "Copy _All" -msgstr "Copiar _todo" - -#: ../panels/midori-console.c:352 -msgid "Copy All" -msgstr "Copiar todo" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "Historial" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Extensións" +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "Hoxe" -#: ../panels/midori-history.c:146 -msgid "A week ago" -msgstr "Fai unha semana" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "Onte" -#: ../panels/midori-history.c:148 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "Fai %d día" msgstr[1] "Fai %d días" -#: ../panels/midori-history.c:151 -msgid "Today" -msgstr "Hoxe" - -#: ../panels/midori-history.c:153 -msgid "Yesterday" -msgstr "Onte" +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "Fai unha semana" -#: ../panels/midori-history.c:324 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" -msgstr "Esta seguro de que desexa eliminar tódolos elementos do historial?" +msgstr "Esta seguro de que desexa eliminar todos os elementos do historial?" -#: ../panels/midori-history.c:369 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" msgstr "Por en marcadores o elemento seleccionado no historial" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" -msgstr "Borrar o elemento seleccionado no historial" +msgstr "Eliminar o elemento seleccionado no historial" -#: ../panels/midori-history.c:386 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "Limpar completamente o historial" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Transferencias" + +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" msgstr "Abrir o carta_fol de destino" -#: ../panels/midori-transfers.c:484 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" msgstr "Copiar o enderezo da lig_azón" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Precísase autenticación" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" @@ -2235,203 +2228,247 @@ "Precísanse un nome de usuario e un\n" "contrasinal para abrir esta localización:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "Usuario" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "Contrasinal" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "_Lembrar o contrasinal" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "Non se puido cargar a icona chamada «%s»" +msgstr "Non foi posíbel cargar a icona chamada «%s»" -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "A icona de inventario «%s» non se pode cargar" +msgstr "Non é posíbel cargar a icona de inventario «%s»" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "Os marcos de animación están rotos" -#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 +#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" msgstr "A propiedade «%s» non é válida para %s" -#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 -#: ../extensions/addons.c:119 +#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Escoller un ficheiro" -#: ../katze/katze-utils.c:564 +#: ../katze/katze-utils.c:506 msgid "Choose folder" msgstr "Escoller un cartafol" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "Ningunha" + +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "1 hora" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "1 día" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "1 semana" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "1 mes" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "1 ano" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Preferencias de %s" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:473 msgid "Configure Advertisement filters" msgstr "Configurar os filtros de publicidade" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:504 #, 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 "Introduza o enderezo dunha lista preconfigurada de filtros na entrada de texto e prema en \"Engadir\" para engadila á lista. Pode atopar máis listas en %s." - -#: ../extensions/adblock.c:587 -msgid "Configure _Advertisement filters..." -msgstr "Configurar os filtros de _publicidade..." +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 "" +"Introduza o enderezo dunha lista preconfigurada de filtros na entrada de " +"texto e prema en «Engadir» para engadila á lista. Pode atopar máis listas en " +"%s." -#: ../extensions/adblock.c:841 +#: ../extensions/adblock.c:882 msgid "Edit rule" msgstr "Editar regra" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:896 msgid "_Rule:" msgstr "_Regra:" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:950 msgid "Bl_ock image" msgstr "Bl_oquear a imaxe" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:955 msgid "Bl_ock link" msgstr "Bl_oquear a ligazón" -#: ../extensions/adblock.c:1494 +#: ../extensions/adblock.c:1670 msgid "Advertisement blocker" msgstr "Bloqueo de publicidade" -#: ../extensions/adblock.c:1495 +#: ../extensions/adblock.c:1671 msgid "Block advertisements according to a filter list" msgstr "Bloquear a publicidade de acordo cunha lista de filtros" -#: ../extensions/addons.c:130 ../extensions/addons.c:490 +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "" +"Parece que esta páxina contén un script de usuario. Desexa instalalalo?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "_instalar un script de usuario" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "" +"Parece que esta páxina contén un estilo de usuario. Desexa instalalalo?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_instalar un estilo de usuario" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Non instalar" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" -msgstr "Scripts de usuario" +msgstr "«Scripts» de usuario" -#: ../extensions/addons.c:135 ../extensions/addons.c:492 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Estilos de usuario" -#: ../extensions/addons.c:191 ../extensions/addons.c:267 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Erro" -#: ../extensions/addons.c:231 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" -msgstr "Está seguro de que desexa borrar '%s'?" +msgstr "Está seguro de que desexa eliminar «%s»?" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:427 msgid "Delete user script" -msgstr "Borrar script de usuario" +msgstr "Eliminar o «script» de usuario" -#: ../extensions/addons.c:238 +#: ../extensions/addons.c:428 msgid "Delete user style" -msgstr "Borrar estilo de usuario" +msgstr "Eliminar o estilo de usuario" -#: ../extensions/addons.c:242 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." -msgstr "Borrouse de forma permanente o ficheiro %s." +msgstr "Eliminouse de forma permanente o ficheiro %s." -#: ../extensions/addons.c:377 ../extensions/addons.c:454 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "Abrir nun editor de texto" -#: ../extensions/addons.c:379 ../extensions/addons.c:463 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Abrir o cartafol de destino" -#: ../extensions/addons.c:445 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "Engadir un novo complemento" -#: ../extensions/addons.c:472 -msgid "Open target folder for selected addon" -msgstr "Abrir o cartafol destino para o complemento seleccionado" - -#: ../extensions/addons.c:473 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "Eliminar o complemento seleccionado" -#: ../extensions/addons.c:1420 -#, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "Non se puido gardar a configuración da extensión '%s': %s\n" - -#: ../extensions/addons.c:1421 ../extensions/addons.c:1586 +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" msgstr "Complementos de usuario" -#: ../extensions/addons.c:1543 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" -msgstr "Non se pode monitorizar o cartafol '%s': %s" +msgstr "Non é posíbel monitorizar o cartafol «%s»: %s" -#: ../extensions/addons.c:1587 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" -msgstr "Compatibilidade para scripts e estilos de usuario" +msgstr "Compatibilidade para «scripts» e estilos de usuario" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "Lapelas de cores" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Colorea cada lapela para distinguilas" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" -msgstr "Xestor de cookies" +msgstr "Xestor de «cookies»" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" -msgstr "Borrar todo" +msgstr "Eliminar todo" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 -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." +#: ../extensions/cookie-manager/cookie-manager-page.c:105 +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." -#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "Expandir todo" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "Contraer todo" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" -msgstr "Está seguro de que desexa borrar todas as cookies?" +msgstr "Está seguro de que desexa eliminar todas as cookies?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Pregunta" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." -msgstr "Só se borrarán as cookies que coincidan co filtro." +msgstr "Só se eliminarán as cookies que coincidan co filtro." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "Na fin da sesión" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2448,15 +2485,15 @@ "Segura: %s\n" "Caduca: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Si" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "Non" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" @@ -2465,115 +2502,111 @@ "Dominio: %s\n" "Cookies: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Nome" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "_Expandir todo" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "_Contraer todo" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 msgid "Filter:" msgstr " Filtro:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 -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/cookie-manager-page.c:1144 +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:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" -msgstr "Listar, ver e borrar cookies" +msgstr "Listar, ver e eliminar cookies" -#: ../extensions/copy-tabs.c:39 +#: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" msgstr "Copiar os _enderezos das lapelas" -#: ../extensions/copy-tabs.c:98 +#: ../extensions/copy-tabs.c:95 msgid "Copy Addresses of Tabs" msgstr "Copiar os enderezos das lapelas" -#: ../extensions/copy-tabs.c:99 +#: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Copiar os enderezos de todas as lapelas ao portarretallos" -#: ../extensions/external-applications.vala:93 -msgid "External Applications" -msgstr "Aplicativos externos" - -#: ../extensions/external-applications.vala:94 -msgid "Associate URL schemes with external commands" -msgstr "Asociar esquemas de URL con comandos externos" - #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "Non se puideron atopar os elementos necesarios Atom «entry» nos datos XML." +msgstr "" +"Non foi posíbel atopar os elementos necesarios Atom «entry» nos datos XML." #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "Non se puideron atopar os elementos necesarios Atom «feed» nos datos XML." +msgstr "" +"Non foi posíbel atopar os elementos necesarios Atom «feed» nos datos XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Última actualización: %s." -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "Fontes" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "Engadir unha nova fonte" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" -msgstr "Borrar fonte" +msgstr "Eliminar fonte" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "_Fontes" #: ../extensions/feed-panel/feed-parse.c:195 #, 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." +msgstr "Non foi posíbel atopar o elemento raíz nos datos XML da fonte." #: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." -msgstr "Formato de fonte non soportado." +msgstr "Formato de fonte non admitido." #: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" -msgstr "Non se puido analizar a fonte XML: %s" +msgstr "Non foi posíbel analizar a fonte XML: %s" #: ../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." +msgstr "Non foi posíbel atopar o elemento «channel» nos datos XML do RSS." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." -msgstr "Versión de RSS non soportada." +msgstr "Versión de RSS non admitida." #: ../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." +msgstr "" +"Non foi posíbel atopar os elementos necesarios RSS «item» nos datos XML." #: ../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." +msgstr "" +"Non foi posíbel atopar os elementos necesarios RSS «channel» nos datos XML." #: ../extensions/feed-panel/main.c:131 #, c-format @@ -2585,197 +2618,693 @@ msgid "Error loading feed '%s'" msgstr "Atopouse un erro ao cargar a fonte «%s»" -#: ../extensions/feed-panel/main.c:520 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "Panel de fontes" -#: ../extensions/feed-panel/main.c:521 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Lector de fontes Atom/RSS" -#: ../extensions/formhistory.c:142 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" msgstr "Produciuse un erro ao engadir o valor ao formulario: %s\n" -#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "Historial de formularios" + +#: ../extensions/formhistory/formhistory.c:112 +#, fuzzy +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Precísanse un nome de usuario e un\n" +"contrasinal para abrir esta localización:" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "Lembrar o contrasinal desta páxina?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Lembrar" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "Non agora" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Nunca para esta páxina" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "Alternar o estado do historial de formularios" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "" +"Activar ou desactivar o historial dos formularios para a lapela actual." + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format msgid "Failed to execute database statement: %s\n" -msgstr "Fallou ao executar a declaración na base de datos: %s\n" +msgstr "Produciuse un fallo ao executar a declaración na base de datos: %s\n" + +#: ../extensions/formhistory/formhistory.c:629 +#, fuzzy +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "Activar só a través das teclas de atallo (Ctrl+Shift+F) por lapela" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "Completador de historial de formularios" -#: ../extensions/formhistory.c:503 +#: ../extensions/formhistory/formhistory.c:669 msgid "Stores history of entered form data" msgstr "Almacena un historial dos datos introducidos nos formularios" -#: ../extensions/formhistory.c:507 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 #, c-format -msgid "Not available: %s" -msgstr "Non dispoñible: %s" +msgid "Failed to select suggestions\n" +msgstr "Produciuse un erro ao seleccionar suxestións\n" -#: ../extensions/formhistory.c:508 -msgid "Resource files not installed" -msgstr "Os ficheiros de recursos non están instalados" +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Non hai lapelas sen visitar" -#: ../extensions/formhistory.c:514 -msgid "Form history filler" -msgstr "Completador de historial de formularios" +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "Lista do historial" -#: ../extensions/history-list.vala:174 -msgid "Next Tab (History List)" -msgstr "Seguinte lapela (historial de lapelas)" - -#: ../extensions/history-list.vala:175 -msgid "Next tab from history" -msgstr "Seguinte lapela do historial" - -#: ../extensions/history-list.vala:184 -msgid "Previous Tab (History List)" -msgstr "Lapela anterior (historial de lapelas)" - -#: ../extensions/history-list.vala:185 -msgid "Previous tab from history" -msgstr "Lapela anterior do historial" +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Comportamento ao pechar as lapelas" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Non facer nada" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Cambiar á última lapela vista" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Cambiar á lapela máis nova" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Seguinte lapela nova (historial de lapelas)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Seguinte lapela nova do historial" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Lapela nova anterior (historial de lapelas)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Lapela nova anterior do historial" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Mostrar a lapela en segundo plano (lista do historial)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Mostrar a lapela actual en segundo plano" -#: ../extensions/history-list.vala:245 +#: ../extensions/history-list.vala:569 msgid "History List" msgstr "Lista do historial" -#: ../extensions/history-list.vala:246 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Permite cambiar de lapela seleccionando nunha lista ordenada por último uso" +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "Ir para a última lapela usada ao cambiar ou pechar lapelas" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Xestos do rato" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Controlar Midori con movementos do rato" -#. 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" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "Cadro de _páxinas" - -#: ../extensions/page-holder.c:178 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "Manter unha ou varias páxinas abertas en paralelo nas lapelas" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "Recargar a páxina ou deter a carga" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "Personalizar os atallos de teclado" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "Personalizar _os atallos..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Atallos" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "Ver e modificar os atallos de teclado" -#: ../extensions/status-clock.c:176 +#: ../extensions/status-clock.c:174 msgid "Statusbar Clock" msgstr "Reloxo na barra de estado" -#: ../extensions/status-clock.c:177 +#: ../extensions/status-clock.c:175 msgid "Display date and time in the statusbar" msgstr "Mostrar data e hora na barra de estado" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Imaxes" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Scripts" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Engadidos de Netscape" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "Características da barra de estado" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" msgstr "Alternar facilmente as características dentro e fóra de páxinas web" -#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Panel de lapelas" -#: ../extensions/tab-panel.c:612 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "Panel de _lapelas" -#: ../extensions/tab-panel.c:629 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Mostrar as lapelas nun panel vertical" -#: ../extensions/tabs-minimized.c:79 +#: ../extensions/tabs-minimized.c:76 msgid "Only Icons on Tabs by default" -msgstr "Por defecto só se mostran as iconas nas lapelas" +msgstr "De xeito predeterminado só se mostran as iconas nas lapelas" -#: ../extensions/tabs-minimized.c:80 +#: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" -msgstr "Por defecto as novas lapelas non teñen etiqueta" +msgstr "De xeito predeterminado as novas lapelas non teñen etiqueta" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Personalizar a barra de ferramentas" -#: ../extensions/toolbar-editor.c:405 -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." +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"Seleccionar os elementos que se van mostrar na barra de ferramentas. Os " +"elementos poden reordenarse arrastrando e soltando." -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" -msgstr "Elementos dispoñibles" +msgstr "Elementos dispoñíbeis" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Elementos mostrados" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "Personalizar a barra de ferramen_tas..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Personalizar..." + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" msgstr "Editor da barra de ferramentas" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" msgstr "Modificar de xeito sinxelo a disposición da barra de ferramentas" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "Gardar unha caché da comunicación HTTP no disco" +#~ msgid "Lightweight web browser" +#~ msgstr "Navegador web lixeiro" + +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "O cartafol de configuración especificado non é correcto." + +#~ msgid "Cookies" +#~ msgstr "Cookies" + +#~ msgid "'Flash' Cookies" +#~ msgstr "Cookies de «Flash»" + +#~ msgid "HTML5 _Databases" +#~ msgstr "Bases de _datos HTML5" + +#~ msgid "Offline Application Cache" +#~ msgstr "Caché de navegación sen conexión" + +#~ msgid "Not available: %s" +#~ msgstr "Non dispoñíbel: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "Os ficheiros de recursos non están instalados" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "Non gardar datos privados durante a navegación" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Engadir atallo á marcación rápida" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Engadir un atallo no escritorio" + +#~ msgid "Create a launcher" +#~ msgstr "Crear un iniciador" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "Subscribirse a esta fonte de novas" + +#~ msgid "Close this window" +#~ msgstr "Pechar esta xanela" + +#~ msgid "Close all open windows" +#~ msgstr "Pechar todas as xanelas abertas" + +#~ msgid "Undo the last modification" +#~ msgstr "Desfacer a última modificación" + +#~ msgid "Redo the last modification" +#~ msgstr "Refacer a última modificación" + +#~ msgid "Cut the selected text" +#~ msgstr "Cortar o texto seleccionado" + +#~ msgid "Copy the selected text" +#~ msgstr "Copiar o texto seleccionado" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "Pegar o texto seleccionado no portarretallos" + +#~ msgid "Delete the selected text" +#~ msgstr "Borrar o texto seleccionado" + +#~ msgid "Select all text" +#~ msgstr "Seleccionar todo o texto" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Buscar a seguinte coincidencia de palabra ou frase" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Buscar a anterior coincidencia de palabra ou frase" + +#~ msgid "Reset the zoom level" +#~ msgstr "Restablecer o nivel de zoom" + +#~ msgid "View the source code of the page" +#~ msgstr "Ver o código fonte da páxina" + +#~ msgid "Scroll to the left" +#~ msgstr "Desprazar cara á esquerda" + +#~ msgid "Scroll down" +#~ msgstr "Desprazar cara abaixo" + +#~ msgid "Scroll up" +#~ msgstr "Desprazar cara arriba" + +#~ msgid "Scroll to the right" +#~ msgstr "Desprazar cara á dereita" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "Borrar o contido do lixo" + +#~ msgid "Open the last closed tab" +#~ msgstr "Abrir a última lapela pechada" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Engadir un novo cartafol de marcadores" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Engadir, editar ou eliminar motores de busca..." + +#~ msgid "Clear private data..." +#~ msgstr "Limpar os datos privados..." + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "" +#~ "Inspeccionar os detalles de páxina e acceder ás ferramentas de " +#~ "desenvolvemento..." + +#~ msgid "Switch to the previous tab" +#~ msgstr "Cambiar á lapela anterior" + +#~ msgid "Switch to the next tab" +#~ msgstr "Cambiar á lapela seguinte" + +#~ msgid "Move tab behind the previous tab" +#~ msgstr "Poñer a lapela detrás da lapela anterior" + +#~ msgid "Move tab in front of the next tab" +#~ msgstr "Poñer a lapela antes da seguinte lapela" + +#~ msgid "Focus the current tab" +#~ msgstr "Enfocar a lapela actual" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Mostrar só a icona da lapela actual" + +#~ msgid "Duplicate the current tab" +#~ msgstr "Duplicar a lapela actual" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Pechar todas as lapelas agás a lapela actual" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Abre as lapelas gardadas na última sesión" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Mostrar as preguntas frecuentes" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Abrir o xestor de reporte de fallos de Midori" + +#~ msgid "Show information about the program" +#~ msgstr "Mostrar información sobre o programa" + +#~ msgid "Show menubar" +#~ msgstr "Mostrar barra de menú" + +#~ msgid "Show navigationbar" +#~ msgstr "Mostrar a barra de navegación" + +#~ msgid "Show sidepanel" +#~ msgstr "Mostrar panel lateral" + +#~ msgid "Show bookmarkbar" +#~ msgstr "Mostrar a barra de marcadores" + +#~ msgid "Show statusbar" +#~ msgstr "Mostrar a barra de estado" + +#~ msgid "Reset the last _session" +#~ msgstr "Restablecer a última _sesión" + +#~ msgid "No filename specified" +#~ msgstr "Nome de ficheiro sen especificar" + +#~ msgid "Not found - %s" +#~ msgstr "Non se atopou - %s" + +#~ msgid "Set number of columns and rows" +#~ msgstr "Definir o número de columnas e filas" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Introduza o número de columnas e filas:" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "Tamaño de entrada non válido para a marcación rápida" + +#~ msgid "Thumb size:" +#~ msgstr "Tamaño da miniatura:" + +#~ msgid "Small" +#~ msgstr "Pequeno" + +#~ msgid "Medium" +#~ msgstr "Mediano" + +#~ msgid "Big" +#~ msgstr "Grande" + +#~ msgid "Document cannot be displayed" +#~ msgstr "Non se pode mostrar o documento" + +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "Aplicar 96 puntos por polgada" + +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "Aplica unha densidade de puntos de vídeo de 96 DIP" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Configurar os filtros de _publicidade..." + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "" +#~ "Permite cambiar de lapela usando Ctrl+Tab seleccionando nunha lista " +#~ "ordenada por último uso" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% cargada" + +#~ msgid "Quit the application" +#~ msgstr "Saír do aplicativo" + +#~ msgid "_Contents" +#~ msgstr "_Contido" + +#~ msgid "Show the documentation" +#~ msgstr "Mostrar a documentación" + +#~ msgid "_Transferbar" +#~ msgstr "Barra de _transferencias" + +#~ msgid "Show transferbar" +#~ msgstr "Mostrar a barra de transferencias" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "Produciuse un erro ao executar a instrución de base de datos\n" + +#~ msgid "Show Blank page" +#~ msgstr "Mostrar unha páxina en branco" + +#~ msgid "All cookies" +#~ msgstr "Todas as cookies" + +#~ msgid "Session cookies" +#~ msgstr "As cookies desta sesión" + +#~ msgid "Show Transferbar" +#~ msgstr "Mostrar a barra de transferencias" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "Mostrar (ou non) a barra de transferencias" + +#~ msgid "Show progress in location entry" +#~ msgstr "Mostrar o progreso da carga na barra de navegación" + +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "Mostrar o progreso da carga (ou non) na barra de navegación" + +#~ msgid "Search engines in location completion" +#~ msgstr "Motor de busca na barra de navegación" + +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "Mostrar (ou non) o motor de busca na barra de navegación" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "Mostrar os controis de operación do panel" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "Mostrar (ou non) os controis de operación do panel" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Mostrar a marcación rápida nas novas lapelas" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Mostrar a marcación rápida nas novas lapelas que se abran" + +#~ msgid "Ask for the destination folder" +#~ msgstr "Preguntar polo cartafol de destino" + +#~ 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" + +#~ 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" + +#~ msgid "Download Manager" +#~ msgstr "Xestor de descargas" + +#~ msgid "An external download manager" +#~ msgstr "Xestor de descargas externo" + +#~ msgid "Open external pages in:" +#~ msgstr "Abrir as páxinas externas en:" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "Onde se van abrir as páxinas abertas dende o exterior" + +#~ msgid "Accept cookies" +#~ msgstr "Aceptar as «cookies»" + +#~ msgid "What type of cookies to accept" +#~ msgstr "Que tipos de «cookies» se van aceptar" + +#~ msgid "Maximum cookie age" +#~ msgstr "Persistencia máxima das «cookies»" + +#~ msgid "Maximum history age" +#~ msgstr "Persistencia máxima do historial" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Lembrar os últimos ficheiros descargados" + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "Lembrar (ou non) a lista de descargas realizadas ultimamente" + +#~ msgid "_Save Link destination" +#~ msgstr "_Gardar ligazón de destino" + +#~ msgid "_Download Link destination" +#~ msgstr "_Descargar ligazón de destino" + +#~ msgid "Download with Download _Manager" +#~ msgstr "Descargar co _Xestor de descargas" + +#~ msgid "Download I_mage" +#~ msgstr "Descargar a i_maxe" + +#~ msgid "General" +#~ msgstr "Xeral" + +#~ msgid "Appearance" +#~ msgstr "Aparencia" + +#~ msgid "Font settings" +#~ msgstr "Axustes de tipo de letra" + +#~ msgid "Interface" +#~ msgstr "Interface" + +#~ msgid "Navigationbar" +#~ msgstr "Barra de navegación" + +#~ msgid "Applications" +#~ msgstr "Aplicativos" + +#~ msgid "External applications" +#~ msgstr "Aplicativos externos" + +#~ msgid "Web Cookies" +#~ msgstr "Cookies" + +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "Borrar as cookies ao saír de Midori" + +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "Borrar as cookies antigas despois de 1 hora" + +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "Borrar as cookies antigas despois de 1 semana" + +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "Borrar as cookies antigas despois de 1 mes" + +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "Borrar as cookies antigas despois de 1 ano" + +#~ msgid "Open target folder for selected addon" +#~ msgstr "Abrir o cartafol destino para o complemento seleccionado" + +#~ msgid "Next Tab (History List)" +#~ msgstr "Seguinte lapela (historial de lapelas)" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "Lapela anterior (historial de lapelas)" + +#~ msgid "Previous tab from history" +#~ msgstr "Lapela anterior do historial" + +#~ msgid "Pageholder" +#~ msgstr "Cadro de páxinas" + +#~ msgid "_Pageholder" +#~ msgstr "Cadro de _páxinas" + +#~ msgid "Keep one or multiple pages open in parallel to your tabs" +#~ msgstr "Manter unha ou varias páxinas abertas en paralelo nas lapelas" + +#~ msgid "Failed to clear search history: %s\n" +#~ msgstr "Produciuse un erro ao limpar o historial de buscas: %s\n" + +#~ msgid "Detach chosen panel from the window" +#~ msgstr "Separar o panel seleccionado da xanela " + +#~ msgid "Hide operating controls" +#~ msgstr "Ocultar os controis de operación" + +#~ msgid "Spell Checking" +#~ msgstr "Corrección ortográfica" + +#~ 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»" + +#~ msgid "Minimize _Current Tab" +#~ msgstr "Minimizar a lapela a_ctual" + +#~ msgid "Minimize the current tab" +#~ msgstr "Minimizar a lapela actual" + +#~ msgid "External Applications" +#~ msgstr "Aplicativos externos" + +#~ msgid "Associate URL schemes with external commands" +#~ msgstr "Asociar esquemas de URL con ordes externas" + +#~ msgid "Spelling dictionaries:" +#~ msgstr "Dicionarios de ortografía:" + +#~ msgid "Console" +#~ msgstr "Consola" + +#~ msgid "Copy _All" +#~ msgstr "Copiar _todo" + +#~ msgid "Copy All" +#~ msgstr "Copiar todo" + +#~ msgid "_Cookie Manager" +#~ msgstr "Xestor de _cookies" + #~ msgid "_Recently visited pages" #~ msgstr "Páxinas visitadas _recentemente" #~ msgid "Reopen pages that you visited earlier" #~ msgstr "Volver abrir as páxinas que visitou antes" -#~ msgid "Show the saved bookmarks" -#~ msgstr "Mostrar os marcadores gardados" - #~ msgid "Original cookies only" #~ msgstr "Só as «cookies» do sitio orixinal" -#~ msgid "Accept cookies from the original website only" -#~ msgstr "Só se aceptan as «cookies» do sitio web orixe" - #~ msgid "Remember last visited pages" #~ msgstr "Lembrar as últimas páxinas visitadas" @@ -2785,7 +3314,8 @@ #~ msgid "Detect proxy server automatically" #~ msgstr "Detectar o servidor proxy automaticamente" -#~ msgid "Whether to detect the proxy server automatically from the environment" +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" #~ msgstr "Detectar (ou non) o servidor proxy automaticamente neste contorno" #~ msgid "_Restore Tab" @@ -2797,7 +3327,8 @@ #~ msgid "Erroneous clock time" #~ msgstr "A hora do reloxo é incorrecta" -#~ msgid "The clock time lies in the past. Please check the current date and time." +#~ msgid "" +#~ "The clock time lies in the past. Please check the current date and time." #~ msgstr "A hora do reloxo está atrasada. Comprobe a data e hora actuais." #~ msgid "Copy %s to the folder %s." @@ -2815,8 +3346,11 @@ #~ msgid "Open Image in New Wi_ndow" #~ msgstr "Abrir a imaxe nunha _nova fiestra" -#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "Copiar os scripts do usuario ao cartafol %s e copiar os estilos de usuario ao cartafol %s." +#~ msgid "" +#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "" +#~ "Copiar os scripts do usuario ao cartafol %s e copiar os estilos de " +#~ "usuario ao cartafol %s." #~ msgid "Failed to get current time: %s\n" #~ msgstr "Produciuse un erro ao obter a hora actual: %s\n" @@ -2866,9 +3400,6 @@ #~ msgid "Enable special extensions for developers" #~ msgstr "Activar as extensións especiais para desenvolvedores" -#~ msgid "MB" -#~ msgstr "MB" - #~ msgid "User_styles" #~ msgstr "_Estilos de usuario" diff -Nru midori-0.2.8/po/he.po midori-0.4.6/po/he.po --- midori-0.2.8/po/he.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/he.po 2012-05-14 22:13:42.000000000 +0000 @@ -3,2072 +3,2191 @@ # This file is distributed under the same license as the midori package. # Shlomi Israel 2009 # Mark Krapivner 2009 -# +# Yaron Shahrabani , 2012. msgid "" msgstr "" "Project-Id-Version: Midori 0.2.1\n" "Report-Msgid-Bugs-To: \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" +"POT-Creation-Date: 2012-04-05 08:18+0000\n" +"PO-Revision-Date: 2012-01-12 11:39+0300\n" +"Last-Translator: Yaron Shahrabani \n" +"Language-Team: גזר\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.7.1\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "דפדפן קל משקל" +msgid "Browse the Web" +msgstr "גלישה באינטרנט" #: ../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 "Internet;WWW;Explorer" +msgstr "אינטרנט;רשת;דפדפן" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2020 ../midori/main.c:2044 +#: ../midori/main.c:2058 ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "דפדפן" -#: ../midori/main.c:97 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "גלישה פרטית" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "פתיחת חלון גלישה פרטית חדש" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4147 +msgid "Private Browsing" +msgstr "גלישה פרטית" + +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "ההגדרות לא ניתנות לטעינה: %s\n" -#: ../midori/main.c:152 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "הערך %s אינו תקף עבור %s" -#: ../midori/main.c:159 -#: ../midori/main.c:240 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr "ערך הגדרה אינו תקף '%s'" #: ../midori/main.c:364 -#: ../extensions/formhistory.c:438 -#, c-format -msgid "Failed to open database: %s\n" -msgstr "נכשל בפתיחת מסד הנתונים: %s\n" - -#: ../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:450 #, c-format -msgid "Failed to remove history item: %s\n" -msgstr "נכשל בהסרת פריט היסטוריה: %s\n" +msgid "The search engines couldn't be loaded. %s\n" +msgstr "מנועי החיפוש לא ניתנים לטעינה. %s\n" -#: ../midori/main.c:474 +#: ../midori/main.c:418 #, c-format msgid "Failed to clear history: %s\n" msgstr "נכשל בניקוי ההיסטוריה: %s\n" -#: ../midori/main.c:497 -#: ../midori/main.c:531 -#: ../midori/main.c:547 +#: ../midori/main.c:438 ../midori/main.c:565 +#: ../extensions/formhistory/formhistory.c:531 #, c-format -msgid "Failed to add history item: %s\n" -msgstr "נכשל בהוספת פריט היסטוריה: %s\n" +msgid "Failed to open database: %s\n" +msgstr "נכשל בפתיחת מסד הנתונים: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:726 +#: ../midori/main.c:508 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "נכשל בהסרת פריטי היסטוריה ישנים: %s\n" -#: ../midori/main.c:755 +#: ../midori/main.c:548 ../panels/midori-history.c:232 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "נכשל בהסרת פריט היסטוריה: %s\n" + +#: ../midori/main.c:595 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "הסימנייה לא ניתנת לשמירה. %s" + +#: ../midori/main.c:617 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "ההגדרות לא ניתנות לשמירה. %s" -#: ../midori/main.c:793 +#: ../midori/main.c:652 #, c-format msgid "The search engines couldn't be saved. %s" -msgstr "מנועי החיפוש לא ניתנים לשמירהץ %s" - -#: ../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:892 -#: ../midori/main.c:915 +#: ../midori/main.c:689 #, c-format msgid "The trash couldn't be saved. %s" msgstr "האשפה לא ניתנת לשמירה. %s" -#: ../midori/main.c:984 -#: ../midori/main.c:1156 +#: ../midori/main.c:730 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "הרחבות" + +#: ../midori/main.c:744 +msgid "Privacy" +msgstr "פרטיות" + +#: ../midori/main.c:756 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"עוגיות מאחסנות פריטי גישה, משחקים שמורים או פרופילים של משתמשים למטרות פרסום." + +#: ../midori/main.c:812 #, c-format msgid "The session couldn't be saved. %s" msgstr "ההפעלה לא ניתנת לשמירה. %s" -#: ../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:1030 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "אין אישורי על (root) זמינים. לא ניתן לאמת את אישורי ה־SSL." + +#: ../midori/main.c:1099 +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:1209 +#: ../midori/main.c:1118 msgid "Modify _preferences" -msgstr "ערוך _העדפות" - -#: ../midori/main.c:1213 -msgid "Reset the last _session" -msgstr "שחזר ל_הפעלה האחרונה" +msgstr "עריכת ה_העדפות" -#: ../midori/main.c:1218 +#: ../midori/main.c:1122 msgid "Disable all _extensions" -msgstr "נטרל את כל ה_הרחבות" +msgstr "נטרול כל ה_הרחבות" + +#: ../midori/main.c:1135 +msgid "Discard old tabs" +msgstr "התעלמות מלשוניות חדשות" + +#: ../midori/main.c:1136 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "הצגת הלשוניות האחרונות מבלי לטעון אותן" + +#: ../midori/main.c:1137 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "הצג רשימת לשוניות שנפתחו קודם" -#: ../midori/main.c:1383 -#: ../midori/main.c:1894 +#: ../midori/main.c:1372 ../midori/main.c:2436 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "תצורת ההפעלה לא ניתנת לטעינה: %s\n" -#: ../midori/main.c:1479 -msgid "No filename specified" -msgstr "לא צויין שם קובץ" - -#: ../midori/main.c:1502 -msgid "An unknown error occured." -msgstr "התרחשה שגיאה לא מזוהה." - -#: ../midori/main.c:1534 +#: ../midori/main.c:1510 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Snapshot saved to: %s\n" -#: ../midori/main.c:1591 +#: ../midori/main.c:1923 msgid "Run ADDRESS as a web application" msgstr "Run ADDRESS as a web application" -#: ../midori/main.c:1591 +#: ../midori/main.c:1923 msgid "ADDRESS" msgstr "ADDRESS" -#: ../midori/main.c:1594 +#: ../midori/main.c:1926 msgid "Use FOLDER as configuration folder" msgstr "Use FOLDER as configuration folder" -#: ../midori/main.c:1594 +#: ../midori/main.c:1926 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1597 +#: ../midori/main.c:1929 +msgid "Private browsing, no changes are saved" +msgstr "Private browsing, no changes are saved" + +#: ../midori/main.c:1931 +msgid "Show a diagnostic dialog" +msgstr "Show a diagnostic dialog" + +#: ../midori/main.c:1933 msgid "Run the specified filename as javascript" msgstr "Run the specified filename as javascript" -#: ../midori/main.c:1600 +#: ../midori/main.c:1935 msgid "Take a snapshot of the specified URI" msgstr "Take a snapshot of the specified URI" -#: ../midori/main.c:1603 +#: ../midori/main.c:1937 msgid "Execute the specified command" msgstr "Execute the specified command" -#: ../midori/main.c:1605 +#: ../midori/main.c:1939 +msgid "List available commands to execute with -e/ --execute" +msgstr "List available commands to execute with -e/ --execute" + +#: ../midori/main.c:1941 msgid "Display program version" msgstr "Display program version" -#: ../midori/main.c:1607 +#: ../midori/main.c:1943 msgid "Addresses" msgstr "כתובות" -#: ../midori/main.c:1672 +#: ../midori/main.c:1945 +msgid "Block URIs according to regular expression PATTERN" +msgstr "Block URIs according to regular expression PATTERN" + +#: ../midori/main.c:1945 +msgid "PATTERN" +msgstr "PATTERN" + +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:1949 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "Reset Midori after SECONDS seconds of inactivity" + +#: ../midori/main.c:1949 +msgid "SECONDS" +msgstr "SECONDS" + +#: ../midori/main.c:1952 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Redirects console warnings to the specified FILENAME" + +#: ../midori/main.c:1952 +msgid "FILENAME" +msgstr "FILENAME" + +#: ../midori/main.c:2017 msgid "[Addresses]" msgstr "[כתובות]" -#: ../midori/main.c:1695 +#: ../midori/main.c:2059 msgid "Please report comments, suggestions and bugs to:" msgstr "אנא דווח תגובות, הצעות ובאגים אל:" -#: ../midori/main.c:1697 +#: ../midori/main.c:2061 msgid "Check for new versions at:" msgstr "בדוק גרסות חדשות ב:" -#: ../midori/main.c:1767 -msgid "The specified configuration folder is invalid." -msgstr "The specified configuration folder is invalid." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2145 +msgid "Saved logins and _passwords" +msgstr "פרטי גישה וססמאות ש_נשמרו" + +#: ../midori/main.c:2147 +msgid "Cookies and Website data" +msgstr "קובצי עוגיה ונתוני אתרים" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2151 ../midori/midori-websettings.c:996 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "מטמון רשת" + +#: ../midori/main.c:2154 +msgid "Website icons" +msgstr "אייקונים של אתרים" -#: ../midori/main.c:1815 +#: ../midori/main.c:2260 +msgid "An unknown error occured" +msgstr "אירעה שגיאה בלתי מוכרת" + +#: ../midori/main.c:2367 msgid "An instance of Midori is already running but not responding.\n" msgstr "מופע של Midori כבר רץ אך אינו מגיב. \n" -#: ../midori/main.c:1861 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "מנועי החיפוש לא ניתנים לטעינה. %s\n" - -#: ../midori/main.c:1879 +#: ../midori/main.c:2403 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "הסימנייה לא ניתנת לטעינה: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" +msgstr "לא ניתן לטעון את הסימנייה: %s\n" -#: ../midori/main.c:1907 +#: ../midori/main.c:2451 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "האשפה לא ניתנת לטעינה: %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:2464 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "ההיסטוריה לא ניתנת לטעינה: %s\n" -#: ../midori/main.c:1932 +#: ../midori/main.c:2480 msgid "The following errors occured:" msgstr "השגיאות הבאות התרחשו:" -#: ../midori/main.c:1948 +#: ../midori/main.c:2496 msgid "_Ignore" -msgstr "folderהתעלם" +msgstr "הת_עלמות" + +#: ../midori/midori-app.c:1334 +msgid "_Bookmark" +msgstr "_סימניה" + +#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6039 +msgid "_Bookmarks" +msgstr "_סימניות" + +#: ../midori/midori-app.c:1336 +msgid "Add Boo_kmark" +msgstr "הוסף סימ_ניה" + +#: ../midori/midori-app.c:1337 +msgid "_Console" +msgstr "_מסוף" + +#: ../midori/midori-app.c:1338 +msgid "_Extensions" +msgstr "_הרחבות" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4566 +msgid "_History" +msgstr "_היסטוריה" + +#: ../midori/midori-app.c:1340 +msgid "_Homepage" +msgstr "_דף הבית" + +#: ../midori/midori-app.c:1341 +msgid "_Userscripts" +msgstr "תסריטי _משתמש" + +#: ../midori/midori-app.c:1342 +msgid "New _Tab" +msgstr "_לשונית חדשה" + +#: ../midori/midori-app.c:1343 +msgid "_Transfers" +msgstr "_העברות" + +#: ../midori/midori-app.c:1344 +msgid "Netscape p_lugins" +msgstr "ת_וספי Netscape" -#: ../midori/midori-array.c:330 +#: ../midori/midori-app.c:1345 +msgid "_Closed Tabs" +msgstr "לשוניות _שנסגרו" + +#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5195 +msgid "New _Window" +msgstr "_חלון חדש" + +#: ../midori/midori-app.c:1347 +msgid "New _Folder" +msgstr "תיקייה _חדשה" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "הקובץ לא נמצא." -#: ../midori/midori-array.c:361 -#: ../midori/midori-array.c:384 -#: ../midori/midori-array.c:394 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "מסמך לא תקין." -#: ../midori/midori-array.c:403 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "סוג סימניות לא מזוהה" -#: ../midori/midori-array.c:567 -#: ../midori/sokoke.c:942 -#, c-format +#: ../midori/midori-array.c:915 msgid "Writing failed." msgstr "הכתיבה נכשלה." -#: ../midori/midori-browser.c:318 -#: ../midori/midori-browser.c:4929 -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5277 +#: ../midori/midori-browser.c:5286 msgid "Reload the current page" msgstr "טען את הדף הנוכחי מחדש" -#: ../midori/midori-browser.c:328 -#: ../midori/midori-browser.c:4932 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:5283 msgid "Stop loading the current page" msgstr "הפסק לטעון את הדף הנוכחי" -#: ../midori/midori-browser.c:441 +#: ../midori/midori-browser.c:476 #, c-format -msgid "%d%% loaded" -msgstr "%d%% נטען" +msgid "Failed to update title: %s\n" +msgstr "עדכון הכותרת נכשל: %s\n" -#: ../midori/midori-browser.c:466 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." msgstr "פעולה בלתי צפויה '%s'." -#: ../midori/midori-browser.c:667 +#: ../midori/midori-browser.c:579 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (גלישה פרטית)" + +#: ../midori/midori-browser.c:693 ../midori/midori-browser.c:726 +msgid "Toplevel folder" +msgstr "תיקיית השורש" + +#: ../midori/midori-browser.c:784 msgid "New folder" msgstr "תיקייה חדשה" -#: ../midori/midori-browser.c:667 +#: ../midori/midori-browser.c:784 msgid "Edit folder" -msgstr "ערוך תיקייה" +msgstr "עריכת התיקייה" -#: ../midori/midori-browser.c:669 +#: ../midori/midori-browser.c:786 msgid "New bookmark" -msgstr "סימניה חדשה" +msgstr "סימנייה חדשה" -#: ../midori/midori-browser.c:669 +#: ../midori/midori-browser.c:786 msgid "Edit bookmark" -msgstr "ערוך סימניה" +msgstr "עריכת הסימנייה" -#: ../midori/midori-browser.c:699 +#: ../midori/midori-browser.c:828 msgid "_Title:" msgstr "_כותרת:" -#: ../midori/midori-browser.c:712 -#: ../midori/midori-searchaction.c:951 -msgid "_Description:" -msgstr "_תיאור:" - -#: ../midori/midori-browser.c:731 -#: ../midori/midori-searchaction.c:965 -#: ../extensions/feed-panel/main.c:368 +#: ../midori/midori-browser.c:848 ../midori/midori-searchaction.c:961 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_כתובת:" -#: ../midori/midori-browser.c:756 -#: ../midori/midori-browser.c:4202 +#: ../midori/midori-browser.c:871 ../midori/midori-browser.c:4303 msgid "_Folder:" msgstr "_תיקייה:" -#: ../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:887 +msgid "Add to _Speed Dial" +msgstr "הוספה ל_חיוג מהיר" -#: ../midori/midori-browser.c:795 +#: ../midori/midori-browser.c:900 msgid "Show in the tool_bar" msgstr "הסג ב_סרגל הכלים" -#: ../midori/midori-browser.c:810 +#: ../midori/midori-browser.c:915 msgid "Run as _web application" msgstr "הפעל כיישום _רשת" -#: ../midori/midori-browser.c:918 -msgid "Save file as" -msgstr "שמור קובץ בשם" +#: ../midori/midori-browser.c:986 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "לא ניתן לשמור את הקובץ „%s“ בתיקייה זו." -#: ../midori/midori-browser.c:1285 -#: ../panels/midori-transfers.c:272 +#: ../midori/midori-browser.c:988 #, c-format -msgid "%s of %s" -msgstr "‏%s מתוך %s" +msgid "You don't have permission to write in this location." +msgstr "אין לך הרשאות לכתוב למיקום זה." -#: ../midori/midori-browser.c:1321 +#: ../midori/midori-browser.c:995 #, c-format -msgid "The file '%s' has been downloaded." -msgstr "לא ניתן להוריד את הקובץ '%s'." +msgid "There is not enough free space to download \"%s\"." +msgstr "אין די מקום פנוי כדי להוריד את „%s“." -#: ../midori/midori-browser.c:1325 -msgid "Transfer completed" -msgstr "ההעברה הושלמה" +#: ../midori/midori-browser.c:998 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "הקובץ זקוק ל־%s אך נותרו רק %s." + +#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4372 +msgid "Save file as" +msgstr "שמירת קובץ בשם" + +#: ../midori/midori-browser.c:1330 +msgid "New Window" +msgstr "חלון חדש" + +#: ../midori/midori-browser.c:1330 +msgid "A new window has been opened" +msgstr "חלון חדש נפתח" + +#: ../midori/midori-browser.c:1333 +msgid "New Tab" +msgstr "לשונית חדשה" -#: ../midori/midori-browser.c:1465 +#: ../midori/midori-browser.c:1333 +msgid "A new tab has been opened" +msgstr "לשונית חדשה נפתחה" + +#: ../midori/midori-browser.c:1368 +msgid "Error opening the image!" +msgstr "אירעה שגיאה בעת פתיחת התמונה!" + +#: ../midori/midori-browser.c:1369 +msgid "Can not open selected image in a default viewer." +msgstr "לא ניתן לפתוח את התמונה הנבחרת במציג בררת המחדל" + +#: ../midori/midori-browser.c:1375 +msgid "Error downloading the image!" +msgstr "אירעה שגיאה בעת הורדת התכנה!" + +#: ../midori/midori-browser.c:1376 +msgid "Can not download selected image." +msgstr "לא ניתן להוריד את התמונה הנבחרת." + +#: ../midori/midori-browser.c:1479 msgid "Save file" -msgstr "שמור קובץ" +msgstr "שמירת קובץ" -#: ../midori/midori-browser.c:2170 +#: ../midori/midori-browser.c:2346 msgid "Open file" -msgstr "פתח קובץ" +msgstr "פתיחת קובץ" + +#: ../midori/midori-browser.c:2478 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr "" -#: ../midori/midori-browser.c:2249 -#: ../extensions/feed-panel/main.c:356 +#: ../midori/midori-browser.c:2484 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "הזנה חדשה" -#: ../midori/midori-browser.c:2287 -#: ../midori/midori-browser.c:4976 -#: ../panels/midori-bookmarks.c:235 +#: ../midori/midori-browser.c:2527 ../midori/midori-browser.c:5346 +#: ../panels/midori-bookmarks.c:427 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:3026 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "ריק" + +#: ../midori/midori-browser.c:3446 +msgid "Toggle text cursor navigation" +msgstr "" + +#: ../midori/midori-browser.c:3762 ../midori/midori-browser.c:5732 +#, fuzzy, c-format +msgid "Failed to insert new history item: %s\n" +msgstr "נכשל בהסרת פריט היסטוריה: %s\n" -#: ../midori/midori-browser.c:3946 -#: ../panels/midori-bookmarks.c:781 -#: ../panels/midori-history.c:822 +#: ../midori/midori-browser.c:4091 ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 msgid "Open all in _Tabs" msgstr "פתח הכל ב_לשוניות" -#: ../midori/midori-browser.c:3953 -#: ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:828 -#: ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4098 ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "פתח ב_לשונית חדשה" -#: ../midori/midori-browser.c:3956 -#: ../panels/midori-bookmarks.c:789 -#: ../panels/midori-history.c:830 -#: ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4101 ../midori/midori-view.c:2648 +#: ../midori/midori-view.c:4678 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "פתח ב_חלון חדש" -#: ../midori/midori-browser.c:4135 +#: ../midori/midori-browser.c:4190 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4136 +#: ../midori/midori-browser.c:4191 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4137 +#: ../midori/midori-browser.c:4192 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4157 +#: ../midori/midori-browser.c:4193 +msgid "Konqueror" +msgstr "Konqueror" + +#: ../midori/midori-browser.c:4194 +msgid "Epiphany" +msgstr "Epiphany" + +#: ../midori/midori-browser.c:4195 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4216 msgid "Import bookmarks..." msgstr "ייבוא סימניות..." -#: ../midori/midori-browser.c:4160 -#: ../midori/midori-browser.c:4981 +#: ../midori/midori-browser.c:4219 ../midori/midori-browser.c:5351 msgid "_Import bookmarks" msgstr "יי_בוא סימניות" -#: ../midori/midori-browser.c:4171 +#: ../midori/midori-browser.c:4230 msgid "_Application:" msgstr "יי_שום:" -#: ../midori/midori-browser.c:4257 +#: ../midori/midori-browser.c:4295 +msgid "Import from XBEL or HTML file" +msgstr "ייבוא מקובץ XBEL או HTML" + +#: ../midori/midori-browser.c:4330 +msgid "Import from a file" +msgstr "ייבוא מקובץ" + +#: ../midori/midori-browser.c:4342 msgid "Failed to import bookmarks" -msgstr "נכשל בייבוא סימניות" +msgstr "ייבוא הסימניות נכשל" -#: ../midori/midori-browser.c:4397 +#: ../midori/midori-browser.c:4377 +msgid "XBEL Bookmarks" +msgstr "סימניות XBEL" + +#: ../midori/midori-browser.c:4382 +msgid "Netscape Bookmarks" +msgstr "סימניות של Netscape" + +#: ../midori/midori-browser.c:4396 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "באפשרות Midori לייצא אך ורק לתצורות XBEL‏ (‎*.xbel) ו־Netscape‏ (‎*.html)" + +#: ../midori/midori-browser.c:4411 +msgid "Failed to export bookmarks" +msgstr "ייצוא הסימניות נכשל" + +#. i18n: Dialog: Clear Private Data, in the Tools menu +#: ../midori/midori-browser.c:4533 msgid "Clear Private Data" -msgstr "נקה נתונים אישיים" +msgstr "מחיקת נתונים אישיים" -#: ../midori/midori-browser.c:4401 +#: ../midori/midori-browser.c:4537 msgid "_Clear private data" -msgstr "_נקה נתונים אישיים" +msgstr "מ_חיקת נתונים אישיים" -#: ../midori/midori-browser.c:4414 +#: ../midori/midori-browser.c:4550 msgid "Clear the following data:" -msgstr "נקה את הנתונים הבאים" - -#: ../midori/midori-browser.c:4424 -#: ../midori/midori-preferences.c:537 -#: ../panels/midori-history.c:108 -msgid "History" -msgstr "היסטוריה" +msgstr "מחיקת הנתונים הבאים:" -#: ../midori/midori-browser.c:4429 -msgid "Cookies" -msgstr "עוגיות" - -#: ../midori/midori-browser.c:4434 -msgid "'Flash' Cookies" -msgstr "עוגיות 'Flash'" +#: ../midori/midori-browser.c:4560 +msgid "Last open _tabs" +msgstr "הלשוניות שנפתחו ל_אחרונה" -#: ../midori/midori-browser.c:4439 -msgid "Website icons" -msgstr "אייקונים של אתרים" - -#: ../midori/midori-browser.c:4444 -#: ../midori/sokoke.c:1101 -msgid "_Closed Tabs" -msgstr "לשוניות _שנסגרו" - -#: ../midori/midori-browser.c:4452 +#: ../midori/midori-browser.c:4586 msgid "Clear private data when _quitting Midori" msgstr "נקה נתונים אישיים בזמן י_ציאה מ־Midori" -#: ../midori/midori-browser.c:4548 +#: ../midori/midori-browser.c:4781 msgid "A lightweight web browser." msgstr "דפדפן קל משקל." -#: ../midori/midori-browser.c:4564 +#: ../midori/midori-browser.c:4782 +msgid "See about:version for version info." +msgstr "יש לעיין ב־about:version לקבלת פרטים על הגרסה." + +#: ../midori/midori-browser.c:4784 +msgid "" +"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." +msgstr "" + +#: ../midori/midori-browser.c:4805 msgid "translator-credits" msgstr "" "Shlomi Israel \n" -"Mark Krapivner " +"Mark Krapivner \n" +"Yaron Shahrabani " -#: ../midori/midori-browser.c:4846 +#: ../midori/midori-browser.c:5193 msgid "_File" msgstr "_קובץ" -#: ../midori/midori-browser.c:4848 -#: ../midori/sokoke.c:1102 -msgid "New _Window" -msgstr "_חלון חדש" - -#: ../midori/midori-browser.c:4849 +#: ../midori/midori-browser.c:5196 msgid "Open a new window" msgstr "פתח חלון חדש" -#: ../midori/midori-browser.c:4852 +#: ../midori/midori-browser.c:5199 msgid "Open a new tab" msgstr "פתח לשונית חדשה" -#: ../midori/midori-browser.c:4855 +#: ../midori/midori-browser.c:5201 +msgid "New P_rivate Browsing Window" +msgstr "חלון גלישה פ_רטית חדש" + +#: ../midori/midori-browser.c:5205 msgid "Open a file" msgstr "פתח קובץ" -#: ../midori/midori-browser.c:4858 +#: ../midori/midori-browser.c:5207 +msgid "_Save Page As..." +msgstr "שמירת ה_עמוד בשם..." + +#: ../midori/midori-browser.c:5208 msgid "Save to a file" -msgstr "שמור לקובץ" +msgstr "שמירה לקובץ" -#: ../midori/midori-browser.c:4860 +#: ../midori/midori-browser.c:5210 msgid "Add to Speed _dial" -msgstr "הוסף _לחיוג מהיר" - -#: ../midori/midori-browser.c:4861 -msgid "Add shortcut to speed dial" -msgstr "הוספת קיצור דרך לחיוג מהיר" +msgstr "הוספה _לחיוג מהיר" -#: ../midori/midori-browser.c:4863 +#: ../midori/midori-browser.c:5214 msgid "Add Shortcut to the _desktop" msgstr "הוספת קיצור דרך ל_שולחן העבודה" -#: ../midori/midori-browser.c:4864 -msgid "Add shortcut to the desktop" -msgstr "הוספת קיצור דרך לשולחן העבודה" +#: ../midori/midori-browser.c:5216 +msgid "Create _Launcher" +msgstr "יצירת מש_גר" -#: ../midori/midori-browser.c:4866 +#: ../midori/midori-browser.c:5220 msgid "Subscribe to News _feed" -msgstr "הרשם ל_הזנת חדשות" +msgstr "הרשמה ל_הזנת חדשות" -#: ../midori/midori-browser.c:4867 -msgid "Subscribe to this news feed" -msgstr "הרשמה להזנת חדשות זו" - -#: ../midori/midori-browser.c:4872 +#: ../midori/midori-browser.c:5226 msgid "_Close Tab" -msgstr "_סגור לשונית" +msgstr "_סגירת הלשונית" -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:5227 msgid "Close the current tab" -msgstr "סגור את הלשונית הנוכחית" +msgstr "סגירת הלשונית הנוכחית" -#: ../midori/midori-browser.c:4875 +#: ../midori/midori-browser.c:5229 msgid "C_lose Window" -msgstr "ס_גור חלון" - -#: ../midori/midori-browser.c:4876 -msgid "Close this window" -msgstr "סגור את החלון הזה" +msgstr "ס_גירת החלון" -#: ../midori/midori-browser.c:4879 +#: ../midori/midori-browser.c:5233 msgid "Print the current page" -msgstr "הדפס את הדף הנוכחי" +msgstr "הדפסת העמוד הנוכחי" -#: ../midori/midori-browser.c:4882 -msgid "Quit the application" -msgstr "יציאה מהיישום" +#: ../midori/midori-browser.c:5235 +msgid "Close a_ll Windows" +msgstr "ס_גירת כל החלונות" -#: ../midori/midori-browser.c:4884 +#: ../midori/midori-browser.c:5238 msgid "_Edit" -msgstr "_ערוך" +msgstr "_עריכה" -#: ../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:4898 -#: ../midori/midori-browser.c:4901 -msgid "Copy the selected text" -msgstr "העתק את הטקסט המסומן" - -#: ../midori/midori-browser.c:4904 -msgid "Paste text from the clipboard" -msgstr "הדבק טקסט מלוח הגזירים" - -#: ../midori/midori-browser.c:4907 -msgid "Delete the selected text" -msgstr "מחק את הטקסט המסומן" - -#: ../midori/midori-browser.c:4910 -msgid "Select all text" -msgstr "סמן את כל הטקסט" +#: ../midori/midori-browser.c:5261 +msgid "_Find..." +msgstr "_חיפוש..." -#: ../midori/midori-browser.c:4913 +#: ../midori/midori-browser.c:5262 msgid "Find a word or phrase in the page" msgstr "חפש מילה או ביטוי בדף" -#: ../midori/midori-browser.c:4915 +#: ../midori/midori-browser.c:5264 msgid "Find _Next" -msgstr "חפש את ה_בא" +msgstr "חיפוש ה_בא" -#: ../midori/midori-browser.c:4916 -msgid "Find the next occurrence of a word or phrase" -msgstr "חפש את המופע הבא של המילה או הביטוי" - -#: ../midori/midori-browser.c:4918 +#: ../midori/midori-browser.c:5267 msgid "Find _Previous" -msgstr "חפש את ה_קודם" - -#: ../midori/midori-browser.c:4919 -msgid "Find the previous occurrence of a word or phrase" -msgstr "חפש את המופע הקודם של המילה או הביטוי" +msgstr "חיפוש ה_קודם" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:5271 msgid "Configure the application preferences" -msgstr "הגדר את העדפות היישום" +msgstr "הגדרת העדפות היישום" -#: ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:5273 msgid "_View" msgstr "_תצוגה" -#: ../midori/midori-browser.c:4926 +#: ../midori/midori-browser.c:5274 msgid "_Toolbars" msgstr "_סרגלי כלים" -#: ../midori/midori-browser.c:4938 +#: ../midori/midori-browser.c:5279 +msgid "Reload page without caching" +msgstr "רענון העמוד ללא שימוש במטמון" + +#: ../midori/midori-browser.c:5289 msgid "Increase the zoom level" -msgstr "הגדל את רמת ההגדלה" +msgstr "התקרבות" -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:5292 msgid "Decrease the zoom level" -msgstr "הקטן את רמת ההגדלה" - -#: ../midori/midori-browser.c:4944 -msgid "Reset the zoom level" -msgstr "אפס את רמת הזום" +msgstr "התרחקות" -#: ../midori/midori-browser.c:4945 +#: ../midori/midori-browser.c:5296 msgid "_Encoding" msgstr "_קידוד" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:5298 msgid "View So_urce" -msgstr "הצג מ_קור" +msgstr "הצגת המ_קור" -#: ../midori/midori-browser.c:4948 -msgid "View the source code of the page" -msgstr "הצג את קוד המקור של הדף" +#: ../midori/midori-browser.c:5301 +msgid "Ca_ret Browsing" +msgstr "גלישת _סמן" -#: ../midori/midori-browser.c:4950 -msgid "View Selection Source" -msgstr "הצג את מקור הבחירה" +#: ../midori/midori-browser.c:5305 +msgid "Toggle fullscreen view" +msgstr "הפעלה/נטרול מסך מלא" -#: ../midori/midori-browser.c:4951 -msgid "View the source code of the selection" -msgstr "הצג את קוד המקור של הבחירה" +#: ../midori/midori-browser.c:5307 +msgid "Scroll _Left" +msgstr "גלילה שמ_אלה" -#: ../midori/midori-browser.c:4955 -msgid "Toggle fullscreen view" -msgstr "מסך מלא" +#: ../midori/midori-browser.c:5310 +msgid "Scroll _Down" +msgstr "גלילה למ_טה" -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:5313 +msgid "Scroll _Up" +msgstr "גלילה למ_עלה" + +#: ../midori/midori-browser.c:5316 +msgid "Scroll _Right" +msgstr "גלילה ימי_נה" + +#: ../midori/midori-browser.c:5319 msgid "_Go" -msgstr "לך" +msgstr "מעבר" -#: ../midori/midori-browser.c:4960 +#: ../midori/midori-browser.c:5322 msgid "Go back to the previous page" -msgstr "לך אל הדף הקודם" +msgstr "מעבר לעמוד הקודם" -#: ../midori/midori-browser.c:4963 +#: ../midori/midori-browser.c:5325 msgid "Go forward to the next page" -msgstr "לך אל הדף הבא" +msgstr "התקדמות לעמוד הבא" -#: ../midori/midori-browser.c:4966 +#. i18n: Visit the previous logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5329 +msgid "Go to the previous sub-page" +msgstr "מעבר לתת־העמוד הקודם" + +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5333 +msgid "Go to the next sub-page" +msgstr "מעבר לתת־העמוד הבא" + +#: ../midori/midori-browser.c:5336 msgid "Go to your homepage" msgstr "לך אל דף הבית" -#: ../midori/midori-browser.c:4968 +#: ../midori/midori-browser.c:5338 msgid "Empty Trash" -msgstr "רוקן אשפה" - -#: ../midori/midori-browser.c:4969 -msgid "Delete the contents of the trash" -msgstr "מחק את תכולת האשפה" +msgstr "פינוי האשפה" -#: ../midori/midori-browser.c:4971 +#: ../midori/midori-browser.c:5341 msgid "Undo _Close Tab" -msgstr "בטל _סגירת לשונית" +msgstr "ביטול _סגירת לשונית" -#: ../midori/midori-browser.c:4972 -msgid "Open the last closed tab" -msgstr "פתח את הלשונית האחרונה שנסגרה" - -#: ../midori/midori-browser.c:4978 +#: ../midori/midori-browser.c:5348 msgid "Add a new _folder" -msgstr "הוסף _תיקייה חדשה" +msgstr "הוספת _תיקייה חדשה" -#: ../midori/midori-browser.c:4979 -msgid "Add a new bookmark folder" -msgstr "הוסף תיקיית סימניות חדשה" +#: ../midori/midori-browser.c:5354 +msgid "_Export bookmarks" +msgstr "יי_צוא סימניות" -#: ../midori/midori-browser.c:4984 -#: ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:5357 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_נהל מנועי חיפוש" -#: ../midori/midori-browser.c:4985 -msgid "Add, edit and remove search engines..." -msgstr "הוסף, ערוך והסר מנועי חיפוש..." - -#: ../midori/midori-browser.c:4988 +#: ../midori/midori-browser.c:5360 msgid "_Clear Private Data" msgstr "_נקה נתונים אישיים" -#: ../midori/midori-browser.c:4989 -msgid "Clear private data..." -msgstr "נקה נתונים אישיים..." +#: ../midori/midori-browser.c:5363 +msgid "_Inspect Page" +msgstr "_ניתוח העמוד" -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:5367 msgid "_Previous Tab" msgstr "לשונית _קודמת" -#: ../midori/midori-browser.c:4994 -msgid "Switch to the previous tab" -msgstr "עבור אל הלשונית הקודמת" - -#: ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:5370 msgid "_Next Tab" msgstr "לשונית _הבאה" -#: ../midori/midori-browser.c:4997 -msgid "Switch to the next tab" -msgstr "עבור אל הלשונית הבאה" +#: ../midori/midori-browser.c:5372 +msgid "Move Tab _Backward" +msgstr "העברת הלשונית _אחורה" + +#: ../midori/midori-browser.c:5374 +msgid "_Move Tab Forward" +msgstr "העברת הלשונית _קדימה" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:5377 msgid "Focus _Current Tab" msgstr "מיקוד לשונית _נוכחית" -#: ../midori/midori-browser.c:5000 -msgid "Focus the current tab" -msgstr "התמקד בלשונית הנוכחית" +#: ../midori/midori-browser.c:5380 +msgid "Focus _Next view" +msgstr "התמקדות על התצוגה ה_באה" + +#: ../midori/midori-browser.c:5383 +msgid "Only show the Icon of the _Current Tab" +msgstr "יש להציג רק את ה_סמל של הלשונית הנוכחית" + +#: ../midori/midori-browser.c:5386 +msgid "_Duplicate Current Tab" +msgstr "ש_כפול הלשונית הנוכחית" + +#: ../midori/midori-browser.c:5389 +msgid "Close Ot_her Tabs" +msgstr "סגירת ש_אר הלשוניות" -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:5392 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 +#: ../midori/midori-browser.c:5395 msgid "_Help" msgstr "_עזרה" -#: ../midori/midori-browser.c:5007 -msgid "_Contents" -msgstr "_תכנים" - -#: ../midori/midori-browser.c:5008 -msgid "Show the documentation" -msgstr "הצג את התיעוד" - -#: ../midori/midori-browser.c:5010 +#: ../midori/midori-browser.c:5397 msgid "_Frequent Questions" msgstr "שאלות _נפוצות" -#: ../midori/midori-browser.c:5011 -msgid "Show the Frequently Asked Questions" -msgstr "הצג את השאלות הנפוצות" - -#: ../midori/midori-browser.c:5013 -msgid "_Report a Bug" -msgstr "_דווח על באג" - -#: ../midori/midori-browser.c:5014 -msgid "Open Midori's bug tracker" -msgstr "פתח את עוקב הבאגים של Midori" - -#: ../midori/midori-browser.c:5017 -msgid "Show information about the program" -msgstr "הצג מידע אודות התוכנה" - -#: ../midori/midori-browser.c:5024 -msgid "P_rivate Browsing" -msgstr "גלישה פ_רטית" - -#: ../midori/midori-browser.c:5025 -msgid "Don't save any private data while browsing" -msgstr "אל תשמור אף מידע אישי בזמן הגלישה" +#: ../midori/midori-browser.c:5400 +msgid "_Report a Problem..." +msgstr "_דיווח על תקלה..." -#: ../midori/midori-browser.c:5030 +#: ../midori/midori-browser.c:5412 msgid "_Menubar" msgstr "סרגל _תפריט" -#: ../midori/midori-browser.c:5031 -msgid "Show menubar" -msgstr "הצג את סרגל התפריט" - -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:5416 msgid "_Navigationbar" msgstr "סרגל _ניווט" -#: ../midori/midori-browser.c:5035 -msgid "Show navigationbar" -msgstr "הצג את סרגל הניווט" - -#: ../midori/midori-browser.c:5038 +#: ../midori/midori-browser.c:5420 msgid "Side_panel" msgstr "_סרגל צד" -#: ../midori/midori-browser.c:5039 -msgid "Show sidepanel" -msgstr "הצג סרגל צד" +#: ../midori/midori-browser.c:5421 +msgid "Sidepanel" +msgstr "חלונית צד" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:5424 msgid "_Bookmarkbar" msgstr "_סרגל סימניות" -#: ../midori/midori-browser.c:5043 -msgid "Show bookmarkbar" -msgstr "הצג את סרגל הסימניות" - -#: ../midori/midori-browser.c:5046 -msgid "_Transferbar" -msgstr "_סרגל העברות" - -#: ../midori/midori-browser.c:5047 -msgid "Show transferbar" -msgstr "הצג את סרגל ההעברה" - -#: ../midori/midori-browser.c:5050 +#: ../midori/midori-browser.c:5428 msgid "_Statusbar" msgstr "_שורת מצב" -#: ../midori/midori-browser.c:5051 -msgid "Show statusbar" -msgstr "הצג את שורת המצב" - -#: ../midori/midori-browser.c:5058 +#: ../midori/midori-browser.c:5437 ../midori/midori-websettings.c:311 msgid "_Automatic" msgstr "_אוטומטי" -#: ../midori/midori-browser.c:5061 -#: ../midori/midori-websettings.c:215 +#: ../midori/midori-browser.c:5440 ../midori/midori-websettings.c:236 msgid "Chinese (BIG5)" msgstr "סינית (BIG5)" -#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:5065 +#. i18n: A double underscore "__" is used to prevent the mnemonic +#: ../midori/midori-browser.c:5444 msgid "Japanese (SHIFT__JIS)" msgstr "יפנית (SHIFT__JIS)" -#: ../midori/midori-browser.c:5068 -#: ../midori/midori-websettings.c:217 +#: ../midori/midori-browser.c:5447 ../midori/midori-websettings.c:238 msgid "Korean (EUC-KR)" msgstr "קוריאנית (EUC-KR)" -#: ../midori/midori-browser.c:5071 -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5450 ../midori/midori-websettings.c:239 msgid "Russian (KOI8-R)" msgstr "רוסית (KOI8-R)" -#: ../midori/midori-browser.c:5074 -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-browser.c:5453 ../midori/midori-websettings.c:240 msgid "Unicode (UTF-8)" msgstr "יוניקוד (UTF-8)" -#: ../midori/midori-browser.c:5077 -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5456 ../midori/midori-websettings.c:241 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 +#: ../midori/midori-browser.c:5459 ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:635 msgid "Custom..." msgstr "מותאם..." -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5964 msgid "_Separator" msgstr "קו _מפריד" -#: ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5971 msgid "_Location..." msgstr "_מיקום..." -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5973 msgid "Open a particular location" msgstr "פתיחת מיקום מסוים" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5995 msgid "_Web Search..." msgstr "חיפוש ב_רשת..." -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5997 msgid "Run a web search" msgstr "הרץ חיפוש באינטרנט" -#: ../midori/midori-browser.c:5625 +#: ../midori/midori-browser.c:6024 msgid "Reopen a previously closed tab or window" msgstr "פתח מחדש לשונית או חלון שנסגרו קודם לכן" -#: ../midori/midori-browser.c:5640 -msgid "_Recently visited pages" -msgstr "דפים שבוקרו _לאחרונה" - -#: ../midori/midori-browser.c:5642 -msgid "Reopen pages that you visited earlier" -msgstr "פתיחה מחדש בדפים שביקרת בהם בעבר" - -#: ../midori/midori-browser.c:5657 -#: ../midori/sokoke.c:1091 -msgid "_Bookmarks" -msgstr "_סימניות" - -#: ../midori/midori-browser.c:5659 +#: ../midori/midori-browser.c:6041 msgid "Show the saved bookmarks" -msgstr "הצג את הסימניות השמורות" +msgstr "הצגת הסימניות השמורות" -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:6058 msgid "_Tools" msgstr "_כלים" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:6074 msgid "_Window" msgstr "_חלון" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:6076 msgid "Show a list of all open tabs" msgstr "הצג רשימה של כל הלשוניות הפתוחות" -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:6090 msgid "_Menu" msgstr "_תפריט" -#: ../midori/midori-browser.c:5704 +#: ../midori/midori-browser.c:6092 msgid "Menu" msgstr "תפריט" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:5895 -msgid "_Inline Find:" -msgstr "חיפוש _פנימי:" - -#: ../midori/midori-browser.c:5926 -msgid "Previous" -msgstr "הקודם" - -#: ../midori/midori-browser.c:5931 -msgid "Next" -msgstr "הבא" +#: ../midori/midori-browser.c:6906 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "הגדרה לא צפויה '%s'" -#: ../midori/midori-browser.c:5936 -msgid "Match Case" -msgstr "התאם רישיות" +#: ../midori/midori-extension.c:310 +#, c-format +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "לא ניתן לטעון את הגדרות ההרחבה '%s':‏ %s\n" -#: ../midori/midori-browser.c:5945 -msgid "Highlight Matches" -msgstr "הדגש התאמות" +#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1695 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "לא ניתן לשמור את הגדרות ההרחבה '%s':‏ %s\n" -#: ../midori/midori-browser.c:5957 -msgid "Close Findbar" -msgstr "סגור סרגל חיפוש" +#: ../midori/midori-locationaction.c:394 +#, c-format +msgid "Search with %s" +msgstr "חיפוש בעזרת %s" -#: ../midori/midori-browser.c:6003 -#: ../panels/midori-transfers.c:143 -msgid "Clear All" -msgstr "נקה הכל" +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "חיפוש באמצעות..." -#: ../midori/midori-browser.c:6364 +#: ../midori/midori-locationaction.c:537 #, c-format -msgid "Unexpected setting '%s'" -msgstr "הגדרה לא צפויה '%s'" +msgid "Failed to select from history\n" +msgstr "הבחירה מההיסטוריה נכשלה\n" -#: ../midori/midori-locationaction.c:974 +#: ../midori/midori-locationaction.c:624 #, c-format -msgid "Search with %s" -msgstr "חיפוש בעזרת %s" +msgid "Search for %s" +msgstr "חיפוש אחר %s" -#: ../midori/midori-panel.c:415 -#: ../midori/midori-panel.c:417 -msgid "Detach chosen panel from the window" -msgstr "נתן את הסרגל הנבחר מהחלון" - -#: ../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 "יישר סרגל צד לימין" +#. i18n: Right-click on Location, Open an URL from the clipboard +#: ../midori/midori-locationaction.c:1400 +msgid "Paste and p_roceed" +msgstr "ה_דבקה ומעבר" -#: ../midori/midori-panel.c:439 -#: ../midori/midori-panel.c:440 -msgid "Close panel" -msgstr "סגור סרגל" +#: ../midori/midori-locationaction.c:1768 +msgid "Not verified" +msgstr "לא מאומת" -#: ../midori/midori-panel.c:614 -#: ../midori/midori-panel.c:617 -msgid "Align sidepanel to the left" -msgstr "יישר סרגל צד לשמאל" +#: ../midori/midori-locationaction.c:1788 +msgid "Verified and encrypted connection" +msgstr "חיבור מאומת ומוצפן" -#: ../midori/midori-panel.c:697 -msgid "Show panel _titles" -msgstr "הצג כותרות סרגל" +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 +msgid "Align sidepanel to the right" +msgstr "יישור סרגל הצד לימין" -#: ../midori/midori-panel.c:704 -msgid "Show operating _controls" -msgstr "הצג _בקרת פעילות" +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 +msgid "Close panel" +msgstr "סגירת הסרגל" -#: ../midori/midori-panel.c:793 -msgid "Options" -msgstr "אפשרויות" +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 +msgid "Align sidepanel to the left" +msgstr "יישור סרגל הצד לשמאל" -#: ../midori/midori-websettings.c:198 -msgid "Show Blank page" -msgstr "הצג דף ריק" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "הצגת חיוג מהיר" -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" -msgstr "הצג את דף הבית" - -#: ../midori/midori-websettings.c:200 -msgid "Show last open tabs" -msgstr "הצג רשימת לשוניות שנפתחו קודם" +msgstr "הצגת דף הבית" -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-websettings.c:237 msgid "Japanese (SHIFT_JIS)" msgstr "יפנית (SHIFT_JIS)" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:257 msgid "New tab" msgstr "לשונית חדשה" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:258 msgid "New window" msgstr "חלון חדש" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:259 msgid "Current tab" msgstr "לשונית נוכחית" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:274 msgid "Default" -msgstr "ברירת מחדל" +msgstr "בררת מחדל" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:275 msgid "Icons" msgstr "סמלים" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:276 msgid "Small icons" msgstr "סמלים קטנים" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:277 msgid "Text" msgstr "טקסט" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:278 msgid "Icons and text" msgstr "סמלים וטקסט" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:279 msgid "Text beside icons" msgstr "טקסט לצד סמלים" -#: ../midori/midori-websettings.c:273 -msgid "All cookies" -msgstr "כל העוגיות" +#: ../midori/midori-websettings.c:294 +msgid "Automatic (GNOME or environment)" +msgstr "אוטומטית (GNOME או סביבה אחרת)" -#: ../midori/midori-websettings.c:274 -msgid "Session cookies" -msgstr "עוגיות הפעלה" +#: ../midori/midori-websettings.c:295 +msgid "HTTP proxy server" +msgstr "שרת מתווך ל־HTTP" -#: ../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:296 +msgid "No proxy server" +msgstr "אין שרת מתווך" -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:294 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:400 msgid "Remember last window size" msgstr "זכור את גודל החלון האחרון" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:401 msgid "Whether to save the last window size" msgstr "האם לשמור את גודל החלון האחרון" -#: ../midori/midori-websettings.c:356 +#: ../midori/midori-websettings.c:409 msgid "Last window width" msgstr "רוחב החלון האחרון" -#: ../midori/midori-websettings.c:357 +#: ../midori/midori-websettings.c:410 msgid "The last saved window width" msgstr "הרוחב האחרון של החלון הנשמר" -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:418 msgid "Last window height" msgstr "אורך החלון האחרון" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:419 msgid "The last saved window height" msgstr "האורך האחרון של החלון הנשמר" -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:444 msgid "Last panel position" msgstr "המיקום האחרון של הסרגל" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:445 msgid "The last saved panel position" msgstr "המיקום האחרון של הסרגל שנשמר" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:454 msgid "Last panel page" msgstr "העמוד האחרון של הסרגל" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:455 msgid "The last saved panel page" msgstr "העמוד האחרון של הסרגל שנשמר" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:463 msgid "Last Web search" msgstr "החיפוש האחרון" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:464 msgid "The last saved Web search" msgstr "חיפוש האינטרנט האחרון שנשמר" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:473 msgid "Show Menubar" msgstr "הצג סרגל תפריט" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:474 msgid "Whether to show the menubar" msgstr "האם להראות את סרגל התפריטים" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:482 msgid "Show Navigationbar" msgstr "הצג סרגל ניווט" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:483 msgid "Whether to show the navigationbar" msgstr "האם להציג את סרגל הניווט" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:491 msgid "Show Bookmarkbar" msgstr "הצג סרגל סימניות" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:492 msgid "Whether to show the bookmarkbar" msgstr "האם להראות את סרגל הסימניות" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:500 msgid "Show Panel" msgstr "הצג סרגל" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:501 msgid "Whether to show the panel" msgstr "האם להציג את הסרגל" -#: ../midori/midori-websettings.c:463 -msgid "Show Transferbar" -msgstr "הצג סרגל העברות" - -#: ../midori/midori-websettings.c:464 -msgid "Whether to show the transferbar" -msgstr "האם להציג את סרגל ההעברות" - -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:509 msgid "Show Statusbar" msgstr "הצג שורת מצב" -#: ../midori/midori-websettings.c:473 +#: ../midori/midori-websettings.c:510 msgid "Whether to show the statusbar" msgstr "האם להציג את שורת המצב" -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:519 msgid "Toolbar Style:" msgstr "סגנון סרגל כלים:" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:520 msgid "The style of the toolbar" msgstr "הסגנון של סרגל הכלים" -#: ../midori/midori-websettings.c:499 -msgid "Show progress in location entry" -msgstr "הצג התקדמות בתיבת המיקום" - -#: ../midori/midori-websettings.c:500 -msgid "Whether to show loading progress in the location entry" -msgstr "האם להציג את התקדמות הטעינה בתיבת המיקום" - -#: ../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 +#: ../midori/midori-websettings.c:529 msgid "Toolbar Items" msgstr "פריטי סרגל כלים" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:530 msgid "The items to show on the toolbar" msgstr "הפריטים להצגה בסרגל הכלים" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:538 msgid "Compact Sidepanel" msgstr "סרגל צד קומפקטי" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:539 msgid "Whether to make the sidepanel compact" msgstr "האם להפוך את סרגל הצד לקומפקטי" -#: ../midori/midori-websettings.c:549 -msgid "Show operating controls of the panel" -msgstr "הצג בקרת הפעלה בסרגל" - -#: ../midori/midori-websettings.c:550 -msgid "Whether to show the operating controls of the panel" -msgstr "האם להציג את בקרת פעילות בסרגל" - -#: ../midori/midori-websettings.c:565 +#: ../midori/midori-websettings.c:554 msgid "Align sidepanel on the right" msgstr "יישר סרגל צד לימין" -#: ../midori/midori-websettings.c:566 +#: ../midori/midori-websettings.c:555 msgid "Whether to align the sidepanel on the right" msgstr "האם ליישר את סרגל הצד לימין" -#: ../midori/midori-websettings.c:575 +#: ../midori/midori-websettings.c:570 +msgid "Open panels in separate windows" +msgstr "פתיחת סרגלים בחלונות נפרדים" + +#: ../midori/midori-websettings.c:571 +msgid "Whether to always open panels in separate windows" +msgstr "האם תמיד לפתוח את הסרגלים בחלונות נפרדים" + +#: ../midori/midori-websettings.c:580 msgid "When Midori starts:" msgstr "כאשר Midori מופעל:" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:581 msgid "What to do when Midori starts" msgstr "מה לעשות כאשר Midori מופעל" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:590 msgid "Homepage:" msgstr "דף הבית:" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:591 msgid "The homepage" msgstr "דף הבית" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:606 msgid "Show crash dialog" msgstr "הצג חלון קריסה" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:607 msgid "Show a dialog after Midori crashed" 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:619 -msgid "Show speed dial in newly opened tabs" -msgstr "הצג חיוג מהיר בלשוניות חדשות" - -#: ../midori/midori-websettings.c:627 +#: ../midori/midori-websettings.c:615 msgid "Save downloaded files to:" msgstr "שמור קבצים שהורדו אל:" -#: ../midori/midori-websettings.c:628 +#: ../midori/midori-websettings.c:616 msgid "The folder downloaded files are saved to" 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: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:683 -msgid "An external download manager" -msgstr "מנהל הורדות חיצוני" - -#: ../midori/midori-websettings.c:691 +#: ../midori/midori-websettings.c:624 msgid "Text Editor" msgstr "עורך טקסט" -#: ../midori/midori-websettings.c:692 +#: ../midori/midori-websettings.c:625 msgid "An external text editor" msgstr "עורך טקסט חיצוני" -#: ../midori/midori-websettings.c:707 +#: ../midori/midori-websettings.c:640 msgid "News Aggregator" msgstr "אוגר חדשות" -#: ../midori/midori-websettings.c:708 +#: ../midori/midori-websettings.c:641 msgid "An external news aggregator" msgstr "אוגר חדשות חיצוני" -#: ../midori/midori-websettings.c:716 +#: ../midori/midori-websettings.c:649 msgid "Location entry Search" msgstr "חיפוש בתיבת מיקום" -#: ../midori/midori-websettings.c:717 +#: ../midori/midori-websettings.c:650 msgid "The search to perform inside the location entry" msgstr "החיפוש לביצוע בתוך תיבת המיקום" -#: ../midori/midori-websettings.c:725 +#: ../midori/midori-websettings.c:658 msgid "Preferred Encoding" msgstr "קידוד מועדף" -#: ../midori/midori-websettings.c:726 +#: ../midori/midori-websettings.c:659 msgid "The preferred character encoding" msgstr "הקידוד המועדף" -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:669 msgid "Always Show Tabbar" msgstr "תמיד הצג סרגל לשוניות" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:670 msgid "Always show the tabbar" msgstr "תמיד הצג את סרגל הלשוניות" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:683 msgid "Close Buttons on Tabs" msgstr "לחצני סגירה בלשוניות" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:684 msgid "Whether tabs have close buttons" msgstr "האם ללשוניות יש לחצני סגירה" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:709 msgid "Open new pages in:" msgstr "פתיחת דפים חדשים ב:" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:710 msgid "Where to open new pages" msgstr "איפה לפתוח דפים חדשים" -#: ../midori/midori-websettings.c:764 -msgid "Open external pages in:" -msgstr "פתח דפים חיצוניים ב:" - -#: ../midori/midori-websettings.c:765 -msgid "Where to open externally opened pages" -msgstr "איפה לפתוח דפים חיצוניים" - -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:719 msgid "Middle click opens Selection" msgstr "לחיצה אמצעית פותחת בחירה" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:720 msgid "Load an address from the selection via middle click" msgstr "פתח את הכתובת הנבחרת באמצעות לחצן אמצעי בעכבר" -#: ../midori/midori-websettings.c:783 +#: ../midori/midori-websettings.c:728 msgid "Open tabs in the background" msgstr "פתח לשוניות ברקע" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:729 msgid "Whether to open new tabs in the background" msgstr "האם לפתוח לשוניות חדשות ברקע" -#: ../midori/midori-websettings.c:792 +#: ../midori/midori-websettings.c:737 msgid "Open Tabs next to Current" msgstr "פתח לשוניות אחרי הנוכחית" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:738 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "האם לפתוח לשוניות אחרי הלשונית הנוכחית או אחרי הלשונית האחרונה" -#: ../midori/midori-websettings.c:801 +#: ../midori/midori-websettings.c:746 msgid "Open popups in tabs" msgstr "פתח חלונות קופצים בלשוניות" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:747 msgid "Whether to open popup windows in tabs" msgstr "האם לפתוח חלונות קופצים בלשוניות" -#: ../midori/midori-websettings.c:812 -#: ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "טען תמונות אוטומטית" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:758 msgid "Load and display images automatically" -msgstr "טען והצג תמונות אוטומטית" +msgstr "טעינה והצגה אוטומטית של תמונות" -#: ../midori/midori-websettings.c:820 -#: ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 msgid "Enable scripts" -msgstr "הפעל תסריטים" +msgstr "הפעלת סקריפטים" -#: ../midori/midori-websettings.c:821 +#: ../midori/midori-websettings.c:766 msgid "Enable embedded scripting languages" -msgstr "הפעל שפות תסריטים משובצות" +msgstr "הפעל שפות סקריפט משובצות" -#: ../midori/midori-websettings.c:828 -#: ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" -msgstr "הפעל תוספי Netscape" +msgstr "הפעלת תוספי Netscape" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:774 msgid "Enable embedded Netscape plugin objects" -msgstr "הפעל אובייקטי תוספי Netscape משובצים" +msgstr "הפעלת רכיבי תוספי Netscape משובצים" + +#: ../midori/midori-websettings.c:789 +msgid "Enable Spell Checking" +msgstr "הפעלת בדיקת איות" + +#: ../midori/midori-websettings.c:790 +msgid "Enable spell checking while typing" +msgstr "הפעלת בדיקת איות תוך כדי הקלדה" + +#: ../midori/midori-websettings.c:796 +msgid "Enable HTML5 database support" +msgstr "הפעלת תמיכה במסד נתונים עבור HTML5" + +#: ../midori/midori-websettings.c:797 +msgid "Whether to enable HTML5 database support" +msgstr "האם להפעיל תמיכה במסד נתונים עבור HTML5" + +#: ../midori/midori-websettings.c:803 +msgid "Enable HTML5 local storage support" +msgstr "הפעלת תמיכה באחסון מקומי עבור HTML5" + +#: ../midori/midori-websettings.c:804 +msgid "Whether to enable HTML5 local storage support" +msgstr "האם להפעיל תמיכה באחסון מקומי עבור HTML5" + +#: ../midori/midori-websettings.c:810 +msgid "Enable offline web application cache" +msgstr "הפעלת מטמון יישומי הרשת" + +#: ../midori/midori-websettings.c:811 +msgid "Whether to enable offline web application cache" +msgstr "האם להפעיל את מטמון יישומי הרשת" + +#: ../midori/midori-websettings.c:827 +msgid "Flash window on background tabs" +msgstr "הבהוב החלון בלשוניות הרקע" -#: ../midori/midori-websettings.c:844 +#: ../midori/midori-websettings.c:828 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "הבהוב חלון הדפדפן אם נפתחה לשונית חדשה ברקע" + +#: ../midori/midori-websettings.c:836 +msgid "Enable WebGL support" +msgstr "הפעלת תמיכה ב־WebGL" + +#: ../midori/midori-websettings.c:837 +msgid "Allow websites to use OpenGL rendering" +msgstr "מתן האפשרות לאתרים להשתמש במנגנון העיבוד OpenGL" + +#: ../midori/midori-websettings.c:863 msgid "Zoom Text and Images" msgstr "קרב טקסט ותמונות" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:864 msgid "Whether to zoom text and images" msgstr "האם לקרב טקסט ותמונות" -#: ../midori/midori-websettings.c:860 +#: ../midori/midori-websettings.c:879 msgid "Find inline while typing" msgstr "חפש תוך כדי הקלדה" -#: ../midori/midori-websettings.c:861 +#: ../midori/midori-websettings.c:880 msgid "Whether to automatically find inline while typing" msgstr "האם לחפש אוטומטית בתוך הטקסט בזמן הקלדה" -#: ../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 "קבלת עוגיות" - -#: ../midori/midori-websettings.c:886 -msgid "What type of cookies to accept" -msgstr "איזה סוג של עוגיות לקבל" - #: ../midori/midori-websettings.c:895 -msgid "Original cookies only" -msgstr "עוגיות מקוריות בלבד" +msgid "Kinetic scrolling" +msgstr "גלילה קינטית" #: ../midori/midori-websettings.c:896 -msgid "Accept cookies from the original website only" -msgstr "קבל עוגיות מהאתר המקורי בלבד" +msgid "Whether scrolling should kinetically move according to speed" +msgstr "האם הגלילה אמורה לזוז באופן קינטי בהתאם למהירות" #: ../midori/midori-websettings.c:904 -msgid "Maximum cookie age" -msgstr "תוקף העוגיות המקסימלי" +msgid "Delete old Cookies after:" +msgstr "מחיקת קובצי עוגייה לאחר:" #: ../midori/midori-websettings.c:905 msgid "The maximum number of days to save cookies for" msgstr "מספר הימים המקסימלי לשמירת עוגיות" +#: ../midori/midori-websettings.c:921 +msgid "Only accept Cookies from sites you visit" +msgstr "קבלת קובצי עוגייה מהאתרים בהם אני מבקר בלבד" + #: ../midori/midori-websettings.c:922 -msgid "Remember last visited pages" -msgstr "זכור דפים שנשמרו לאחרונה" +msgid "Block cookies sent by third-party websites" +msgstr "חסימת קובצי עוגייה שנשלחים על ידי אתרי צד שלישי" -#: ../midori/midori-websettings.c:923 -msgid "Whether the last visited pages are saved" -msgstr "האם הדפים שנשמרו אחרונים ישמרו" - -#: ../midori/midori-websettings.c:931 -msgid "Maximum history age" -msgstr "תוקף מקסימלי להיסטוריה" +#: ../midori/midori-websettings.c:936 +msgid "Delete pages from history after:" +msgstr "מחיקת דפים מההיסטוריה לאחר:" -#: ../midori/midori-websettings.c:932 +#: ../midori/midori-websettings.c:937 msgid "The maximum number of days to save the history for" msgstr "מספר הימים המקסימלי לשמירת היסטוריה" -#: ../midori/midori-websettings.c:940 -msgid "Remember last downloaded files" -msgstr "זכור את הקבצים האחרונים שירדו" - -#: ../midori/midori-websettings.c:941 -msgid "Whether the last downloaded files are saved" -msgstr "האם לשמור את הקבצים האחרונים שירדו" - -#: ../midori/midori-websettings.c:951 -msgid "Proxy Server" +#: ../midori/midori-websettings.c:952 +msgid "Proxy server" msgstr "שרת מתווך" -#: ../midori/midori-websettings.c:952 +#: ../midori/midori-websettings.c:953 +msgid "The type of proxy server to use" +msgstr "סוג שרת המתווך לשימוש" + +#: ../midori/midori-websettings.c:962 +msgid "HTTP Proxy Server" +msgstr "שרת מתווך HTTP" + +#: ../midori/midori-websettings.c:963 msgid "The proxy server used for HTTP connections" msgstr "השרת המתווך המשמש עבור חיבורי HTTP" -#: ../midori/midori-websettings.c:967 -msgid "Detect proxy server automatically" -msgstr "זהה שרת מתווך אוטומטית" - -#: ../midori/midori-websettings.c:968 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "האם לזהות את השרת המתווך אוטומטית מסביבת העבודה" +#: ../midori/midori-websettings.c:978 +msgid "Port" +msgstr "פתחה" + +#: ../midori/midori-websettings.c:979 +#, fuzzy +msgid "The proxy server port used for HTTP connections" +msgstr "השרת המתווך המשמש עבור חיבורי HTTP" + +#: ../midori/midori-websettings.c:997 +msgid "The maximum size of cached pages on disk" +msgstr "" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:1014 msgid "Identify as" msgstr "הזדהה בתור" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:1015 msgid "What to identify as to web pages" msgstr "כיצד להזדהות עבור דפי אינטרנט" -#: ../midori/midori-websettings.c:1001 +#: ../midori/midori-websettings.c:1031 msgid "Identification string" msgstr "מחרוזת זיהוי" -#: ../midori/midori-websettings.c:1002 +#: ../midori/midori-websettings.c:1032 msgid "The application identification string" msgstr "מחרוזת הזיהוי של היישום" -#: ../midori/midori-websettings.c:1017 +#: ../midori/midori-websettings.c:1048 +#, fuzzy +msgid "Preferred languages" +msgstr "קידוד מועדף" + +#: ../midori/midori-websettings.c:1049 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" + +#: ../midori/midori-websettings.c:1064 msgid "Clear private data" msgstr "נקה נתונים אישיים" -#: ../midori/midori-websettings.c:1018 +#: ../midori/midori-websettings.c:1065 msgid "The private data selected for deletion" 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:915 -#: ../midori/midori-view.c:3805 -#: ../midori/midori-view.c:3809 +#: ../midori/midori-websettings.c:1080 +msgid "Clear data" +msgstr "מחיקת נתונים אישיים" + +#: ../midori/midori-websettings.c:1081 +msgid "The data selected for deletion" +msgstr "הנתונים שנבחרו למחיקה" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1130 +msgid "Strip referrer details sent to websites" +msgstr "" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1132 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "" + +#: ../midori/midori-websettings.c:1146 +msgid "Always use my font choices" +msgstr "תמיד להשתמש בבחירות הגופן שלי" + +#: ../midori/midori-websettings.c:1147 +msgid "Override fonts picked by websites with user preferences" +msgstr "דריסת גופנים שנבחרו על ידי האתרים באמצעות העדפות המשתמש" + +#: ../midori/midori-view.c:1353 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "האתר %s מעוניין לשמור מסד נתונים עם HTML5." + +#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1389 +msgid "_Deny" +msgstr "_דחייה" + +#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1389 +msgid "_Allow" +msgstr "_אישור" + +#: ../midori/midori-view.c:1385 +#, c-format +msgid "%s wants to know your location." +msgstr "האתר %s מעוניין לדעת מהו מיקומך." + +#: ../midori/midori-view.c:1476 #, c-format msgid "Error - %s" msgstr "שגיאה - %s" -#: ../midori/midori-view.c:916 +#: ../midori/midori-view.c:1477 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "העמוד '%s' לא ניתן לטעינה." -#: ../midori/midori-view.c:921 +#: ../midori/midori-view.c:1479 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 - לא נמצא" - -#: ../midori/midori-view.c:1168 -#: ../midori/midori-view.c:1897 +#: ../midori/midori-view.c:1676 ../midori/midori-view.c:2589 #, 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:2419 ../midori/midori-view.c:2738 +msgid "Inspect _Element" +msgstr "ח_קירת רכיב" -#: ../midori/midori-view.c:1734 -#: ../midori/midori-view.c:1801 +#: ../midori/midori-view.c:2471 msgid "Open Link in New _Tab" msgstr "פתח קישור ב_לשונית חדשה" -#: ../midori/midori-view.c:1738 +#: ../midori/midori-view.c:2475 msgid "Open Link in _Foreground Tab" msgstr "פתח קישור בלשונית ש_בחזית" -#: ../midori/midori-view.c:1739 +#: ../midori/midori-view.c:2476 msgid "Open Link in _Background Tab" msgstr "פתח קישור בלשונית ש_ברקע" -#: ../midori/midori-view.c:1742 -#: ../midori/midori-view.c:1808 +#: ../midori/midori-view.c:2479 msgid "Open Link in New _Window" msgstr "פתח קישור ב_חלון חדש" -#: ../midori/midori-view.c:1745 -msgid "_Copy Link destination" -msgstr "_העתק את יעד הקישור" - -#: ../midori/midori-view.c:1748 -#: ../midori/midori-view.c:1820 -msgid "_Save Link destination" -msgstr "_שמור את יעד הקישור" - -#: ../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:2482 +msgid "Open Link as Web A_pplication" +msgstr "פתיחת קישור כיישום _רשת" + +#: ../midori/midori-view.c:2487 +msgid "Copy Link de_stination" +msgstr "העתקת יעד ה_קישור" -#: ../midori/midori-view.c:1765 +#: ../midori/midori-view.c:2503 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 +#: ../midori/midori-view.c:2506 msgid "Copy Image _Address" msgstr "העתק _כתובת תמונה" -#: ../midori/midori-view.c:1774 +#: ../midori/midori-view.c:2509 msgid "Save I_mage" msgstr "שמור ת_מונה" -#: ../midori/midori-view.c:1775 -msgid "Download I_mage" -msgstr "הורד ת_מונה" +#: ../midori/midori-view.c:2512 +msgid "Open in Image _Viewer" +msgstr "פתיחה במ_ציג תמונות" -#: ../midori/midori-view.c:1782 +#: ../midori/midori-view.c:2519 msgid "Copy Video _Address" msgstr "העתק _כתובת וידאו" -#: ../midori/midori-view.c:1785 +#: ../midori/midori-view.c:2522 msgid "Save _Video" msgstr "שמור _וידאו" -#: ../midori/midori-view.c:1785 +#: ../midori/midori-view.c:2522 msgid "Download _Video" msgstr "הורד _וידאו" -#: ../midori/midori-view.c:1845 +#: ../midori/midori-view.c:2548 msgid "Search _with" msgstr "חיפוש _בעזרת" -#: ../midori/midori-view.c:1873 -#: ../midori/midori-view.c:1884 +#: ../midori/midori-view.c:2580 msgid "_Search the Web" msgstr "_חיפוש ברשת" -#: ../midori/midori-view.c:1905 +#: ../midori/midori-view.c:2597 msgid "Open Address in New _Tab" msgstr "פתח את הכתובות ב_לשונית חדשה" -#: ../midori/midori-view.c:2164 +#: ../midori/midori-view.c:2886 msgid "Open or download file" msgstr "פתח או הורד קובץ" -#: ../midori/midori-view.c:2187 +#: ../midori/midori-view.c:2905 #, c-format msgid "File Type: '%s'" msgstr "סוג הקובץ: '%s'" -#: ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2907 #, c-format msgid "File Type: %s ('%s')" msgstr "סוג הקובץ: %s ‏('%s')" +#: ../midori/midori-view.c:2911 +#, c-format +msgid "File Name: %s" +msgstr "שם הקובץ: %s" + #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2194 +#: ../midori/midori-view.c:2930 #, c-format msgid "Open %s" msgstr "פתח את %s" -#: ../midori/midori-view.c:2710 +#: ../midori/midori-view.c:3575 #, c-format msgid "Inspect page - %s" msgstr "בדיקת עמוד - %s" -#: ../midori/midori-view.c:2928 -msgid "Speed dial" +#: ../midori/midori-view.c:3906 +msgid "Speed Dial" msgstr "חיוג מהיר" -#: ../midori/midori-view.c:2929 +#: ../midori/midori-view.c:3907 ../midori/midori-view.c:4003 msgid "Click to add a shortcut" -msgstr "לחת כאן כדי להוסיף קיצור דרך" +msgstr "לחץ כאן כדי להוסיף קיצור דרך" -#: ../midori/midori-view.c:2930 +#: ../midori/midori-view.c:3908 msgid "Enter shortcut address" msgstr "הזן כתובת לקיצור" -#: ../midori/midori-view.c:2931 +#: ../midori/midori-view.c:3909 msgid "Enter shortcut title" msgstr "הזן כותרת לקיצור" -#: ../midori/midori-view.c:2932 +#: ../midori/midori-view.c:3910 msgid "Are you sure you want to delete this shortcut?" msgstr "אתה בטוח שברצונך למחוק את קיצור הדרך?" -#: ../midori/midori-view.c:2962 -#, c-format -msgid "Document cannot be displayed" -msgstr "לא ניתן להציג תיעוד" - -#: ../midori/midori-view.c:2979 +#: ../midori/midori-view.c:4072 #, c-format msgid "No documentation installed" msgstr "אין תיעוד מותקן" -#: ../midori/midori-view.c:3106 +#: ../midori/midori-view.c:4148 +msgid "Midori doesn't store any personal data:" +msgstr "" + +#: ../midori/midori-view.c:4149 +msgid "No history or web cookies are being saved." +msgstr "" + +#: ../midori/midori-view.c:4150 +msgid "Extensions are disabled." +msgstr "" + +#: ../midori/midori-view.c:4151 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "" + +#: ../midori/midori-view.c:4152 +msgid "Midori prevents websites from tracking the user:" +msgstr "" + +#: ../midori/midori-view.c:4153 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "" + +#: ../midori/midori-view.c:4154 +#, fuzzy +msgid "DNS prefetching is disabled." +msgstr "‏DNS מסודר מראש" + +#: ../midori/midori-view.c:4155 +msgid "The language and timezone are not revealed to websites." +msgstr "" + +#: ../midori/midori-view.c:4156 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "" + +#: ../midori/midori-view.c:4196 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "" + +#: ../midori/midori-view.c:4252 +msgid "Page loading delayed" +msgstr "" + +#: ../midori/midori-view.c:4253 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "" + +#: ../midori/midori-view.c:4254 +msgid "Load Page" +msgstr "טעינת העמוד" + +#: ../midori/midori-view.c:4420 msgid "Blank page" msgstr "דף ריק" -#: ../midori/midori-view.c:3349 +#: ../midori/midori-view.c:4682 msgid "_Duplicate Tab" -msgstr "_שכפל לשונית" +msgstr "ש_כפול לשונית" -#: ../midori/midori-view.c:3354 -msgid "_Restore Tab" -msgstr "_שחזר לשונית" +#: ../midori/midori-view.c:4687 +msgid "Show Tab _Label" +msgstr "הצגת תווית בל_שונית" + +#: ../midori/midori-view.c:4687 +msgid "Show Tab _Icon Only" +msgstr " הצגת סמל הל_שונית בלבד" + +#: ../midori/midori-view.c:4693 +msgid "Close ot_her Tabs" +msgstr "סגירת _שאר הלשוניות" + +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5506 +msgid "previous" +msgstr "הקודם" -#: ../midori/midori-view.c:3354 -msgid "_Minimize Tab" -msgstr "_מזער לשונית" +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5525 +msgid "next" +msgstr "הבא" -#: ../midori/midori-view.c:3911 +#: ../midori/midori-view.c:5538 msgid "Print background images" msgstr "הדפס תמונות רקע" -#: ../midori/midori-view.c:3912 +#: ../midori/midori-view.c:5539 msgid "Whether background images should be printed" msgstr "האם להדפיס תמונות רקע" -#: ../midori/midori-view.c:3956 -#: ../midori/midori-preferences.c:398 +#: ../midori/midori-view.c:5571 msgid "Features" -msgstr "תוכונות" - -#. Page "General" -#: ../midori/midori-preferences.c:318 -msgid "General" -msgstr "כללי" +msgstr "תכונות" -#: ../midori/midori-preferences.c:319 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "הפעלה" -#: ../midori/midori-preferences.c:334 -#: ../midori/midori-preferences.c:341 -msgid "Use current page as homepage" -msgstr "השתמש בדף הנוכחי כדף הבית" +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "שימוש בעמוד ה_נוכחי" -#: ../midori/midori-preferences.c:351 -#: ../panels/midori-transfers.c:88 -msgid "Transfers" -msgstr "העברות" +#: ../midori/midori-preferences.c:314 +msgid "Use current page as homepage" +msgstr "שימוש בדף הנוכחי כדף הבית" #. Page "Appearance" -#: ../midori/midori-preferences.c:366 -msgid "Appearance" -msgstr "מראה" - -#: ../midori/midori-preferences.c:367 -msgid "Font settings" -msgstr "הגדרות גופן" - -#: ../midori/midori-preferences.c:369 -msgid "Default Font Family" -msgstr "משפחת גופנים ברירת מחדל" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "גופנים" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "משפחת גופנים בעלת יחס" -#: ../midori/midori-preferences.c:372 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "משפחת גופנים לשימוש כברית המחדל להצגת טקסט" -#: ../midori/midori-preferences.c:375 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "גודל גופנים לשימוש כברית המחדל להצגת טקסט" -#: ../midori/midori-preferences.c:377 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "משפחת גופנית עם רוחב קבוע" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "משפחת גופנים לשימוש בהצגת טקסט בעל רוחב קבוע" -#: ../midori/midori-preferences.c:383 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" msgstr "גודל גופנים לשימוש בהצגת טקסט בעל רוחב קבוע" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "גודל גון מינימלי" -#: ../midori/midori-preferences.c:388 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "משפחת גופנים המינימלי לשימוש בהצגת טקסט" #. Page "Behavior" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "התנהגות" -#: ../midori/midori-preferences.c:410 -msgid "Shrink images automatically" -msgstr "כווץ תמונות אוטומטית" - -#: ../midori/midori-preferences.c:411 -msgid "Automatically shrink standalone images to fit" -msgstr "" - -#: ../midori/midori-preferences.c:423 -msgid "Enforce 96 dots per inch" -msgstr "הכרח 96 נקודות לאינץ'" - -#: ../midori/midori-preferences.c:424 -msgid "Enforce a video dot density of 96 DPI" -msgstr "" - -#: ../midori/midori-preferences.c:427 -msgid "Enable developer tools" -msgstr "הפעל כלי מפתח" - -#: ../midori/midori-preferences.c:428 -msgid "Enable special extensions for developers" -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 "הפעל בדיקת איות תוך כדי הקלדה" +#: ../midori/midori-preferences.c:385 +msgid "Allow scripts to open popups" +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\"" +#: ../midori/midori-preferences.c:386 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "האם מותר לסקריפטים לפתוח חלונות קופצים אוטומטית" #. Page "Interface" -#: ../midori/midori-preferences.c:453 -msgid "Interface" -msgstr "מנשק" - -#: ../midori/midori-preferences.c:454 -msgid "Navigationbar" -msgstr "סרגל ניווט" - -#: ../midori/midori-preferences.c:464 +#: ../midori/midori-preferences.c:416 msgid "Browsing" 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:503 -#: ../midori/midori-preferences.c:504 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "רשת" -#. Page "Privacy" -#: ../midori/midori-preferences.c:523 -msgid "Privacy" -msgstr "פרטיות" - -#: ../midori/midori-preferences.c:524 -msgid "Web Cookies" -msgstr "עוגיות רשת" - -#: ../midori/midori-preferences.c:535 -#: ../midori/midori-preferences.c:542 -msgid "days" -msgstr "ימים" +#: ../midori/midori-preferences.c:463 +msgid "Hostname" +msgstr "שם מארח" -#: ../midori/midori-searchaction.c:488 -#: ../katze/katze-arrayaction.c:334 -msgid "Empty" -msgstr "ריק" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "מ״ב" -#: ../midori/midori-searchaction.c:907 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "הוסף מנוע חיפוש" -#: ../midori/midori-searchaction.c:907 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "ערוך מנוע חיפוש" -#: ../midori/midori-searchaction.c:935 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_שם:" -#: ../midori/midori-searchaction.c:979 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_תיאור:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "_סמל:" -#: ../midori/midori-searchaction.c:993 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "_אות:" -#: ../midori/midori-searchaction.c:1212 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" -msgstr "ניהול מנועי חיפוש" +msgstr "ניהול מנועי החיפוש" -#: ../midori/midori-searchaction.c:1311 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" -msgstr "קבע כברירת מחדל" +msgstr "שימוש כ_בררת מחדל" -#: ../midori/sokoke.c:1090 -msgid "_Bookmark" -msgstr "_סימניה" +#: ../midori/sokoke.c:412 +msgid "Open with" +msgstr "פתיחה באמצעות" -#: ../midori/sokoke.c:1092 -msgid "Add Boo_kmark" -msgstr "הוסף סימ_ניה" +#: ../midori/sokoke.c:420 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "נא לבחור ביישום או בפקודה לפתיחת \"%s\":" -#: ../midori/sokoke.c:1093 -msgid "_Console" -msgstr "_מסוף" +#: ../midori/sokoke.c:461 ../midori/sokoke.c:471 ../midori/sokoke.c:499 +#: ../midori/sokoke.c:528 ../midori/sokoke.c:542 +msgid "Could not run external program." +msgstr "לא ניתן להריץ תוכנה חיצונית." -#: ../midori/sokoke.c:1094 -msgid "_Extensions" -msgstr "_הרחבות" +#: ../midori/sokoke.c:1653 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "שעה אחת" +msgstr[1] "%d שעות" -#: ../midori/sokoke.c:1095 -msgid "_History" -msgstr "_היסטוריה" +#: ../midori/sokoke.c:1654 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "דקה אחת" +msgstr[1] "%s דקות" -#: ../midori/sokoke.c:1096 -msgid "_Homepage" -msgstr "_דף הבית" +#: ../midori/sokoke.c:1655 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "שנייה אחת" +msgstr[1] "%d שניות" -#: ../midori/sokoke.c:1097 -msgid "_Userscripts" -msgstr "תסריטי _משתמש" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1663 ../panels/midori-transfers.c:267 +#, c-format +msgid "%s of %s" +msgstr "‏%s מתוך %s" -#: ../midori/sokoke.c:1098 -msgid "New _Tab" -msgstr "_לשונית חדשה" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1672 +msgid "?B" +msgstr "" -#: ../midori/sokoke.c:1099 -msgid "_Transfers" -msgstr "_העברות" +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1675 +#, c-format +msgid " (%s/s)" +msgstr "" -#: ../midori/sokoke.c:1100 -msgid "Netscape p_lugins" -msgstr "ת_וספי Netscape" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1692 +#, c-format +msgid " - %s remaining" +msgstr "" -#: ../panels/midori-addons.c:94 -#: ../panels/midori-addons.c:139 -msgid "Userscripts" -msgstr "תסריטי משתמש" +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:291 +msgid "_Inline Find:" +msgstr "חיפוש _פנימי:" -#: ../panels/midori-addons.c:95 -msgid "Userstyles" -msgstr "עיצובי משתמש" +#: ../toolbars/midori-findbar.c:317 +msgid "Previous" +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." +#: ../toolbars/midori-findbar.c:323 +msgid "Next" +msgstr "הבא" + +#: ../toolbars/midori-findbar.c:327 +msgid "Match Case" +msgstr "התאם רישיות" + +#: ../toolbars/midori-findbar.c:336 +msgid "Highlight Matches" +msgstr "הדגש התאמות" -#: ../panels/midori-addons.c:896 +#: ../toolbars/midori-findbar.c:347 +msgid "Close Findbar" +msgstr "סגור סרגל חיפוש" + +#: ../toolbars/midori-transferbar.c:122 #, c-format -msgid "Can't monitor folder '%s': %s" -msgstr "לא ניתן לנתר אחר התיקייה '%s': ‏%s" +msgid "The file '%s' has been downloaded." +msgstr "לא ניתן להוריד את הקובץ '%s'." + +#: ../toolbars/midori-transferbar.c:125 +msgid "Transfer completed" +msgstr "ההעברה הושלמה" + +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "הקובץ שהתקבל פגום." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" + +#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "ניקוי הכול" + +#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 +msgid "Some files are being downloaded" +msgstr "ישנם קבצים הנמצאים כרגע בהליכי הורדה" + +#: ../toolbars/midori-transferbar.c:374 +msgid "_Quit Midori" +msgstr "י_ציאה מ־Midori" + +#: ../toolbars/midori-transferbar.c:376 +msgid "The transfers will be cancelled if Midori quits." +msgstr "הקבצים המועברים יבוטלו עם היציאה מ־Midori." -#: ../panels/midori-bookmarks.c:112 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "סימניות" -#: ../panels/midori-bookmarks.c:243 +#: ../panels/midori-bookmarks.c:257 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "הוספת פריט הסימנייה נכשלה: %s\n" + +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "ערוך את הסימנייה הנבחרת" -#: ../panels/midori-bookmarks.c:251 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "מחק את הסימנייה הנבחרת" -#: ../panels/midori-bookmarks.c:264 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" -msgstr "הוסף תיקייה חדשה" +msgstr "הוספת תיקייה חדשה" -#: ../panels/midori-bookmarks.c:594 +#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 msgid "Separator" -msgstr "מפריד" +msgstr "מפריד" + +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "היסטוריה" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "מסוף" +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "היום" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "הרחבות" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "אתמול" -#: ../panels/midori-history.c:162 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "לפני יום" +msgstr[1] "לפני %d ימים" + +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "לפני שבוע" + +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" msgstr "האם אתה בטוח שברצונך להסיר את כל פרטי ההיסטוריה?" -#: ../panels/midori-history.c:217 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" msgstr "הוסף לסימניות את פריט ההיסטוריה הנבחר" -#: ../panels/midori-history.c:226 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" msgstr "מחק את פריט ההיסטוריה הנבחר" -#: ../panels/midori-history.c:234 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" 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:611 -msgid "A week ago" -msgstr "לפני שבוע" - -#: ../panels/midori-history.c:616 -#, c-format -msgid "%d day ago" -msgid_plural "%d days ago" -msgstr[0] "לפני יום" -msgstr[1] "לפני %d ימים" - -#: ../panels/midori-history.c:624 -msgid "Today" -msgstr "היום" - -#: ../panels/midori-history.c:626 -msgid "Yesterday" -msgstr "אתמול" - -#: ../panels/midori-plugins.c:87 -#: ../extensions/statusbar-features.c:108 -msgid "Netscape plugins" -msgstr "תוספי Netscape" +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "העברות" -#: ../panels/midori-transfers.c:480 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "פתח _תיקיית יעד" -#: ../panels/midori-transfers.c:483 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" -msgstr "העתק את כתו_בת הקישור" +msgstr "העתקת כתו_בת הקישור" -#: ../katze/katze-http-auth.c:209 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "נדרש אימות" -#: ../katze/katze-http-auth.c:225 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" @@ -2076,119 +2195,242 @@ "נדרש שם משתמש וסיסמה\n" "כדי לגשת לכתובת זו:" -#: ../katze/katze-http-auth.c:239 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "שם משתמש" -#: ../katze/katze-http-auth.c:252 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "סיסמה" -#: ../katze/katze-http-auth.c:266 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "_זכור סיסמה" -#: ../katze/katze-throbber.c:828 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "" -#: ../katze/katze-throbber.c:841 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "" -#: ../katze/katze-throbber.c:907 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" -msgstr "" +msgstr "שקופיות ההנפשה פגומות" -#: ../katze/katze-utils.c:483 -#: ../katze/katze-utils.c:862 +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 #, c-format msgid "Property '%s' is invalid for %s" msgstr "" -#: ../katze/katze-utils.c:529 -#: ../katze/katze-utils.c:558 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 +#: ../extensions/addons.c:308 msgid "Choose file" -msgstr "בחר קובץ" +msgstr "בחירת קובץ" -#: ../katze/katze-utils.c:544 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "בחר תיקייה" -#: ../katze/katze-preferences.c:78 +#: ../katze/katze-utils.c:604 +msgid "None" +msgstr "כלום" + +#: ../katze/katze-utils.c:719 +msgid "1 hour" +msgstr "שעה אחת" + +#: ../katze/katze-utils.c:720 +msgid "1 day" +msgstr "יום אחד" + +#: ../katze/katze-utils.c:721 +msgid "1 week" +msgstr "שבוע אחד" + +#: ../katze/katze-utils.c:722 +msgid "1 month" +msgstr "חודש אחד" + +#: ../katze/katze-utils.c:723 +msgid "1 year" +msgstr "שנה אחת" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "מאפיינים עבור %s" -#: ../extensions/adblock.c:373 +#: ../extensions/adblock.c:467 msgid "Configure Advertisement filters" msgstr "הגדרת מסנני פרסומות" -#: ../extensions/adblock.c:403 +#: ../extensions/adblock.c:498 #, 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." +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:846 +msgid "Edit rule" +msgstr "עריכת הכלל" + +#: ../extensions/adblock.c:860 +msgid "_Rule:" +msgstr "_כלל:" + +#: ../extensions/adblock.c:914 +msgid "Bl_ock image" +msgstr "ח_סימת תמונה" + +#: ../extensions/adblock.c:919 +msgid "Bl_ock link" +msgstr "חסימת _קישור" -#: ../extensions/adblock.c:1099 +#: ../extensions/adblock.c:1620 msgid "Advertisement blocker" msgstr "חוסם פרסומות" -#: ../extensions/adblock.c:1100 +#: ../extensions/adblock.c:1621 msgid "Block advertisements according to a filter list" msgstr "חסימת פרסומות בעזרת רשימת מסננים" -#: ../extensions/colorful-tabs.c:127 +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "מסתבר כי דף זה מכיל סקריפט משתמש. האם ברצונך להתקין אותו?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "הת_קנת סקריפט משתמש" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "מסתבר כי דף זה מכיל סגנון משתמש. האם ברצונך להתקין אותו?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "הת_קנת סגנון משתמש" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "לא להתקין" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 +msgid "Userscripts" +msgstr "סקריפטים מצד המשתמש" + +#: ../extensions/addons.c:324 ../extensions/addons.c:683 +msgid "Userstyles" +msgstr "עיצובי משתמש" + +#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "שגיאה" + +#: ../extensions/addons.c:421 +#, c-format +msgid "Do you want to delete '%s'?" +msgstr "האם ברצונך למחוק את '%s'?" + +#: ../extensions/addons.c:427 +msgid "Delete user script" +msgstr "מחיקת סקריפט מצד המשתמש" + +#: ../extensions/addons.c:428 +msgid "Delete user style" +msgstr "מחיקת סגנון המשתמש" + +#: ../extensions/addons.c:431 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "הקובץ %s יימחק לצמיתות." + +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "פתיחה בעורך טקסט" + +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "פתיחת תיקיית יעד" + +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "הוספת תוספת חדשה" + +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "הסרת התוספת הנבחרת" + +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 +msgid "User addons" +msgstr "תוספי המשתמש" + +#: ../extensions/addons.c:1826 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "לא ניתן לנתר אחר התיקייה '%s': ‏%s" + +#: ../extensions/addons.c:1915 +msgid "Support for userscripts and userstyles" +msgstr "תמיכה בסקריפטים וערכות עיצוב מצד המשתמש" + +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "לשוניות צבעוניות" -#: ../extensions/colorful-tabs.c:128 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "צבע לשוניות בצבעים שונים" -#: ../extensions/cookie-manager/cookie-manager-page.c:79 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "מנהל עוגיות" -#: ../extensions/cookie-manager/cookie-manager-page.c:109 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 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." +#: ../extensions/cookie-manager/cookie-manager-page.c:105 +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 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" -msgstr "הרחב הכל" +msgstr "הרחבת הכול" -#: ../extensions/cookie-manager/cookie-manager-page.c:133 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" -msgstr "כווץ הכל" +msgstr "כיווץ הכול" -#: ../extensions/cookie-manager/cookie-manager-page.c:460 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" msgstr "האם באמת ברצונך למחוק את כל העוגיות?" -#: ../extensions/cookie-manager/cookie-manager-page.c:462 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "שאלה" -#: ../extensions/cookie-manager/cookie-manager-page.c:471 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." msgstr "רק עוגיות שיתאימו למסנן ימחקו." -#: ../extensions/cookie-manager/cookie-manager-page.c:539 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "בסיום ההפעלה" -#: ../extensions/cookie-manager/cookie-manager-page.c:542 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2205,92 +2447,104 @@ "מאובטח: %s\n" "תפוגה: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:548 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "כן" -#: ../extensions/cookie-manager/cookie-manager-page.c:548 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "לא" -#: ../extensions/cookie-manager/cookie-manager-page.c:811 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#, c-format +msgid "" +"Domain: %s\n" +"Cookies: %d" +msgstr "" +"שם מתחם: %s\n" +"עוגיות: %d" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "שם" -#: ../extensions/cookie-manager/cookie-manager-page.c:862 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" -msgstr "_הרחב הכל" +msgstr "_הרחבת הכול" -#: ../extensions/cookie-manager/cookie-manager-page.c:870 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" -msgstr "_כווץ הכל" +msgstr "_כיווץ הכול" -#: ../extensions/cookie-manager/cookie-manager-page.c:923 +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 msgid "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/main.c:40 -msgid "_Cookie Manager" -msgstr "מנהל _עוגיות" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"הזן מחרוזת סינון כדי להציג עוגיות ששמם או שם המתחם שלהם תואמים למסנן שהוזן" -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" -msgstr "מיין, הצג ומחק עוגיות" +msgstr "מיון, הצגה ומחיקה עוגיות" -#: ../extensions/dnsprefetch.c:194 -msgid "DNS prefetching" -msgstr "‏DNS מסודר מראש" +#: ../extensions/copy-tabs.c:38 +msgid "Copy Tab _Addresses" +msgstr "העתקת _כתובות הלשוניות" + +#: ../extensions/copy-tabs.c:95 +msgid "Copy Addresses of Tabs" +msgstr "העתקת הכתובות שמופעלות בלשוניות" -#: ../extensions/dnsprefetch.c:195 -msgid "Prefetch IP addresses of hovered links" -msgstr "קבל מראש כתובות IP של קישורים במעבר עכבר" +#: ../extensions/copy-tabs.c:96 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "העתקת הכתובות של כל הלשוניות ללוח הגזירים" -#: ../extensions/feed-panel/feed-atom.c:237 +#: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "" -#: ../extensions/feed-panel/feed-atom.c:343 +#: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "" #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "עודכן לאחרונה: %s." -#: ../extensions/feed-panel/feed-panel.c:667 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "הזנות" -#: ../extensions/feed-panel/feed-panel.c:720 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "הוסף הזנה חדשה" -#: ../extensions/feed-panel/feed-panel.c:727 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "מחק הזנה" -#: ../extensions/feed-panel/feed-panel.c:810 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "_הזנות" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "" -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "סוג ההזנה לא נתמך." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "נכשל בפתיחת הזנת ‏XML‏: %s" @@ -2311,183 +2565,697 @@ msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "" -#: ../extensions/feed-panel/main.c:124 -msgid "Error" -msgstr "שגיאה" - -#: ../extensions/feed-panel/main.c:126 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "ההזנה '%s' כבר קיימת" -#: ../extensions/feed-panel/main.c:203 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "שגיאה בטעינת '%s'" -#: ../extensions/feed-panel/main.c:514 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "סרגל ההזנות" -#: ../extensions/feed-panel/main.c:515 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "קריאת הזנות Atom/RSS" -#: ../extensions/formhistory.c:140 +#: ../extensions/formhistory/formhistory.c:39 #, 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/formhistory.c:95 +msgid "Form history" +msgstr "היסטוריית הטופס" -#: ../extensions/formhistory.c:506 +#: ../extensions/formhistory/formhistory.c:112 +#, fuzzy +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"נדרש שם משתמש וסיסמה\n" +"כדי לגשת לכתובת זו:" + +#: ../extensions/formhistory/formhistory.c:294 +#, fuzzy +msgid "Remember password on this page?" +msgstr "_זכור סיסמה" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "שמירה" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "לא כעת" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "לעולם לא לעמוד זה" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "" + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format -msgid "Not available: %s" -msgstr "לא זמין: %s" +msgid "Failed to execute database statement: %s\n" +msgstr "נכשל בהרצת הצהרת מסד הנתונים: %s\n" -#: ../extensions/formhistory.c:507 -msgid "Resource files not installed" -msgstr "קבצי משאבים לא הותקנו" +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" -#: ../extensions/formhistory.c:513 +#: ../extensions/formhistory/formhistory.c:668 msgid "Form history filler" msgstr "ממלא היסטוריית טפסים" -#: ../extensions/mouse-gestures.c:288 +#: ../extensions/formhistory/formhistory.c:669 +msgid "Stores history of entered form data" +msgstr "מאחסון היסטוריה של נתונים שהוכנסו בטפסים" + +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#, c-format +msgid "Failed to select suggestions\n" +msgstr "בחירת ההצעות נכשלה\n" + +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "ישנן לשוניות שלא ביקרת בהן" + +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "רשימת ההיסטוריה" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "התנהגות סגירת הלשוניות" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "לא לעשות דבר" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "מעבר ללשונית האחרונה בה צפית" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "מעבר ללשונית החדשה ביותר" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "הלשונית החדשה הבאה (רשימת ההיסטוריה)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "הלשונית החדשה הבאה מההיסטוריה" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "הלשונית החדשה הקודמת (רשימת ההיסטוריה)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "הלשונית החדשה הקודמת מההיסטוריה" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "הצגת לשונית ברקע (רשימת היסטוריה)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "הצגת הלשונית הנבחרת ברקע" + +#: ../extensions/history-list.vala:569 +msgid "History List" +msgstr "רשימת ההיסטוריה" + +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "" +"יש לעבור ללשונית האחרונה שהייתה בשימוש בעת סגירה של או מעבר בין לשוניות" + +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "מחוות עכבר" -#: ../extensions/mouse-gestures.c:289 +#: ../extensions/mouse-gestures.c:302 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 -msgid "Pageholder" -msgstr "מחזיק עמודים" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "_מחזיק עמודים" - -#: ../extensions/page-holder.c:178 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "השאר דף אחר או יותר פתוחים במקביל ללשוניות שלך" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "רענון או עצירת טעינת העמוד" -#: ../extensions/shortcuts.c:173 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "התאמת קיצורי מקלדת" -#: ../extensions/shortcuts.c:265 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "התאמת קי_צורים..." -#: ../extensions/shortcuts.c:304 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "קיצורים" -#: ../extensions/shortcuts.c:305 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "הצגה ועריכה של קיצורי מקלדת" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/status-clock.c:174 +msgid "Statusbar Clock" +msgstr "שעון בשורת המצב" + +#: ../extensions/status-clock.c:175 +msgid "Display date and time in the statusbar" +msgstr "הצגת התאריך והשעה בשורת המצב" + +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "תמונות" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" -msgstr "תסריטים" +msgstr "סקריפטים" + +#: ../extensions/statusbar-features.c:151 +msgid "Netscape plugins" +msgstr "תוספי Netscape" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "תכונות שורת מצב" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" msgstr "הפעל או כבה בקלות תכונות של דפי אינטרנט" -#: ../extensions/tab-panel.c:565 -#: ../extensions/tab-panel.c:622 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "סרגל לשוניות" -#: ../extensions/tab-panel.c:606 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "סרגל ל_שוניות" -#: ../extensions/tab-panel.c:623 +#: ../extensions/tab-panel.c:681 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/tabs-minimized.c:76 +msgid "Only Icons on Tabs by default" +msgstr "רק את הסמלים שעל הלשוניות כבררת מחדל" + +#: ../extensions/tabs-minimized.c:77 +msgid "New tabs have no label by default" +msgstr "ללשוניות חדשות אין תווית כבררת מחדל" -#: ../extensions/toolbar-editor.c:391 +#: ../extensions/toolbar-editor.c:393 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." +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." msgstr "בחר פריטים להצגה בסרגל הכלים. ניתן לסדר פריטים מחדש על ידי גרירתם." -#: ../extensions/toolbar-editor.c:423 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "פריטים זמינים" -#: ../extensions/toolbar-editor.c:444 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "פריטים מוצגים" -#: ../extensions/toolbar-editor.c:579 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "התאמת _סרגל הכלים..." -#: ../extensions/toolbar-editor.c:612 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "התאמה _אישית..." + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" -msgstr "עורך סרגל כלים" +msgstr "עורך סרגלי הכלים" -#: ../extensions/toolbar-editor.c:614 +#: ../extensions/toolbar-editor.c:628 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 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "אגירת נתוני תקשורת HTTP על הכונן" +#~ msgid "Lightweight web browser" +#~ msgstr "דפדפן קל משקל" + +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "The specified configuration folder is invalid." + +#~ msgid "Cookies" +#~ msgstr "עוגיות" + +#~ msgid "'Flash' Cookies" +#~ msgstr "עוגיות 'Flash'" + +#~ msgid "HTML5 _Databases" +#~ msgstr "מ_סדי נתונים של HTML5" + +#~ msgid "Offline Application Cache" +#~ msgstr "מטמון יישומים בלתי מקוונים" + +#~ msgid "Not available: %s" +#~ msgstr "לא זמין: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "קבצי משאבים לא הותקנו" + +#~ msgid "Reset the last _session" +#~ msgstr "שחזר ל_הפעלה האחרונה" + +#~ msgid "No filename specified" +#~ msgstr "לא צויין שם קובץ" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% נטען" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "אל תשמור אף מידע אישי בזמן הגלישה" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "הוספת קיצור דרך לחיוג מהיר" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "הוספת קיצור דרך לשולחן העבודה" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "הרשמה להזנת חדשות זו" + +#~ msgid "Close this window" +#~ msgstr "סגור את החלון הזה" + +#~ msgid "Quit the application" +#~ msgstr "יציאה מהיישום" + +#~ msgid "Undo the last modification" +#~ msgstr "ביטול השינוי האחרון" + +#~ msgid "Redo the last modification" +#~ msgstr "בצע שוב את השינוי האחרון" + +#~ msgid "Cut the selected text" +#~ msgstr "גזור את הטקסט המסומן" + +#~ msgid "Copy the selected text" +#~ msgstr "העתק את הטקסט המסומן" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "הדבק טקסט מלוח הגזירים" + +#~ msgid "Delete the selected text" +#~ msgstr "מחק את הטקסט המסומן" + +#~ msgid "Select all text" +#~ msgstr "סמן את כל הטקסט" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "חפש את המופע הבא של המילה או הביטוי" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "חפש את המופע הקודם של המילה או הביטוי" + +#~ msgid "Reset the zoom level" +#~ msgstr "אפס את רמת הזום" + +#~ msgid "View the source code of the page" +#~ msgstr "הצג את קוד המקור של הדף" + +#~ msgid "Scroll to the left" +#~ msgstr "יישר סרגל צד לשמאל" + +#~ msgid "Scroll to the right" +#~ msgstr "יישר סרגל צד לימין" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "מחק את תכולת האשפה" + +#~ msgid "Open the last closed tab" +#~ msgstr "פתח את הלשונית האחרונה שנסגרה" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "הוסף תיקיית סימניות חדשה" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "הוסף, ערוך והסר מנועי חיפוש..." + +#~ msgid "Clear private data..." +#~ msgstr "נקה נתונים אישיים..." + +#~ msgid "Switch to the previous tab" +#~ msgstr "עבור אל הלשונית הקודמת" + +#~ msgid "Focus the current tab" +#~ msgstr "התמקד בלשונית הנוכחית" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "סגור את הלשונית הנוכחית" + +#~ msgid "Duplicate the current tab" +#~ msgstr "סגור את הלשונית הנוכחית" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "סגור את הלשונית הנוכחית" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "פתח את הלשוניות שנפתחו בהפעלה הקודמת" + +#~ msgid "_Contents" +#~ msgstr "_תכנים" + +#~ msgid "Show the documentation" +#~ msgstr "הצג את התיעוד" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "הצג את השאלות הנפוצות" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "פתח את עוקב הבאגים של Midori" + +#~ msgid "Show information about the program" +#~ msgstr "הצג מידע אודות התוכנה" + +#~ msgid "Show menubar" +#~ msgstr "הצג את סרגל התפריט" + +#~ msgid "Show navigationbar" +#~ msgstr "הצג את סרגל הניווט" + +#~ msgid "Show sidepanel" +#~ msgstr "הצג סרגל צד" + +#~ msgid "Show bookmarkbar" +#~ msgstr "הצג את סרגל הסימניות" + +#~ msgid "_Transferbar" +#~ msgstr "_סרגל העברות" + +#~ msgid "Show transferbar" +#~ msgstr "הצג את סרגל ההעברה" + +#~ msgid "Show statusbar" +#~ msgstr "הצג את שורת המצב" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "נכשל בהרצת הצהרת מסד הנתונים: %s\n" + +#~ msgid "Show Blank page" +#~ msgstr "הצג דף ריק" + +#~ msgid "All cookies" +#~ msgstr "כל העוגיות" + +#~ msgid "Session cookies" +#~ msgstr "עוגיות הפעלה" + +#~ msgid "Show Transferbar" +#~ msgstr "הצג סרגל העברות" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "האם להציג את סרגל ההעברות" + +#~ msgid "Show progress in location entry" +#~ msgstr "הצג התקדמות בתיבת המיקום" + +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "האם להציג את התקדמות הטעינה בתיבת המיקום" + +#~ msgid "Search engines in location completion" +#~ msgstr "מנועי חיפוש בהשלמת הכתובות" + +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "האם להציג את מנועי החיפוש בהשלמת הכתובות" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "הצג בקרת הפעלה בסרגל" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "האם להציג את בקרת פעילות בסרגל" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "הצג חיוג מהיר בלשוניות חדשות" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "הצג חיוג מהיר בלשוניות חדשות" + +#~ msgid "Download Manager" +#~ msgstr "מנהל הורדות" + +#~ msgid "An external download manager" +#~ msgstr "מנהל הורדות חיצוני" + +#~ msgid "Open external pages in:" +#~ msgstr "פתח דפים חיצוניים ב:" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "איפה לפתוח דפים חיצוניים" + +#~ msgid "Accept cookies" +#~ msgstr "קבלת עוגיות" + +#~ msgid "What type of cookies to accept" +#~ msgstr "איזה סוג של עוגיות לקבל" + +#~ msgid "Maximum cookie age" +#~ msgstr "תוקף העוגיות המקסימלי" + +#~ msgid "Maximum history age" +#~ msgstr "תוקף מקסימלי להיסטוריה" + +#~ msgid "Remember last downloaded files" +#~ msgstr "זכור את הקבצים האחרונים שירדו" + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "האם לשמור את הקבצים האחרונים שירדו" + +#~ msgid "Not found - %s" +#~ msgstr "‏%s - לא נמצא" + +#~ msgid "_Save Link destination" +#~ msgstr "_שמור את יעד הקישור" + +#~ msgid "Download with Download _Manager" +#~ msgstr "הורד בעזרת _מנהל הורדות" + +#~ msgid "_Download Link destination" +#~ msgstr "_הורד את יעד הקישור" + +#~ msgid "Small" +#~ msgstr "סמלים קטנים" + +#~ msgid "Medium" +#~ msgstr "תפריט" + +#~ msgid "Document cannot be displayed" +#~ msgstr "לא ניתן להציג תיעוד" + +#~ msgid "General" +#~ msgstr "כללי" + +#~ msgid "Appearance" +#~ msgstr "מראה" + +#~ msgid "Font settings" +#~ msgstr "הגדרות גופן" + +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "הכרח 96 נקודות לאינץ'" + +#~ msgid "Interface" +#~ msgstr "מנשק" + +#~ msgid "Navigationbar" +#~ msgstr "סרגל ניווט" + +#~ msgid "Applications" +#~ msgstr "יישומים" + +#~ msgid "External applications" +#~ msgstr "יישומים חיצוניים" + +#~ msgid "Web Cookies" +#~ msgstr "עוגיות רשת" + +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "נקה נתונים אישיים בזמן י_ציאה מ־Midori" + +#~ msgid "days" +#~ msgstr "ימים" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "הגדרת מסנני _פרסומות..." + +#~ msgid "Next Tab (History List)" +#~ msgstr "רשימת היסטוריית לשוניות" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "רשימת היסטוריית לשוניות" + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "מאפשר להחליף לשוניות על ידי בחירה מרשימה הממוינת על ידי שימוש אחרון" + +#~ msgid "Pageholder" +#~ msgstr "מחזיק עמודים" + +#~ msgid "_Pageholder" +#~ msgstr "_מחזיק עמודים" + +#~ msgid "Keep one or multiple pages open in parallel to your tabs" +#~ msgstr "השאר דף אחר או יותר פתוחים במקביל ללשוניות שלך" + +#~ msgid "View Selection Source" +#~ msgstr "הצג את מקור הבחירה" + +#~ msgid "View the source code of the selection" +#~ msgstr "הצג את קוד המקור של הבחירה" + +#~ msgid "_Recently visited pages" +#~ msgstr "דפים שבוקרו _לאחרונה" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "פתיחה מחדש בדפים שביקרת בהם בעבר" + +#~ msgid "Detach chosen panel from the window" +#~ msgstr "נתן את הסרגל הנבחר מהחלון" + +#~ msgid "Show panel _titles" +#~ msgstr "הצג כותרות סרגל" + +#~ msgid "Show operating _controls" +#~ msgstr "הצג _בקרת פעילות" + +#~ msgid "Options" +#~ msgstr "אפשרויות" + +#~ msgid "Ask for the destination folder" +#~ msgstr "שאל עבור תיקייה יעד" + +#~ msgid "Whether to ask for the destination folder when downloading a file" +#~ msgstr "האם לשאול על תיקיית היעד בזמן הורדת קבץ" + +#~ msgid "Whether to show a notification when a transfer has been completed" +#~ msgstr "האם להציג הודעה כאשר העברה מסתיימת" + +#~ msgid "Original cookies only" +#~ msgstr "עוגיות מקוריות בלבד" + +#~ msgid "Remember last visited pages" +#~ msgstr "זכור דפים שנשמרו לאחרונה" + +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "האם הדפים שנשמרו אחרונים ישמרו" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "זהה שרת מתווך אוטומטית" + +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" +#~ msgstr "האם לזהות את השרת המתווך אוטומטית מסביבת העבודה" + +#~ msgid "Open _Link" +#~ msgstr "פתח _קישור" + +#~ msgid "Open Image in New Wi_ndow" +#~ msgstr "פתח את התמונה בח_לון חדש" + +#~ msgid "Download I_mage" +#~ msgstr "הורד ת_מונה" + +#~ msgid "_Restore Tab" +#~ msgstr "_שחזר לשונית" + +#~ msgid "_Minimize Tab" +#~ msgstr "_מזער לשונית" + +#~ msgid "Shrink images automatically" +#~ msgstr "כווץ תמונות אוטומטית" + +#~ msgid "Enable developer tools" +#~ msgstr "הפעל כלי מפתח" + +#~ msgid "Enable special extensions for developers" +#~ msgstr "הפעלת הרחבות מיוחדות עבור מפתחים" + +#~ msgid "Spell Checking" +#~ msgstr "בדיקת איות" + +#~ msgid "" +#~ "A comma separated list of languages to be used for spell checking, for " +#~ "example \"en_GB,de_DE\"" +#~ msgstr "" +#~ "רשימה המופרדת בפסיקים עבור שפות לשימוש בבדיקת איות, לדוגמה \"en_US,he_IL\"" + +#~ msgid "" +#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "העתק את תסריטי המשתמש לתיקייה %s ואת עיצובי המשתמש לתיקייה %s." + +#~ msgid "Console" +#~ msgstr "מסוף" + +#~ msgid "Erroneous clock time" +#~ msgstr "זמן השעון שגוי" + +#~ msgid "" +#~ "The clock time lies in the past. Please check the current date and time." +#~ msgstr "הזמן השעון נמצא בעבר. לא לבדוק את הזמן והתאריך הנוכחיים." + +#~ msgid "_Cookie Manager" +#~ msgstr "מנהל _עוגיות" + +#~ msgid "Prefetch IP addresses of hovered links" +#~ msgstr "קבל מראש כתובות IP של קישורים במעבר עכבר" + +#~ msgid "Not available on this platform" +#~ msgstr "לא זמין על פלטפורמה זו" + #~ 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 -Nru midori-0.2.8/po/hr.po midori-0.4.6/po/hr.po --- midori-0.2.8/po/hr.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/hr.po 2012-05-14 22:13:42.000000000 +0000 @@ -2,354 +2,508 @@ # Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the Midori package. # Ivica Kolić, 2010. -# +# Ivica Kolić , 2010. +# msgid "" msgstr "" "Project-Id-Version: Midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-13 22:11+0000\n" -"PO-Revision-Date: 2010-09-14 02:58+0200\n" +"POT-Creation-Date: 2012-05-13 15:27+0000\n" +"PO-Revision-Date: 2010-12-22 21:45+0100\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Croatian <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Lagani web preglednik" +msgid "Browse the Web" +msgstr "Pretraži web" + +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "Internet;WWW;Explorer" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1322 ../midori/main.c:1651 -#: ../midori/main.c:1659 ../midori/main.c:1675 -#: ../midori/midori-websettings.c:312 +#: ../data/midori.desktop.in.h:3 ../midori/main.c:1972 ../midori/main.c:1996 +#: ../midori/main.c:2010 ../midori/midori-websettings.c:313 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Web preglednik" -#: ../midori/main.c:99 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Midori privatno pretraživanje" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Novi prozor privatnog pretraživanja" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4288 +msgid "Private Browsing" +msgstr " (Privatno pretraživanje)" + +#: ../midori/main.c:97 ../midori/main.c:103 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Konfiguracija ne može biti učitana: %s\n" -#: ../midori/main.c:148 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Vrijednost '%s' nije valjana za %s" -#: ../midori/main.c:155 ../midori/main.c:241 +#: ../midori/main.c:156 ../midori/main.c:260 #, c-format msgid "Invalid configuration value '%s'" msgstr "Neispravna konfiguracijska vrijednost '%s'" -#: ../midori/main.c:366 ../midori/main.c:470 ../extensions/formhistory.c:439 +#: ../midori/main.c:381 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Tražilice ne nogu biti učitane: %s\n" + +#: ../midori/main.c:435 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Neuspjelo uklanjanje povijesti: %s\n" + +#: ../midori/main.c:455 ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" msgstr "Neuspjelo otvaranje baze podataka: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:422 +#: ../midori/main.c:525 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Neuspjelo uklanjanje starih stavki povijesti: %s\n" -#: ../midori/main.c:453 ../panels/midori-history.c:169 -#: ../panels/midori-history.c:199 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Neuspjelo uklanjanje stavke povijesti: %s\n" - -#: ../midori/main.c:498 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Zabilješke ne mogu biti spremljene. %s" - -#: ../midori/main.c:525 +#: ../midori/main.c:547 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Konfiguracija ne može biti spremljena. %s" -#: ../midori/main.c:563 +#: ../midori/main.c:582 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Tražilice ne mogu biti spremljene. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:583 ../midori/main.c:606 +#: ../midori/main.c:619 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Smeće ne može biti spremljeno. %s" -#: ../midori/main.c:665 ../midori/main.c:905 +#: ../midori/main.c:660 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Proširenja" + +#: ../midori/main.c:674 +msgid "Privacy" +msgstr "Privatnost" + +#: ../midori/main.c:686 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" + +#: ../midori/main.c:742 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sesija ne može biti spremljena. %s" -#: ../midori/main.c:849 +#: ../midori/main.c:960 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" -#: ../midori/main.c:939 +#: ../midori/main.c:1036 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 "" +"Izgleda da se Midori srušio zadnji put kad je bio otvoren.Ako se ovo događa " +"učestalo,pokušajte jednu os slijedećih opcija da biste riješili problem." -#: ../midori/main.c:954 +#: ../midori/main.c:1055 msgid "Modify _preferences" msgstr "Izmjeni _osobitosti" -#: ../midori/main.c:958 -msgid "Reset the last _session" -msgstr "Obnovi posljednju _sesiju" - -#: ../midori/main.c:963 +#: ../midori/main.c:1059 msgid "Disable all _extensions" msgstr "Onemogući sva _proširenja" -#: ../midori/main.c:1202 ../midori/main.c:1946 +#: ../midori/main.c:1072 +msgid "Discard old tabs" +msgstr "" + +#: ../midori/main.c:1073 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "Pokaži zadnje kartice bez učitavanja" + +#: ../midori/main.c:1074 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "Pokaži zadnje otvorene kartice" + +#: ../midori/main.c:1321 ../midori/main.c:2399 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sesija ne može biti učitana: %s\n" -#: ../midori/main.c:1322 -msgid "No filename specified" -msgstr "Nije navedeno ime datoteke" - -#: ../midori/main.c:1341 -msgid "An unknown error occured." -msgstr "Nepoznata greška." - -#: ../midori/main.c:1372 +#: ../midori/main.c:1459 #, c-format msgid "Snapshot saved to: %s\n" -msgstr "" +msgstr "Snimak spremljen u:%s\n" -#: ../midori/main.c:1544 +#: ../midori/main.c:1875 msgid "Run ADDRESS as a web application" msgstr "Pokreni Adresu kao web aplikaciju" -#: ../midori/main.c:1544 +#: ../midori/main.c:1875 msgid "ADDRESS" msgstr "ADRESA" -#: ../midori/main.c:1547 +#: ../midori/main.c:1878 msgid "Use FOLDER as configuration folder" msgstr "Koristi MAPU kao konfiguracijsku mapu" -#: ../midori/main.c:1547 +#: ../midori/main.c:1878 msgid "FOLDER" msgstr "MAPA" -#: ../midori/main.c:1550 +#: ../midori/main.c:1881 +msgid "Private browsing, no changes are saved" +msgstr "Privatno pregledavanje, promjene nisu spremljene" + +#: ../midori/main.c:1883 msgid "Show a diagnostic dialog" msgstr "Pokaži dijagnostički dijalog" -#: ../midori/main.c:1552 +#: ../midori/main.c:1885 msgid "Run the specified filename as javascript" msgstr "Pokreni naznačeno ime datoteke kao javascript" -#: ../midori/main.c:1555 +#: ../midori/main.c:1887 msgid "Take a snapshot of the specified URI" msgstr "" -#: ../midori/main.c:1558 +#: ../midori/main.c:1889 msgid "Execute the specified command" msgstr "Izvrši naznačenu naredbu" -#: ../midori/main.c:1560 +#: ../midori/main.c:1891 +msgid "List available commands to execute with -e/ --execute" +msgstr "Listaj dostupne naredbe za izvršavanje pomoću -e/ --execute" + +#: ../midori/main.c:1893 msgid "Display program version" msgstr "Prikaži verziju programa" -#: ../midori/main.c:1562 +#: ../midori/main.c:1895 msgid "Addresses" msgstr "Adrese" -#: ../midori/main.c:1564 +#: ../midori/main.c:1897 msgid "Block URIs according to regular expression PATTERN" msgstr "" -#: ../midori/main.c:1564 +#: ../midori/main.c:1897 msgid "PATTERN" msgstr "UZORAK" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1568 +#: ../midori/main.c:1901 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "" -#: ../midori/main.c:1568 +#: ../midori/main.c:1901 msgid "SECONDS" msgstr "SEKUNDE" -#: ../midori/main.c:1648 +#: ../midori/main.c:1904 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "" + +#: ../midori/main.c:1904 +msgid "FILENAME" +msgstr "DATOTEKA" + +#: ../midori/main.c:1969 msgid "[Addresses]" msgstr "[Adrese]" -#: ../midori/main.c:1676 +#: ../midori/main.c:2011 msgid "Please report comments, suggestions and bugs to:" msgstr "Prijavite komentare,sugestije i probleme u:" -#: ../midori/main.c:1678 +#: ../midori/main.c:2013 msgid "Check for new versions at:" msgstr "Provjeri za nove verzije na:" -#: ../midori/main.c:1795 -msgid "The specified configuration folder is invalid." -msgstr "Određena konfiguracijaka mapa nije valjana" +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2108 +msgid "Saved logins and _passwords" +msgstr "Spremljene prijave i _lozinke" + +#: ../midori/main.c:2110 +msgid "Cookies and Website data" +msgstr "" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2114 ../midori/midori-websettings.c:997 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "" + +#: ../midori/main.c:2117 +msgid "Website icons" +msgstr "Website ikone" + +#: ../midori/main.c:2223 +msgid "An unknown error occured" +msgstr "Nepoznata greška" -#: ../midori/main.c:1843 +#: ../midori/main.c:2330 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori instanca je već pokrenuta ali ne odgovara.\n" -#: ../midori/main.c:1898 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "Tražilice ne nogu biti učitane: %s\n" - -#: ../midori/main.c:1919 +#: ../midori/main.c:2366 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Zabilješke ne mogu biti učitane: %s\n" -#: ../midori/main.c:1961 +#: ../midori/main.c:2414 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Smeće ne može biti učitano: %s\n" -#: ../midori/main.c:1974 +#: ../midori/main.c:2427 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Povijest ne može biti učitana: %s\n" -#: ../midori/main.c:1988 +#: ../midori/main.c:2443 msgid "The following errors occured:" msgstr "Došlo je do slijedeće greške:" -#: ../midori/main.c:2004 +#: ../midori/main.c:2459 msgid "_Ignore" msgstr "_Ignoriraj" -#: ../midori/midori-array.c:429 +#: ../midori/midori-app.c:1339 +msgid "_Bookmark" +msgstr "_Zabilješka" + +#: ../midori/midori-app.c:1340 ../midori/midori-browser.c:6066 +msgid "_Bookmarks" +msgstr "_Zabilješke" + +#: ../midori/midori-app.c:1341 +msgid "Add Boo_kmark" +msgstr "Dodaj za_bilješku" + +#: ../midori/midori-app.c:1342 +msgid "_Console" +msgstr "_Konzola" + +#: ../midori/midori-app.c:1343 +msgid "_Extensions" +msgstr "_Proširenja" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1344 ../midori/midori-browser.c:4591 +msgid "_History" +msgstr "_Povijest" + +#: ../midori/midori-app.c:1345 +msgid "_Homepage" +msgstr "_Početna stranica" + +#: ../midori/midori-app.c:1346 +msgid "_Userscripts" +msgstr "_Korisničke skripte" + +#: ../midori/midori-app.c:1347 +msgid "New _Tab" +msgstr "Nova _kartica" + +#: ../midori/midori-app.c:1348 +msgid "_Transfers" +msgstr "_Prijenosi" + +#: ../midori/midori-app.c:1349 +msgid "Netscape p_lugins" +msgstr "Netscape p_riključci" + +#: ../midori/midori-app.c:1350 +msgid "_Closed Tabs" +msgstr "_Zatvorene kartice" + +#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5218 +msgid "New _Window" +msgstr "Novi _prozor" + +#: ../midori/midori-app.c:1352 +msgid "New _Folder" +msgstr "Nova _mapa" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "Datoteka nije pronađena." -#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 -#: ../midori/midori-array.c:496 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Deformirani dokument." -#: ../midori/midori-array.c:505 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "Neprepoznati format zabilješke." -#: ../midori/midori-array.c:716 +#: ../midori/midori-array.c:915 msgid "Writing failed." msgstr "Neuspjelo pisanje." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4887 -#: ../midori/midori-browser.c:4893 +#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5300 +#: ../midori/midori-browser.c:5309 msgid "Reload the current page" msgstr "Učitaj ponovo trenutnu stranicu" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4890 +#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5306 msgid "Stop loading the current page" msgstr "Prestani učitavati trenutnu stranicu" -#: ../midori/midori-browser.c:453 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% učitano" - -#: ../midori/midori-browser.c:491 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" msgstr "Neuspjeh u ažuriranju naslova: %s\n" -#: ../midori/midori-browser.c:504 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." msgstr "Neočekivana radnja '%s'." -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:569 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Privatno pretraživanje)" + +#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716 +msgid "Toplevel folder" +msgstr "" + +#: ../midori/midori-browser.c:774 msgid "New folder" msgstr "Nova mapa" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:774 msgid "Edit folder" msgstr "Uredi mapu" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "New bookmark" msgstr "Nova zabilješka" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "Edit bookmark" msgstr "Uredi zabilješku" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:818 msgid "_Title:" msgstr "_Naslov:" -#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:958 -msgid "_Description:" -msgstr "_Opis:" - -#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:972 +#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4007 +#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4328 msgid "_Folder:" msgstr "_Mapa:" -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 -#: ../midori/midori-browser.c:4012 ../midori/midori-browser.c:4040 -msgid "Toplevel folder" -msgstr "" - -#: ../midori/midori-browser.c:872 +#: ../midori/midori-browser.c:877 msgid "Add to _Speed Dial" msgstr "Dodaj u _brzo biranje" -#: ../midori/midori-browser.c:885 +#: ../midori/midori-browser.c:890 msgid "Show in the tool_bar" msgstr "Prikaži u alatnoj_traci" -#: ../midori/midori-browser.c:900 +#: ../midori/midori-browser.c:905 msgid "Run as _web application" msgstr "Pokreni kao _web aplikaciju" -#: ../midori/midori-browser.c:979 +#: ../midori/midori-browser.c:976 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Datoteka \"%s\" ne može biti spremljena u ovoj mapi." + +#: ../midori/midori-browser.c:978 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Nemate dozvole za pisanje na ovoj lokaciji." + +#: ../midori/midori-browser.c:985 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Nema dovoljno slobodnog prostora za preuzimanje \"%s\"." -#: ../midori/midori-browser.c:983 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." -msgstr "" +msgstr "Datoteci je potrebno %s ali samo %s je preostalo." -#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4048 -#: ../midori/midori-browser.c:4083 +#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4397 msgid "Save file as" msgstr "Spremi datoteku kao" -#: ../midori/midori-browser.c:1438 +#: ../midori/midori-browser.c:1320 +msgid "New Window" +msgstr "Novi prozor" + +#: ../midori/midori-browser.c:1320 +msgid "A new window has been opened" +msgstr "Otvoren je novi prozor" + +#: ../midori/midori-browser.c:1323 +msgid "New Tab" +msgstr "Nova kartica" + +#: ../midori/midori-browser.c:1323 +msgid "A new tab has been opened" +msgstr "Otvorena je nova kartica" + +#: ../midori/midori-browser.c:1358 +msgid "Error opening the image!" +msgstr "Greška pri otvaranju slike!" + +#: ../midori/midori-browser.c:1359 +msgid "Can not open selected image in a default viewer." +msgstr "Ne mogu otvoriti odabranu sliku u zadanom pregledniku." + +#: ../midori/midori-browser.c:1365 +msgid "Error downloading the image!" +msgstr "Greška pri preuzimanju slike!" + +#: ../midori/midori-browser.c:1366 +msgid "Can not download selected image." +msgstr "Ne mogu preuzeti odabranu sliku." + +#: ../midori/midori-browser.c:1492 msgid "Save file" msgstr "Spremi datoteku" -#: ../midori/midori-browser.c:2154 +#: ../midori/midori-browser.c:2367 msgid "Open file" msgstr "Otvori datoteku" -#: ../midori/midori-browser.c:2232 +#: ../midori/midori-browser.c:2499 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -358,145 +512,139 @@ "automatically." msgstr "" -#: ../midori/midori-browser.c:2238 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "" -#: ../midori/midori-browser.c:2281 ../midori/midori-browser.c:4952 -#: ../panels/midori-bookmarks.c:400 +#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5369 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "Dodaj novu zabilješku" -#: ../midori/midori-browser.c:3284 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "Ne mogu pokrenuti vanjski program" +#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "Prazno" + +#: ../midori/midori-browser.c:3469 +msgid "Toggle text cursor navigation" +msgstr "" -#: ../midori/midori-browser.c:3527 ../midori/midori-browser.c:5342 +#: ../midori/midori-browser.c:3784 ../midori/midori-browser.c:5759 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nespjelo dodavanje nove stavke povijesti: %s\n" -#: ../midori/midori-browser.c:3842 ../panels/midori-bookmarks.c:713 -#: ../panels/midori-history.c:736 +#: ../midori/midori-browser.c:4116 ../panels/midori-bookmarks.c:745 +#: ../panels/midori-history.c:803 msgid "Open all in _Tabs" msgstr "Otvori sve u _karticama" -#: ../midori/midori-browser.c:3849 ../panels/midori-bookmarks.c:719 -#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:542 +#: ../midori/midori-browser.c:4123 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Otvori u novoj _kartici" -#: ../midori/midori-browser.c:3852 ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:744 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4126 ../midori/midori-view.c:2688 +#: ../midori/midori-view.c:4828 ../panels/midori-bookmarks.c:753 +#: ../panels/midori-history.c:811 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Otvori u novom _prozoru" -#: ../midori/midori-browser.c:3930 +#: ../midori/midori-browser.c:4215 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3931 +#: ../midori/midori-browser.c:4216 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3932 +#: ../midori/midori-browser.c:4217 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:4218 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:4219 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3958 +#: ../midori/midori-browser.c:4220 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4241 msgid "Import bookmarks..." msgstr "Uvezi zabilješke..." -#: ../midori/midori-browser.c:3961 ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:4244 ../midori/midori-browser.c:5374 msgid "_Import bookmarks" msgstr "_Uvezi zabilješke" -#: ../midori/midori-browser.c:3972 +#: ../midori/midori-browser.c:4255 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:3999 ../midori/midori-browser.c:5070 -#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 -#: ../katze/katze-utils.c:696 -msgid "Custom..." -msgstr "Prilagođeno..." +#: ../midori/midori-browser.c:4320 +msgid "Import from XBEL or HTML file" +msgstr "Uvezi iz XBEL ili HTML datoteke" + +#: ../midori/midori-browser.c:4355 +msgid "Import from a file" +msgstr "Uvezi iz datoteke" -#: ../midori/midori-browser.c:4059 +#: ../midori/midori-browser.c:4367 msgid "Failed to import bookmarks" msgstr "Neuspjeli uvoz zabilješki" -#: ../midori/midori-browser.c:4100 +#: ../midori/midori-browser.c:4402 +msgid "XBEL Bookmarks" +msgstr "XBEL zabilješke" + +#: ../midori/midori-browser.c:4407 +msgid "Netscape Bookmarks" +msgstr "Netscape zabilješke" + +#: ../midori/midori-browser.c:4421 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "MIdori može izvesti samo u XBEL (*.xbel) i Netscape (*.html)" + +#: ../midori/midori-browser.c:4436 msgid "Failed to export bookmarks" msgstr "Neuspjeli izvoz zabilješki" -#: ../midori/midori-browser.c:4153 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "Neuspjelo uklanjanje povijesti: %s\n" - -#: ../midori/midori-browser.c:4161 -#, c-format -msgid "Failed to clear search history: %s\n" -msgstr "Nespjelo uklanjanje traženja povijesti: %s\n" - #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4268 +#: ../midori/midori-browser.c:4558 msgid "Clear Private Data" msgstr "Očisti privatne podatke" -#: ../midori/midori-browser.c:4272 +#: ../midori/midori-browser.c:4562 msgid "_Clear private data" msgstr "_Očisti privatne podatke" -#: ../midori/midori-browser.c:4286 +#: ../midori/midori-browser.c:4575 msgid "Clear the following data:" msgstr "Očisti slijedeće podatke:" -#: ../midori/midori-browser.c:4296 ../midori/midori-preferences.c:532 -#: ../panels/midori-history.c:114 -msgid "History" -msgstr "Povijest" - -#: ../midori/midori-browser.c:4301 -msgid "Cookies" -msgstr "Kolačići" - -#: ../midori/midori-browser.c:4306 -msgid "'Flash' Cookies" -msgstr "'Flash' kolačići" - -#: ../midori/midori-browser.c:4311 -msgid "Website icons" -msgstr "Website ikone" - -#: ../midori/midori-browser.c:4316 ../midori/sokoke.c:1314 -msgid "_Closed Tabs" -msgstr "_Zatvorene kartice" - -#: ../midori/midori-browser.c:4321 ../extensions/web-cache.c:462 -msgid "Web Cache" -msgstr "" +#: ../midori/midori-browser.c:4585 +msgid "Last open _tabs" +msgstr "Zadnje otvorene _kartice" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4611 msgid "Clear private data when _quitting Midori" msgstr "Očisti privatne podatke kad _isključuješ Midori" -#: ../midori/midori-browser.c:4470 +#: ../midori/midori-browser.c:4806 msgid "A lightweight web browser." msgstr "Lagani web preglednik" -#: ../midori/midori-browser.c:4472 +#: ../midori/midori-browser.c:4807 +msgid "See about:version for version info." +msgstr "Vidi about:version za informacije o verziji" + +#: ../midori/midori-browser.c:4809 msgid "" "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 " @@ -504,1692 +652,1495 @@ "option) any later version." msgstr "" -#: ../midori/midori-browser.c:4491 +#: ../midori/midori-browser.c:4830 msgid "translator-credits" -msgstr "Ivica Kolić (zvacet) " +msgstr "Ivica Kolić " -#: ../midori/midori-browser.c:4800 +#: ../midori/midori-browser.c:5216 msgid "_File" msgstr "_Datoteka" -#: ../midori/midori-browser.c:4802 ../midori/sokoke.c:1315 -msgid "New _Window" -msgstr "Novi _prozor" - -#: ../midori/midori-browser.c:4803 +#: ../midori/midori-browser.c:5219 msgid "Open a new window" msgstr "Otvori u novom prozoru" -#: ../midori/midori-browser.c:4806 +#: ../midori/midori-browser.c:5222 msgid "Open a new tab" msgstr "Otvori novu karticu" -#: ../midori/midori-browser.c:4808 -msgid "P_rivate Browsing" -msgstr "P_rivatno pretraživanje" - -#: ../midori/midori-browser.c:4809 -msgid "Don't save any private data while browsing" -msgstr "Ne spremaj privatne podatke dok pregledavaš" +#: ../midori/midori-browser.c:5224 +msgid "New P_rivate Browsing Window" +msgstr "Novi p_rozor privatnog pretraživanja" -#: ../midori/midori-browser.c:4813 +#: ../midori/midori-browser.c:5228 msgid "Open a file" msgstr "Otvori datoteku" -#: ../midori/midori-browser.c:4816 +#: ../midori/midori-browser.c:5230 +msgid "_Save Page As..." +msgstr "_Spremi stranicu kao..." + +#: ../midori/midori-browser.c:5231 msgid "Save to a file" msgstr "Spremi u datoteku" -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:5233 msgid "Add to Speed _dial" msgstr "Dodaj u Brzo _biranje" -#: ../midori/midori-browser.c:4819 -msgid "Add shortcut to speed dial" -msgstr "Dodaj prečac u brzo biranje" - -#: ../midori/midori-browser.c:4821 +#: ../midori/midori-browser.c:5237 msgid "Add Shortcut to the _desktop" msgstr "Dodaj prečac na _radnu površinu" -#: ../midori/midori-browser.c:4822 -msgid "Add shortcut to the desktop" -msgstr "Dodaj prečac na radnu površinu" +#: ../midori/midori-browser.c:5239 +msgid "Create _Launcher" +msgstr "Napravi _pokretač" -#: ../midori/midori-browser.c:4824 +#: ../midori/midori-browser.c:5243 msgid "Subscribe to News _feed" msgstr "" -#: ../midori/midori-browser.c:4825 -msgid "Subscribe to this news feed" -msgstr "" - -#: ../midori/midori-browser.c:4830 +#: ../midori/midori-browser.c:5249 msgid "_Close Tab" msgstr "_Zatvori karticu" -#: ../midori/midori-browser.c:4831 +#: ../midori/midori-browser.c:5250 msgid "Close the current tab" msgstr "Zatvori trenutnu karticu" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:5252 msgid "C_lose Window" msgstr "Z_atvori prozor" -#: ../midori/midori-browser.c:4834 -msgid "Close this window" -msgstr "Zatvori ovaj prozor" - -#: ../midori/midori-browser.c:4837 +#: ../midori/midori-browser.c:5256 msgid "Print the current page" msgstr "Ispiši trenutnu stranicu" -#: ../midori/midori-browser.c:4840 -msgid "Quit the application" -msgstr "Isključi program" +#: ../midori/midori-browser.c:5258 +msgid "Close a_ll Windows" +msgstr "Zatvori s_ve prozore" -#: ../midori/midori-browser.c:4842 +#: ../midori/midori-browser.c:5261 msgid "_Edit" msgstr "_Uredi" -#: ../midori/midori-browser.c:4846 -msgid "Undo the last modification" -msgstr "Poništi zadnju izmjenu" - -#: ../midori/midori-browser.c:4849 -msgid "Redo the last modification" -msgstr "Vrati zadnju izmjenu" - -#: ../midori/midori-browser.c:4853 -msgid "Cut the selected text" -msgstr "Izreži označeni tekst" +#: ../midori/midori-browser.c:5284 +msgid "_Find..." +msgstr "_Nađi..." -#: ../midori/midori-browser.c:4856 ../midori/midori-browser.c:4859 -msgid "Copy the selected text" -msgstr "Kopiraj označeni tekst" - -#: ../midori/midori-browser.c:4862 -msgid "Paste text from the clipboard" -msgstr "" - -#: ../midori/midori-browser.c:4865 -msgid "Delete the selected text" -msgstr "Izbriši odabrani tekst" - -#: ../midori/midori-browser.c:4868 -msgid "Select all text" -msgstr "Označi sav tekst" - -#: ../midori/midori-browser.c:4871 +#: ../midori/midori-browser.c:5285 msgid "Find a word or phrase in the page" msgstr "Nađi riječ ili frazu na stranici" -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:5287 msgid "Find _Next" -msgstr "Nađi _Slijedeće" - -#: ../midori/midori-browser.c:4874 -msgid "Find the next occurrence of a word or phrase" -msgstr "Nađi slijedeće pojavljivanje riječi ili fraze" +msgstr "Nađi _slijedeće" -#: ../midori/midori-browser.c:4876 +#: ../midori/midori-browser.c:5290 msgid "Find _Previous" -msgstr "Nađi _Prethodno" +msgstr "Nađi _prethodno" -#: ../midori/midori-browser.c:4877 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Nađi prethodno pojavljivanje riječi ili fraze" - -#: ../midori/midori-browser.c:4881 +#: ../midori/midori-browser.c:5294 msgid "Configure the application preferences" msgstr "Konfiguriraj postavke programa" -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:5296 msgid "_View" msgstr "_Pogled" -#: ../midori/midori-browser.c:4884 +#: ../midori/midori-browser.c:5297 msgid "_Toolbars" msgstr "_Alatne trake" -#: ../midori/midori-browser.c:4896 +#: ../midori/midori-browser.c:5302 +msgid "Reload page without caching" +msgstr "" + +#: ../midori/midori-browser.c:5312 msgid "Increase the zoom level" msgstr "Povećaj zoom razinu" -#: ../midori/midori-browser.c:4899 +#: ../midori/midori-browser.c:5315 msgid "Decrease the zoom level" msgstr "Smanji zoom razinu" -#: ../midori/midori-browser.c:4902 -msgid "Reset the zoom level" -msgstr "Vrati zoom razinu" - -#: ../midori/midori-browser.c:4903 +#: ../midori/midori-browser.c:5319 msgid "_Encoding" msgstr "_Kodiranje" -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:5321 msgid "View So_urce" msgstr "" -#: ../midori/midori-browser.c:4906 -msgid "View the source code of the page" -msgstr "Prikaži izvorni kod stranice" +#: ../midori/midori-browser.c:5324 +msgid "Ca_ret Browsing" +msgstr "" -#: ../midori/midori-browser.c:4909 +#: ../midori/midori-browser.c:5328 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:4912 +#: ../midori/midori-browser.c:5330 msgid "Scroll _Left" msgstr "Kliži _Lijevo" -#: ../midori/midori-browser.c:4913 -msgid "Scroll to the left" -msgstr "Kliži ulijevo" - -#: ../midori/midori-browser.c:4915 +#: ../midori/midori-browser.c:5333 msgid "Scroll _Down" msgstr "Kliži _Dolje" -#: ../midori/midori-browser.c:4916 -msgid "Scroll down" -msgstr "Kliži dolje" - -#: ../midori/midori-browser.c:4918 +#: ../midori/midori-browser.c:5336 msgid "Scroll _Up" msgstr "Kliži _Gore" -#: ../midori/midori-browser.c:4919 -msgid "Scroll up" -msgstr "Kliži gore" - -#: ../midori/midori-browser.c:4921 +#: ../midori/midori-browser.c:5339 msgid "Scroll _Right" msgstr "Kližu _Desno" -#: ../midori/midori-browser.c:4922 -msgid "Scroll to the right" -msgstr "Kliži nadesno" - -#: ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:5342 msgid "_Go" msgstr "_Idi" -#: ../midori/midori-browser.c:4928 +#: ../midori/midori-browser.c:5345 msgid "Go back to the previous page" msgstr "Natrag na prethodnu stranicu" -#: ../midori/midori-browser.c:4931 +#: ../midori/midori-browser.c:5348 msgid "Go forward to the next page" msgstr "Naprijed na idući stranicu" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:5352 msgid "Go to the previous sub-page" msgstr "Idi na prethodnu podstranicu" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4939 +#: ../midori/midori-browser.c:5356 msgid "Go to the next sub-page" msgstr "Idi na iduću podstranicu" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:5359 msgid "Go to your homepage" msgstr "Idi na svoju početnu stranicu" -#: ../midori/midori-browser.c:4944 +#: ../midori/midori-browser.c:5361 msgid "Empty Trash" msgstr "Isprazni smeće" -#: ../midori/midori-browser.c:4945 -msgid "Delete the contents of the trash" -msgstr "Izbriši sadržaj smeća" - -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:5364 msgid "Undo _Close Tab" msgstr "Poništi _zatvori karticu" -#: ../midori/midori-browser.c:4948 -msgid "Open the last closed tab" -msgstr "Otvori zadnju zatvorenu karticu" - -#: ../midori/midori-browser.c:4954 +#: ../midori/midori-browser.c:5371 msgid "Add a new _folder" msgstr "Dodaj novu _mapu" -#: ../midori/midori-browser.c:4955 -msgid "Add a new bookmark folder" -msgstr "Dodaj novu mapu zabilješki" - -#: ../midori/midori-browser.c:4960 +#: ../midori/midori-browser.c:5377 msgid "_Export bookmarks" msgstr "_Izvezi zabilješke" -#: ../midori/midori-browser.c:4963 ../midori/midori-searchaction.c:490 +#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Upravljaj tražilicama" -#: ../midori/midori-browser.c:4964 -msgid "Add, edit and remove search engines..." -msgstr "Dodaj,uredi i ukloni tražilice" - -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:5383 msgid "_Clear Private Data" msgstr "_Očisti privatne podatke" -#: ../midori/midori-browser.c:4968 -msgid "Clear private data..." -msgstr "Očisti privatne podatke" - -#: ../midori/midori-browser.c:4972 +#: ../midori/midori-browser.c:5386 msgid "_Inspect Page" msgstr "" -#: ../midori/midori-browser.c:4973 -msgid "Inspect page details and access developer tools..." -msgstr "" - -#: ../midori/midori-browser.c:4978 +#: ../midori/midori-browser.c:5390 msgid "_Previous Tab" msgstr "_Prethodna kartica" -#: ../midori/midori-browser.c:4979 -msgid "Switch to the previous tab" -msgstr "Prebaci na prethodnu stranicu" - -#: ../midori/midori-browser.c:4981 +#: ../midori/midori-browser.c:5393 msgid "_Next Tab" msgstr "_Slijedeća kartica" -#: ../midori/midori-browser.c:4982 -msgid "Switch to the next tab" -msgstr "Prebaci na slijedeću stranicu" +#: ../midori/midori-browser.c:5395 +msgid "Move Tab _Backward" +msgstr "_Premjesti karticu unazad" + +#: ../midori/midori-browser.c:5397 +msgid "_Move Tab Forward" +msgstr "_Premjesti karticu naprijed" -#: ../midori/midori-browser.c:4984 +#: ../midori/midori-browser.c:5400 msgid "Focus _Current Tab" msgstr "" -#: ../midori/midori-browser.c:4985 -msgid "Focus the current tab" +#: ../midori/midori-browser.c:5403 +msgid "Focus _Next view" msgstr "" -#: ../midori/midori-browser.c:4987 -msgid "Minimize _Current Tab" -msgstr "Minimiziraj _trenutnu karticu" +#: ../midori/midori-browser.c:5406 +msgid "Only show the Icon of the _Current Tab" +msgstr "Pokaži samo ikonu _trenutne kartice" -#: ../midori/midori-browser.c:4988 -msgid "Minimize the current tab" -msgstr "Minimiziraj trenutnu karticu" - -#: ../midori/midori-browser.c:4990 +#: ../midori/midori-browser.c:5409 msgid "_Duplicate Current Tab" msgstr "_Udvostruči trenutnu karticu" -#: ../midori/midori-browser.c:4991 -msgid "Duplicate the current tab" -msgstr "Udvostruči trenutnu karticu" - -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:5412 msgid "Close Ot_her Tabs" msgstr "Zatvori dr_uge kartice" -#: ../midori/midori-browser.c:4994 -msgid "Close all tabs except the current tab" -msgstr "Zatvori sve kartice osim trenutne" - -#: ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:5415 msgid "Open last _session" msgstr "Otvori posljednju _sesiju" -#: ../midori/midori-browser.c:4997 -msgid "Open the tabs saved in the last session" -msgstr "Otvori kartice spremljene u posljednjoj sesiji" - -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:5418 msgid "_Help" msgstr "_Pomoć" -#: ../midori/midori-browser.c:5001 -msgid "_Contents" -msgstr "_Sadržaji" - -#: ../midori/midori-browser.c:5002 -msgid "Show the documentation" -msgstr "Pokaži dokumentaciju" - -#: ../midori/midori-browser.c:5004 +#: ../midori/midori-browser.c:5420 msgid "_Frequent Questions" msgstr "_Česta pitanja" -#: ../midori/midori-browser.c:5005 -msgid "Show the Frequently Asked Questions" -msgstr "Pokaži često postavljana pitanja" - -#: ../midori/midori-browser.c:5007 -msgid "_Report a Bug" -msgstr "_Prijavite problem" - -#: ../midori/midori-browser.c:5008 -msgid "Open Midori's bug tracker" -msgstr "" - -#: ../midori/midori-browser.c:5011 -msgid "Show information about the program" -msgstr "Prikaži informacije o programu" +#: ../midori/midori-browser.c:5423 +msgid "_Report a Problem..." +msgstr "_Prijavite problem..." -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:5435 msgid "_Menubar" msgstr "_Traka izbornika" -#: ../midori/midori-browser.c:5020 -msgid "Show menubar" -msgstr "Pokaži traku izbornika" - -#: ../midori/midori-browser.c:5023 +#: ../midori/midori-browser.c:5439 msgid "_Navigationbar" msgstr "_Navigacijska traka" -#: ../midori/midori-browser.c:5024 -msgid "Show navigationbar" -msgstr "Pokaži navigacijsku traku" - -#: ../midori/midori-browser.c:5027 +#: ../midori/midori-browser.c:5443 msgid "Side_panel" msgstr "Bočni_stupac" -#: ../midori/midori-browser.c:5028 -msgid "Show sidepanel" -msgstr "Pokaži bočni stupac" +#: ../midori/midori-browser.c:5444 +msgid "Sidepanel" +msgstr "Bočni stupac" -#: ../midori/midori-browser.c:5031 +#: ../midori/midori-browser.c:5447 msgid "_Bookmarkbar" msgstr "_Traka zabilješki" -#: ../midori/midori-browser.c:5032 -msgid "Show bookmarkbar" -msgstr "Pokaži traku zabilješki" - -#: ../midori/midori-browser.c:5035 -msgid "_Transferbar" -msgstr "_Traka prijenosa" - -#: ../midori/midori-browser.c:5036 -msgid "Show transferbar" -msgstr "Pokaži traku prijenosa" - -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:5451 msgid "_Statusbar" msgstr "_Statusna traka" -#: ../midori/midori-browser.c:5040 -msgid "Show statusbar" -msgstr "Pokaži statusnu traku" - -#: ../midori/midori-browser.c:5048 +#: ../midori/midori-browser.c:5460 ../midori/midori-websettings.c:312 msgid "_Automatic" msgstr "_Automatski" -#: ../midori/midori-browser.c:5051 ../midori/midori-websettings.c:220 -msgid "Chinese (BIG5)" -msgstr "Kineski (BIG5)" +#: ../midori/midori-browser.c:5463 ../midori/midori-websettings.c:236 +msgid "Chinese Traditional (BIG5)" +msgstr "Tradicionalni kineski (BIG5)" + +#: ../midori/midori-browser.c:5466 ../midori/midori-websettings.c:237 +msgid "Chinese Simplified (GB18030)" +msgstr "Pojednostavljeni kineski (GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5055 +#: ../midori/midori-browser.c:5470 msgid "Japanese (SHIFT__JIS)" msgstr "Japanski (SHIFT__JIS)" -#: ../midori/midori-browser.c:5058 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5473 ../midori/midori-websettings.c:239 msgid "Korean (EUC-KR)" msgstr "Korejski (EUC-KR)" -#: ../midori/midori-browser.c:5061 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5476 ../midori/midori-websettings.c:240 msgid "Russian (KOI8-R)" msgstr "Ruski (KOI8-R)" -#: ../midori/midori-browser.c:5064 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5479 ../midori/midori-websettings.c:241 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5067 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5482 ../midori/midori-websettings.c:242 msgid "Western (ISO-8859-1)" msgstr "Zapadni (ISO-8859-1)" -#: ../midori/midori-browser.c:5585 +#: ../midori/midori-browser.c:5485 ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:318 ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "Prilagođeno..." + +#: ../midori/midori-browser.c:5991 msgid "_Separator" msgstr "_Razdjelnik" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5998 msgid "_Location..." msgstr "_Lokacija..." -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:6000 msgid "Open a particular location" msgstr "Otvori određenu lokaciju" -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:6022 msgid "_Web Search..." msgstr "_Web pretraživanje..." -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:6024 msgid "Run a web search" msgstr "Pokreni web pretraživanje" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:6051 msgid "Reopen a previously closed tab or window" msgstr "Ponovno otvori prethodno zatvorenu karticu ili prozor" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:6068 +msgid "Show the saved bookmarks" +msgstr "Pokaži spremljene zabilješke" + +#: ../midori/midori-browser.c:6085 msgid "_Tools" msgstr "_Alati" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:6101 msgid "_Window" msgstr "_Prozor" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:6103 msgid "Show a list of all open tabs" msgstr "Pokaži listu svih otvorenih kartica" -#: ../midori/midori-browser.c:5689 +#: ../midori/midori-browser.c:6117 msgid "_Menu" msgstr "_Izbornik" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:6119 msgid "Menu" msgstr "Izbornik" -#: ../midori/midori-browser.c:6256 +#: ../midori/midori-browser.c:6933 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekivana postavka '%s'" -#: ../midori/midori-locationaction.c:390 +#: ../midori/midori-extension.c:329 #, c-format -msgid "Failed to select from history\n" -msgstr "Neuspjeli odabir iz povijesti\n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "Konfiguracija proširenja '%s' ne može biti učitana: %s\n" -#: ../midori/midori-locationaction.c:474 +#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "Traži %s" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Konfiguracija proširenja '%s' ne može biti spremljena: %s\n" -#: ../midori/midori-locationaction.c:497 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "Traži pomoću %s" -#: ../midori/midori-locationaction.c:1305 +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Traži pomoću..." + +#: ../midori/midori-locationaction.c:537 #, c-format -msgid "Failed to execute database statement\n" -msgstr "" +msgid "Failed to select from history\n" +msgstr "Neuspjeli odabir iz povijesti\n" + +#: ../midori/midori-locationaction.c:624 +#, c-format +msgid "Search for %s" +msgstr "Traži %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1361 +#: ../midori/midori-locationaction.c:1398 msgid "Paste and p_roceed" msgstr "Zalijepi i n_astavi" -#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 -msgid "Detach chosen panel from the window" +#: ../midori/midori-locationaction.c:1739 +msgid "Not verified" +msgstr "Nije provjereno" + +#: ../midori/midori-locationaction.c:1759 +msgid "Verified and encrypted connection" +msgstr "Provjerena i šifrirana veza" + +#: ../midori/midori-locationaction.c:1771 +msgid "Open, unencrypted connection" msgstr "" -#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 -#: ../midori/midori-panel.c:596 ../midori/midori-panel.c:599 +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" msgstr "Poravnaj bočni stupac desno" -#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Zatvori panel" -#: ../midori/midori-panel.c:597 ../midori/midori-panel.c:600 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Poravnaj bočni stupac lijevo" -#: ../midori/midori-panel.c:754 -msgid "Hide operating controls" -msgstr "" - -#: ../midori/midori-websettings.c:200 -msgid "Show Blank page" -msgstr "Pokaži praznu stranicu" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "Pokaži brzo biranje" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" msgstr "Pokaži početnu stranicu" -#: ../midori/midori-websettings.c:202 -msgid "Show last open tabs" -msgstr "Pokaži zadnje otvorene kartice" - -#: ../midori/midori-websettings.c:204 -msgid "Show last tabs without loading" -msgstr "Pokaži zadnje kartice bez učitavanja" - -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:238 msgid "Japanese (SHIFT_JIS)" msgstr "Japanski (SHIFT_JIS)" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:258 msgid "New tab" msgstr "Nova kartica" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:259 msgid "New window" msgstr "Novi prozor" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:260 msgid "Current tab" msgstr "Trenutna kartica" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:275 msgid "Default" msgstr "Zadano" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:276 msgid "Icons" msgstr "Ikone" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:277 msgid "Small icons" msgstr "Male ikone" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:278 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:279 msgid "Icons and text" msgstr "Ikone i tekst" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:280 msgid "Text beside icons" msgstr "Tekst pored ikona" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:295 msgid "Automatic (GNOME or environment)" msgstr "Automatski (GNOME ili okruženje)" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:296 msgid "HTTP proxy server" msgstr "HTTP proxy poslužitelj" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:297 msgid "No proxy server" msgstr "Nema proxy poslužitelja" -#: ../midori/midori-websettings.c:295 -msgid "All cookies" -msgstr "Svi kolačići" +#: ../midori/midori-websettings.c:314 +msgid "Safari" +msgstr "Safari" -#: ../midori/midori-websettings.c:296 -msgid "Session cookies" -msgstr "Kolačići sesije" - -#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 -msgid "None" -msgstr "Nijedan" - -#: ../midori/midori-websettings.c:313 -msgid "Safari" -msgstr "Safari" - -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:315 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:316 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:317 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:401 msgid "Remember last window size" msgstr "Zapamti zadnu veličinu prozora" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:402 msgid "Whether to save the last window size" msgstr "Da li spremiti zadnju veličinu prozora" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:410 msgid "Last window width" msgstr "Zadnja širina prozora" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:411 msgid "The last saved window width" msgstr "Zadnja sačuvana širina prozora" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:419 msgid "Last window height" msgstr "zadnja visina prozora" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:420 msgid "The last saved window height" msgstr "Zadnja sačuvana visina prozora" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:445 msgid "Last panel position" msgstr "Zadnja pozicija ploče" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:446 msgid "The last saved panel position" msgstr "Zadnja spremljena pozicija ploče" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:455 msgid "Last panel page" msgstr "Zadnja stranica ploče" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:456 msgid "The last saved panel page" msgstr "Zadnja spremljena stranica ploče" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:464 msgid "Last Web search" msgstr "Zadnje Web pretraživanje" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:465 msgid "The last saved Web search" msgstr "Zadnje sačuvano Web pretraživanje" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:474 msgid "Show Menubar" msgstr "Pokaži traku izbornika" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:475 msgid "Whether to show the menubar" msgstr "Da li pokazati izbornik" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:483 msgid "Show Navigationbar" msgstr "Pokaži navigacijsku traku" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:484 msgid "Whether to show the navigationbar" msgstr "Da li pokazati navigacijsku traku" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:492 msgid "Show Bookmarkbar" msgstr "Pokaži traku zabilješki" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:493 msgid "Whether to show the bookmarkbar" msgstr "Da li pokazati traku zabilješki" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:501 msgid "Show Panel" msgstr "Pokaži ploču" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:502 msgid "Whether to show the panel" msgstr "Da li pokazati ploču" -#: ../midori/midori-websettings.c:485 -msgid "Show Transferbar" -msgstr "Pokaži traku prijenosa" - -#: ../midori/midori-websettings.c:486 -msgid "Whether to show the transferbar" -msgstr "Da li pokazati traku prijenosa" - -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:510 msgid "Show Statusbar" msgstr "Pokaži statusnu traku" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:511 msgid "Whether to show the statusbar" msgstr "Da li pokazati statusnu traku" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:520 msgid "Toolbar Style:" msgstr "Stil alatne trake" -#: ../midori/midori-websettings.c:505 -msgid "The style of the toolbar" -msgstr "" - #: ../midori/midori-websettings.c:521 -msgid "Show progress in location entry" -msgstr "" - -#: ../midori/midori-websettings.c:522 -msgid "Whether to show loading progress in the location entry" -msgstr "" - -#: ../midori/midori-websettings.c:537 -msgid "Search engines in location completion" -msgstr "" - -#: ../midori/midori-websettings.c:538 -msgid "Whether to show search engines in the location completion" -msgstr "" +msgid "The style of the toolbar" +msgstr "Stil alatne trake" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:530 msgid "Toolbar Items" msgstr "Stavke alatne trake" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:531 msgid "The items to show on the toolbar" msgstr "Stavke za prikazivanje u alatnoj traci" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:539 msgid "Compact Sidepanel" msgstr "Zbijeni bočni stupac" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:540 msgid "Whether to make the sidepanel compact" msgstr "Da li bočni stupac učiniti zbijenim" -#: ../midori/midori-websettings.c:571 -msgid "Show operating controls of the panel" -msgstr "" - -#: ../midori/midori-websettings.c:572 -msgid "Whether to show the operating controls of the panel" -msgstr "" - -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:555 msgid "Align sidepanel on the right" msgstr "Poravnaj bočni stupac desno" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:556 msgid "Whether to align the sidepanel on the right" msgstr "Da li poravnati bočni stupac lijevo" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:571 msgid "Open panels in separate windows" msgstr "Otvori ploče u zasebnim prozorima" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:572 msgid "Whether to always open panels in separate windows" msgstr "Da li uvijek otvarati ploče u odvojenim prozorima" -#: ../midori/midori-websettings.c:613 +#: ../midori/midori-websettings.c:581 msgid "When Midori starts:" msgstr "Kad se Midori pokrene:" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:582 msgid "What to do when Midori starts" msgstr "Što učiniti kad se Midori pokrene" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:591 msgid "Homepage:" msgstr "Početna stranica:" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:592 msgid "The homepage" msgstr "početna stranica" -#: ../midori/midori-websettings.c:639 +#: ../midori/midori-websettings.c:607 msgid "Show crash dialog" msgstr "Pokaži dijalog rušenja" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:608 msgid "Show a dialog after Midori crashed" msgstr "Pokaži dijalog nakon što se Midori sruši" -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:656 -msgid "Show speed dial in new tabs" -msgstr "Pokaži brzo biranje u novim karticama" - -#: ../midori/midori-websettings.c:657 -msgid "Show speed dial in newly opened tabs" -msgstr "Pokaži brzo biranje u novootvorenim karticama" - -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:616 msgid "Save downloaded files to:" msgstr "Spremi preuzimanja u" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:617 msgid "The folder downloaded files are saved to" -msgstr "" - -#: ../midori/midori-websettings.c:687 -msgid "Ask for the destination folder" -msgstr "Pitaj za odredišni direktorij" - -#: ../midori/midori-websettings.c:688 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "Da li pitati za odredišni direktorij kada preuzimam datoteku" - -#: ../midori/midori-websettings.c:707 -msgid "Notify when a transfer has been completed" -msgstr "Obavijesti kad je prijenos kompletiran" - -#: ../midori/midori-websettings.c:708 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "Da li pokazati obavijest kada je prijenos dovršen" +msgstr "Mapa preuzetih datoteka je spremljena u" -#: ../midori/midori-websettings.c:720 -msgid "Download Manager" -msgstr "Upravitelj preuzimanja" - -#: ../midori/midori-websettings.c:721 -msgid "An external download manager" -msgstr "Vanjski upravitelj preuzimanja" - -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:625 msgid "Text Editor" msgstr "Uređivač teksta" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:626 msgid "An external text editor" msgstr "Vanjski uređivač teksta" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:641 msgid "News Aggregator" msgstr "" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:642 msgid "An external news aggregator" msgstr "" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:650 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:651 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:763 +#: ../midori/midori-websettings.c:659 msgid "Preferred Encoding" msgstr "Željeno kodiranje" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:660 msgid "The preferred character encoding" msgstr "Željeno kodiranje znakova" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:670 msgid "Always Show Tabbar" msgstr "Uvijek pokaži Traku kartica" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:671 msgid "Always show the tabbar" msgstr "Uvijek pokaži traku kartica" -#: ../midori/midori-websettings.c:783 +#: ../midori/midori-websettings.c:684 msgid "Close Buttons on Tabs" -msgstr "" +msgstr "Zatvori dugmad na karticama" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:685 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:792 +#: ../midori/midori-websettings.c:710 msgid "Open new pages in:" msgstr "Otvori nove stranice u:" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:711 msgid "Where to open new pages" msgstr "Gdje otvoriti nove stranice" -#: ../midori/midori-websettings.c:802 -msgid "Open external pages in:" -msgstr "Otvori vanjske stranice u:" - -#: ../midori/midori-websettings.c:803 -msgid "Where to open externally opened pages" -msgstr "Gdje otvoriti izvanjski otvorene stranice" - -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:720 msgid "Middle click opens Selection" msgstr "Srednji klik otvara odabir" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:721 msgid "Load an address from the selection via middle click" msgstr "Učitaj adresu iz odabira pomoću srednjeg klika" -#: ../midori/midori-websettings.c:821 +#: ../midori/midori-websettings.c:729 msgid "Open tabs in the background" msgstr "Otvori kartice u pozadini" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:730 msgid "Whether to open new tabs in the background" msgstr "Da li otvoriti nove kartice u pozadini" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:738 msgid "Open Tabs next to Current" msgstr "Otvori kartice do trenutne" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:739 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:747 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:748 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:758 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Učitaj slike automatski" -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:759 msgid "Load and display images automatically" msgstr "Učitaj i prikaži slike automatski" -#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:766 ../extensions/statusbar-features.c:143 msgid "Enable scripts" msgstr "Omogući skripte" -#: ../midori/midori-websettings.c:859 +#: ../midori/midori-websettings.c:767 msgid "Enable embedded scripting languages" msgstr "" -#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:774 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" msgstr "Omogući Netscape priključke" -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:775 msgid "Enable embedded Netscape plugin objects" msgstr "" -#: ../midori/midori-websettings.c:883 +#: ../midori/midori-websettings.c:790 +msgid "Enable Spell Checking" +msgstr "Omogući provjeru pravopisa" + +#: ../midori/midori-websettings.c:791 +msgid "Enable spell checking while typing" +msgstr "Omogući provjeru pravopisa dok pišem" + +#: ../midori/midori-websettings.c:797 msgid "Enable HTML5 database support" msgstr "Omogući podršku za HTML5 bazu podataka" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:798 msgid "Whether to enable HTML5 database support" msgstr "Da li omogućiti podršku za HTML bazu podataka" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:804 msgid "Enable HTML5 local storage support" msgstr "Omogući podršku za HTML5 lokalnu pohranu" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:805 msgid "Whether to enable HTML5 local storage support" msgstr "Da li omogućiti podršku za HTML5 lokalnu pohranu" -#: ../midori/midori-websettings.c:899 +#: ../midori/midori-websettings.c:811 msgid "Enable offline web application cache" msgstr "" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:812 msgid "Whether to enable offline web application cache" msgstr "" -#: ../midori/midori-websettings.c:925 +#: ../midori/midori-websettings.c:828 +msgid "Flash window on background tabs" +msgstr "" + +#: ../midori/midori-websettings.c:829 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "" + +#: ../midori/midori-websettings.c:837 +msgid "Enable WebGL support" +msgstr "Omogući WebGL podršku " + +#: ../midori/midori-websettings.c:838 +msgid "Allow websites to use OpenGL rendering" +msgstr "" + +#: ../midori/midori-websettings.c:864 msgid "Zoom Text and Images" msgstr "Zumiraj tekst i slike" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:865 msgid "Whether to zoom text and images" msgstr "Da li zumirati tekst i slike" -#: ../midori/midori-websettings.c:941 +#: ../midori/midori-websettings.c:880 msgid "Find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:881 msgid "Whether to automatically find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:957 +#: ../midori/midori-websettings.c:896 msgid "Kinetic scrolling" msgstr "" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:897 msgid "Whether scrolling should kinetically move according to speed" msgstr "" -#: ../midori/midori-websettings.c:966 -msgid "Accept cookies" -msgstr "Prihvati kolačiće" +#: ../midori/midori-websettings.c:905 +msgid "Delete old Cookies after:" +msgstr "Obriši stare kolačiće nakon:" -#: ../midori/midori-websettings.c:967 -msgid "What type of cookies to accept" -msgstr "Koju vrstu kolačića prihvatiti" - -#: ../midori/midori-websettings.c:976 -msgid "Maximum cookie age" -msgstr "" - -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:906 msgid "The maximum number of days to save cookies for" msgstr "Maksimalni broj dana za spremanje kolačića" -#: ../midori/midori-websettings.c:986 -msgid "Maximum history age" +#: ../midori/midori-websettings.c:922 +msgid "Only accept Cookies from sites you visit" +msgstr "Prihvati kolačiće samo sa stranica koje ste posjetili" + +#: ../midori/midori-websettings.c:923 +msgid "Block cookies sent by third-party websites" msgstr "" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:937 +msgid "Delete pages from history after:" +msgstr "Obriši stranice iz povijesti nakon:" + +#: ../midori/midori-websettings.c:938 msgid "The maximum number of days to save the history for" msgstr "Maksimalni broj dana za spremanje povijesti" -#: ../midori/midori-websettings.c:995 -msgid "Remember last downloaded files" -msgstr "Zapamti zadnje preuzete datoteke" - -#: ../midori/midori-websettings.c:996 -msgid "Whether the last downloaded files are saved" -msgstr "" - -#: ../midori/midori-websettings.c:1013 +#: ../midori/midori-websettings.c:953 msgid "Proxy server" msgstr "Proxy poslužitelj" -#: ../midori/midori-websettings.c:1014 +#: ../midori/midori-websettings.c:954 msgid "The type of proxy server to use" -msgstr "" +msgstr "Tip proxy poslužitelja za uporabu" -#: ../midori/midori-websettings.c:1023 +#: ../midori/midori-websettings.c:963 msgid "HTTP Proxy Server" msgstr "HTTP Proxy poslužitelj" -#: ../midori/midori-websettings.c:1024 +#: ../midori/midori-websettings.c:964 msgid "The proxy server used for HTTP connections" msgstr "Proxy poslužitelj korišten za HTTP spajanja" +#: ../midori/midori-websettings.c:979 +msgid "Port" +msgstr "Port" + +#: ../midori/midori-websettings.c:980 +msgid "The proxy server port used for HTTP connections" +msgstr "Proxy poslužitelj korišten za HTTP spajanja" + +#: ../midori/midori-websettings.c:998 +msgid "The maximum size of cached pages on disk" +msgstr "" + #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1040 +#: ../midori/midori-websettings.c:1015 msgid "Identify as" msgstr "Predstavi se kao" -#: ../midori/midori-websettings.c:1041 +#: ../midori/midori-websettings.c:1016 msgid "What to identify as to web pages" -msgstr "" +msgstr "Kako se predstaviti na web stranicama" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1032 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1033 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1049 msgid "Preferred languages" msgstr "Željeni jezici" -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:1050 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "" -#: ../midori/midori-websettings.c:1089 +#: ../midori/midori-websettings.c:1065 msgid "Clear private data" msgstr "Očisti privatne podatke" -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1066 msgid "The private data selected for deletion" msgstr "Privatni podaci odabrani za brisanje" -#. 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:1227 ../midori/midori-view.c:4442 -#: ../midori/midori-view.c:4446 +#: ../midori/midori-websettings.c:1081 +msgid "Clear data" +msgstr "Očisti podatke" + +#: ../midori/midori-websettings.c:1082 +msgid "The data selected for deletion" +msgstr "Podaci odabrani za brisanje" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1131 +msgid "Strip referrer details sent to websites" +msgstr "" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1133 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "" + +#: ../midori/midori-websettings.c:1147 +msgid "Always use my font choices" +msgstr "Uvijek koristi moj izbor fonta" + +#: ../midori/midori-websettings.c:1148 +msgid "Override fonts picked by websites with user preferences" +msgstr "" + +#: ../midori/midori-view.c:1375 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s želi spremiti HTML5 bazu podataka." + +#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1411 +msgid "_Deny" +msgstr "_Uskrati" + +#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1411 +msgid "_Allow" +msgstr "_Dopusti" + +#: ../midori/midori-view.c:1407 +#, c-format +msgid "%s wants to know your location." +msgstr "%s želi znati vašu lokaciju." + +#: ../midori/midori-view.c:1500 #, c-format msgid "Error - %s" msgstr "Greška - %s" -#: ../midori/midori-view.c:1228 +#: ../midori/midori-view.c:1501 #, c-format msgid "The page '%s' couldn't be loaded." -msgstr "Stranica '%s ne može biti učitana" +msgstr "Stranica '%s' ne može biti učitana" -#: ../midori/midori-view.c:1230 +#: ../midori/midori-view.c:1503 msgid "Try again" msgstr "Pokušaj ponovo" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1249 -#, c-format -msgid "Not found - %s" -msgstr "NIje pronađeno - %s" - -#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 +#: ../midori/midori-view.c:1701 ../midori/midori-view.c:2623 #, c-format msgid "Send a message to %s" msgstr "Pošalji poruku %s" -#: ../midori/midori-view.c:2060 ../midori/midori-view.c:2446 +#: ../midori/midori-view.c:2453 ../midori/midori-view.c:2779 msgid "Inspect _Element" msgstr "" -#: ../midori/midori-view.c:2112 ../midori/midori-view.c:2182 +#: ../midori/midori-view.c:2505 msgid "Open Link in New _Tab" msgstr "Otvori poveznicu u novoj _kartici" -#: ../midori/midori-view.c:2116 +#: ../midori/midori-view.c:2509 msgid "Open Link in _Foreground Tab" msgstr "Otvori poveznicu u _prednjoj kartici" -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2510 msgid "Open Link in _Background Tab" msgstr "Otvori poveznicu u _pozadinskoj kartici" -#: ../midori/midori-view.c:2120 ../midori/midori-view.c:2189 +#: ../midori/midori-view.c:2513 msgid "Open Link in New _Window" msgstr "Otvori poveznicu u novom _prozoru" -#: ../midori/midori-view.c:2123 +#: ../midori/midori-view.c:2516 msgid "Open Link as Web A_pplication" -msgstr "Otvori poveznicu kao Web A_plikaciju" +msgstr "Otvori poveznicu kao web p_rogram" -#: ../midori/midori-view.c:2126 +#: ../midori/midori-view.c:2521 msgid "Copy Link de_stination" msgstr "Kopiraj odredište po_veznice" -#: ../midori/midori-view.c:2129 ../midori/midori-view.c:2201 -msgid "_Save Link destination" -msgstr "_Spremi odredište poveznice" - -#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2195 -msgid "_Download Link destination" -msgstr "_Preuzmi odredište poveznice" - -#: ../midori/midori-view.c:2134 ../midori/midori-view.c:2164 -#: ../midori/midori-view.c:2206 -msgid "Download with Download _Manager" -msgstr "Preuzimanje pomoću upravitelja _preuzimanjima" - -#: ../midori/midori-view.c:2143 +#: ../midori/midori-view.c:2537 msgid "Open _Image in New Tab" msgstr "Otvori _sliku u novoj kartici" -#: ../midori/midori-view.c:2146 +#: ../midori/midori-view.c:2540 msgid "Copy Image _Address" msgstr "Kopiraj adresu _slike" -#: ../midori/midori-view.c:2149 +#: ../midori/midori-view.c:2543 msgid "Save I_mage" -msgstr "Sačuvaj S_liku" +msgstr "Sačuvaj s_liku" -#: ../midori/midori-view.c:2150 -msgid "Download I_mage" -msgstr "Preuzmi S_liku" +#: ../midori/midori-view.c:2546 +msgid "Open in Image _Viewer" +msgstr "Otvori u pregledniku _slika" -#: ../midori/midori-view.c:2157 +#: ../midori/midori-view.c:2553 msgid "Copy Video _Address" msgstr "Kopiraj video _adresu" -#: ../midori/midori-view.c:2160 +#: ../midori/midori-view.c:2556 msgid "Save _Video" msgstr "Spremi _video" -#: ../midori/midori-view.c:2160 +#: ../midori/midori-view.c:2556 msgid "Download _Video" msgstr "Preuzmi _video" -#: ../midori/midori-view.c:2223 +#: ../midori/midori-view.c:2582 msgid "Search _with" msgstr "Traži _pomoću" -#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2614 msgid "_Search the Web" msgstr "_Pretraži web" -#: ../midori/midori-view.c:2287 +#: ../midori/midori-view.c:2631 msgid "Open Address in New _Tab" msgstr "Otvori adresu u novoj _kartici" -#: ../midori/midori-view.c:2591 +#: ../midori/midori-view.c:2684 +msgid "Open _Frame in New Tab" +msgstr "Otvori _okvir u novoj kartici" + +#: ../midori/midori-view.c:2988 msgid "Open or download file" msgstr "Otvori ili preuzmi datoteku" -#: ../midori/midori-view.c:2610 +#: ../midori/midori-view.c:3008 #, c-format msgid "File Type: '%s'" msgstr "Tip datoteke: '%s'" -#: ../midori/midori-view.c:2613 +#: ../midori/midori-view.c:3010 #, c-format msgid "File Type: %s ('%s')" msgstr "Tip datoteke: %s ('%s')" -#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2617 +#: ../midori/midori-view.c:3014 +#, c-format +msgid "File Name: %s" +msgstr "Ime datoteke: %s" + +#: ../midori/midori-view.c:3041 #, c-format msgid "Open %s" msgstr "Otvori %s" -#: ../midori/midori-view.c:3158 +#: ../midori/midori-view.c:3700 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:3439 -msgid "Speed dial" +#: ../midori/midori-view.c:4047 +msgid "Speed Dial" msgstr "Brzo biranje" -#: ../midori/midori-view.c:3440 +#: ../midori/midori-view.c:4048 ../midori/midori-view.c:4144 msgid "Click to add a shortcut" msgstr "Klik za dodavanje prečaca" -#: ../midori/midori-view.c:3441 +#: ../midori/midori-view.c:4049 msgid "Enter shortcut address" msgstr "Unesi adresu prečaca" -#: ../midori/midori-view.c:3442 +#: ../midori/midori-view.c:4050 msgid "Enter shortcut title" msgstr "Unesi naslov prečaca" -#: ../midori/midori-view.c:3443 +#: ../midori/midori-view.c:4051 msgid "Are you sure you want to delete this shortcut?" msgstr "jeste li sigurni da želite izbrisati ovaj prečac?" -#: ../midori/midori-view.c:3444 -msgid "Set number of columns and rows" -msgstr "Postavi broj stupaca i redova" +#: ../midori/midori-view.c:4213 +#, c-format +msgid "No documentation installed" +msgstr "Dokumentacija nije instalirana" -#: ../midori/midori-view.c:3445 -msgid "Enter number of columns and rows:" -msgstr "Unesi broj stupaca i redova" +#: ../midori/midori-view.c:4289 +msgid "Midori doesn't store any personal data:" +msgstr "Midori ne pohranjuje osobne podatke" -#: ../midori/midori-view.c:3446 -msgid "Invalid input for the size of the speed dial" -msgstr "Neispravni unos za veličinu brzog biranja" +#: ../midori/midori-view.c:4290 +msgid "No history or web cookies are being saved." +msgstr "Ni povijest ni kolačići nisu spremljeni." -#: ../midori/midori-view.c:3447 -msgid "Thumb size:" +#: ../midori/midori-view.c:4291 +msgid "Extensions are disabled." +msgstr "Proširenja su onemogućena." + +#: ../midori/midori-view.c:4292 +msgid "HTML5 storage, local database and application caches are disabled." msgstr "" -#: ../midori/midori-view.c:3448 -msgid "Small" -msgstr "Male" +#: ../midori/midori-view.c:4293 +msgid "Midori prevents websites from tracking the user:" +msgstr "Midovi sprečava web stranice da prate korisnika:" -#: ../midori/midori-view.c:3449 -msgid "Medium" -msgstr "Srednje" +#: ../midori/midori-view.c:4294 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "" -#: ../midori/midori-view.c:3450 -msgid "Big" -msgstr "Velike" +#: ../midori/midori-view.c:4295 +msgid "DNS prefetching is disabled." +msgstr "" -#: ../midori/midori-view.c:3476 -#, c-format -msgid "Document cannot be displayed" -msgstr "Dokument ne može biti prikazan" +#: ../midori/midori-view.c:4296 +msgid "The language and timezone are not revealed to websites." +msgstr "Jezik i vremenska zona se ne otkrivaju web stranicama." -#: ../midori/midori-view.c:3499 -#, c-format -msgid "No documentation installed" -msgstr "Dokumentacija nije instalirana" +#: ../midori/midori-view.c:4297 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "Web stranice ne mogu izlistati Flash ili druge Netscape priključke." + +#: ../midori/midori-view.c:4346 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "" +"Brojevi verzije u zagradama prikazuju verziju korištenu pri pokretanju." -#: ../midori/midori-view.c:3618 +#: ../midori/midori-view.c:4402 msgid "Page loading delayed" msgstr "Odgođeno učitavanje stranice" -#: ../midori/midori-view.c:3619 +#: ../midori/midori-view.c:4403 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" -#: ../midori/midori-view.c:3620 +#: ../midori/midori-view.c:4404 msgid "Load Page" msgstr "Učitaj stranicu" -#: ../midori/midori-view.c:3764 +#: ../midori/midori-view.c:4570 msgid "Blank page" msgstr "Prazna stranica" -#: ../midori/midori-view.c:4018 +#: ../midori/midori-view.c:4832 msgid "_Duplicate Tab" msgstr "_Udvostruči karticu" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4837 msgid "Show Tab _Label" msgstr "Pokaži oznaku _kartice" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4837 msgid "Show Tab _Icon Only" msgstr "Prikaži samo _ikone kartice" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4843 msgid "Close ot_her Tabs" msgstr "Zatvori dr_uge kartice" -#: ../midori/midori-view.c:4680 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5656 +msgid "previous" +msgstr "prethodno" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5675 +msgid "next" +msgstr "slijedeće" + +#: ../midori/midori-view.c:5688 msgid "Print background images" msgstr "Ispis pozadinskih slika" -#: ../midori/midori-view.c:4681 +#: ../midori/midori-view.c:5689 msgid "Whether background images should be printed" msgstr "" -#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:5721 msgid "Features" -msgstr "" - -#. Page "General" -#: ../midori/midori-preferences.c:301 -msgid "General" -msgstr "Osnovno" +msgstr "Obilježja" -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Pokretanje" -#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Koristi _trenutnu stranicu" + +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Koristi trenutnu stranicu kao početnu stranicu" -#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Prijenosi" - #. Page "Appearance" -#: ../midori/midori-preferences.c:352 -msgid "Appearance" -msgstr "Izgled" - -#: ../midori/midori-preferences.c:353 -msgid "Font settings" -msgstr "Postavke fonta" - -#: ../midori/midori-preferences.c:355 -msgid "Default Font Family" -msgstr "" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Fontovi" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Zadana obitelj fonta" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" -msgstr "" +msgstr "Zadana obitelj fonta koje se koristi za prikaz teksta" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" -msgstr "" +msgstr "Zadana veličina fonta za prikaz teksta" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" msgstr "" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Najmanja veličina fonta" -#: ../midori/midori-preferences.c:374 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "Najmanja veličina fonta korištena za prikaz teksta" #. Page "Behavior" -#: ../midori/midori-preferences.c:383 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Ponašanje" -#: ../midori/midori-preferences.c:396 -msgid "Enforce 96 dots per inch" -msgstr "" - -#: ../midori/midori-preferences.c:397 -msgid "Enforce a video dot density of 96 DPI" -msgstr "" - -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "" -#: ../midori/midori-preferences.c:422 -msgid "Spell Checking" -msgstr "Provjera pravopisa" - -#: ../midori/midori-preferences.c:424 -msgid "Enable Spell Checking" -msgstr "Omogući provjeru pravopisa" - -#: ../midori/midori-preferences.c:425 -msgid "Enable spell checking while typing" -msgstr "Omogući provjeru pravopisa dok pišem" - -#: ../midori/midori-preferences.c:427 -msgid "Spelling dictionaries:" -msgstr "Pravopisni rječnici" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:431 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" -msgstr "" -"Zarezom odijeljena lista jezika koja će se koristiti za provjeru pravopisa," -"npr. \"en_GB,de_DE\"" - #. Page "Interface" -#: ../midori/midori-preferences.c:437 -msgid "Interface" -msgstr "Sučelje" - -#: ../midori/midori-preferences.c:438 -msgid "Navigationbar" -msgstr "Navigacijska traka" - -#: ../midori/midori-preferences.c:448 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Pretraživanje" -#. Page "Applications" -#: ../midori/midori-preferences.c:470 -msgid "Applications" -msgstr "Programi" - -#: ../midori/midori-preferences.c:471 -msgid "External applications" -msgstr "Vanjski programi" - #. Page "Network" -#: ../midori/midori-preferences.c:487 ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "Mreža" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:463 msgid "Hostname" msgstr "Ime računala" -#. Page "Privacy" -#: ../midori/midori-preferences.c:513 -msgid "Privacy" -msgstr "Privatnost" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "MB" -#: ../midori/midori-preferences.c:514 -msgid "Web Cookies" -msgstr "Web kolačići" - -#: ../midori/midori-preferences.c:523 ../midori/midori-preferences.c:537 -msgid "days" -msgstr "dana" - -#: ../midori/midori-searchaction.c:481 -msgid "Empty" -msgstr "Prazno" - -#: ../midori/midori-searchaction.c:914 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Dodaj tražilicu" -#: ../midori/midori-searchaction.c:914 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Uredi tražilicu" -#: ../midori/midori-searchaction.c:942 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Ime:" -#: ../midori/midori-searchaction.c:986 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Opis:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "_Ikona:" -#: ../midori/midori-searchaction.c:1000 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "" -#: ../midori/midori-searchaction.c:1231 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "Upravljaj tražilicama" -#: ../midori/midori-searchaction.c:1332 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "Koristi kao _zadano" -#: ../midori/sokoke.c:1303 -msgid "_Bookmark" -msgstr "_Zabilješka" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "Otvori pomoću" -#: ../midori/sokoke.c:1304 -msgid "_Bookmarks" -msgstr "_Zabilješke" - -#: ../midori/sokoke.c:1305 -msgid "Add Boo_kmark" -msgstr "Dodaj za_bilješku" - -#: ../midori/sokoke.c:1306 -msgid "_Console" -msgstr "" - -#: ../midori/sokoke.c:1307 -msgid "_Extensions" -msgstr "_Proširenja" - -#: ../midori/sokoke.c:1308 -msgid "_History" -msgstr "_Povijest" - -#: ../midori/sokoke.c:1309 -msgid "_Homepage" -msgstr "_Početna stranica" +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Izaberite program ili naredbu za otvaranje \"%s\":" -#: ../midori/sokoke.c:1310 -msgid "_Userscripts" -msgstr "_Korisničke skripte" +#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "Ne mogu pokrenuti vanjski program" -#: ../midori/sokoke.c:1311 -msgid "New _Tab" -msgstr "Nova _kartica" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d sat" +msgstr[1] "%d sati" +msgstr[2] "%d sata" + +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minuta" +msgstr[1] "%d minute" +msgstr[2] "%d minuta" + +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d sekunda" +msgstr[1] "%d sekunde" +msgstr[2] "%d sekundi" -#: ../midori/sokoke.c:1312 -msgid "_Transfers" -msgstr "_Prijenosi" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s od %s" -#: ../midori/sokoke.c:1313 -msgid "Netscape p_lugins" -msgstr "Netscape p_riključci" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr "(%s/s)" -#: ../midori/sokoke.c:1316 -msgid "New _Folder" -msgstr "Nova _mapa" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr "- %s preostalo" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:213 +#: ../toolbars/midori-findbar.c:291 msgid "_Inline Find:" msgstr "" -#: ../toolbars/midori-findbar.c:245 +#: ../toolbars/midori-findbar.c:317 msgid "Previous" msgstr "Prethodno" -#: ../toolbars/midori-findbar.c:251 +#: ../toolbars/midori-findbar.c:323 msgid "Next" msgstr "Slijedeće" -#: ../toolbars/midori-findbar.c:255 +#: ../toolbars/midori-findbar.c:327 msgid "Match Case" msgstr "" -#: ../toolbars/midori-findbar.c:264 +#: ../toolbars/midori-findbar.c:336 msgid "Highlight Matches" msgstr "" -#: ../toolbars/midori-findbar.c:275 +#: ../toolbars/midori-findbar.c:347 msgid "Close Findbar" msgstr "" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 -#, c-format -msgid "%s of %s" -msgstr "%s od %s" - -#: ../toolbars/midori-transferbar.c:123 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "Datoteka '%s' je preuzeta." -#: ../toolbars/midori-transferbar.c:126 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Prijenos završen" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "Preuzeta datoteka je pogrešna." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" + +#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Očisti sve" -#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 +#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 msgid "Some files are being downloaded" msgstr "Neke datoteke su preuzete" -#: ../toolbars/midori-transferbar.c:306 +#: ../toolbars/midori-transferbar.c:377 msgid "_Quit Midori" msgstr "_Isključi Midori" -#: ../toolbars/midori-transferbar.c:308 +#: ../toolbars/midori-transferbar.c:379 msgid "The transfers will be cancelled if Midori quits." msgstr "Prijenosi će biti odgođeni ako se Midori isključi" -#: ../panels/midori-bookmarks.c:116 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Zabilješke" -#: ../panels/midori-bookmarks.c:269 +#: ../panels/midori-bookmarks.c:257 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Neuspjeh u dodavanju stavki zabilješki: %s\n" -#: ../panels/midori-bookmarks.c:408 +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "Uredi odabrane zabilješke" -#: ../panels/midori-bookmarks.c:416 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "Izbriši odabrane zabilješke" -#: ../panels/midori-bookmarks.c:430 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" msgstr "Dodaj novu mapu" -#: ../panels/midori-bookmarks.c:562 ../panels/midori-history.c:572 +#: ../panels/midori-bookmarks.c:594 ../panels/midori-history.c:635 msgid "Separator" msgstr "Razdjelnik" -#: ../panels/midori-console.c:90 -msgid "Console" -msgstr "" - -#: ../panels/midori-console.c:351 -msgid "Copy _All" -msgstr "Kopiraj _sve" - -#: ../panels/midori-console.c:352 -msgid "Copy All" -msgstr "Kopiraj sve" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "Povijest" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Proširenja" +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "Danas" -#: ../panels/midori-history.c:146 -msgid "A week ago" -msgstr "Prije tjedan dana" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "Jučer" -#: ../panels/midori-history.c:148 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -2197,43 +2148,48 @@ msgstr[1] "% d dana prije" msgstr[2] "% d dana prije" -#: ../panels/midori-history.c:151 -msgid "Today" -msgstr "Danas" +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "Prije tjedan dana" -#: ../panels/midori-history.c:153 -msgid "Yesterday" -msgstr "Jučer" +#: ../panels/midori-history.c:232 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Neuspjelo uklanjanje stavke povijesti: %s\n" -#: ../panels/midori-history.c:324 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" msgstr "Jeste li sigurni da želite ukloniti sve stavke povijesti?" -#: ../panels/midori-history.c:369 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" msgstr "Zabilježi odabranu stavku povijesti" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" msgstr "Izbriši odabranu stavku povijesti" -#: ../panels/midori-history.c:386 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "Obriši cijelu povijest" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Prijenosi" + +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" msgstr "Otvori odredišni _direktorij" -#: ../panels/midori-transfers.c:484 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" msgstr "Kopiraj lokaciju po_veznice" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Potrebna ovjera" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" @@ -2241,207 +2197,244 @@ "Korisničko ime i lozinka su potrebni\n" "za otvaranje ove lokacije" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "Korisničko ime" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "Lozinka" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "_Zapamti lozinku" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Imenovana ikona '%s ne može biti učitana" -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 +#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Svojstvo '%s' nije valjano za %s" -#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 -#: ../extensions/addons.c:119 +#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Izaberi datoteku" -#: ../katze/katze-utils.c:564 +#: ../katze/katze-utils.c:506 msgid "Choose folder" msgstr "Izaberi mapu" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "Nijedan" + +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "1 sat" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "1 dan" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "1 tjedan" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "1 mjesec" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "1 godina" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Osobitosti za %s" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:473 msgid "Configure Advertisement filters" -msgstr "" +msgstr "Konfiguriraj filtere oglašavanja" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:504 #, 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:587 -msgid "Configure _Advertisement filters..." -msgstr "" - -#: ../extensions/adblock.c:841 +#: ../extensions/adblock.c:882 msgid "Edit rule" msgstr "Uredi pravilo" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:896 msgid "_Rule:" msgstr "_Pravilo:" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:950 msgid "Bl_ock image" msgstr "Bl_okiraj sliku" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:955 msgid "Bl_ock link" msgstr "Bl_okiraj poveznicu" -#: ../extensions/adblock.c:1492 +#: ../extensions/adblock.c:1670 msgid "Advertisement blocker" msgstr "" -#: ../extensions/adblock.c:1493 +#: ../extensions/adblock.c:1671 msgid "Block advertisements according to a filter list" +msgstr "Blokiraj oglašavanj sukladno sa listom filtera" + +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "" +"Izgleda da ova stranica sadrži korisničku skriptu.Želite li je instalirati?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "_Instaliraj korisničku skriptu" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" msgstr "" +"Izgleda da ova stranica sadrži korisnički stil..Želite li ga instalirati?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_Instaliraj korisnički stil" -#: ../extensions/addons.c:130 ../extensions/addons.c:490 +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Nemoj instalirati" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Korisničke skripte" -#: ../extensions/addons.c:135 ../extensions/addons.c:492 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" -msgstr "" +msgstr "Korisnički stilovi" -#: ../extensions/addons.c:191 ../extensions/addons.c:267 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Greška" -#: ../extensions/addons.c:231 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "Želite li izbrisati '%s'?" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "Izbriši korisničke skripte" -#: ../extensions/addons.c:238 +#: ../extensions/addons.c:428 msgid "Delete user style" -msgstr "" +msgstr "Izbriši korisnički stil" -#: ../extensions/addons.c:242 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." msgstr "Datoteka %sće biti trajno uklonjena" -#: ../extensions/addons.c:377 ../extensions/addons.c:454 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "Otvori u uređivaču teksta" -#: ../extensions/addons.c:379 ../extensions/addons.c:463 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Otvori odredišni direktorij" -#: ../extensions/addons.c:445 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "Dodaj novu dodatak" -#: ../extensions/addons.c:472 -msgid "Open target folder for selected addon" -msgstr "" - -#: ../extensions/addons.c:473 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "Ukloni odabrani dodatak" -#: ../extensions/addons.c:1420 -#, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "" - -#: ../extensions/addons.c:1421 ../extensions/addons.c:1583 +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" msgstr "Korisnički dodaci" -#: ../extensions/addons.c:1542 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "" -#: ../extensions/addons.c:1584 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" -msgstr "" +msgstr "Podrška za korisničke skripte i stilove" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "Obojane kartice" -#: ../extensions/colorful-tabs.c:203 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Upravitelj kolačićima" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "Izbriši sve" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 +#: ../extensions/cookie-manager/cookie-manager-page.c:105 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." msgstr "" +"Briše sve kolačiće.Ako je postavljen filter,biti će izbrisani samo oni " +"kolačići koji odgovaraju filteru." -#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "Proširi sve" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "Skupi sve" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" msgstr "Želite li izbrisati sve kolačiće?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Pitanje" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." msgstr "Biti će izbrisani samo kolačići koji odgovaraju filteru" -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "Na kraju sesije" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2458,15 +2451,15 @@ "Sigurno: %s\n" "Ističe: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Da" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "Ne" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" @@ -2475,56 +2468,44 @@ "Domena: %s\n" "Kolačići: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Ime" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "_Proširi sve" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "_Skupi sve" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 msgid "Filter:" msgstr "Filter:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 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" -msgstr "_Upravitelj kolačićima" - -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Listaj,pogledaj i izbriši kolačiće" -#: ../extensions/copy-tabs.c:39 +#: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" msgstr "Kopiraj adresu _kartice" -#: ../extensions/copy-tabs.c:96 +#: ../extensions/copy-tabs.c:95 msgid "Copy Addresses of Tabs" msgstr "Kopiraj adresu kartica" -#: ../extensions/copy-tabs.c:97 +#: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" msgstr "" -#: ../extensions/external-applications.vala:93 -msgid "External Applications" -msgstr "Vanjski programi" - -#: ../extensions/external-applications.vala:94 -msgid "Associate URL schemes with external commands" -msgstr "" - #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "" @@ -2534,25 +2515,25 @@ msgstr "" #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:396 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Zadnje ažuriranje: %s." -#: ../extensions/feed-panel/feed-panel.c:668 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:721 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:728 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:810 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "" @@ -2605,92 +2586,153 @@ msgid "Read Atom/ RSS feeds" msgstr "" -#: ../extensions/formhistory.c:142 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" msgstr "" -#: ../extensions/formhistory.c:454 ../extensions/formhistory.c:458 +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Korisničko ime i lozinka su potrebni\n" +"za otvaranje ove lokacije" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "Zapamtiti lozinku na ovoj stranici?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Zapamti" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "Ne sada" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Nikada za ovu stranicu" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "" + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "" -#: ../extensions/formhistory.c:501 +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:669 msgid "Stores history of entered form data" msgstr "" -#: ../extensions/formhistory.c:505 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 #, c-format -msgid "Not available: %s" -msgstr "Nije dostupno: %s" +msgid "Failed to select suggestions\n" +msgstr "Neuspjeli odabir prijedloga\n" -#: ../extensions/formhistory.c:506 -msgid "Resource files not installed" -msgstr "" +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Nema neposjećenih kartica" -#: ../extensions/formhistory.c:512 -msgid "Form history filler" +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "Lista povijesti" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Ponašanje zatvaranja kartica" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Ne čini ništa" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Prebaci na zadnju gledanu karticu" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Prebaci na najnoviju stranicu" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Slijedeća nova kartica (lista povijesti)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Slijedeća nova kartica iz povijesti" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Prethodna nova kartica (lista povijesti)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Prethodna nova kartica iz povijesti" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" msgstr "" -#: ../extensions/history-list.vala:174 -msgid "Next Tab (History List)" -msgstr "Slijedeća kartica (lista povijesti)" - -#: ../extensions/history-list.vala:175 -msgid "Next tab from history" -msgstr "Slijedeća kartica iz povijesti" - -#: ../extensions/history-list.vala:184 -msgid "Previous Tab (History List)" -msgstr "Prethodna kartica (lista povijesti)" - -#: ../extensions/history-list.vala:185 -msgid "Previous tab from history" -msgstr "Prethodna kartica iz povijesti" +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "" -#: ../extensions/history-list.vala:245 +#: ../extensions/history-list.vala:569 msgid "History List" msgstr "Lista povijesti" -#: ../extensions/history-list.vala:246 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" msgstr "" -"Dozvoli prebacivanje kartica izborom sa liste poredanih po zadnjoj upotrebi" #: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" -msgstr "" +msgstr "Kretnje mišem" #: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Kontroliraj Midori kretnjom miša" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:175 -msgid "Pageholder" -msgstr "" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "Učitaj ponovno stranicu ili zaustavi učitavanje" -#: ../extensions/page-holder.c:159 -msgid "_Pageholder" -msgstr "" - -#: ../extensions/page-holder.c:176 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "Držite jednu ili više stranica otvorenima paralelno sa vašim karticama" - -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "Prilagodi kratice tipkovnice" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "Prilagodi kr_atice..." -#: ../extensions/shortcuts.c:313 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Kratice" -#: ../extensions/shortcuts.c:314 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "Pogledaj i uredi kratice tipkovnice" @@ -2702,73 +2744,77 @@ msgid "Display date and time in the statusbar" msgstr "Prikaži datum i vrijeme u statusnoj traci" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Slike" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Skripte" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Netscape priključci" -#: ../extensions/statusbar-features.c:147 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" -msgstr "" +msgstr "Obilježja statusne trake" -#: ../extensions/statusbar-features.c:148 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" msgstr "" -#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Kartica ploče" -#: ../extensions/tab-panel.c:610 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "K_artica ploče" -#: ../extensions/tab-panel.c:627 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Pokaži kartice u okomitoj ploči" -#: ../extensions/tabs-minimized.c:77 +#: ../extensions/tabs-minimized.c:76 msgid "Only Icons on Tabs by default" -msgstr "" +msgstr "Kao zadano samo ikone na karticama" -#: ../extensions/tabs-minimized.c:78 +#: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" msgstr "" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Prilagodi alatnu traku" -#: ../extensions/toolbar-editor.c:405 +#: ../extensions/toolbar-editor.c:409 msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " +"Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Dostupne stavke" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Prikazane stavke" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "Prilagodi_Alatnu traku..." -#: ../extensions/toolbar-editor.c:606 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "Prilagodi..." + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" msgstr "Uređivač alatne trake" -#: ../extensions/toolbar-editor.c:607 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" msgstr "Jednostavno uređivanje izgleda alatnih traka" @@ -2776,21 +2822,365 @@ msgid "Cache HTTP communication on disk" msgstr "" +#~ msgid "The bookmarks couldn't be saved. %s" +#~ msgstr "Zabilješke ne mogu biti spremljene. %s" + +#~ msgid "Lightweight web browser" +#~ msgstr "Lagani web preglednik" + +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "Određena konfiguracijaka mapa nije valjana" + +#~ msgid "Cookies" +#~ msgstr "Kolačići" + +#~ msgid "'Flash' Cookies" +#~ msgstr "'Flash' kolačići" + +#~ msgid "HTML5 _Databases" +#~ msgstr "Omogući _podršku za HTML5 bazu podataka" + +#~ msgid "Not available: %s" +#~ msgstr "Nije dostupno: %s" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "Ne spremaj privatne podatke dok pregledavaš" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Dodaj prečac u brzo biranje" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Dodaj prečac na radnu površinu" + +#~ msgid "Create a launcher" +#~ msgstr "Napravi pokretač" + +#~ msgid "Close this window" +#~ msgstr "Zatvori ovaj prozor" + +#~ msgid "Close all open windows" +#~ msgstr "Zatvori sve otvorene prozore" + +#~ msgid "Undo the last modification" +#~ msgstr "Poništi zadnju izmjenu" + +#~ msgid "Redo the last modification" +#~ msgstr "Vrati zadnju izmjenu" + +#~ msgid "Cut the selected text" +#~ msgstr "Izreži označeni tekst" + +#~ msgid "Copy the selected text" +#~ msgstr "Kopiraj označeni tekst" + +#~ msgid "Delete the selected text" +#~ msgstr "Izbriši odabrani tekst" + +#~ msgid "Select all text" +#~ msgstr "Označi sav tekst" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Nađi slijedeće pojavljivanje riječi ili fraze" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Nađi prethodno pojavljivanje riječi ili fraze" + +#~ msgid "Reset the zoom level" +#~ msgstr "Vrati zoom razinu" + +#~ msgid "View the source code of the page" +#~ msgstr "Prikaži izvorni kod stranice" + +#~ msgid "Scroll to the left" +#~ msgstr "Kliži ulijevo" + +#~ msgid "Scroll down" +#~ msgstr "Kliži dolje" + +#~ msgid "Scroll up" +#~ msgstr "Kliži gore" + +#~ msgid "Scroll to the right" +#~ msgstr "Kliži nadesno" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "Izbriši sadržaj smeća" + +#~ msgid "Open the last closed tab" +#~ msgstr "Otvori zadnju zatvorenu karticu" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Dodaj novu mapu zabilješki" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Dodaj,uredi i ukloni tražilice..." + +#~ msgid "Clear private data..." +#~ msgstr "Očisti privatne podatke..." + +#~ msgid "Switch to the previous tab" +#~ msgstr "Prebaci na prethodnu stranicu" + +#~ msgid "Switch to the next tab" +#~ msgstr "Prebaci na slijedeću stranicu" + +#~ msgid "Move tab behind the previous tab" +#~ msgstr "Premjesti karticu iza prethodne kartice" + +#~ msgid "Move tab in front of the next tab" +#~ msgstr "Premjesti karticu ispred sljedeće kartice" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Pokaži samo ikonu u trenutnoj karticu" + +#~ msgid "Duplicate the current tab" +#~ msgstr "Udvostruči trenutnu karticu" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Zatvori sve kartice osim trenutne" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Otvori kartice spremljene u posljednjoj sesiji" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Pokaži često postavljana pitanja" + +#~ msgid "Show information about the program" +#~ msgstr "Prikaži informacije o programu" + +#~ msgid "Show menubar" +#~ msgstr "Pokaži traku izbornika" + +#~ msgid "Show navigationbar" +#~ msgstr "Pokaži navigacijsku traku" + +#~ msgid "Show sidepanel" +#~ msgstr "Pokaži bočni stupac" + +#~ msgid "Show bookmarkbar" +#~ msgstr "Pokaži traku zabilješki" + +#~ msgid "Show statusbar" +#~ msgstr "Pokaži statusnu traku" + +#~ msgid "No filename specified" +#~ msgstr "Nije navedeno ime datoteke" + +#~ msgid "Set number of columns and rows" +#~ msgstr "Postavi broj stupaca i redova" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Unesi broj stupaca i redova" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "Neispravni unos za veličinu brzog biranja" + +#~ msgid "Small" +#~ msgstr "Male" + +#~ msgid "Medium" +#~ msgstr "Srednje" + +#~ msgid "Big" +#~ msgstr "Velike" + +#~ msgid "Reset the last _session" +#~ msgstr "Obnovi posljednju _sesiju" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Konfiguriraj _filtere oglašavanja..." + +#~ msgid "Not found - %s" +#~ msgstr "NIje pronađeno - %s" + +#~ msgid "Document cannot be displayed" +#~ msgstr "Dokument ne može biti prikazan" + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "Prebacivanje kartica pomoću Ctrl+Tab poredanih po zadnjoj upotrebi" + +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "Obriši stare kolačiće nakon jednog sata" + +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "Obriši stare kolačiće nakon jednog tjedna" + +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "Obriši stare kolačiće nakon jednog mjeseca" + +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "Obriši stare kolačiće nakon jedne godine" + +#~ msgid "All cookies" +#~ msgstr "Svi kolačići" + +#~ msgid "Session cookies" +#~ msgstr "Kolačići sesije" + +#~ msgid "Show Transferbar" +#~ msgstr "Pokaži traku prijenosa" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "Da li pokazati traku prijenosa" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Pokaži brzo biranje u novim karticama" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Pokaži brzo biranje u novootvorenim karticama" + +#~ msgid "Download Manager" +#~ msgstr "Upravitelj preuzimanja" + +#~ msgid "An external download manager" +#~ msgstr "Vanjski upravitelj preuzimanja" + +#~ msgid "Open external pages in:" +#~ msgstr "Otvori vanjske stranice u:" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "Gdje otvoriti izvanjski otvorene stranice" + +#~ msgid "Accept cookies" +#~ msgstr "Prihvati kolačiće" + +#~ msgid "What type of cookies to accept" +#~ msgstr "Koju vrstu kolačića prihvatiti" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Zapamti zadnje preuzete datoteke" + +#~ msgid "Appearance" +#~ msgstr "Izgled" + +#~ msgid "Applications" +#~ msgstr "Programi" + +#~ msgid "Quit the application" +#~ msgstr "Isključi program" + +#~ msgid "Show Blank page" +#~ msgstr "Pokaži praznu stranicu" + +#~ msgid "Download with Download _Manager" +#~ msgstr "Preuzimanje pomoću upravitelja _preuzimanjima" + +#~ msgid "General" +#~ msgstr "Osnovno" + +#~ msgid "Font settings" +#~ msgstr "Postavke fonta" + +#~ msgid "Interface" +#~ msgstr "Sučelje" + +#~ msgid "Navigationbar" +#~ msgstr "Navigacijska traka" + +#~ msgid "External applications" +#~ msgstr "Vanjski programi" + +#~ msgid "Web Cookies" +#~ msgstr "Web kolačići" + +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "Očisti kolačiće kad _isključuješ Midori" + +#~ msgid "%s of %s, %s/s" +#~ msgstr "%s od %s, %s/s" + +#~ msgid "Open target folder for selected addon" +#~ msgstr "Otvori ciljanu mapu za odabrani dodatak" + +#~ msgid "Next Tab (History List)" +#~ msgstr "Slijedeća kartica (lista povijesti)" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "Prethodna kartica (lista povijesti)" + +#~ msgid "Previous tab from history" +#~ msgstr "Prethodna kartica iz povijesti" + +#~ msgid "Keep one or multiple pages open in parallel to your tabs" +#~ msgstr "" +#~ "Držite jednu ili više stranica otvorenima paralelno sa vašim karticama" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% učitano" + +#~ msgid "_Contents" +#~ msgstr "_Sadržaji" + +#~ msgid "Show the documentation" +#~ msgstr "Pokaži dokumentaciju" + +#~ msgid "_Transferbar" +#~ msgstr "_Traka prijenosa" + +#~ msgid "Show transferbar" +#~ msgstr "Pokaži traku prijenosa" + +#~ msgid "Ask for the destination folder" +#~ msgstr "Pitaj za odredišni direktorij" + +#~ msgid "Whether to ask for the destination folder when downloading a file" +#~ msgstr "Da li pitati za odredišni direktorij kada preuzimam datoteku" + +#~ msgid "Whether to show a notification when a transfer has been completed" +#~ msgstr "Da li pokazati obavijest kada je prijenos dovršen" + +#~ msgid "_Save Link destination" +#~ msgstr "_Spremi odredište poveznice" + +#~ msgid "_Download Link destination" +#~ msgstr "_Preuzmi odredište poveznice" + +#~ msgid "Download I_mage" +#~ msgstr "Preuzmi S_liku" + +#~ msgid "Failed to clear search history: %s\n" +#~ msgstr "Nespjelo uklanjanje traženja povijesti: %s\n" + +#~ msgid "Minimize _Current Tab" +#~ msgstr "Minimiziraj _trenutnu karticu" + +#~ msgid "Minimize the current tab" +#~ msgstr "Minimiziraj trenutnu karticu" + +#~ msgid "Spell Checking" +#~ msgstr "Provjera pravopisa" + +#~ msgid "Spelling dictionaries:" +#~ msgstr "Pravopisni rječnici" + +#~ msgid "" +#~ "A comma separated list of languages to be used for spell checking, for " +#~ "example \"en_GB,de_DE\"" +#~ msgstr "" +#~ "Zarezom odijeljena lista jezika koja će se koristiti za provjeru " +#~ "pravopisa,npr. \"en_GB,de_DE\"" + +#~ msgid "Copy _All" +#~ msgstr "Kopiraj _sve" + +#~ msgid "Copy All" +#~ msgstr "Kopiraj sve" + +#~ msgid "_Cookie Manager" +#~ msgstr "_Upravitelj kolačićima" + +#~ msgid "External Applications" +#~ msgstr "Vanjski programi" + #~ msgid "_Recently visited pages" #~ msgstr "_Nedavno posjećene stranice" #~ msgid "Reopen pages that you visited earlier" #~ msgstr "Ponovo otvori stranice koje ste posjetili ranije" -#~ msgid "Show the saved bookmarks" -#~ msgstr "Pokaži spremljene zabilješke" - #~ msgid "Original cookies only" #~ msgstr "Samo izvorne kolačiće" -#~ msgid "Accept cookies from the original website only" -#~ msgstr "Prihvati kolačiće samo sa izvorne web stranice" - #~ msgid "Remember last visited pages" #~ msgstr "Zapamti zadnju posjećenu stranicu" diff -Nru midori-0.2.8/po/hu.po midori-0.4.6/po/hu.po --- midori-0.2.8/po/hu.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/hu.po 2012-05-14 22:13:42.000000000 +0000 @@ -1,323 +1,471 @@ # Hungarian translation of midori # Copyright 2010 Free Software Foundation, Inc. # This file is distributed under the same license as the midori package. -# -# Gabor Kelemen , 2010. +# +# Gabor Kelemen , 2010, 2012. msgid "" msgstr "" "Project-Id-Version: midori master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-22 04:08+0000\n" -"PO-Revision-Date: 2010-06-22 03:12+0200\n" +"POT-Creation-Date: 2012-04-20 22:03+0000\n" +"PO-Revision-Date: 2012-04-21 05:15+0200\n" "Last-Translator: Gabor Kelemen \n" -"Language-Team: Hungarian \n" +"Language-Team: Magyar \n" +"Language: \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" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.0\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Könnyűsúlyú webböngésző" +msgid "Browse the Web" +msgstr "A világháló böngészése" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 -#: ../midori/main.c:1636 ../midori/main.c:1652 -#: ../midori/midori-websettings.c:314 +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "Internet;WWW;Explorer" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072 +#: ../midori/main.c:2086 ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Webböngésző" -#: ../midori/main.c:102 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Midori privát böngészés" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Új privát böngészési ablak megnyitása" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164 +msgid "Private Browsing" +msgstr "Privát böngészés" + +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "A beállítások nem tölthetők be: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "A(z) „%s” érték érvénytelen ehhez: %s" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr "Érvénytelen beállításérték: „%s”" -#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 +#: ../midori/main.c:380 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "A keresőmotorok nem tölthetők be. %s\n" + +#: ../midori/main.c:434 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Az előzmények törlése meghiúsult: %s\n" + +#: ../midori/main.c:454 ../midori/main.c:581 +#: ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" msgstr "Az adatbázis nem nyitható meg: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:524 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "A régi előzményelemek eltávolítása meghiúsult: %s\n" -#: ../midori/main.c:468 +#: ../midori/main.c:564 ../panels/midori-history.c:232 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Az előzményelem eltávolítása meghiúsult: %s\n" + +#: ../midori/main.c:611 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "A könyvjelzők nem menthetők. %s" -#: ../midori/main.c:500 +#: ../midori/main.c:633 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "A beállítások nem menthetők. %s" -#: ../midori/main.c:538 +#: ../midori/main.c:668 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "A keresőmotorok nem menthetők. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:558 ../midori/main.c:581 +#: ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" msgstr "A Kuka nem menthető. %s" -#: ../midori/main.c:640 ../midori/main.c:880 +#: ../midori/main.c:746 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Kiterjesztések" + +#: ../midori/main.c:760 +msgid "Privacy" +msgstr "Adatvédelem" + +#: ../midori/main.c:772 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"A sütik bejelentkezési adatokat, mentett játékállásokat vagy reklámcéllal " +"felhasználói profilokat tárolnak." + +#: ../midori/main.c:828 #, c-format msgid "The session couldn't be saved. %s" msgstr "A munkamenet nem menthető. %s" -#: ../midori/main.c:824 -msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "Nem érhető el gyökértanúsítvány-fájl. Az SSL-tanúsítványok nem ellenőrizhetők." - -#: ../midori/main.c:914 -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 "Úgy tűnik, hogy a Midori összeomlott az utolsó futásakor. Ha ez ismételten előfordul, a probléma megoldása érdekében próbálja ki a következő lehetőségeket." +#: ../midori/main.c:1046 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" +"Nem érhető el gyökértanúsítvány-fájl. Az SSL-tanúsítványok nem " +"ellenőrizhetők." + +#: ../midori/main.c:1115 +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 "" +"Úgy tűnik, hogy a Midori összeomlott az utolsó futásakor. Ha ez ismételten " +"előfordul, a probléma megoldása érdekében próbálja ki a következő " +"lehetőségeket." -#: ../midori/main.c:929 +#: ../midori/main.c:1134 msgid "Modify _preferences" msgstr "Beállítások _módosítása" -#: ../midori/main.c:933 -msgid "Reset the last _session" -msgstr "_Utolsó munkamenet visszaállítása" - -#: ../midori/main.c:938 +#: ../midori/main.c:1138 msgid "Disable all _extensions" msgstr "Minden _kiterjesztés letiltása" -#: ../midori/main.c:1174 ../midori/main.c:1905 +#: ../midori/main.c:1151 +msgid "Discard old tabs" +msgstr "Régi lapok eldobása" + +#: ../midori/main.c:1152 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "A legutóbbi lapok megjelenítése betöltés nélkül" + +#: ../midori/main.c:1153 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "A legutóbbi lapok megjelenítése" + +#: ../midori/main.c:1400 ../midori/main.c:2464 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "A munkamenet nem tölthető be: %s\n" -#: ../midori/main.c:1298 -msgid "No filename specified" -msgstr "Nincs megadva fájlnév" - -#: ../midori/main.c:1317 -msgid "An unknown error occured." -msgstr "Ismeretlen hiba történt." - -#: ../midori/main.c:1348 +#: ../midori/main.c:1538 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Pillanatkép mentve ide: %s\n" -#: ../midori/main.c:1520 +#: ../midori/main.c:1951 msgid "Run ADDRESS as a web application" msgstr "A CÍM futtatása webalkalmazásként" -#: ../midori/main.c:1520 +#: ../midori/main.c:1951 msgid "ADDRESS" msgstr "CÍM" -#: ../midori/main.c:1523 +#: ../midori/main.c:1954 msgid "Use FOLDER as configuration folder" msgstr "A MAPPA használata konfigurációs mappaként" -#: ../midori/main.c:1523 +#: ../midori/main.c:1954 msgid "FOLDER" msgstr "MAPPA" -#: ../midori/main.c:1526 +#: ../midori/main.c:1957 +msgid "Private browsing, no changes are saved" +msgstr "Privát böngészés, nem lesznek mentve változtatások" + +#: ../midori/main.c:1959 msgid "Show a diagnostic dialog" msgstr "Diagnosztikai ablak megjelenítése" -#: ../midori/main.c:1528 +#: ../midori/main.c:1961 msgid "Run the specified filename as javascript" msgstr "A megadott fájl futtatása javascriptként" -#: ../midori/main.c:1531 +#: ../midori/main.c:1963 msgid "Take a snapshot of the specified URI" msgstr "Pillanatkép készítése a megadott URI-ről" -#: ../midori/main.c:1534 +#: ../midori/main.c:1965 msgid "Execute the specified command" msgstr "A megadott parancs futtatása" -#: ../midori/main.c:1536 +#: ../midori/main.c:1967 +msgid "List available commands to execute with -e/ --execute" +msgstr "A -e/--execute segítségével végrehajtható parancsok felsorolása" + +#: ../midori/main.c:1969 msgid "Display program version" msgstr "A program verziójának megjelenítése" -#: ../midori/main.c:1538 +#: ../midori/main.c:1971 msgid "Addresses" msgstr "Címek" -#: ../midori/main.c:1540 +#: ../midori/main.c:1973 msgid "Block URIs according to regular expression PATTERN" msgstr "URI-címek blokkolása a MINTA reguláris kifejezés alapján" -#: ../midori/main.c:1540 +#: ../midori/main.c:1973 msgid "PATTERN" msgstr "MINTA" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1544 +#: ../midori/main.c:1977 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "A Midori visszaállítása ennyi MÁSODPERC inaktivitás után" -#: ../midori/main.c:1544 +#: ../midori/main.c:1977 msgid "SECONDS" msgstr "MÁSODPERC" -#: ../midori/main.c:1625 +#: ../midori/main.c:1980 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Konzolos figyelmeztetések átirányítása a megadott FÁJLNÉVBE" + +#: ../midori/main.c:1980 +msgid "FILENAME" +msgstr "FÁJLNÉV" + +#: ../midori/main.c:2045 msgid "[Addresses]" msgstr "[Címek]" -#: ../midori/main.c:1653 +#: ../midori/main.c:2087 msgid "Please report comments, suggestions and bugs to:" msgstr "A megjegyzéseit, javaslatait és a hibákat ide küldje:" -#: ../midori/main.c:1655 +#: ../midori/main.c:2089 msgid "Check for new versions at:" msgstr "Új verziókért lásd:" -#: ../midori/main.c:1752 -msgid "The specified configuration folder is invalid." -msgstr "A megadott konfigurációs mappa érvénytelen." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2173 +msgid "Saved logins and _passwords" +msgstr "Mentett felhasználónevek és _jelszavak" + +#: ../midori/main.c:2175 +msgid "Cookies and Website data" +msgstr "Sütik és weboldaladatok" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2179 ../midori/midori-websettings.c:996 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Webes gyorsítótár" + +#: ../midori/main.c:2182 +msgid "Website icons" +msgstr "Weboldalikonok" -#: ../midori/main.c:1800 +#: ../midori/main.c:2288 +msgid "An unknown error occured" +msgstr "Ismeretlen hiba történt" + +#: ../midori/main.c:2395 msgid "An instance of Midori is already running but not responding.\n" msgstr "A Midori egy példánya már fut, de nem válaszol.\n" -#: ../midori/main.c:1855 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "A keresőmotorok nem tölthetők be. %s\n" - -#: ../midori/main.c:1877 +#: ../midori/main.c:2431 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "A könyvjelzők nem tölthetők be: %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:2479 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "A Kuka nem tölthető be: %s\n" -#: ../midori/main.c:1934 +#: ../midori/main.c:2492 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Az előzmények nem tölthetők be: %s\n" -#: ../midori/main.c:1948 +#: ../midori/main.c:2508 msgid "The following errors occured:" msgstr "A következő hibák történtek:" -#: ../midori/main.c:1964 +#: ../midori/main.c:2524 msgid "_Ignore" msgstr "_Kihagyás" -#: ../midori/midori-array.c:428 +#: ../midori/midori-app.c:1334 +msgid "_Bookmark" +msgstr "_Könyvjelző" + +#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6073 +msgid "_Bookmarks" +msgstr "_Könyvjelzők" + +#: ../midori/midori-app.c:1336 +msgid "Add Boo_kmark" +msgstr "Köny_vjelző hozzáadása" + +#: ../midori/midori-app.c:1337 +msgid "_Console" +msgstr "_Konzol" + +#: ../midori/midori-app.c:1338 +msgid "_Extensions" +msgstr "Kit_erjesztések" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4600 +msgid "_History" +msgstr "_Előzmények" + +#: ../midori/midori-app.c:1340 +msgid "_Homepage" +msgstr "Kez_dőlap" + +#: ../midori/midori-app.c:1341 +msgid "_Userscripts" +msgstr "_Felhasználói parancsfájlok" + +#: ../midori/midori-app.c:1342 +msgid "New _Tab" +msgstr "Új _lap" + +#: ../midori/midori-app.c:1343 +msgid "_Transfers" +msgstr "Á_tvitelek" + +#: ../midori/midori-app.c:1344 +msgid "Netscape p_lugins" +msgstr "_Netscape bővítmények" + +#: ../midori/midori-app.c:1345 +msgid "_Closed Tabs" +msgstr "_Bezárt lapok" + +#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5229 +msgid "New _Window" +msgstr "Új _ablak" + +#: ../midori/midori-app.c:1347 +msgid "New _Folder" +msgstr "Új _mappa" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "A fájl nem található." -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Rosszul formált dokumentum." -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "Ismeretlen könyvjelzőformátum." -#: ../midori/midori-array.c:718 +#: ../midori/midori-array.c:915 msgid "Writing failed." msgstr "Az írás meghiúsult." -#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5244 -#: ../midori/midori-browser.c:5250 +#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5311 +#: ../midori/midori-browser.c:5320 msgid "Reload the current page" msgstr "Az aktuális oldal újratöltése" -#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:5317 msgid "Stop loading the current page" msgstr "Az aktuális oldal betöltésének leállítása" -#: ../midori/midori-browser.c:456 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% betöltve" - -#: ../midori/midori-browser.c:494 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" msgstr "A cím frissítése meghiúsult: %s\n" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." msgstr "Váratlan művelet: „%s”." -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:579 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (privát böngészés)" + +#: ../midori/midori-browser.c:693 ../midori/midori-browser.c:726 +msgid "Toplevel folder" +msgstr "Felső szintű mappa" + +#: ../midori/midori-browser.c:784 msgid "New folder" msgstr "Új mappa" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:784 msgid "Edit folder" msgstr "Mappa szerkesztése" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:786 msgid "New bookmark" msgstr "Új könyvjelző" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:786 msgid "Edit bookmark" msgstr "Könyvjelző szerkesztése" -#: ../midori/midori-browser.c:764 +#: ../midori/midori-browser.c:828 msgid "_Title:" msgstr "_Cím:" -#: ../midori/midori-browser.c:777 ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "_Leírás:" - -#: ../midori/midori-browser.c:796 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:848 ../midori/midori-searchaction.c:961 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Webcím:" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4400 +#: ../midori/midori-browser.c:871 ../midori/midori-browser.c:4337 msgid "_Folder:" msgstr "_Mappa:" -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:940 -#: ../midori/midori-browser.c:4405 ../midori/midori-browser.c:4437 -msgid "Toplevel folder" -msgstr "Felső szintű mappa" - -#: ../midori/midori-browser.c:874 +#: ../midori/midori-browser.c:887 msgid "Add to _Speed Dial" msgstr "Felvétel a _gyorstárcsázásba" -#: ../midori/midori-browser.c:887 +#: ../midori/midori-browser.c:900 msgid "Show in the tool_bar" msgstr "M_egjelenítés az eszköztáron" -#: ../midori/midori-browser.c:902 +#: ../midori/midori-browser.c:915 msgid "Run as _web application" msgstr "_Futtatás webalkalmazásként" -#: ../midori/midori-browser.c:994 +#: ../midori/midori-browser.c:986 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "A fájl („%s”) nem menthető ebbe a mappába." + +#: ../midori/midori-browser.c:988 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Nincs jogosultsága erre a helyre írni." + +#: ../midori/midori-browser.c:995 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Nincs elég szabad lemezhely a(z) „%s” letöltéséhez." @@ -327,1922 +475,1743 @@ msgid "The file needs %s but only %s are left." msgstr "A fájl %s helyet igényel, de csak %s maradt." -#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4455 -#: ../midori/midori-browser.c:4487 +#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4406 msgid "Save file as" msgstr "Fájl mentése másként" -#: ../midori/midori-browser.c:1448 +#: ../midori/midori-browser.c:1330 +msgid "New Window" +msgstr "Új ablak" + +#: ../midori/midori-browser.c:1330 +msgid "A new window has been opened" +msgstr "Új ablak nyílt meg" + +#: ../midori/midori-browser.c:1333 +msgid "New Tab" +msgstr "Új lap" + +#: ../midori/midori-browser.c:1333 +msgid "A new tab has been opened" +msgstr "Új lap nyílt meg" + +#: ../midori/midori-browser.c:1368 +msgid "Error opening the image!" +msgstr "Hiba a kép megnyitásakor" + +#: ../midori/midori-browser.c:1369 +msgid "Can not open selected image in a default viewer." +msgstr "Nem nyitható meg a kiválasztott kép az alapértelmezett megjelenítőben." + +#: ../midori/midori-browser.c:1375 +msgid "Error downloading the image!" +msgstr "Hiba a kép letöltésekor" + +#: ../midori/midori-browser.c:1376 +msgid "Can not download selected image." +msgstr "A kijelölt kép nem tölthető le." + +#: ../midori/midori-browser.c:1502 msgid "Save file" msgstr "Fájl mentése" -#: ../midori/midori-browser.c:2152 +#: ../midori/midori-browser.c:2377 msgid "Open file" msgstr "Fájl megnyitása" -#: ../midori/midori-browser.c:2230 +#: ../midori/midori-browser.c:2509 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." msgstr "" -"A fenti URI használatához nyisson meg egy hírforrásolvasót. Általában találhat egy „Új feliratkozás”, „Új hírforrás” vagy hasonló menüt vagy gombot.\n" -"Ennek alternatívájaként nyissa meg a Beállítások -> Alkalmazások fület, és válasszon egy hírforrásolvasót. A hírforrások ikonjára kattintva ezután az automatikusan felvételre kerül." +"A fenti URI használatához nyisson meg egy hírforrásolvasót. Általában " +"találhat egy „Új feliratkozás”, „Új hírforrás” vagy hasonló menüt vagy " +"gombot.\n" +"Ennek alternatívájaként nyissa meg a Beállítások -> Alkalmazások fület, és " +"válasszon egy hírforrásolvasót. A hírforrások ikonjára kattintva ezután az " +"automatikusan felvételre kerül." -#: ../midori/midori-browser.c:2236 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2515 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Új hírforrás" -#: ../midori/midori-browser.c:2279 ../midori/midori-browser.c:5309 -#: ../panels/midori-bookmarks.c:422 +#: ../midori/midori-browser.c:2558 ../midori/midori-browser.c:5380 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "Új könyvjelző hozzáadása" -#: ../midori/midori-browser.c:2748 ../panels/midori-bookmarks.c:203 -#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 -#: ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Az adatbázis-utasítás végrehajtása meghiúsult: %s\n" - -#: ../midori/midori-browser.c:2828 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3057 ../midori/midori-searchaction.c:488 msgid "Empty" msgstr "Üres" -#: ../midori/midori-browser.c:3446 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "A külső program nem futtatható." +#: ../midori/midori-browser.c:3477 +msgid "Toggle text cursor navigation" +msgstr "Kurzoros szövegnavigáció átváltása" -#: ../midori/midori-browser.c:3760 ../midori/midori-browser.c:5693 +#: ../midori/midori-browser.c:3793 ../midori/midori-browser.c:5766 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Az új előzményelem beszúrása meghiúsult: %s\n" -#: ../midori/midori-browser.c:4093 ../panels/midori-bookmarks.c:780 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:4125 ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 msgid "Open all in _Tabs" msgstr "Összes _megnyitása lapokon" -#: ../midori/midori-browser.c:4100 ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4132 ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Megnyi_tás új lapon" -#: ../midori/midori-browser.c:4103 ../midori/midori-view.c:2424 -#: ../midori/midori-view.c:4103 ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4135 ../midori/midori-view.c:2657 +#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Megnyitás új _ablakban" -#: ../midori/midori-browser.c:4326 +#: ../midori/midori-browser.c:4224 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4327 +#: ../midori/midori-browser.c:4225 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4328 +#: ../midori/midori-browser.c:4226 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4227 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4228 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4351 +#: ../midori/midori-browser.c:4229 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4250 msgid "Import bookmarks..." msgstr "Könyvjelzők importálása…" -#: ../midori/midori-browser.c:4354 ../midori/midori-browser.c:5314 +#: ../midori/midori-browser.c:4253 ../midori/midori-browser.c:5385 msgid "_Import bookmarks" msgstr "_Könyvjelzők importálása" -#: ../midori/midori-browser.c:4365 +#: ../midori/midori-browser.c:4264 msgid "_Application:" msgstr "_Alkalmazás:" -#: ../midori/midori-browser.c:4392 ../midori/midori-browser.c:5418 -#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 -#: ../katze/katze-utils.c:691 -msgid "Custom..." -msgstr "Egyéni…" +#: ../midori/midori-browser.c:4329 +msgid "Import from XBEL or HTML file" +msgstr "Importálás XBEL vagy HTML fájlból" + +#: ../midori/midori-browser.c:4364 +msgid "Import from a file" +msgstr "Importálás fájlból" -#: ../midori/midori-browser.c:4466 +#: ../midori/midori-browser.c:4376 msgid "Failed to import bookmarks" msgstr "A könyvjelzők importálása sikertelen" -#: ../midori/midori-browser.c:4502 +#: ../midori/midori-browser.c:4411 +msgid "XBEL Bookmarks" +msgstr "XBEL-könyvjelzők" + +#: ../midori/midori-browser.c:4416 +msgid "Netscape Bookmarks" +msgstr "Netscape könyvjelzők" + +#: ../midori/midori-browser.c:4430 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "" +"A Midori csak XBEL (*.xbel) és Netscape (*.html) formátumba tud exportálni" + +#: ../midori/midori-browser.c:4445 msgid "Failed to export bookmarks" msgstr "A könyvjelzők exportálása sikertelen" -#: ../midori/midori-browser.c:4556 ../panels/midori-bookmarks.c:271 -#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Az előzményelem eltávolítása meghiúsult: %s\n" - #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4663 +#: ../midori/midori-browser.c:4567 msgid "Clear Private Data" msgstr "Privát adatok törlése" -#: ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:4571 msgid "_Clear private data" msgstr "_Privát adatok törlése" -#: ../midori/midori-browser.c:4681 +#: ../midori/midori-browser.c:4584 msgid "Clear the following data:" msgstr "A következő adatok törlése:" -#: ../midori/midori-browser.c:4692 ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 -msgid "History" -msgstr "Előzmények" - -#: ../midori/midori-browser.c:4698 -msgid "Cookies" -msgstr "Sütik" - -#: ../midori/midori-browser.c:4703 -msgid "'Flash' Cookies" -msgstr "„Flash” sütik" - -#: ../midori/midori-browser.c:4708 -msgid "Website icons" -msgstr "Weboldalikonok" - -#: ../midori/midori-browser.c:4713 ../midori/sokoke.c:1298 -msgid "_Closed Tabs" -msgstr "_Bezárt lapok" - -#: ../midori/midori-browser.c:4718 ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "Webes gyorsítótár" +#: ../midori/midori-browser.c:4594 +msgid "Last open _tabs" +msgstr "_Legutóbb nyitott lapok" -#: ../midori/midori-browser.c:4726 +#: ../midori/midori-browser.c:4620 msgid "Clear private data when _quitting Midori" msgstr "Privát adatok törlése a Mi_doriból kilépéskor" -#: ../midori/midori-browser.c:4827 +#: ../midori/midori-browser.c:4815 msgid "A lightweight web browser." msgstr "Könnyűsúlyú webböngésző." -#: ../midori/midori-browser.c:4829 -msgid "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." -msgstr "A Midori szabad szoftver, terjesztheti és/vagy módosíthatja a Free Software Foundation által kiadott GNU Lesser General Public License 2.1 (vagy bármely későbbi) változatában foglaltak alapján." +#: ../midori/midori-browser.c:4816 +msgid "See about:version for version info." +msgstr "Verzióinformációkért lásd az about:version oldalt." + +#: ../midori/midori-browser.c:4818 +msgid "" +"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." +msgstr "" +"A Midori szabad szoftver, terjesztheti és/vagy módosíthatja a Free Software " +"Foundation által kiadott GNU Lesser General Public License 2.1 (vagy bármely " +"későbbi) változatában foglaltak alapján." -#: ../midori/midori-browser.c:4848 +#: ../midori/midori-browser.c:4839 msgid "translator-credits" -msgstr "Kelemen Gábor " +msgstr "Kelemen Gábor " -#: ../midori/midori-browser.c:5157 +#: ../midori/midori-browser.c:5227 msgid "_File" msgstr "_Fájl" -#: ../midori/midori-browser.c:5159 ../midori/sokoke.c:1299 -msgid "New _Window" -msgstr "Új _ablak" - -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:5230 msgid "Open a new window" msgstr "Új ablak megnyitása" -#: ../midori/midori-browser.c:5163 +#: ../midori/midori-browser.c:5233 msgid "Open a new tab" msgstr "Új lap megnyitása" -#: ../midori/midori-browser.c:5165 -msgid "P_rivate Browsing" -msgstr "_Privát böngészés" - -#: ../midori/midori-browser.c:5166 -msgid "Don't save any private data while browsing" -msgstr "Ne mentsen privát adatokat böngészéskor" +#: ../midori/midori-browser.c:5235 +msgid "New P_rivate Browsing Window" +msgstr "Új _privát böngészési ablak megnyitása" -#: ../midori/midori-browser.c:5170 +#: ../midori/midori-browser.c:5239 msgid "Open a file" msgstr "Fájl megnyitása" -#: ../midori/midori-browser.c:5173 +#: ../midori/midori-browser.c:5241 +msgid "_Save Page As..." +msgstr "Oldal _mentése másként…" + +#: ../midori/midori-browser.c:5242 msgid "Save to a file" msgstr "Mentés fájlba" -#: ../midori/midori-browser.c:5175 +#: ../midori/midori-browser.c:5244 msgid "Add to Speed _dial" msgstr "Hozzáadás _gyorstárcsázáshoz" -#: ../midori/midori-browser.c:5176 -msgid "Add shortcut to speed dial" -msgstr "Indítóikon hozzáadása a gyorstárcsázáshoz" - -#: ../midori/midori-browser.c:5178 +#: ../midori/midori-browser.c:5248 msgid "Add Shortcut to the _desktop" -msgstr "Indítóikon hozzáadása az _asztalhoz" +msgstr "Parancsikon hozzáadása az _asztalhoz" -#: ../midori/midori-browser.c:5179 -msgid "Add shortcut to the desktop" -msgstr "Indítóikon hozzáadása az asztalhoz" +#: ../midori/midori-browser.c:5250 +msgid "Create _Launcher" +msgstr "_Parancsikon létrehozása" -#: ../midori/midori-browser.c:5181 +#: ../midori/midori-browser.c:5254 msgid "Subscribe to News _feed" msgstr "_Feliratkozás hírforrásra" -#: ../midori/midori-browser.c:5182 -msgid "Subscribe to this news feed" -msgstr "Feliratkozás erre a hírforrásra" - -#: ../midori/midori-browser.c:5187 +#: ../midori/midori-browser.c:5260 msgid "_Close Tab" msgstr "Lap _bezárása" -#: ../midori/midori-browser.c:5188 +#: ../midori/midori-browser.c:5261 msgid "Close the current tab" msgstr "A jelenlegi lap bezárása" -#: ../midori/midori-browser.c:5190 +#: ../midori/midori-browser.c:5263 msgid "C_lose Window" msgstr "_Ablak bezárása" -#: ../midori/midori-browser.c:5191 -msgid "Close this window" -msgstr "A jelenlegi ablak bezárása" - -#: ../midori/midori-browser.c:5194 +#: ../midori/midori-browser.c:5267 msgid "Print the current page" msgstr "A jelenlegi oldal nyomtatása" -#: ../midori/midori-browser.c:5197 -msgid "Quit the application" -msgstr "Kilépés az alkalmazásból" +#: ../midori/midori-browser.c:5269 +msgid "Close a_ll Windows" +msgstr "Minden _ablak bezárása" -#: ../midori/midori-browser.c:5199 +#: ../midori/midori-browser.c:5272 msgid "_Edit" msgstr "S_zerkesztés" -#: ../midori/midori-browser.c:5203 -msgid "Undo the last modification" -msgstr "Az utolsó módosítás visszavonása" - -#: ../midori/midori-browser.c:5206 -msgid "Redo the last modification" -msgstr "Az utolsó módosítás újra végrehajtása" - -#: ../midori/midori-browser.c:5210 -msgid "Cut the selected text" -msgstr "A kijelölt szöveg kivágása" - -#: ../midori/midori-browser.c:5213 ../midori/midori-browser.c:5216 -msgid "Copy the selected text" -msgstr "A kijelölt szöveg másolása" - -#: ../midori/midori-browser.c:5219 -msgid "Paste text from the clipboard" -msgstr "Beillesztés a vágólapról" - -#: ../midori/midori-browser.c:5222 -msgid "Delete the selected text" -msgstr "A kijelölt szöveg törlése" - -#: ../midori/midori-browser.c:5225 -msgid "Select all text" -msgstr "A teljes szöveg kijelölése" +#: ../midori/midori-browser.c:5295 +msgid "_Find..." +msgstr "_Keresés…" -#: ../midori/midori-browser.c:5228 +#: ../midori/midori-browser.c:5296 msgid "Find a word or phrase in the page" msgstr "Szó vagy kifejezés keresése az oldalon" -#: ../midori/midori-browser.c:5230 +#: ../midori/midori-browser.c:5298 msgid "Find _Next" msgstr "_Következő találat" -#: ../midori/midori-browser.c:5231 -msgid "Find the next occurrence of a word or phrase" -msgstr "Szó vagy kifejezés következő előfordulásának keresése" - -#: ../midori/midori-browser.c:5233 +#: ../midori/midori-browser.c:5301 msgid "Find _Previous" msgstr "_Előző találat" -#: ../midori/midori-browser.c:5234 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Szó vagy kifejezés előző előfordulásának keresése" - -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:5305 msgid "Configure the application preferences" msgstr "Az alkalmazás beállításainak megadása" -#: ../midori/midori-browser.c:5240 +#: ../midori/midori-browser.c:5307 msgid "_View" msgstr "_Nézet" -#: ../midori/midori-browser.c:5241 +#: ../midori/midori-browser.c:5308 msgid "_Toolbars" msgstr "_Eszköztárak" -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:5313 +msgid "Reload page without caching" +msgstr "Oldal újratöltése gyorsítótárazás nélkül" + +#: ../midori/midori-browser.c:5323 msgid "Increase the zoom level" msgstr "Nagyítási szint növelése" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5326 msgid "Decrease the zoom level" msgstr "Nagyítási szint csökkentése" -#: ../midori/midori-browser.c:5259 -msgid "Reset the zoom level" -msgstr "Nagyítási szint visszaállítása" - -#: ../midori/midori-browser.c:5260 +#: ../midori/midori-browser.c:5330 msgid "_Encoding" msgstr "_Kódolás" -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:5332 msgid "View So_urce" msgstr "_Forrás megjelenítése" -#: ../midori/midori-browser.c:5263 -msgid "View the source code of the page" -msgstr "Az oldal forráskódjának megtekintése" +#: ../midori/midori-browser.c:5335 +msgid "Ca_ret Browsing" +msgstr "_Kurzoros böngészés" -#: ../midori/midori-browser.c:5266 +#: ../midori/midori-browser.c:5339 msgid "Toggle fullscreen view" msgstr "Teljes képernyős nézet be- illetve kikapcsolása" -#: ../midori/midori-browser.c:5269 +#: ../midori/midori-browser.c:5341 msgid "Scroll _Left" msgstr "Görgetés _balra" -#: ../midori/midori-browser.c:5270 -msgid "Scroll to the left" -msgstr "Görgetés balra" - -#: ../midori/midori-browser.c:5272 +#: ../midori/midori-browser.c:5344 msgid "Scroll _Down" msgstr "Görgetés l_e" -#: ../midori/midori-browser.c:5273 -msgid "Scroll down" -msgstr "Görgetés le" - -#: ../midori/midori-browser.c:5275 +#: ../midori/midori-browser.c:5347 msgid "Scroll _Up" msgstr "Görgetés _fel" -#: ../midori/midori-browser.c:5276 -msgid "Scroll up" -msgstr "Görgetés fel" - -#: ../midori/midori-browser.c:5278 +#: ../midori/midori-browser.c:5350 msgid "Scroll _Right" msgstr "Görgetés j_obbra" -#: ../midori/midori-browser.c:5279 -msgid "Scroll to the right" -msgstr "Görgetés jobbra" - -#: ../midori/midori-browser.c:5282 +#: ../midori/midori-browser.c:5353 msgid "_Go" msgstr "_Ugrás" -#: ../midori/midori-browser.c:5285 +#: ../midori/midori-browser.c:5356 msgid "Go back to the previous page" msgstr "Ugrás az előző oldalra" -#: ../midori/midori-browser.c:5288 +#: ../midori/midori-browser.c:5359 msgid "Go forward to the next page" msgstr "Ugrás a következő oldalra" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5292 +#: ../midori/midori-browser.c:5363 msgid "Go to the previous sub-page" msgstr "Ugrás az előző aloldalra" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5296 +#: ../midori/midori-browser.c:5367 msgid "Go to the next sub-page" msgstr "Ugrás a következő aloldalra" -#: ../midori/midori-browser.c:5299 +#: ../midori/midori-browser.c:5370 msgid "Go to your homepage" msgstr "Ugrás a kezdőlapra" -#: ../midori/midori-browser.c:5301 +#: ../midori/midori-browser.c:5372 msgid "Empty Trash" msgstr "Kuka ürítése" -#: ../midori/midori-browser.c:5302 -msgid "Delete the contents of the trash" -msgstr "A Kuka tartalmának törlése" - -#: ../midori/midori-browser.c:5304 +#: ../midori/midori-browser.c:5375 msgid "Undo _Close Tab" msgstr "Lapbezárás _visszavonása" -#: ../midori/midori-browser.c:5305 -msgid "Open the last closed tab" -msgstr "Az utoljára bezárt lap megnyitása" - -#: ../midori/midori-browser.c:5311 +#: ../midori/midori-browser.c:5382 msgid "Add a new _folder" msgstr "Új mappa _hozzáadása" -#: ../midori/midori-browser.c:5312 -msgid "Add a new bookmark folder" -msgstr "Új könyvjelzőmappa hozzáadása" - -#: ../midori/midori-browser.c:5317 +#: ../midori/midori-browser.c:5388 msgid "_Export bookmarks" msgstr "Könyvjelzők e_xportálása" -#: ../midori/midori-browser.c:5320 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5391 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Keresőszolgáltatások kezelése" -#: ../midori/midori-browser.c:5321 -msgid "Add, edit and remove search engines..." -msgstr "Keresőszolgáltatások hozzáadása, szerkesztése és eltávolítása…" - -#: ../midori/midori-browser.c:5324 +#: ../midori/midori-browser.c:5394 msgid "_Clear Private Data" msgstr "_Privát adatok törlése" -#: ../midori/midori-browser.c:5325 -msgid "Clear private data..." -msgstr "Privát adatok törlése…" - -#: ../midori/midori-browser.c:5329 +#: ../midori/midori-browser.c:5397 msgid "_Inspect Page" msgstr "_Oldal vizsgálata" -#: ../midori/midori-browser.c:5330 -msgid "Inspect page details and access developer tools..." -msgstr "Oldal részleteinek vizsgálata és fejlesztői eszközök elérése…" - -#: ../midori/midori-browser.c:5335 +#: ../midori/midori-browser.c:5401 msgid "_Previous Tab" msgstr "_Előző lap" -#: ../midori/midori-browser.c:5336 -msgid "Switch to the previous tab" -msgstr "Váltás az előző lapra" - -#: ../midori/midori-browser.c:5338 +#: ../midori/midori-browser.c:5404 msgid "_Next Tab" msgstr "_Következő lap" -#: ../midori/midori-browser.c:5339 -msgid "Switch to the next tab" -msgstr "Váltás a következő lapra" +#: ../midori/midori-browser.c:5406 +msgid "Move Tab _Backward" +msgstr "Lap mozgatása _hátra" + +#: ../midori/midori-browser.c:5408 +msgid "_Move Tab Forward" +msgstr "Lap mozgatása _előre" -#: ../midori/midori-browser.c:5341 +#: ../midori/midori-browser.c:5411 msgid "Focus _Current Tab" msgstr "_Aktuális lap előtérbe" -#: ../midori/midori-browser.c:5342 -msgid "Focus the current tab" -msgstr "Aktuális lap előtérbe hozása" +#: ../midori/midori-browser.c:5414 +msgid "Focus _Next view" +msgstr "_Következő nézet előtérbe" + +#: ../midori/midori-browser.c:5417 +msgid "Only show the Icon of the _Current Tab" +msgstr "Csak _a jelenlegi lap ikonjának megjelenítése" + +#: ../midori/midori-browser.c:5420 +msgid "_Duplicate Current Tab" +msgstr "Jelenlegi lap _kettőzése" -#: ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:5423 +msgid "Close Ot_her Tabs" +msgstr "_Többi lap bezárása" + +#: ../midori/midori-browser.c:5426 msgid "Open last _session" msgstr "_Utolsó munkamenet megnyitása" -#: ../midori/midori-browser.c:5345 -msgid "Open the tabs saved in the last session" -msgstr "Az utolsó munkamenetben mentett lapok megnyitása" - -#: ../midori/midori-browser.c:5347 +#: ../midori/midori-browser.c:5429 msgid "_Help" msgstr "_Súgó" -#: ../midori/midori-browser.c:5349 -msgid "_Contents" -msgstr "_Tartalom" - -#: ../midori/midori-browser.c:5350 -msgid "Show the documentation" -msgstr "A dokumentáció megjelenítése" - -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:5431 msgid "_Frequent Questions" msgstr "_Gyakori kérdések" -#: ../midori/midori-browser.c:5353 -msgid "Show the Frequently Asked Questions" -msgstr "A gyakran ismételt kérdések megjelenítése" - -#: ../midori/midori-browser.c:5355 -msgid "_Report a Bug" -msgstr "_Hiba jelentése" - -#: ../midori/midori-browser.c:5356 -msgid "Open Midori's bug tracker" -msgstr "A Midori hibakövetőjének megnyitása" - -#: ../midori/midori-browser.c:5359 -msgid "Show information about the program" -msgstr "Információk megjelenítése a programról" +#: ../midori/midori-browser.c:5434 +msgid "_Report a Problem..." +msgstr "_Hiba jelentése…" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5446 msgid "_Menubar" msgstr "_Menüsáv" -#: ../midori/midori-browser.c:5368 -msgid "Show menubar" -msgstr "A menüsáv megjelenítése" - -#: ../midori/midori-browser.c:5371 +#: ../midori/midori-browser.c:5450 msgid "_Navigationbar" msgstr "_Navigációs sáv" -#: ../midori/midori-browser.c:5372 -msgid "Show navigationbar" -msgstr "A navigációs sáv megjelenítése" - -#: ../midori/midori-browser.c:5375 +#: ../midori/midori-browser.c:5454 msgid "Side_panel" msgstr "_Oldalsáv" -#: ../midori/midori-browser.c:5376 -msgid "Show sidepanel" -msgstr "Az oldalsáv megjelenítése" +#: ../midori/midori-browser.c:5455 +msgid "Sidepanel" +msgstr "Oldalsáv" -#: ../midori/midori-browser.c:5379 +#: ../midori/midori-browser.c:5458 msgid "_Bookmarkbar" msgstr "_Könyvjelzősáv" -#: ../midori/midori-browser.c:5380 -msgid "Show bookmarkbar" -msgstr "A könyvjelzősáv megjelenítése" - -#: ../midori/midori-browser.c:5383 -msgid "_Transferbar" -msgstr "Át_vitelsáv" - -#: ../midori/midori-browser.c:5384 -msgid "Show transferbar" -msgstr "Az átvitelsáv megjelenítése" - -#: ../midori/midori-browser.c:5387 +#: ../midori/midori-browser.c:5462 msgid "_Statusbar" msgstr "Á_llapotsor" -#: ../midori/midori-browser.c:5388 -msgid "Show statusbar" -msgstr "Az állapotsor megjelenítése" - -#: ../midori/midori-browser.c:5396 +#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:311 msgid "_Automatic" msgstr "_Automatikus" -#: ../midori/midori-browser.c:5399 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:236 msgid "Chinese (BIG5)" msgstr "Kínai (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5403 +#: ../midori/midori-browser.c:5478 msgid "Japanese (SHIFT__JIS)" msgstr "Japán (SHIFT__JIS)" -#: ../midori/midori-browser.c:5406 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5481 ../midori/midori-websettings.c:238 msgid "Korean (EUC-KR)" msgstr "Koreai (EUC-KR)" -#: ../midori/midori-browser.c:5409 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5484 ../midori/midori-websettings.c:239 msgid "Russian (KOI8-R)" msgstr "Orosz (KOI8-R)" -#: ../midori/midori-browser.c:5412 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5487 ../midori/midori-websettings.c:240 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5415 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5490 ../midori/midori-websettings.c:241 msgid "Western (ISO-8859-1)" msgstr "Nyugati (ISO-8859-1)" -#: ../midori/midori-browser.c:5949 +#: ../midori/midori-browser.c:5493 ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "Egyéni…" + +#: ../midori/midori-browser.c:5998 msgid "_Separator" msgstr "_Elválasztó" -#: ../midori/midori-browser.c:5956 +#: ../midori/midori-browser.c:6005 msgid "_Location..." msgstr "He_ly…" -#: ../midori/midori-browser.c:5958 +#: ../midori/midori-browser.c:6007 msgid "Open a particular location" msgstr "Adott hely megnyitása" -#: ../midori/midori-browser.c:5982 +#: ../midori/midori-browser.c:6029 msgid "_Web Search..." msgstr "_Webkeresés…" -#: ../midori/midori-browser.c:5984 +#: ../midori/midori-browser.c:6031 msgid "Run a web search" msgstr "Webkeresés futtatása " -#: ../midori/midori-browser.c:6005 +#: ../midori/midori-browser.c:6058 msgid "Reopen a previously closed tab or window" msgstr "Korábban bezárt lap vagy ablak ismételt megnyitása" -#: ../midori/midori-browser.c:6020 -msgid "_Recently visited pages" -msgstr "_Nemrég látogatott oldalak" - -#: ../midori/midori-browser.c:6022 -msgid "Reopen pages that you visited earlier" -msgstr "Korábban meglátogatott oldalak ismételt megnyitása" - -#: ../midori/midori-browser.c:6037 ../midori/sokoke.c:1288 -msgid "_Bookmarks" -msgstr "_Könyvjelzők" - -#: ../midori/midori-browser.c:6039 +#: ../midori/midori-browser.c:6075 msgid "Show the saved bookmarks" msgstr "A mentett könyvjelzők megjelenítése" -#: ../midori/midori-browser.c:6054 +#: ../midori/midori-browser.c:6092 msgid "_Tools" msgstr "_Eszközök" -#: ../midori/midori-browser.c:6067 +#: ../midori/midori-browser.c:6108 msgid "_Window" msgstr "_Ablak" -#: ../midori/midori-browser.c:6069 +#: ../midori/midori-browser.c:6110 msgid "Show a list of all open tabs" msgstr "Az összes megnyitott lap listájának megjelenítése" -#: ../midori/midori-browser.c:6083 +#: ../midori/midori-browser.c:6124 msgid "_Menu" msgstr "_Menü" -#: ../midori/midori-browser.c:6085 +#: ../midori/midori-browser.c:6126 msgid "Menu" msgstr "Menü" -#: ../midori/midori-browser.c:6670 +#: ../midori/midori-browser.c:6940 #, c-format msgid "Unexpected setting '%s'" msgstr "Váratlan beállítás: „%s”" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-extension.c:329 #, c-format -msgid "Failed to select from history\n" -msgstr "Az előzményekből választás meghiúsult\n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "A(z) „%s” kiterjesztés beállításai nem tölthetők be: %s\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "%s keresése" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "A(z) „%s” kiterjesztés beállításai nem menthetők: %s\n" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "Keresés ezzel: %s" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Keresés ezzel…" + +#: ../midori/midori-locationaction.c:537 #, c-format -msgid "Failed to execute database statement\n" -msgstr "Az adatbázis-utasítás végrehajtása meghiúsult\n" +msgid "Failed to select from history\n" +msgstr "Az előzményekből választás meghiúsult\n" -#. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:624 +#, c-format +msgid "Search for %s" +msgstr "%s keresése" + +#. i18n: Right-click on Location, Open an URL from the clipboard +#: ../midori/midori-locationaction.c:1400 msgid "Paste and p_roceed" msgstr "Beillesztés és _folytatás" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 -msgid "Detach chosen panel from the window" -msgstr "Kiválasztott panel leválasztása az ablakról" +#: ../midori/midori-locationaction.c:1768 +msgid "Not verified" +msgstr "Nem ellenőrzött" + +#: ../midori/midori-locationaction.c:1788 +msgid "Verified and encrypted connection" +msgstr "Ellenőrzött és titkosított kapcsolat" -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" msgstr "Az oldalsáv jobbra igazítása" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Panel bezárása" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Az oldalsáv balra igazítása" -#: ../midori/midori-panel.c:802 -msgid "Hide operating controls" -msgstr "Vezérlők elrejtése" - -#: ../midori/midori-websettings.c:204 -msgid "Show Blank page" -msgstr "Üres oldal megjelenítése" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "Gyorstárcsázó megjelenítése" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" msgstr "Kezdőlap megjelenítése" -#: ../midori/midori-websettings.c:206 -msgid "Show last open tabs" -msgstr "A legutóbbi lapok megjelenítése" - -#: ../midori/midori-websettings.c:207 -msgid "Show last tabs without loading" -msgstr "A legutóbbi lapok megjelenítése betöltés nélkül" - -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:237 msgid "Japanese (SHIFT_JIS)" msgstr "Japán (SHIFT_JIS)" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:257 msgid "New tab" msgstr "Új lap" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:258 msgid "New window" msgstr "Új ablak" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:259 msgid "Current tab" msgstr "Aktuális lap" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:274 msgid "Default" msgstr "Alapértelmezett" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:275 msgid "Icons" msgstr "Ikonok" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:276 msgid "Small icons" msgstr "Kis ikonok" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:277 msgid "Text" msgstr "Szöveg" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:278 msgid "Icons and text" msgstr "Ikonok és szöveg" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:279 msgid "Text beside icons" msgstr "Szöveg az ikonok mellett" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:294 msgid "Automatic (GNOME or environment)" msgstr "Automatikus (GNOME vagy környezet)" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:295 msgid "HTTP proxy server" msgstr "HTTP proxykiszolgáló" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:296 msgid "No proxy server" msgstr "Nincs proxykiszolgáló" -#: ../midori/midori-websettings.c:297 -msgid "All cookies" -msgstr "Minden süti" - -#: ../midori/midori-websettings.c:298 -msgid "Session cookies" -msgstr "Munkamenetsütik" - -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 -msgid "None" -msgstr "Nincs" - -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:400 msgid "Remember last window size" msgstr "Utolsó ablakméret megjegyzése" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:401 msgid "Whether to save the last window size" msgstr "Az utolsó ablakméret megjegyzendő-e" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:409 msgid "Last window width" msgstr "Utolsó ablakszélesség" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:410 msgid "The last saved window width" msgstr "Az utoljára mentett ablakszélesség" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:418 msgid "Last window height" msgstr "Utolsó ablakmagasság" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:419 msgid "The last saved window height" msgstr "Az utoljára mentett ablakmagasság" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:444 msgid "Last panel position" msgstr "Utolsó panelpozíció" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:445 msgid "The last saved panel position" msgstr "Az utoljára mentett panelpozíció" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:454 msgid "Last panel page" msgstr "Utolsó paneloldal" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:455 msgid "The last saved panel page" msgstr "Az utoljára mentett paneloldal" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:463 msgid "Last Web search" msgstr "Utolsó webkeresés" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:464 msgid "The last saved Web search" msgstr "Az utoljára mentett webkeresés" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:473 msgid "Show Menubar" msgstr "Menüsáv megjelenítése" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:474 msgid "Whether to show the menubar" msgstr "A menüsáv megjelenítendő-e" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:482 msgid "Show Navigationbar" msgstr "Navigációs sáv megjelenítése" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:483 msgid "Whether to show the navigationbar" msgstr "A navigációs sáv megjelenítendő-e" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:491 msgid "Show Bookmarkbar" msgstr "Könyvjelzősáv megjelenítése" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:492 msgid "Whether to show the bookmarkbar" msgstr "A könyvjelzősáv megjelenítendő-e" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:500 msgid "Show Panel" msgstr "Panel megjelenítése" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:501 msgid "Whether to show the panel" msgstr "A panel megjelenítendő-e" -#: ../midori/midori-websettings.c:487 -msgid "Show Transferbar" -msgstr "Átvitelsáv megjelenítése" - -#: ../midori/midori-websettings.c:488 -msgid "Whether to show the transferbar" -msgstr "Az átvitelsáv megjelenítendő-e" - -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:509 msgid "Show Statusbar" msgstr "Állapotsor megjelenítése" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:510 msgid "Whether to show the statusbar" msgstr "Az állapotsor megjelenítendő-e" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:519 msgid "Toolbar Style:" msgstr "Eszköztár stílusa:" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:520 msgid "The style of the toolbar" msgstr "Az eszköztár stílusa" -#: ../midori/midori-websettings.c:523 -msgid "Show progress in location entry" -msgstr "Előrehaladás megjelenítése a címsávban" - -#: ../midori/midori-websettings.c:524 -msgid "Whether to show loading progress in the location entry" -msgstr "A betöltés előrehaladása megjelenjen-e a címsávban" - -#: ../midori/midori-websettings.c:539 -msgid "Search engines in location completion" -msgstr "Keresőszolgáltatások megjelenítése a helykiegészítésben" - -#: ../midori/midori-websettings.c:540 -msgid "Whether to show search engines in the location completion" -msgstr "Megjelenjenek-e a keresőszolgáltatások a helykiegészítésben" - -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:529 msgid "Toolbar Items" msgstr "Eszköztárelemek" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:530 msgid "The items to show on the toolbar" msgstr "Az eszköztáron megjelenítendő elemek" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:538 msgid "Compact Sidepanel" msgstr "Tömör oldalsáv" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:539 msgid "Whether to make the sidepanel compact" msgstr "Az oldalsáv tömören jelenjen-e meg" -#: ../midori/midori-websettings.c:573 -msgid "Show operating controls of the panel" -msgstr "A panel vezérlőinek megjelenítése" - -#: ../midori/midori-websettings.c:574 -msgid "Whether to show the operating controls of the panel" -msgstr "Megjelenjenek-e a panel vezérlői" - -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:554 msgid "Align sidepanel on the right" msgstr "Az oldalsáv jobbra igazítása" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:555 msgid "Whether to align the sidepanel on the right" msgstr "Az oldalsáv jobbra legyen-e igazítva" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:570 msgid "Open panels in separate windows" msgstr "Panelek megnyitása külön ablakokban" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:571 msgid "Whether to always open panels in separate windows" msgstr "A panelek mindig külön ablakokban nyíljanak-e meg" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:580 msgid "When Midori starts:" msgstr "A Midori indulásakor:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:581 msgid "What to do when Midori starts" msgstr "Mi történjen a Midori indulásakor" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:590 msgid "Homepage:" msgstr "Kezdőlap:" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:591 msgid "The homepage" msgstr "A kezdőlap" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:606 msgid "Show crash dialog" msgstr "Összeomlási ablak megjelenítése" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:607 msgid "Show a dialog after Midori crashed" msgstr "Párbeszédablak megjelenítése a Midori összeomlása után" -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:658 -msgid "Show speed dial in new tabs" -msgstr "Gyorstárcsázás megjelenítése új lapokon" - -#: ../midori/midori-websettings.c:659 -msgid "Show speed dial in newly opened tabs" -msgstr "Gyorstárcsázás megjelenítése az újonnan megnyitott lapokon" - -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:615 msgid "Save downloaded files to:" msgstr "Letöltött fájlok mentése ide:" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:616 msgid "The folder downloaded files are saved to" msgstr "A letöltött fájlok ebbe a mappába kerülnek mentésre" -#: ../midori/midori-websettings.c:689 -msgid "Ask for the destination folder" -msgstr "Rákérdezés a célmappára" - -#: ../midori/midori-websettings.c:690 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "Fájl letöltésekor rákérdezzen-e a célmappára" - -#: ../midori/midori-websettings.c:709 -msgid "Notify when a transfer has been completed" -msgstr "Értesítés átvitel befejeződésekor" - -#: ../midori/midori-websettings.c:710 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "Megjelenjen-e értesítés átvitel befejeződésekor" - -#: ../midori/midori-websettings.c:722 -msgid "Download Manager" -msgstr "Letöltéskezelő" - -#: ../midori/midori-websettings.c:723 -msgid "An external download manager" -msgstr "Külső letöltéskezelő" - -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:624 msgid "Text Editor" msgstr "Szövegszerkesztő" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:625 msgid "An external text editor" msgstr "Külső szövegszerkesztő" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:640 msgid "News Aggregator" msgstr "Hírforrásolvasó" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:641 msgid "An external news aggregator" msgstr "Külső hírforrásolvasó" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:649 msgid "Location entry Search" msgstr "Keresés a címsávban" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:650 msgid "The search to perform inside the location entry" msgstr "A címsávban végrehajtandó keresés" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:658 msgid "Preferred Encoding" msgstr "Előnyben részesített kódolás" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:659 msgid "The preferred character encoding" msgstr "Az előnyben részesített karakterkódolás" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:669 msgid "Always Show Tabbar" msgstr "Mindig jelenjen meg a lapsáv" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:670 msgid "Always show the tabbar" msgstr "Mindig jelenjen meg a lapsáv" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:683 msgid "Close Buttons on Tabs" msgstr "Bezárás gombok a lapokon" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:684 msgid "Whether tabs have close buttons" msgstr "A lapokon legyenek-e bezárás gombok" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:709 msgid "Open new pages in:" msgstr "Új oldalak megnyitása:" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:710 msgid "Where to open new pages" msgstr "Hol nyíljanak meg az új oldalak" -#: ../midori/midori-websettings.c:804 -msgid "Open external pages in:" -msgstr "Külső oldalak megnyitása:" - -#: ../midori/midori-websettings.c:805 -msgid "Where to open externally opened pages" -msgstr "Hol nyíljanak meg a külső programokból megnyitott oldalak" - -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:719 msgid "Middle click opens Selection" msgstr "A középső kattintás megnyitja a kijelölést" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:720 msgid "Load an address from the selection via middle click" msgstr "Cím betöltése a kijelölésből középső kattintásra" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:728 msgid "Open tabs in the background" msgstr "Lapok megnyitása a háttérben" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:729 msgid "Whether to open new tabs in the background" msgstr "Az új lapok a háttérben nyíljanak-e meg" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:737 msgid "Open Tabs next to Current" msgstr "Lapok megnyitása az aktuális mellett" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:738 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Az új lapok az aktuális mellett vagy az utolsó után nyíljanak-e meg" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:746 msgid "Open popups in tabs" msgstr "Felugró ablakok megnyitása lapokon" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:747 msgid "Whether to open popup windows in tabs" msgstr "A felugró ablakok lapokon nyíljanak-e meg" -#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Képek automatikus betöltése" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:758 msgid "Load and display images automatically" msgstr "A képek automatikus letöltése és megnyitása" -#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 msgid "Enable scripts" msgstr "Parancsfájlok engedélyezése" -#: ../midori/midori-websettings.c:861 +#: ../midori/midori-websettings.c:766 msgid "Enable embedded scripting languages" msgstr "Beágyazott programnyelvek engedélyezése" -#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" msgstr "Netscape bővítmények engedélyezése" -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:774 msgid "Enable embedded Netscape plugin objects" msgstr "Beágyazott Netscape bővítményobjektumok engedélyezése" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:789 +msgid "Enable Spell Checking" +msgstr "Helyesírás-ellenőrzés engedélyezése" + +#: ../midori/midori-websettings.c:790 +msgid "Enable spell checking while typing" +msgstr "Helyesírás-ellenőrzés engedélyezése gépeléskor" + +#: ../midori/midori-websettings.c:796 msgid "Enable HTML5 database support" msgstr "HTML5 adatbázis-támogatás engedélyezése" -#: ../midori/midori-websettings.c:886 +#: ../midori/midori-websettings.c:797 msgid "Whether to enable HTML5 database support" msgstr "A HTML5 adatbázis-támogatás engedélyezve legyen-e" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:803 msgid "Enable HTML5 local storage support" msgstr "HTML5 helyi tárolás támogatásának engedélyezése" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:804 msgid "Whether to enable HTML5 local storage support" msgstr "A HTML5 helyi tárolás támogatása engedélyezve legyen-e" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:810 msgid "Enable offline web application cache" msgstr "Webalkalmazások kapcsolat nélküli gyorsítótárának engedélyezése" -#: ../midori/midori-websettings.c:902 +#: ../midori/midori-websettings.c:811 msgid "Whether to enable offline web application cache" msgstr "A webalkalmazások kapcsolat nélküli gyorsítótára engedélyezve legyen-e" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:827 +msgid "Flash window on background tabs" +msgstr "Ablak megvillantása háttérben lévő lapok nyitásakor" + +#: ../midori/midori-websettings.c:828 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "A böngészőablak megvillantása új lap megnyílásakor a háttérben" + +#: ../midori/midori-websettings.c:836 +msgid "Enable WebGL support" +msgstr "WebGL-támogatás engedélyezése" + +#: ../midori/midori-websettings.c:837 +msgid "Allow websites to use OpenGL rendering" +msgstr "A weboldalak használhatnak OpenGL renderelést" + +#: ../midori/midori-websettings.c:863 msgid "Zoom Text and Images" msgstr "Szöveg és képek nagyítása" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:864 msgid "Whether to zoom text and images" msgstr "A szöveg és képek nagyítandók-e" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:879 msgid "Find inline while typing" msgstr "Beágyazott keresés gépeléskor" -#: ../midori/midori-websettings.c:944 +#: ../midori/midori-websettings.c:880 msgid "Whether to automatically find inline while typing" msgstr "Gépeléskor az automatikus beágyazott keresés használandó-e" # Fixme: ez mi? -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:895 msgid "Kinetic scrolling" msgstr "Kinetikus görgetés" # Fixme: ez mi? -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:896 msgid "Whether scrolling should kinetically move according to speed" msgstr "A görgetés kinetikusan mozogjon-e a sebességnek megfelelően" -#: ../midori/midori-websettings.c:968 -msgid "Accept cookies" -msgstr "Sütik elfogadása" - -#: ../midori/midori-websettings.c:969 -msgid "What type of cookies to accept" -msgstr "Milyen típusú sütiket fogadjon el" - -#: ../midori/midori-websettings.c:985 -msgid "Original cookies only" -msgstr "Csak eredeti sütik" - -#: ../midori/midori-websettings.c:986 -msgid "Accept cookies from the original website only" -msgstr "Csak az eredeti webhelyről származó sütik elfogadása" - -#: ../midori/midori-websettings.c:994 -msgid "Maximum cookie age" -msgstr "Sütik maximális kora" +#: ../midori/midori-websettings.c:904 +msgid "Delete old Cookies after:" +msgstr "Régi sütik törlése ennyi után:" -#: ../midori/midori-websettings.c:995 +#: ../midori/midori-websettings.c:905 msgid "The maximum number of days to save cookies for" msgstr "Sütik tárolása legfeljebb ennyi napig" -#: ../midori/midori-websettings.c:1012 -msgid "Remember last visited pages" -msgstr "Utoljára látogatott oldalak megjegyzése" - -#: ../midori/midori-websettings.c:1013 -msgid "Whether the last visited pages are saved" -msgstr "Az utoljára meglátogatott oldalak mentendők-e" - -#: ../midori/midori-websettings.c:1021 -msgid "Maximum history age" -msgstr "Előzmények maximális kora" +#: ../midori/midori-websettings.c:921 +msgid "Only accept Cookies from sites you visit" +msgstr "Sütik elfogadása csak az Ön által meglátogatott webhelyekről" + +#: ../midori/midori-websettings.c:922 +msgid "Block cookies sent by third-party websites" +msgstr "Külső weboldalak sütijeinek blokkolása" + +#: ../midori/midori-websettings.c:936 +msgid "Delete pages from history after:" +msgstr "Oldalak törlése az előzményekből ennyi után:" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:937 msgid "The maximum number of days to save the history for" msgstr "Előzmények tárolása legfeljebb ennyi napig" -#: ../midori/midori-websettings.c:1030 -msgid "Remember last downloaded files" -msgstr "Utoljára letöltött fájlok megjegyzése" - -#: ../midori/midori-websettings.c:1031 -msgid "Whether the last downloaded files are saved" -msgstr "Az utoljára letöltött fájlok megjegyzendők-e" - -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:952 msgid "Proxy server" msgstr "Proxykiszolgáló" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:953 msgid "The type of proxy server to use" msgstr "A használandó proxykiszolgáló típusa" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:962 msgid "HTTP Proxy Server" msgstr "HTTP proxykiszolgáló" -#: ../midori/midori-websettings.c:1059 +#: ../midori/midori-websettings.c:963 msgid "The proxy server used for HTTP connections" msgstr "A HTTP kapcsolatokhoz használt proxykiszolgáló" -#: ../midori/midori-websettings.c:1074 -msgid "Detect proxy server automatically" -msgstr "Proxykiszolgáló automatikus felismerése" - -#: ../midori/midori-websettings.c:1075 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Megpróbálja-e automatikusan felismerni a proxykiszolgálót a környezetből" +#: ../midori/midori-websettings.c:978 +msgid "Port" +msgstr "Port" + +#: ../midori/midori-websettings.c:979 +msgid "The proxy server port used for HTTP connections" +msgstr "A HTTP kapcsolatokhoz használt proxykiszolgálóport" + +#: ../midori/midori-websettings.c:997 +msgid "The maximum size of cached pages on disk" +msgstr "Gyorsítótárazott oldalak legnagyobb mérete a lemezen" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1014 msgid "Identify as" msgstr "Azonosítás mint" -#: ../midori/midori-websettings.c:1092 +#: ../midori/midori-websettings.c:1015 msgid "What to identify as to web pages" msgstr "Miként mutatkozzon be a weboldalaknak" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1031 msgid "Identification string" msgstr "Azonosító karakterlánc" -#: ../midori/midori-websettings.c:1109 +#: ../midori/midori-websettings.c:1032 msgid "The application identification string" msgstr "Az alkalmazást azonosító karakterlánc" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1048 msgid "Preferred languages" msgstr "Előnyben részesített nyelvek" -#: ../midori/midori-websettings.c:1125 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "Többnyelvű weboldalak megjelenítésekor előnyben részesített nyelvek vesszővel elválasztott listája. Például: „hu”, „hu,en” vagy „en-us;q=1.0, fr-fr;q=0.667”" +#: ../midori/midori-websettings.c:1049 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"Többnyelvű weboldalak megjelenítésekor előnyben részesített nyelvek " +"vesszővel elválasztott listája. Például: „hu”, „hu,en” vagy „en-us;q=1.0, fr-" +"fr;q=0.667”" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1064 msgid "Clear private data" msgstr "Privát adatok törlése" -#: ../midori/midori-websettings.c:1141 +#: ../midori/midori-websettings.c:1065 msgid "The private data selected for deletion" msgstr "A törlésre kiválasztott privát adatok" -#. 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:1261 ../midori/midori-view.c:4567 -#: ../midori/midori-view.c:4571 +#: ../midori/midori-websettings.c:1080 +msgid "Clear data" +msgstr "Adatok törlése" + +#: ../midori/midori-websettings.c:1081 +msgid "The data selected for deletion" +msgstr "A törlésre kiválasztott adatok" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1130 +msgid "Strip referrer details sent to websites" +msgstr "Weboldalaknak küldött hivatkozási részletek rövidítése" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1132 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "A „Referer” fejlécet rövidíteni kell-e a gépnévre" + +#: ../midori/midori-websettings.c:1146 +msgid "Always use my font choices" +msgstr "Mindig a saját betűkészletek használata" + +#: ../midori/midori-websettings.c:1147 +msgid "Override fonts picked by websites with user preferences" +msgstr "" +"A weboldalak által választott betűkészletek felülbírálása felhasználói " +"beállításokkal" + +#: ../midori/midori-view.c:1360 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s HTML5 adatbázist szeretne menteni." + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Deny" +msgstr "_Megtagadás" + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Allow" +msgstr "_Engedélyezés" + +#: ../midori/midori-view.c:1392 +#, c-format +msgid "%s wants to know your location." +msgstr "%s tudni szeretné az Ön tartózkodási helyét." + +#: ../midori/midori-view.c:1485 #, c-format msgid "Error - %s" msgstr "Hiba - %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1486 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "A(z) „%s” oldal nem tölthető be." -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1488 msgid "Try again" msgstr "Próbálja újra" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 -#, c-format -msgid "Not found - %s" -msgstr "Nem található - %s" - -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598 #, c-format msgid "Send a message to %s" msgstr "Üzenet küldése a következőnek: %s" -#: ../midori/midori-view.c:2147 ../midori/midori-view.c:2532 +#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747 msgid "Inspect _Element" msgstr "Elem _vizsgálata" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2269 +#: ../midori/midori-view.c:2480 msgid "Open Link in New _Tab" msgstr "Hivatkozás megnyitása új _lapon" -#: ../midori/midori-view.c:2203 +#: ../midori/midori-view.c:2484 msgid "Open Link in _Foreground Tab" msgstr "Hi_vatkozás megnyitása az előtérben lévő lapon" -#: ../midori/midori-view.c:2204 +#: ../midori/midori-view.c:2485 msgid "Open Link in _Background Tab" msgstr "_Hivatkozás megnyitása a háttérben lévő lapon" -#: ../midori/midori-view.c:2207 ../midori/midori-view.c:2276 +#: ../midori/midori-view.c:2488 msgid "Open Link in New _Window" msgstr "Hivatkozás megnyitása új _ablakban" -#: ../midori/midori-view.c:2210 +#: ../midori/midori-view.c:2491 msgid "Open Link as Web A_pplication" msgstr "Hivatkozás megnyitása _webes alkalmazásként" -#: ../midori/midori-view.c:2213 +#: ../midori/midori-view.c:2496 msgid "Copy Link de_stination" msgstr "Hivatkozás _címének másolása" -#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2288 -msgid "_Save Link destination" -msgstr "Hivatkozás címének me_ntése" - -#: ../midori/midori-view.c:2217 ../midori/midori-view.c:2282 -msgid "_Download Link destination" -msgstr "Hivatkozás címének l_etöltése" - -#: ../midori/midori-view.c:2221 ../midori/midori-view.c:2251 -#: ../midori/midori-view.c:2293 -msgid "Download with Download _Manager" -msgstr "_Letöltés a letöltéskezelővel" - -#: ../midori/midori-view.c:2230 +#: ../midori/midori-view.c:2512 msgid "Open _Image in New Tab" msgstr "Ké_p megnyitása új lapon" -#: ../midori/midori-view.c:2233 +#: ../midori/midori-view.c:2515 msgid "Copy Image _Address" msgstr "Kép _címének másolása" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2518 msgid "Save I_mage" msgstr "Kép me_ntése" -#: ../midori/midori-view.c:2237 -msgid "Download I_mage" -msgstr "_Kép letöltése" +#: ../midori/midori-view.c:2521 +msgid "Open in Image _Viewer" +msgstr "Megnyitás a _képmegjelenítőben" -#: ../midori/midori-view.c:2244 +#: ../midori/midori-view.c:2528 msgid "Copy Video _Address" msgstr "Videó _címének másolása" -#: ../midori/midori-view.c:2247 +#: ../midori/midori-view.c:2531 msgid "Save _Video" msgstr "Videó me_ntése" -#: ../midori/midori-view.c:2247 +#: ../midori/midori-view.c:2531 msgid "Download _Video" msgstr "_Videó letöltése" -#: ../midori/midori-view.c:2310 +#: ../midori/midori-view.c:2557 msgid "Search _with" msgstr "_Keresés ezzel" -#: ../midori/midori-view.c:2345 ../midori/midori-view.c:2352 +#: ../midori/midori-view.c:2589 msgid "_Search the Web" msgstr "Keresés a _weben" -#: ../midori/midori-view.c:2373 +#: ../midori/midori-view.c:2606 msgid "Open Address in New _Tab" msgstr "Cím meg_nyitása új lapon" -#: ../midori/midori-view.c:2674 +#: ../midori/midori-view.c:2909 msgid "Open or download file" msgstr "Fájl megnyitása vagy letöltése" -#: ../midori/midori-view.c:2693 +#: ../midori/midori-view.c:2929 #, c-format msgid "File Type: '%s'" msgstr "Fájltípus: „%s”" -#: ../midori/midori-view.c:2696 +#: ../midori/midori-view.c:2931 #, c-format msgid "File Type: %s ('%s')" msgstr "Fájltípus: %s („%s”)" -#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2700 +#: ../midori/midori-view.c:2935 +#, c-format +msgid "File Name: %s" +msgstr "Fájlnév: %s" + +#: ../midori/midori-view.c:2955 #, c-format msgid "Open %s" msgstr "%s megnyitása" -#: ../midori/midori-view.c:3244 +#: ../midori/midori-view.c:3576 #, c-format msgid "Inspect page - %s" msgstr "Oldal vizsgálata - %s" -#: ../midori/midori-view.c:3526 -msgid "Speed dial" +#: ../midori/midori-view.c:3923 +msgid "Speed Dial" msgstr "Gyorstárcsázó" -#: ../midori/midori-view.c:3527 +#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020 msgid "Click to add a shortcut" msgstr "Kattintson gyorsindító hozzáadásához" -#: ../midori/midori-view.c:3528 +#: ../midori/midori-view.c:3925 msgid "Enter shortcut address" msgstr "Adja meg a gyorsindító címét" -#: ../midori/midori-view.c:3529 +#: ../midori/midori-view.c:3926 msgid "Enter shortcut title" msgstr "Adja meg a gyorsindító címét" -#: ../midori/midori-view.c:3530 +#: ../midori/midori-view.c:3927 msgid "Are you sure you want to delete this shortcut?" msgstr "Biztosan törölni akarja ezt a gyorsindítót?" -#: ../midori/midori-view.c:3531 -msgid "Set number of columns and rows" -msgstr "Oszlopok és sorok számának beállítása" - -#: ../midori/midori-view.c:3532 -msgid "Enter number of columns and rows:" -msgstr "Adja meg az oszlopok és sorok számát:" - -#: ../midori/midori-view.c:3533 -msgid "Invalid input for the size of the speed dial" -msgstr "A gyorstárcsázó megadott mérete érvénytelen" - -#: ../midori/midori-view.c:3534 -msgid "Thumb size:" -msgstr "Bélyegkép mérete:" +#: ../midori/midori-view.c:4089 +#, c-format +msgid "No documentation installed" +msgstr "Nincs telepítve dokumentáció" -#: ../midori/midori-view.c:3535 -msgid "Small" -msgstr "Kicsi" +#: ../midori/midori-view.c:4165 +msgid "Midori doesn't store any personal data:" +msgstr "A Midori nem tárol személyes adatokat:" + +#: ../midori/midori-view.c:4166 +msgid "No history or web cookies are being saved." +msgstr "Nem kerülnek mentésre előzmények vagy webes sütik." + +#: ../midori/midori-view.c:4167 +msgid "Extensions are disabled." +msgstr "Kiterjesztések letiltva." -#: ../midori/midori-view.c:3536 -msgid "Medium" -msgstr "Közepes" +#: ../midori/midori-view.c:4168 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "" +"HTML5 tárolás, a helyi adatbázis- és alkalmazás-gyorsítótárak le vannak " +"tiltva." -#: ../midori/midori-view.c:3537 -msgid "Big" -msgstr "Nagy" +#: ../midori/midori-view.c:4169 +msgid "Midori prevents websites from tracking the user:" +msgstr "A Midori megakadályozza, hogy a weboldalak kövessék a felhasználót:" + +#: ../midori/midori-view.c:4170 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "A hivatkozó URL-címek le lesznek csupaszítva a gépnévig." + +#: ../midori/midori-view.c:4171 +msgid "DNS prefetching is disabled." +msgstr "A DNS-előtöltés letiltva." + +#: ../midori/midori-view.c:4172 +msgid "The language and timezone are not revealed to websites." +msgstr "A nyelv és időzóna nem kerül megadásra a weboldalaknak." -#: ../midori/midori-view.c:3563 -#, c-format -msgid "Document cannot be displayed" -msgstr "A dokumentum nem jeleníthető meg" +#: ../midori/midori-view.c:4173 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "" +"A Flash és más Netscape bővítmények nem sorolhatók fel a weboldalak által." -#: ../midori/midori-view.c:3586 -#, c-format -msgid "No documentation installed" -msgstr "Nincs telepítve dokumentáció" +#: ../midori/midori-view.c:4222 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "" +"A szögletes zárójelben lévő verziószámok megjelenítik a futás közben " +"használt verziót." -#: ../midori/midori-view.c:3707 +#: ../midori/midori-view.c:4278 msgid "Page loading delayed" msgstr "Oldalbetöltés késleltetve" -#: ../midori/midori-view.c:3708 +#: ../midori/midori-view.c:4279 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "A betöltés késleltetve egy nemrégi összeomlás vagy az indítási beállítások miatt." +msgstr "" +"A betöltés késleltetve egy nem régi összeomlás vagy az indítási beállítások " +"miatt." -#: ../midori/midori-view.c:3709 +#: ../midori/midori-view.c:4280 msgid "Load Page" msgstr "Oldal betöltése" -#: ../midori/midori-view.c:3853 +#: ../midori/midori-view.c:4446 msgid "Blank page" msgstr "Üres oldal" -#: ../midori/midori-view.c:4107 +#: ../midori/midori-view.c:4708 msgid "_Duplicate Tab" msgstr "_Lap kettőzése" -#: ../midori/midori-view.c:4112 -msgid "_Restore Tab" -msgstr "Lap _visszaállítása" - -#: ../midori/midori-view.c:4112 -msgid "_Minimize Tab" -msgstr "Lap _minimalizálása" +#: ../midori/midori-view.c:4713 +msgid "Show Tab _Label" +msgstr "Lap_címke megjelenítése" + +#: ../midori/midori-view.c:4713 +msgid "Show Tab _Icon Only" +msgstr "Csak l_apikon megjelenítése" -#: ../midori/midori-view.c:4118 +#: ../midori/midori-view.c:4719 msgid "Close ot_her Tabs" msgstr "_Többi lap bezárása" -#: ../midori/midori-view.c:4804 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5532 +msgid "previous" +msgstr "előző" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5551 +msgid "next" +msgstr "következő" + +#: ../midori/midori-view.c:5564 msgid "Print background images" msgstr "Háttérképek nyomtatása" -#: ../midori/midori-view.c:4805 +#: ../midori/midori-view.c:5565 msgid "Whether background images should be printed" msgstr "A háttérképeket ki kell-e nyomtatni" -#: ../midori/midori-view.c:4857 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:5597 msgid "Features" msgstr "Szolgáltatások" -#. Page "General" -#: ../midori/midori-preferences.c:298 -msgid "General" -msgstr "Általános" - -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Indítás" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "_Jelenlegi oldal használata" + +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Jelenlegi oldal használata kezdőlapként" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Átvitelek" - #. Page "Appearance" -#: ../midori/midori-preferences.c:349 -msgid "Appearance" -msgstr "Megjelenés" - -#: ../midori/midori-preferences.c:350 -msgid "Font settings" -msgstr "Betűkészlet-beállítások" - -#: ../midori/midori-preferences.c:352 -msgid "Default Font Family" -msgstr "Alapértelmezett betűkészletcsalád" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Betűkészletek" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Proporcionális betűkészletcsalád" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" -msgstr "A szöveg megjelenítésére alapértelmezésben használandó betűkészletcsalád" +msgstr "" +"A szöveg megjelenítésére alapértelmezésben használandó betűkészletcsalád" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "A szöveg megjelenítésére alapértelmezésben használandó betűméret" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Rögzített szélességű betűkészletcsalád" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" -msgstr "A rögzített szélességű szöveg megjelenítésére használt betűkészletcsalád" +msgstr "" +"A rögzített szélességű szöveg megjelenítésére használt betűkészletcsalád" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" msgstr "A rögzített szélességű szöveg megjelenítésére használt betűméret" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Minimális betűméret" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "A szöveg megjelenítésére használt minimális betűméret" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Viselkedés" -#: ../midori/midori-preferences.c:393 -msgid "Enforce 96 dots per inch" -msgstr "96 DPI kényszerítése" - -#: ../midori/midori-preferences.c:394 -msgid "Enforce a video dot density of 96 DPI" -msgstr "96 DPI képpontsűrűség kényszerítése" - -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "A parancsfájlok megnyithatnak felugró ablakokat" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "A parancsfájlok megnyithatnak-e automatikusan felugró ablakokat" -#: ../midori/midori-preferences.c:419 -msgid "Spell Checking" -msgstr "Helyesírás-ellenőrzés" - -#: ../midori/midori-preferences.c:422 -msgid "Enable Spell Checking" -msgstr "Helyesírás-ellenőrzés engedélyezése" - -#: ../midori/midori-preferences.c:423 -msgid "Enable spell checking while typing" -msgstr "Helyesírás-ellenőrzés engedélyezése gépeléskor" - -#: ../midori/midori-preferences.c:425 -msgid "Spelling dictionaries:" -msgstr "Helyesírási szótárak:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "A helyesírás-ellenőrzéshez használandó nyelvek vesszővel elválasztott listája, például: „hu_HU,en_US”" - #. Page "Interface" -#: ../midori/midori-preferences.c:435 -msgid "Interface" -msgstr "Felület" - -#: ../midori/midori-preferences.c:436 -msgid "Navigationbar" -msgstr "Navigációs sáv" - -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Böngészés" -#. Page "Applications" -#: ../midori/midori-preferences.c:468 -msgid "Applications" -msgstr "Alkalmazások" - -#: ../midori/midori-preferences.c:469 -msgid "External applications" -msgstr "Külső alkalmazások" - #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "Hálózat" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:463 msgid "Hostname" msgstr "Gépnév" -#. Page "Privacy" -#: ../midori/midori-preferences.c:511 -msgid "Privacy" -msgstr "Adatvédelem" - -#: ../midori/midori-preferences.c:512 -msgid "Web Cookies" -msgstr "Webes sütik" - -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 -msgid "days" -msgstr "nap" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "MB" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Keresőszolgáltatás hozzáadása" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Keresőszolgáltatás szerkesztése" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Név:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Leírás:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "_Ikon:" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "_Jelsor:" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "Keresőszolgáltatások kezelése" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "_Alapértelmezett" -#: ../midori/sokoke.c:1287 -msgid "_Bookmark" -msgstr "_Könyvjelző" - -#: ../midori/sokoke.c:1289 -msgid "Add Boo_kmark" -msgstr "Köny_vjelző hozzáadása" - -#: ../midori/sokoke.c:1290 -msgid "_Console" -msgstr "_Konzol" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "Megnyitás ezzel" -#: ../midori/sokoke.c:1291 -msgid "_Extensions" -msgstr "Kit_erjesztések" +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Válasszon egy alkalmazást vagy parancsot „%s” megnyitásához:" -#: ../midori/sokoke.c:1292 -msgid "_History" -msgstr "_Előzmények" +#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "A külső program nem futtatható." -#: ../midori/sokoke.c:1293 -msgid "_Homepage" -msgstr "Kez_dőlap" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d óra" +msgstr[1] "%d óra" -#: ../midori/sokoke.c:1294 -msgid "_Userscripts" -msgstr "_Felhasználói parancsfájlok" +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d perc" +msgstr[1] "%d perc" -#: ../midori/sokoke.c:1295 -msgid "New _Tab" -msgstr "Új _lap" +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d másodperc" +msgstr[1] "%d másodperc" -#: ../midori/sokoke.c:1296 -msgid "_Transfers" -msgstr "Á_tvitelek" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s / %s" -#: ../midori/sokoke.c:1297 -msgid "Netscape p_lugins" -msgstr "_Netscape bővítmények" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/sokoke.c:1300 -msgid "New _Folder" -msgstr "Új _mappa" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr " – %s van hátra" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:201 +#: ../toolbars/midori-findbar.c:291 msgid "_Inline Find:" msgstr "Beágyazott _keresés:" -#: ../toolbars/midori-findbar.c:233 +#: ../toolbars/midori-findbar.c:317 msgid "Previous" msgstr "Előző" -#: ../toolbars/midori-findbar.c:239 +#: ../toolbars/midori-findbar.c:323 msgid "Next" msgstr "Tovább" -#: ../toolbars/midori-findbar.c:243 +#: ../toolbars/midori-findbar.c:327 msgid "Match Case" msgstr "Kis- és nagybetű" -#: ../toolbars/midori-findbar.c:252 +#: ../toolbars/midori-findbar.c:336 msgid "Highlight Matches" msgstr "Találatok kiemelése" -#: ../toolbars/midori-findbar.c:263 +#: ../toolbars/midori-findbar.c:347 msgid "Close Findbar" msgstr "Keresősáv bezárása" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s / %s" - -#: ../toolbars/midori-transferbar.c:123 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "A(z) „%s” fájl letöltve." -#: ../toolbars/midori-transferbar.c:126 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Átvitel kész" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "A letöltött fájl hibás." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"A hivatkozáshoz tartozó ellenőrzőösszeg nem egyezik. Ez azt jelenti, hogy a " +"fájl valószínűleg nem teljes, vagy megváltozott." + +#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Minden mező törlése" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 msgid "Some files are being downloaded" msgstr "Néhány fájl letöltése folyamatban" -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:377 msgid "_Quit Midori" msgstr "_Kilépés a Midoriból" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:379 msgid "The transfers will be cancelled if Midori quits." msgstr "Az átvitel meg fog szakadni, ha kilép a Midoriból." -#: ../panels/midori-bookmarks.c:109 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Könyvjelzők" -#: ../panels/midori-bookmarks.c:244 +#: ../panels/midori-bookmarks.c:257 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "A könyvjelzőelem hozzáadása meghiúsult: %s\n" -#: ../panels/midori-bookmarks.c:430 +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "A kijelölt könyvjelző szerkesztése" -#: ../panels/midori-bookmarks.c:438 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "A kijelölt könyvjelző törlése" -#: ../panels/midori-bookmarks.c:451 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" msgstr "Új mappa hozzáadása" -#: ../panels/midori-bookmarks.c:585 +#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 msgid "Separator" msgstr "Elválasztó" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "Konzol" - -#: ../panels/midori-console.c:361 -msgid "Copy _All" -msgstr "Ö_sszes másolása" - -#: ../panels/midori-console.c:362 -msgid "Copy All" -msgstr "Összes másolása" - -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Kiterjesztések" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "Előzmények" -#: ../panels/midori-history.c:273 -msgid "Erroneous clock time" -msgstr "Hibás óraidő" - -#: ../panels/midori-history.c:274 -msgid "The clock time lies in the past. Please check the current date and time." -msgstr "Az óra ideje a múltban van. Ellenőrizze a jelenlegi dátumot és időt." +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "Ma" -#: ../panels/midori-history.c:286 -msgid "A week ago" -msgstr "Egy hete" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "Tegnap" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d napja" msgstr[1] "%d napja" -#: ../panels/midori-history.c:291 -msgid "Today" -msgstr "Ma" - -#: ../panels/midori-history.c:293 -msgid "Yesterday" -msgstr "Tegnap" +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "Egy hete" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" msgstr "Biztos benne, hogy minden előzményelemet el akar távolítani?" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" msgstr "A kijelölt előzményelem könyvjelzőzése" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" msgstr "A kijelölt előzményelem törlése" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "Minden előzmény törlése" -#: ../panels/midori-history.c:952 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Szűrő:" +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Átvitelek" -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" msgstr "_Célmappa megnyitása" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" msgstr "Link _helyének másolása" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Hitelesítés szükséges" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" @@ -2250,164 +2219,244 @@ "A hely megnyitásához felhasználónév\n" "és jelszó szükséges:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "Felhasználói név" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "Jelszó" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "Jelszó _megjegyzése" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "A(z) „%s” nevű ikon nem tölthető be" -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "A(z) „%s” alapértelmezett ikon nem tölthető be" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "Az animációs képkockák sérültek" -#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" msgstr "A(z) „%s” tulajdonság érvénytelen a következőhöz: %s" -#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Válasszon fájlt" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:506 msgid "Choose folder" msgstr "Válasszon mappát" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "Nincs" + +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "1 óra" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "1 nap" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "1 hét" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "1 hónap" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "1 év" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "%s tulajdonságai" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:473 msgid "Configure Advertisement filters" msgstr "Reklámszűrők beállítása" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:504 #, 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 "Írja be az előre beállított szűrőlista címét a szövegmezőben, és a listához adáshoz nyomja meg a „Hozzáadás” gombot. További listákat itt találhat: %s." - -#: ../extensions/adblock.c:587 -msgid "Configure _Advertisement filters..." -msgstr "_Reklámszűrők beállítása…" +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 "" +"Írja be az előre beállított szűrőlista címét a szövegmezőben, és a listához " +"adáshoz nyomja meg a „Hozzáadás” gombot. További listákat itt találhat: %s." -#: ../extensions/adblock.c:841 +#: ../extensions/adblock.c:882 msgid "Edit rule" msgstr "Szabály szerkesztése" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:896 msgid "_Rule:" msgstr "S_zabály:" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:950 msgid "Bl_ock image" msgstr "Kép _blokkolása" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:955 msgid "Bl_ock link" msgstr "_Hivatkozás blokkolása" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1670 msgid "Advertisement blocker" msgstr "Reklámblokkoló" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1671 msgid "Block advertisements according to a filter list" msgstr "Reklámok blokkolása szűrőlista alapján" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "%s másolása ezen mappába: %s." +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "Ez az oldal felhasználói parancsfájlt tartalmaz. Szeretné telepíteni?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "Felhasználói parancsfájl _telepítése" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "Ez az oldal felhasználói stílust tartalmaz. Szeretné telepíteni?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "Felhasználói _stílus telepítése" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Ne telepítse" -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Felhasználói parancsfájlok" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Felhasználói stílusok" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Hiba" + +#: ../extensions/addons.c:421 #, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "A(z) „%s” kiterjesztés beállításai nem menthetők: %s\n" +msgid "Do you want to delete '%s'?" +msgstr "Biztos, hogy törölni akarja a következőt: „%s”?" + +#: ../extensions/addons.c:427 +msgid "Delete user script" +msgstr "Felhasználói parancsfájl törlése" + +#: ../extensions/addons.c:428 +msgid "Delete user style" +msgstr "Felhasználói stílus törlése" + +#: ../extensions/addons.c:431 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "A(z) „%s” fájl véglegesen törlésre kerül." + +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "Megnyitás szövegszerkesztőben" + +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "Célmappa megnyitása" + +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "Új bővítmény hozzáadása" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "Kijelölt bővítmény eltávolítása" + +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" msgstr "Felhasználói bővítmények" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "„%s” mappa nem figyelhető meg: %s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" msgstr "Felhasználói parancsfájlok és stílusok támogatása" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "Színes lapok" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Eltérő szín adása minden lapnak" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Sütikezelő" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "Összes törlése" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "Minden megjelenített süti törlése. Ha be van állítva szűrő, akkor csak az annak megfelelő sütiket törli." +#: ../extensions/cookie-manager/cookie-manager-page.c:105 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"Minden megjelenített süti törlése. Ha be van állítva szűrő, akkor csak az " +"annak megfelelő sütiket törli." -#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "Összes kibontása" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "Összes összecsukása" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" msgstr "Biztos, hogy az összes sütit törölni akarja?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Kérdés" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." msgstr "Csak a szűrőnek megfelelő sütik kerülnek törlésre." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "A munkamenet végén" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2424,15 +2473,15 @@ "Biztonságos: %s\n" "Lejár: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Igen" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "Nem" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" @@ -2441,39 +2490,42 @@ "Tartomány: %s\n" "Sütik: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Név" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "Összes _kibontása" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "Összes össze_csukása" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "Adjon meg egy szűrő karakterláncot a név vagy tartomány mező szűréséhez" - -#: ../extensions/cookie-manager/main.c:40 -msgid "_Cookie Manager" -msgstr "_Sütikezelő" +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +msgid "Filter:" +msgstr "Szűrő:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Adjon meg egy szűrő karakterláncot a név vagy tartomány mező szűréséhez" -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Sütik felsorolása, megjelenítése és törlése" -#: ../extensions/copy-tabs.c:39 +#: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" msgstr "Lap_címek másolása" -#: ../extensions/copy-tabs.c:98 +#: ../extensions/copy-tabs.c:95 msgid "Copy Addresses of Tabs" msgstr "Lapok címeinek másolása" -#: ../extensions/copy-tabs.c:99 +#: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Az összes lap címeinek vágólapra másolása" @@ -2486,39 +2538,39 @@ msgstr "Nem találhatók a szükséges Atom „feed” bejegyzések az XML adatokban." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Utolsó frissítés: %s." -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "Hírforrások" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "Új hírforrás hozzáadása" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "Hírforrás törlése" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "_Hírforrások" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Nem található gyökérelem a hírforrás XML adataiban." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Nem támogatott hírforrásformátum." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Az XML hírforrás feldolgozása meghiúsult: %s" @@ -2539,10 +2591,6 @@ msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Nem találhatók a szükséges RSS „channel” elemek az XML adatokban." -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "Hiba" - #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" @@ -2553,149 +2601,632 @@ msgid "Error loading feed '%s'" msgstr "Hiba a(z) „%s” hírforrás betöltésekor" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "Hírforráspanel" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Atom/ RSS hírforrások olvasása" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" msgstr "Az űrlapérték hozzáadása meghiúsult: %s\n" -#: ../extensions/formhistory.c:510 -msgid "Stores history of entered form data" -msgstr "A bevitt űrlapadatok előzményeit tárolja" +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "Űrlapelőzmények" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Mesterjelszó szükséges a\n" +"jelszóadatbázis megnyitásához" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "A program megjegyezze a jelszót ezen az oldalon?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Megjegyzés" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "Most nem" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Soha ezen az oldalon" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "Űrlapelőzmény-állapot átváltása" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "Az űrlapelőzmények be- vagy kikapcsolása a jelenlegi lapon." -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format -msgid "Not available: %s" -msgstr "Nem érhető el: %s" +msgid "Failed to execute database statement: %s\n" +msgstr "Az adatbázis-utasítás végrehajtása meghiúsult: %s\n" -#: ../extensions/formhistory.c:515 -msgid "Resource files not installed" -msgstr "Az erőforrásfájlok nincsenek telepítve" +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" +"Az űrlapelőzmények aktiválása laponként, csak gyorsbillentyűvel (Ctrl+Shift" +"+F)" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory/formhistory.c:668 msgid "Form history filler" msgstr "Űrlap-előzmények kitöltése" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/formhistory/formhistory.c:669 +msgid "Stores history of entered form data" +msgstr "A bevitt űrlapadatok előzményeit tárolja" + +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#, c-format +msgid "Failed to select suggestions\n" +msgstr "A javaslatok kiválasztása meghiúsult\n" + +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Nincsenek nem látogatott lapok" + +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "Előzménylista" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Lapbezárás viselkedése" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Ne tegyen semmit" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Váltás az utoljára megjelenített lapra" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Váltás a legújabb lapra" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Következő új lap (előzménylista)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Következő új lap az előzményekből" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Előző új lap (előzménylista)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Előző új lap az előzményekből" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Lap megjelenítése a háttérben (előzménylista)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "A jelenleg kijelölt lap megjelenítése a háttérben" + +#: ../extensions/history-list.vala:569 +msgid "History List" +msgstr "Előzménylista" + +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "Az utoljára használt lapra lépés lapok váltásakor vagy bezárásakor" + +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Egérgesztusok" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "A Midori irányítása az egér mozgatásával" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 -msgid "Pageholder" -msgstr "Oldaltároló" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "_Oldaltároló" - -#: ../extensions/page-holder.c:178 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "Oldalak nyitva tartása a lapokkal párhuzamosan" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "Oldal újratöltése, vagy betöltés leállítása" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "Gyorsbillentyűk személyre szabása" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "_Gyorsbillentyűk személyre szabása…" -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Gyorsbillentyűk" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "Gyorsbillentyűk megjelenítése és szerkesztése" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/status-clock.c:174 +msgid "Statusbar Clock" +msgstr "Állapotsoróra" + +#: ../extensions/status-clock.c:175 +msgid "Display date and time in the statusbar" +msgstr "Dátum és idő megjelenítése az állapotsorban" + +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Képek" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Parancsfájlok" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Netscape bővítmények" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "Állapotsor-összetevők" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" msgstr "Weboldalak összetevőinek egyszerű be- és kikapcsolása" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Lappanel" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "_Lappanel" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Lapok megjelenítése függőleges panelen" -#: ../extensions/tab-switcher.c:402 -msgid "Tab History List" -msgstr "Lapelőzmények listája" - -#: ../extensions/tab-switcher.c:403 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Lehetővé teszi a lapok közti váltást az utolsó használat alapján rendezett listából" - -#: ../extensions/tabs-minimized.c:79 -msgid "Minimize new Tabs" -msgstr "Új lapok minimalizálása" - -#: ../extensions/tabs-minimized.c:80 -msgid "New tabs open minimized" -msgstr "Az új lapok minimalizálva nyílnak meg" +#: ../extensions/tabs-minimized.c:76 +msgid "Only Icons on Tabs by default" +msgstr "Csak ikonok a lapokon alapértelmezésben" + +#: ../extensions/tabs-minimized.c:77 +msgid "New tabs have no label by default" +msgstr "Az új lapokon alapértelmezésben nincs felirat" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Eszköztár testreszabása" -#: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "Válassza ki az eszköztáron megjelenítendő elemeket. Az elemek fogd és vidd módszerrel átrendezhetők." +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"Válassza ki az eszköztáron megjelenítendő elemeket. Az elemek fogd és vidd " +"módszerrel átrendezhetők." -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Elérhető elemek" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Megjelenített elemek" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "_Eszköztár személyre szabása…" -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Testreszabás…" + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" msgstr "Eszköztárszerkesztő" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" msgstr "Az eszköztár elrendezésének egyszerű szerkesztése" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "HTTP kommunikáció gyorsítótárazása a lemezen" + +#~ msgid "Lightweight web browser" +#~ msgstr "Könnyűsúlyú webböngésző" + +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "A megadott konfigurációs mappa érvénytelen." + +#~ msgid "Cookies" +#~ msgstr "Sütik" + +#~ msgid "'Flash' Cookies" +#~ msgstr "„Flash” sütik" + +#~ msgid "HTML5 _Databases" +#~ msgstr "HTML5 a_datbázisok" + +#~ msgid "Offline Application Cache" +#~ msgstr "Alkalmazások kapcsolat nélküli gyorsítótára" + +#~ msgid "Reset the last _session" +#~ msgstr "_Utolsó munkamenet visszaállítása" + +#~ msgid "No filename specified" +#~ msgstr "Nincs megadva fájlnév" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% betöltve" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "Ne mentsen privát adatokat böngészéskor" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Indítóikon hozzáadása a gyorstárcsázáshoz" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Indítóikon hozzáadása az asztalhoz" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "Feliratkozás erre a hírforrásra" + +#~ msgid "Close this window" +#~ msgstr "A jelenlegi ablak bezárása" + +#~ msgid "Quit the application" +#~ msgstr "Kilépés az alkalmazásból" + +#~ msgid "Undo the last modification" +#~ msgstr "Az utolsó módosítás visszavonása" + +#~ msgid "Redo the last modification" +#~ msgstr "Az utolsó módosítás újra végrehajtása" + +#~ msgid "Cut the selected text" +#~ msgstr "A kijelölt szöveg kivágása" + +#~ msgid "Copy the selected text" +#~ msgstr "A kijelölt szöveg másolása" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "Beillesztés a vágólapról" + +#~ msgid "Delete the selected text" +#~ msgstr "A kijelölt szöveg törlése" + +#~ msgid "Select all text" +#~ msgstr "A teljes szöveg kijelölése" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Szó vagy kifejezés következő előfordulásának keresése" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Szó vagy kifejezés előző előfordulásának keresése" + +#~ msgid "Reset the zoom level" +#~ msgstr "Nagyítási szint visszaállítása" + +#~ msgid "View the source code of the page" +#~ msgstr "Az oldal forráskódjának megtekintése" + +#~ msgid "Scroll to the left" +#~ msgstr "Görgetés balra" + +#~ msgid "Scroll down" +#~ msgstr "Görgetés le" + +#~ msgid "Scroll up" +#~ msgstr "Görgetés fel" + +#~ msgid "Scroll to the right" +#~ msgstr "Görgetés jobbra" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "A Kuka tartalmának törlése" + +#~ msgid "Open the last closed tab" +#~ msgstr "Az utoljára bezárt lap megnyitása" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Új könyvjelzőmappa hozzáadása" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Keresőszolgáltatások hozzáadása, szerkesztése és eltávolítása…" + +#~ msgid "Clear private data..." +#~ msgstr "Privát adatok törlése…" + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "Oldal részleteinek vizsgálata és fejlesztői eszközök elérése…" + +#~ msgid "Switch to the previous tab" +#~ msgstr "Váltás az előző lapra" + +#~ msgid "Focus the current tab" +#~ msgstr "Aktuális lap előtérbe hozása" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Csak a jelenlegi lap ikonjának megjelenítése" + +#~ msgid "Duplicate the current tab" +#~ msgstr "A jelenlegi lap megkettőzése" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Minden lap bezárása a jelenlegin kívül" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Az utolsó munkamenetben mentett lapok megnyitása" + +#~ msgid "_Contents" +#~ msgstr "_Tartalom" + +#~ msgid "Show the documentation" +#~ msgstr "A dokumentáció megjelenítése" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "A gyakran ismételt kérdések megjelenítése" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "A Midori hibakövetőjének megnyitása" + +#~ msgid "Show information about the program" +#~ msgstr "Információk megjelenítése a programról" + +#~ msgid "Show menubar" +#~ msgstr "A menüsáv megjelenítése" + +#~ msgid "Show navigationbar" +#~ msgstr "A navigációs sáv megjelenítése" + +#~ msgid "Show sidepanel" +#~ msgstr "Az oldalsáv megjelenítése" + +#~ msgid "Show bookmarkbar" +#~ msgstr "A könyvjelzősáv megjelenítése" + +#~ msgid "_Transferbar" +#~ msgstr "Át_vitelsáv" + +#~ msgid "Show transferbar" +#~ msgstr "Az átvitelsáv megjelenítése" + +#~ msgid "Show statusbar" +#~ msgstr "Az állapotsor megjelenítése" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "Az adatbázis-utasítás végrehajtása meghiúsult\n" + +#~ msgid "Show Blank page" +#~ msgstr "Üres oldal megjelenítése" + +#~ msgid "All cookies" +#~ msgstr "Minden süti" + +#~ msgid "Session cookies" +#~ msgstr "Munkamenetsütik" + +#~ msgid "Show Transferbar" +#~ msgstr "Átvitelsáv megjelenítése" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "Az átvitelsáv megjelenítendő-e" + +#~ msgid "Show progress in location entry" +#~ msgstr "Előrehaladás megjelenítése a címsávban" + +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "A betöltés előrehaladása megjelenjen-e a címsávban" + +#~ msgid "Search engines in location completion" +#~ msgstr "Keresőszolgáltatások megjelenítése a helykiegészítésben" + +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "Megjelenjenek-e a keresőszolgáltatások a helykiegészítésben" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "A panel vezérlőinek megjelenítése" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "Megjelenjenek-e a panel vezérlői" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Gyorstárcsázás megjelenítése új lapokon" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Gyorstárcsázás megjelenítése az újonnan megnyitott lapokon" + +#~ msgid "Ask for the destination folder" +#~ msgstr "Rákérdezés a célmappára" + +#~ msgid "Whether to ask for the destination folder when downloading a file" +#~ msgstr "Fájl letöltésekor rákérdezzen-e a célmappára" + +#~ msgid "Whether to show a notification when a transfer has been completed" +#~ msgstr "Megjelenjen-e értesítés átvitel befejeződésekor" + +#~ msgid "Download Manager" +#~ msgstr "Letöltéskezelő" + +#~ msgid "An external download manager" +#~ msgstr "Külső letöltéskezelő" + +#~ msgid "Open external pages in:" +#~ msgstr "Külső oldalak megnyitása:" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "Hol nyíljanak meg a külső programokból megnyitott oldalak" + +#~ msgid "Accept cookies" +#~ msgstr "Sütik elfogadása" + +#~ msgid "What type of cookies to accept" +#~ msgstr "Milyen típusú sütiket fogadjon el" + +#~ msgid "Maximum cookie age" +#~ msgstr "Sütik maximális kora" + +#~ msgid "Maximum history age" +#~ msgstr "Előzmények maximális kora" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Utoljára letöltött fájlok megjegyzése" + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "Az utoljára letöltött fájlok megjegyzendők-e" + +#~ msgid "Not found - %s" +#~ msgstr "Nem található - %s" + +#~ msgid "_Save Link destination" +#~ msgstr "Hivatkozás címének me_ntése" + +#~ msgid "_Download Link destination" +#~ msgstr "Hivatkozás címének l_etöltése" + +#~ msgid "Download with Download _Manager" +#~ msgstr "_Letöltés a letöltéskezelővel" + +#~ msgid "Download I_mage" +#~ msgstr "_Kép letöltése" + +#~ msgid "Set number of columns and rows" +#~ msgstr "Oszlopok és sorok számának beállítása" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Adja meg az oszlopok és sorok számát:" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "A gyorstárcsázó megadott mérete érvénytelen" + +#~ msgid "Thumb size:" +#~ msgstr "Bélyegkép mérete:" + +#~ msgid "Small" +#~ msgstr "Kicsi" + +#~ msgid "Medium" +#~ msgstr "Közepes" + +#~ msgid "Big" +#~ msgstr "Nagy" + +#~ msgid "Document cannot be displayed" +#~ msgstr "A dokumentum nem jeleníthető meg" + +#~ msgid "General" +#~ msgstr "Általános" + +#~ msgid "Appearance" +#~ msgstr "Megjelenés" + +#~ msgid "Font settings" +#~ msgstr "Betűkészlet-beállítások" + +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "96 DPI kényszerítése" + +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "96 DPI képpontsűrűség kényszerítése" + +#~ msgid "Interface" +#~ msgstr "Felület" + +#~ msgid "Navigationbar" +#~ msgstr "Navigációs sáv" + +#~ msgid "Applications" +#~ msgstr "Alkalmazások" + +#~ msgid "External applications" +#~ msgstr "Külső alkalmazások" + +#~ msgid "Web Cookies" +#~ msgstr "Webes sütik" + +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "Sütik törlése a Midoriból kilépéskor" + +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "Régi sütik törlése 1 óra után" + +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "Régi sütik törlése 1 hét után" + +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "Régi sütik törlése 1 hónap után" + +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "Régi sütik törlése 1 év után" + +#~ msgid "days" +#~ msgstr "nap" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "_Reklámszűrők beállítása…" + +#~ msgid "Open target folder for selected addon" +#~ msgstr "Kijelölt bővítmény célmappájának megnyitása" + +#~ msgid "Not available: %s" +#~ msgstr "Nem érhető el: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "Az erőforrásfájlok nincsenek telepítve" + +#~ msgid "Next Tab (History List)" +#~ msgstr "Következő lap (előzménylista)" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "Előző lap (előzménylista)" + +#~ msgid "Previous tab from history" +#~ msgstr "Előző lap az előzményekből" + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "Lapváltás Ctrl+Tab-bal, az utolsó használat szerinti sorrendben" + +#~ msgid "Pageholder" +#~ msgstr "Oldaltároló" + +#~ msgid "_Pageholder" +#~ msgstr "_Oldaltároló" + +#~ msgid "Keep one or multiple pages open in parallel to your tabs" +#~ msgstr "Oldalak nyitva tartása a lapokkal párhuzamosan" + +#~ msgid "Detach chosen panel from the window" +#~ msgstr "Kiválasztott panel leválasztása az ablakról" + +#~ msgid "Hide operating controls" +#~ msgstr "Vezérlők elrejtése" + +#~ msgid "Spell Checking" +#~ msgstr "Helyesírás-ellenőrzés" + +#~ msgid "" +#~ "A comma separated list of languages to be used for spell checking, for " +#~ "example \"en_GB,de_DE\"" +#~ msgstr "" +#~ "A helyesírás-ellenőrzéshez használandó nyelvek vesszővel elválasztott " +#~ "listája, például: „hu_HU,en_US”" + +#~ msgid "Failed to clear search history: %s\n" +#~ msgstr "A keresési előzmények törlése meghiúsult: %s\n" diff -Nru midori-0.2.8/po/id.po midori-0.4.6/po/id.po --- midori-0.2.8/po/id.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/id.po 2012-05-14 22:13:42.000000000 +0000 @@ -1,1874 +1,2207 @@ # Indonesian translations for midori package. # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. -# Andhika Padmawan , 2009. -# +# Andhika Padmawan , 2011. +# 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-26 10:42-0400\n" +"POT-Creation-Date: 2012-03-17 23:30+0000\n" +"PO-Revision-Date: 2011-03-12 16:27+0700\n" "Last-Translator: Andhika Padmawan \n" "Language-Team: Indonesian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Peramban web ringan" +msgid "Browse the Web" +msgstr "Ramban Web" -#: ../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 +msgid "Internet;WWW;Explorer" +msgstr "Internet;WWW;Explorer" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:1989 ../midori/main.c:2009 +#: ../midori/main.c:2023 ../midori/midori-websettings.c:308 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Peramban Web" -#: ../midori/main.c:96 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Midori Meramban Privat" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Buka jendela meramban privat baru" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4081 +msgid "Private Browsing" +msgstr "Meramban Privat" + +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Konfigurasi tak dapat dimuat: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Nilai '%s' hanya sah untuk %s" -#: ../midori/main.c:158 ../midori/main.c:238 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr "Nilai konfigurasi '%s' tidak sah" -#: ../midori/main.c:350 -#, c-format -msgid "Failed to open database: %s\n" -msgstr "Gagal membuka basis data: %s\n" - -#: ../midori/main.c:382 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Gagal mengeksekusi pernyataan basis data: %s\n" - -#: ../midori/main.c:436 +#: ../midori/main.c:364 #, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Gagal menghapus item riwayat: %s\n" +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Mesin pencari tak dapat dimuat. %s\n" -#: ../midori/main.c:460 +#: ../midori/main.c:418 #, c-format msgid "Failed to clear history: %s\n" msgstr "Gagal membersihkan riwayat: %s\n" -#: ../midori/main.c:483 ../midori/main.c:517 ../midori/main.c:533 +#: ../midori/main.c:438 ../midori/main.c:562 +#: ../extensions/formhistory/formhistory.c:531 #, c-format -msgid "Failed to add history item: %s\n" -msgstr "Gagal menambah item riwayat: %s\n" +msgid "Failed to open database: %s\n" +msgstr "Gagal membuka basis data: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:712 +#: ../midori/main.c:505 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Gagal menghapus item riwayat lama: %s\n" -#: ../midori/main.c:741 +#: ../midori/main.c:545 ../panels/midori-history.c:232 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Gagal menghapus item riwayat: %s\n" + +#: ../midori/main.c:592 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Bookmark tak dapat disimpan. %s" + +#: ../midori/main.c:614 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Konfigurasi tak dapat disimpan. %s" -#: ../midori/main.c:779 +#: ../midori/main.c:649 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Mesin pencari tak dapat disimpan. %s" -#: ../midori/main.c:798 ../midori/main.c:826 ../midori/main.c:855 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Bookmark tak dapat disimpan. %s" - #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:878 ../midori/main.c:901 +#: ../midori/main.c:686 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Kotak sampah tak dapat disimpan. %s" -#: ../midori/main.c:974 +#: ../midori/main.c:727 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Ekstensi" + +#: ../midori/main.c:741 +msgid "Privacy" +msgstr "Privasi" + +#: ../midori/main.c:753 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"Kuki menyimpan data log masuk, permainan yang disimpan, atau profil pengguna " +"untuk kepentingan iklan." + +#: ../midori/main.c:809 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sesi tak dapat disimpan. %s" -#: ../midori/main.c:1101 +#: ../midori/main.c:1027 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" +"Tak ada sertifikat root yang tersedia. Sertifikat SSL tak dapat diverifikasi." + +#: ../midori/main.c:1096 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 kelihatannya telah macet saat terakhir kali dibuka. Jika hal ini " -"terjadi berulang kali, coba salah satu opsi berikut untuk memecahkan " -"masalah tersebut." +"terjadi berulang kali, coba salah satu opsi berikut untuk memecahkan masalah " +"tersebut." -#: ../midori/main.c:1116 +#: ../midori/main.c:1115 msgid "Modify _preferences" msgstr "Ubah _pengaturan" -#: ../midori/main.c:1120 -msgid "Reset the last _session" -msgstr "Atur ulang _sesi terakhir" - -#: ../midori/main.c:1125 +#: ../midori/main.c:1119 msgid "Disable all _extensions" msgstr "Nonaktifkan semua _ekstensi" -#: ../midori/main.c:1343 -msgid "No filename specified" -msgstr "Tak ada nama berkas yang ditentukan" - -#: ../midori/main.c:1366 -msgid "An unknown error occured." -msgstr "Galat tak diketahui terjadi." +#: ../midori/main.c:1132 +msgid "Discard old tabs" +msgstr "Abaikan tab lama" + +#: ../midori/main.c:1133 ../midori/midori-websettings.c:217 +msgid "Show last tabs without loading" +msgstr "Tampilkan tab terakhir tanpa memuat" + +#: ../midori/main.c:1134 ../midori/midori-websettings.c:216 +msgid "Show last open tabs" +msgstr "Tampilkan tab yang terakhir terbuka" + +#: ../midori/main.c:1342 ../midori/main.c:2400 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Sesi tak dapat dimuat: %s\n" -#: ../midori/main.c:1398 +#: ../midori/main.c:1480 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Cuplikan layar disimpan ke: %s\n" -#: ../midori/main.c:1447 +#: ../midori/main.c:1892 msgid "Run ADDRESS as a web application" msgstr "Jalankan ALAMAT sebagai sebuah aplikasi web" -#: ../midori/main.c:1447 +#: ../midori/main.c:1892 msgid "ADDRESS" msgstr "ALAMAT" -#: ../midori/main.c:1449 +#: ../midori/main.c:1895 msgid "Use FOLDER as configuration folder" msgstr "Gunakan FOLDER sebagai folder konfigurasi" -#: ../midori/main.c:1449 +#: ../midori/main.c:1895 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1451 +#: ../midori/main.c:1898 +msgid "Private browsing, no changes are saved" +msgstr "Meramban privat, tak ada perubahan yang disimpan" + +#: ../midori/main.c:1900 +msgid "Show a diagnostic dialog" +msgstr "Tampilkan dialog diagnosis" + +#: ../midori/main.c:1902 msgid "Run the specified filename as javascript" msgstr "Jalankan nama berkas yang ditentukan sebagai javascript" -#: ../midori/main.c:1454 +#: ../midori/main.c:1904 msgid "Take a snapshot of the specified URI" msgstr "Ambil cuplikan layar dari URI yang ditentukan" -#: ../midori/main.c:1457 +#: ../midori/main.c:1906 msgid "Execute the specified command" msgstr "Eksekusi perintah yang ditentukan" -#: ../midori/main.c:1459 +#: ../midori/main.c:1908 +msgid "List available commands to execute with -e/ --execute" +msgstr "Senarai perintah tersedia yang dijalankan dengan -e/ --execute" + +#: ../midori/main.c:1910 msgid "Display program version" msgstr "Tampilkan versi program" -#: ../midori/main.c:1461 +#: ../midori/main.c:1912 msgid "Addresses" msgstr "Alamat" -#: ../midori/main.c:1514 +#: ../midori/main.c:1914 +msgid "Block URIs according to regular expression PATTERN" +msgstr "Blok URI berdasarkan POLA ekspresi reguler" + +#: ../midori/main.c:1914 +msgid "PATTERN" +msgstr "POLA" + +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:1918 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "Atur ulang Midori setelah DETIK detik tidak aktif" + +#: ../midori/main.c:1918 +msgid "SECONDS" +msgstr "DETIK" + +#: ../midori/main.c:1921 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Mengalihkan peringatan konsol ke NAMABERKAS yang ditentukan" + +#: ../midori/main.c:1921 +msgid "FILENAME" +msgstr "NAMABERKAS" + +#: ../midori/main.c:1986 msgid "[Addresses]" msgstr "[Alamat]" -#: ../midori/main.c:1537 +#: ../midori/main.c:1996 +msgid "The specified configuration folder is invalid." +msgstr "Folder konfigurasi yang ditentukan tidak valid." + +#: ../midori/main.c:2024 msgid "Please report comments, suggestions and bugs to:" msgstr "Silakan laporkan komentar, saran dan kutu ke:" -#: ../midori/main.c:1539 +#: ../midori/main.c:2026 msgid "Check for new versions at:" msgstr "Cek versi baru di:" -#: ../midori/main.c:1619 -msgid "The specified configuration folder is invalid." -msgstr "Folder konfigurasi yang ditentukan tidak valid." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2110 +msgid "Saved logins and _passwords" +msgstr "Log masuk dan _sandi tersimpan" + +#: ../midori/main.c:2112 +msgid "Cookies and Website data" +msgstr "Data Kuki dan Situs Web" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2116 ../midori/midori-websettings.c:985 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Tembolok Web" -#: ../midori/main.c:1655 -msgid "An instance of Midori is already running but not responding.\n" -msgstr "Sebuah instansi Midori telah berjalan namun tidak merespon.\n" +#: ../midori/main.c:2119 +msgid "Website icons" +msgstr "Ikon situs web" -#: ../midori/main.c:1715 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "Mesin pencari tak dapat dimuat. %s\n" +#: ../midori/main.c:2225 +msgid "An unknown error occured" +msgstr "Galat tak diketahui terjadi" -#: ../midori/main.c:1727 -#, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "Bookmark tak dapat dimuat: %s\n" +#: ../midori/main.c:2331 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Sebuah instansi Midori telah berjalan namun tidak merespon.\n" -#: ../midori/main.c:1742 +#: ../midori/main.c:2367 #, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "Sesi tak dapat dimuat: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" +msgstr "Penanda tak dapat dimuat: %s\n" -#: ../midori/main.c:1755 +#: ../midori/main.c:2415 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Kotak sampah tak dapat dimuat: %s\n" -#: ../midori/main.c:1768 +#: ../midori/main.c:2428 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Riwayat tak dapat dimuat: %s\n" -#: ../midori/main.c:1780 +#: ../midori/main.c:2444 msgid "The following errors occured:" msgstr "Galat berikut terjadi:" -#: ../midori/main.c:1796 +#: ../midori/main.c:2460 msgid "_Ignore" msgstr "_Abaikan" -#: ../midori/midori-array.c:250 +#: ../midori/midori-app.c:1331 +msgid "_Bookmark" +msgstr "B_ookmark" + +#: ../midori/midori-app.c:1332 ../midori/midori-browser.c:6027 +msgid "_Bookmarks" +msgstr "B_ookmark" + +#: ../midori/midori-app.c:1333 +msgid "Add Boo_kmark" +msgstr "Tambah P_enanda" + +#: ../midori/midori-app.c:1334 +msgid "_Console" +msgstr "_Konsol" + +#: ../midori/midori-app.c:1335 +msgid "_Extensions" +msgstr "_Ekstensi" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1336 ../midori/midori-browser.c:4555 +msgid "_History" +msgstr "_Riwayat" + +#: ../midori/midori-app.c:1337 +msgid "_Homepage" +msgstr "_Beranda" + +#: ../midori/midori-app.c:1338 +msgid "_Userscripts" +msgstr "_Skrip pengguna" + +#: ../midori/midori-app.c:1339 +msgid "New _Tab" +msgstr "Tab _Baru" + +#: ../midori/midori-app.c:1340 +msgid "_Transfers" +msgstr "_Transfer" + +#: ../midori/midori-app.c:1341 +msgid "Netscape p_lugins" +msgstr "P_lugin Netscape" + +#: ../midori/midori-app.c:1342 +msgid "_Closed Tabs" +msgstr "_Tab Tertutup" + +#: ../midori/midori-app.c:1343 ../midori/midori-browser.c:5183 +msgid "New _Window" +msgstr "Jendela _Baru" + +#: ../midori/midori-app.c:1344 +msgid "New _Folder" +msgstr "_Folder Baru" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "Berkas tak ditemukan." -#: ../midori/midori-array.c:258 ../midori/midori-array.c:267 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Dokumen salah bentuk." -#: ../midori/midori-array.c:429 ../midori/sokoke.c:694 -#, c-format +#: ../midori/midori-array.c:628 +msgid "Unrecognized bookmark format." +msgstr "Format penanda tak dikenal." + +#: ../midori/midori-array.c:915 msgid "Writing failed." msgstr "Penulisan gagal." -#: ../midori/midori-browser.c:307 ../midori/midori-browser.c:4229 -#: ../midori/midori-browser.c:4235 +#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5265 +#: ../midori/midori-browser.c:5274 msgid "Reload the current page" msgstr "Muat ulang halaman ini" -#: ../midori/midori-browser.c:318 ../midori/midori-browser.c:4232 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:5271 msgid "Stop loading the current page" msgstr "Stop memuat halaman ini" -#: ../midori/midori-browser.c:409 +#: ../midori/midori-browser.c:465 #, c-format -msgid "%d%% loaded" -msgstr "%d%% termuat" +msgid "Failed to update title: %s\n" +msgstr "Gagal memutakhirkan judul: %s\n" -#: ../midori/midori-browser.c:434 +#: ../midori/midori-browser.c:478 #, c-format msgid "Unexpected action '%s'." msgstr "Aksi tak diharapkan '%s'." -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:568 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Meramban Privat)" + +#: ../midori/midori-browser.c:682 ../midori/midori-browser.c:715 +msgid "Toplevel folder" +msgstr "Folder level atas" + +#: ../midori/midori-browser.c:773 msgid "New folder" msgstr "Folder baru" -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:773 msgid "Edit folder" msgstr "Sunting folder" -#: ../midori/midori-browser.c:618 +#: ../midori/midori-browser.c:775 msgid "New bookmark" -msgstr "Bookmark baru" +msgstr "Penanda baru" -#: ../midori/midori-browser.c:618 +#: ../midori/midori-browser.c:775 msgid "Edit bookmark" -msgstr "Sunting bookmark" +msgstr "Sunting penanda" -#: ../midori/midori-browser.c:648 +#: ../midori/midori-browser.c:817 msgid "_Title:" msgstr "_Judul:" -#: ../midori/midori-browser.c:661 ../midori/midori-searchaction.c:952 -msgid "_Description:" -msgstr "_Keterangan:" - -#: ../midori/midori-browser.c:680 ../midori/midori-searchaction.c:966 -#: ../extensions/feed-panel/main.c:343 +#: ../midori/midori-browser.c:837 ../midori/midori-searchaction.c:961 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Alamat" -#: ../midori/midori-browser.c:699 +#: ../midori/midori-browser.c:860 ../midori/midori-browser.c:4292 msgid "_Folder:" msgstr "_Folder:" -#: ../midori/midori-browser.c:704 ../midori/midori-browser.c:745 -msgid "Toplevel folder" -msgstr "Folder level atas" +#: ../midori/midori-browser.c:876 +msgid "Add to _Speed Dial" +msgstr "Tambah ke Panggil _Cepat" -#: ../midori/midori-browser.c:821 -msgid "Save file as" -msgstr "Simpan berkas sebagai" +#: ../midori/midori-browser.c:889 +msgid "Show in the tool_bar" +msgstr "Tampilkan di _batang alat" -#: ../midori/midori-browser.c:1172 +#: ../midori/midori-browser.c:904 +msgid "Run as _web application" +msgstr "Jalankan sebagai aplikasi _web" + +#: ../midori/midori-browser.c:975 #, c-format -msgid "The file '%s' has been downloaded." -msgstr "Berkas '%s' telah diunduh." +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Berkas \"%s\" tak dapat disimpan di folder ini." -#: ../midori/midori-browser.c:1176 -msgid "Transfer completed" -msgstr "Transfer selesai" +#: ../midori/midori-browser.c:977 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Anda tidak mempunyai hak akses untuk menulis di lokasi ini." + +#: ../midori/midori-browser.c:984 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "Tidak cukup ruang kosong untuk mengunduh \"%s\"." + +#: ../midori/midori-browser.c:987 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "Berkas memerlukan %s tapi hanya %s yang tersisa." + +#: ../midori/midori-browser.c:1025 ../midori/midori-browser.c:4361 +msgid "Save file as" +msgstr "Simpan berkas sebagai" + +#: ../midori/midori-browser.c:1319 +msgid "New Window" +msgstr "Jendela Baru" + +#: ../midori/midori-browser.c:1319 +msgid "A new window has been opened" +msgstr "Sebuah jendela baru telah dibuka" + +#: ../midori/midori-browser.c:1322 +msgid "New Tab" +msgstr "Tab Baru" + +#: ../midori/midori-browser.c:1322 +msgid "A new tab has been opened" +msgstr "Sebuah tab baru telah dibuka" + +#: ../midori/midori-browser.c:1357 +msgid "Error opening the image!" +msgstr "Galat membuka gambar!" + +#: ../midori/midori-browser.c:1358 +msgid "Can not open selected image in a default viewer." +msgstr "Tak dapat membuka gambar terpilih di penampil standar." + +#: ../midori/midori-browser.c:1364 +msgid "Error downloading the image!" +msgstr "Gagal mengunduh gambar!" + +#: ../midori/midori-browser.c:1365 +msgid "Can not download selected image." +msgstr "Tak dapat mengunduh gambar terpilih." -#: ../midori/midori-browser.c:1317 +#: ../midori/midori-browser.c:1468 msgid "Save file" msgstr "Simpan berkas" -#: ../midori/midori-browser.c:1984 +#: ../midori/midori-browser.c:2335 msgid "Open file" msgstr "Buka berkas" -#: ../midori/midori-browser.c:3430 ../panels/midori-bookmarks.c:781 -#: ../panels/midori-history.c:812 +#: ../midori/midori-browser.c:2467 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr "" +"Untuk menggunakan URI membuka agregator berita. Biasanya ada menu atau " +"tombol \"Pelanggan Baru\", \"Umpan Berita Baru\" atau sejenisnya.\n" +"Sebagai alternatif pergi ke Pengaturan, Aplikasi di Midori, lalu pilih " +"Agregator Berita. Lain kali anda klik ikon umpan berita, maka umpan akan " +"ditambahkan secara otomatis." + +#: ../midori/midori-browser.c:2473 ../extensions/feed-panel/main.c:365 +msgid "New feed" +msgstr "Umpan baru" + +#: ../midori/midori-browser.c:2516 ../midori/midori-browser.c:5334 +#: ../panels/midori-bookmarks.c:427 +msgid "Add a new bookmark" +msgstr "Tambah penanda baru" + +#: ../midori/midori-browser.c:3015 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "Kosong" + +#: ../midori/midori-browser.c:3435 +msgid "Toggle text cursor navigation" +msgstr "Ubah navigasi kursor teks" + +#: ../midori/midori-browser.c:3751 ../midori/midori-browser.c:5720 +#, c-format +msgid "Failed to insert new history item: %s\n" +msgstr "Gagal memasukkan item riwayat baru: %s\n" + +#: ../midori/midori-browser.c:4080 ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 msgid "Open all in _Tabs" msgstr "Buka semua di _Tab" -#: ../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:4087 ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Buka di _Tab Baru" -#: ../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:4090 ../midori/midori-view.c:2632 +#: ../midori/midori-view.c:4583 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Buka di _Jendela Baru" -#: ../midori/midori-browser.c:3750 +#: ../midori/midori-browser.c:4179 +msgid "Arora" +msgstr "Arora" + +#: ../midori/midori-browser.c:4180 +msgid "Kazehakase" +msgstr "Kazehakase" + +#: ../midori/midori-browser.c:4181 +msgid "Opera" +msgstr "Opera" + +#: ../midori/midori-browser.c:4182 +msgid "Konqueror" +msgstr "Konqueror" + +#: ../midori/midori-browser.c:4183 +msgid "Epiphany" +msgstr "Epiphany" + +#: ../midori/midori-browser.c:4184 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4205 +msgid "Import bookmarks..." +msgstr "Impor penanda..." + +#: ../midori/midori-browser.c:4208 ../midori/midori-browser.c:5339 +msgid "_Import bookmarks" +msgstr "_Impor penanda" + +#: ../midori/midori-browser.c:4219 +msgid "_Application:" +msgstr "_Aplikasi:" + +#: ../midori/midori-browser.c:4284 +msgid "Import from XBEL or HTML file" +msgstr "Impor dari berkas XBEL atau HTML" + +#: ../midori/midori-browser.c:4319 +msgid "Import from a file" +msgstr "Impor dari berkas" + +#: ../midori/midori-browser.c:4331 +msgid "Failed to import bookmarks" +msgstr "Gagal mengimpor penanda" + +#: ../midori/midori-browser.c:4366 +msgid "XBEL Bookmarks" +msgstr "Penanda XBEL" + +#: ../midori/midori-browser.c:4371 +msgid "Netscape Bookmarks" +msgstr "Penanda Netscape" + +#: ../midori/midori-browser.c:4385 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "Midori hanya dapat mengekspor ke XBEL (*.xbel) dan Netscape (*.html)" + +#: ../midori/midori-browser.c:4400 +msgid "Failed to export bookmarks" +msgstr "Gagal mengekspor penanda" + +#. i18n: Dialog: Clear Private Data, in the Tools menu +#: ../midori/midori-browser.c:4522 msgid "Clear Private Data" msgstr "Hapus Data Pribadi" -#: ../midori/midori-browser.c:3754 +#: ../midori/midori-browser.c:4526 msgid "_Clear private data" msgstr "_Hapus data pribadi" -#: ../midori/midori-browser.c:3767 +#: ../midori/midori-browser.c:4539 msgid "Clear the following data:" msgstr "Hapus data berikut:" -#: ../midori/midori-browser.c:3777 ../midori/midori-preferences.c:671 -#: ../panels/midori-history.c:108 -msgid "History" -msgstr "Riwayat" - -#: ../midori/midori-browser.c:3782 -msgid "Cookies" -msgstr "Kuki" - -#: ../midori/midori-browser.c:3787 -msgid "'Flash' Cookies" -msgstr "Kuki 'Flash'" - -#: ../midori/midori-browser.c:3792 -msgid "Website icons" -msgstr "Ikon situs web" - -#: ../midori/midori-browser.c:3797 ../midori/sokoke.c:868 -msgid "_Closed Tabs" -msgstr "_Tab Tertutup" +#: ../midori/midori-browser.c:4549 +msgid "Last open _tabs" +msgstr "Tab terakhir dibuka" -#: ../midori/midori-browser.c:3805 +#: ../midori/midori-browser.c:4575 msgid "Clear private data when _quitting Midori" msgstr "Hapus data pribadi ketika _keluar Midori" -#: ../midori/midori-browser.c:3889 +#: ../midori/midori-browser.c:4770 msgid "A lightweight web browser." msgstr "Peramban web ringan." -#: ../midori/midori-browser.c:3897 +#: ../midori/midori-browser.c:4771 +msgid "See about:version for version info." +msgstr "Lihaat tentang:versi untuk info versi." + +#: ../midori/midori-browser.c:4773 +msgid "" +"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." +msgstr "" +"Pustaka ini adalah peranti bebas; anda dapat mendistribusikan ulang dan/atau " +"memodifikasinya di bawah GNU Lesser General Public License yang " +"dipublikasikan oleh Free Software Foundation; baik versi 2.1 dari Lisensi, " +"atau (menurut pilihan anda) versi apapun setelahnya." + +#: ../midori/midori-browser.c:4794 msgid "translator-credits" msgstr "Andhika Padmawan " -#: ../midori/midori-browser.c:4163 +#: ../midori/midori-browser.c:5181 msgid "_File" msgstr "_Berkas" -#: ../midori/midori-browser.c:4165 ../midori/sokoke.c:869 -msgid "New _Window" -msgstr "Jendela _Baru" - -#: ../midori/midori-browser.c:4166 +#: ../midori/midori-browser.c:5184 msgid "Open a new window" msgstr "Buka di jendela baru" -#: ../midori/midori-browser.c:4169 +#: ../midori/midori-browser.c:5187 msgid "Open a new tab" msgstr "Buka di tab baru" -#: ../midori/midori-browser.c:4172 +#: ../midori/midori-browser.c:5189 +msgid "New P_rivate Browsing Window" +msgstr "Jendela Meramban P_rivat Baru" + +#: ../midori/midori-browser.c:5193 msgid "Open a file" msgstr "Buka berkas" -#: ../midori/midori-browser.c:4175 +#: ../midori/midori-browser.c:5195 +msgid "_Save Page As..." +msgstr "_Simpan Halaman Sebagai..." + +#: ../midori/midori-browser.c:5196 msgid "Save to a file" msgstr "Simpan ke berkas" -#: ../midori/midori-browser.c:4177 +#: ../midori/midori-browser.c:5198 msgid "Add to Speed _dial" msgstr "Tambah ke Panggil _cepat" -#: ../midori/midori-browser.c:4178 -msgid "Add shortcut to speed dial" -msgstr "Tambah jalan pintas ke panggil cepat" +#: ../midori/midori-browser.c:5202 +msgid "Add Shortcut to the _desktop" +msgstr "Tambah jalan pintas ke _desktop" + +#: ../midori/midori-browser.c:5204 +msgid "Create _Launcher" +msgstr "Buat _Peluncur" + +#: ../midori/midori-browser.c:5208 +msgid "Subscribe to News _feed" +msgstr "Berlangganan ke umpan _berita" -#: ../midori/midori-browser.c:4180 +#: ../midori/midori-browser.c:5214 msgid "_Close Tab" msgstr "_Tutup Tab" -#: ../midori/midori-browser.c:4181 +#: ../midori/midori-browser.c:5215 msgid "Close the current tab" msgstr "Tutup tab saat ini" -#: ../midori/midori-browser.c:4183 +#: ../midori/midori-browser.c:5217 msgid "C_lose Window" msgstr "T_utup Jendela" -#: ../midori/midori-browser.c:4184 -msgid "Close this window" -msgstr "Tutup jendela ini" - -#: ../midori/midori-browser.c:4187 +#: ../midori/midori-browser.c:5221 msgid "Print the current page" msgstr "Cetak halaman saat ini" -#: ../midori/midori-browser.c:4190 -msgid "Quit the application" -msgstr "Keluar aplikasi" +#: ../midori/midori-browser.c:5223 +msgid "Close a_ll Windows" +msgstr "T_utup semua Jendela" -#: ../midori/midori-browser.c:4192 +#: ../midori/midori-browser.c:5226 msgid "_Edit" msgstr "_Sunting" -#: ../midori/midori-browser.c:4195 -msgid "Cut the selected text" -msgstr "Potong teks terpilih" - -#: ../midori/midori-browser.c:4198 ../midori/midori-browser.c:4201 -msgid "Copy the selected text" -msgstr "Salin teks terpilih" - -#: ../midori/midori-browser.c:4204 -msgid "Paste text from the clipboard" -msgstr "Tempel teks dari papan klip" - -#: ../midori/midori-browser.c:4207 -msgid "Delete the selected text" -msgstr "Hapus teks terpilih" - -#: ../midori/midori-browser.c:4210 -msgid "Select all text" -msgstr "Pilih semua teks" +#: ../midori/midori-browser.c:5249 +msgid "_Find..." +msgstr "_Cari..." -#: ../midori/midori-browser.c:4213 +#: ../midori/midori-browser.c:5250 msgid "Find a word or phrase in the page" msgstr "Cari kata atau frasa di halaman" -#: ../midori/midori-browser.c:4215 +#: ../midori/midori-browser.c:5252 msgid "Find _Next" msgstr "Cari _Berikutnya" -#: ../midori/midori-browser.c:4216 -msgid "Find the next occurrence of a word or phrase" -msgstr "Cari kejadian berikutnya dari kata atau frasa" - -#: ../midori/midori-browser.c:4218 +#: ../midori/midori-browser.c:5255 msgid "Find _Previous" msgstr "Cari _Sebelumnya" -#: ../midori/midori-browser.c:4219 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Cari kejadian sebelumnya dari kata atau frasa" - -#: ../midori/midori-browser.c:4223 +#: ../midori/midori-browser.c:5259 msgid "Configure the application preferences" msgstr "Konfigurasi pilihan aplikasi" -#: ../midori/midori-browser.c:4225 +#: ../midori/midori-browser.c:5261 msgid "_View" msgstr "_Tampilan" -#: ../midori/midori-browser.c:4226 +#: ../midori/midori-browser.c:5262 msgid "_Toolbars" msgstr "_Batang Alat" -#: ../midori/midori-browser.c:4238 +#: ../midori/midori-browser.c:5267 +msgid "Reload page without caching" +msgstr "Muat ulang halaman tanpa menyimpan tembolok" + +#: ../midori/midori-browser.c:5277 msgid "Increase the zoom level" msgstr "Naikkan level pembesaran" -#: ../midori/midori-browser.c:4241 +#: ../midori/midori-browser.c:5280 msgid "Decrease the zoom level" msgstr "Turunkan level pembesaran" -#: ../midori/midori-browser.c:4244 -msgid "Reset the zoom level" -msgstr "Reset level pembesaran" - -#: ../midori/midori-browser.c:4245 +#: ../midori/midori-browser.c:5284 msgid "_Encoding" msgstr "_Penyandian" -#: ../midori/midori-browser.c:4247 +#: ../midori/midori-browser.c:5286 msgid "View So_urce" msgstr "Tampilkan S_umber" -#: ../midori/midori-browser.c:4248 -msgid "View the source code of the page" -msgstr "Tampilkan kode program dari halaman" - -#: ../midori/midori-browser.c:4250 -msgid "View Selection Source" -msgstr "Tampilkan Pemilihan Sumber" - -#: ../midori/midori-browser.c:4251 -msgid "View the source code of the selection" -msgstr "Tampilkan kode program dari pemilihan" +#: ../midori/midori-browser.c:5289 +msgid "Ca_ret Browsing" +msgstr "Meramban Ca_ret" -#: ../midori/midori-browser.c:4255 +#: ../midori/midori-browser.c:5293 msgid "Toggle fullscreen view" msgstr "Aktifkan tampilan layar penuh" -#: ../midori/midori-browser.c:4257 +#: ../midori/midori-browser.c:5295 +msgid "Scroll _Left" +msgstr "Gulung _Kiri" + +#: ../midori/midori-browser.c:5298 +msgid "Scroll _Down" +msgstr "Gulung _Bawah" + +#: ../midori/midori-browser.c:5301 +msgid "Scroll _Up" +msgstr "Gulung _Atas" + +#: ../midori/midori-browser.c:5304 +msgid "Scroll _Right" +msgstr "_Gulung Kanan" + +#: ../midori/midori-browser.c:5307 msgid "_Go" msgstr "_Ke" -#: ../midori/midori-browser.c:4260 +#: ../midori/midori-browser.c:5310 msgid "Go back to the previous page" msgstr "Mundur ke halaman sebelumnya" -#: ../midori/midori-browser.c:4263 +#: ../midori/midori-browser.c:5313 msgid "Go forward to the next page" msgstr "Maju ke halaman berikutnya" -#: ../midori/midori-browser.c:4266 +#. i18n: Visit the previous logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5317 +msgid "Go to the previous sub-page" +msgstr "Maju ke sub-halaman sebelumnya" + +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5321 +msgid "Go to the next sub-page" +msgstr "Maju ke sub-halaman berikutnya" + +#: ../midori/midori-browser.c:5324 msgid "Go to your homepage" msgstr "Ke laman anda" -#: ../midori/midori-browser.c:4268 +#: ../midori/midori-browser.c:5326 msgid "Empty Trash" msgstr "Kosongkan Tempat Sampah" -#: ../midori/midori-browser.c:4269 -msgid "Delete the contents of the trash" -msgstr "Hapus isi tempat sampah" - -#: ../midori/midori-browser.c:4271 +#: ../midori/midori-browser.c:5329 msgid "Undo _Close Tab" msgstr "Tak _Jadi Tutup Tab" -#: ../midori/midori-browser.c:4272 -msgid "Open the last closed tab" -msgstr "Buka tab yang terakhir ditutup" - -#: ../midori/midori-browser.c:4276 ../panels/midori-bookmarks.c:231 -msgid "Add a new bookmark" -msgstr "Tambah bookmark baru" - -#: ../midori/midori-browser.c:4278 +#: ../midori/midori-browser.c:5336 msgid "Add a new _folder" msgstr "Tambah sebuah _folder baru" -#: ../midori/midori-browser.c:4279 -msgid "Add a new bookmark folder" -msgstr "Tambah sebuah folder penanda baru" +#: ../midori/midori-browser.c:5342 +msgid "_Export bookmarks" +msgstr "_Ekspor penanda" -#: ../midori/midori-browser.c:4281 ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:5345 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Atur Mesin Pencari" -#: ../midori/midori-browser.c:4282 -msgid "Add, edit and remove search engines..." -msgstr "Tambah, sunting dan hapus mesin pencari..." - -#: ../midori/midori-browser.c:4285 +#: ../midori/midori-browser.c:5348 msgid "_Clear Private Data" msgstr "_Hapus Data Pribadi" -#: ../midori/midori-browser.c:4286 -msgid "Clear private data..." -msgstr "Hapus data pribadi..." +#: ../midori/midori-browser.c:5351 +msgid "_Inspect Page" +msgstr "_Inspeksi Halaman" -#: ../midori/midori-browser.c:4290 +#: ../midori/midori-browser.c:5355 msgid "_Previous Tab" msgstr "_Tab Sebelumnya" -#: ../midori/midori-browser.c:4291 -msgid "Switch to the previous tab" -msgstr "Pindah ke tab sebelumnya" - -#: ../midori/midori-browser.c:4293 +#: ../midori/midori-browser.c:5358 msgid "_Next Tab" msgstr "Tab _Berikutnya" -#: ../midori/midori-browser.c:4294 -msgid "Switch to the next tab" -msgstr "Pindah ke tab berikutnya" +#: ../midori/midori-browser.c:5360 +msgid "Move Tab _Backward" +msgstr "_Geser Tab ke Belakang" + +#: ../midori/midori-browser.c:5362 +msgid "_Move Tab Forward" +msgstr "_Geser Tab ke Depan" + +#: ../midori/midori-browser.c:5365 +msgid "Focus _Current Tab" +msgstr "Fokus _Tab Saat Ini" + +#: ../midori/midori-browser.c:5368 +msgid "Focus _Next view" +msgstr "Tampilan Fokus _Berikutnya" + +#: ../midori/midori-browser.c:5371 +msgid "Only show the Icon of the _Current Tab" +msgstr "Hanya tampilkan Ikon dari Tab _Terkini" + +#: ../midori/midori-browser.c:5374 +msgid "_Duplicate Current Tab" +msgstr "_Duplikasi Tab Saat Ini" + +#: ../midori/midori-browser.c:5377 +msgid "Close Ot_her Tabs" +msgstr "_Tutup Tab Lainnya" + +#: ../midori/midori-browser.c:5380 +msgid "Open last _session" +msgstr "Buka _sesi terakhir" -#: ../midori/midori-browser.c:4296 +#: ../midori/midori-browser.c:5383 msgid "_Help" msgstr "Ba_ntuan" -#: ../midori/midori-browser.c:4298 -msgid "_Contents" -msgstr "_Isi" - -#: ../midori/midori-browser.c:4299 -msgid "Show the documentation" -msgstr "Tampilkan dokumentasi" - -#: ../midori/midori-browser.c:4301 +#: ../midori/midori-browser.c:5385 msgid "_Frequent Questions" msgstr "_Pertanyaan Sering Ditanyakan" -#: ../midori/midori-browser.c:4302 -msgid "Show the Frequently Asked Questions" -msgstr "Tampilkan Pertanyaan Acapkali Diajukan" - -#: ../midori/midori-browser.c:4304 -msgid "_Report a Bug" -msgstr "_Laporkan Kutu" - -#: ../midori/midori-browser.c:4305 -msgid "Open Midori's bug tracker" -msgstr "Buka pelacak kutu Midori" - -#: ../midori/midori-browser.c:4308 -msgid "Show information about the program" -msgstr "Tampilkan informasi tentang program" - -#: ../midori/midori-browser.c:4315 -msgid "P_rivate Browsing" -msgstr "Meramban P_rivat" - -#: ../midori/midori-browser.c:4316 -msgid "Don't save any private data while browsing" -msgstr "Jangan simpan data privat ketika meramban" +#: ../midori/midori-browser.c:5388 +msgid "_Report a Problem..." +msgstr "_Laporkan Masalah..." -#: ../midori/midori-browser.c:4321 +#: ../midori/midori-browser.c:5400 msgid "_Menubar" msgstr "_Batang menu" -#: ../midori/midori-browser.c:4322 -msgid "Show menubar" -msgstr "Tampilkan batang menu" - -#: ../midori/midori-browser.c:4325 +#: ../midori/midori-browser.c:5404 msgid "_Navigationbar" msgstr "Batang _navigasi" -#: ../midori/midori-browser.c:4326 -msgid "Show navigationbar" -msgstr "Tampilkan batang navigasi" - -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:5408 msgid "Side_panel" msgstr "Panel _sisi" -#: ../midori/midori-browser.c:4330 -msgid "Show sidepanel" -msgstr "Tampilkan panel sisi" +#: ../midori/midori-browser.c:5409 +msgid "Sidepanel" +msgstr "Panel sisi" -#: ../midori/midori-browser.c:4333 +#: ../midori/midori-browser.c:5412 msgid "_Bookmarkbar" msgstr "Batang _penanda" -#: ../midori/midori-browser.c:4334 -msgid "Show bookmarkbar" -msgstr "Tampilkan batang penanda" - -#: ../midori/midori-browser.c:4337 -msgid "_Transferbar" -msgstr "Batang _transfer" - -#: ../midori/midori-browser.c:4338 -msgid "Show transferbar" -msgstr "Tampilkan batang transfer" - -#: ../midori/midori-browser.c:4341 +#: ../midori/midori-browser.c:5416 msgid "_Statusbar" msgstr "Batang stat_us" -#: ../midori/midori-browser.c:4342 -msgid "Show statusbar" -msgstr "Tampilkan batang status" - -#: ../midori/midori-browser.c:4349 +#: ../midori/midori-browser.c:5425 ../midori/midori-websettings.c:307 msgid "_Automatic" msgstr "_Otomatis" -#: ../midori/midori-browser.c:4352 ../midori/midori-websettings.c:214 +#: ../midori/midori-browser.c:5428 ../midori/midori-websettings.c:232 msgid "Chinese (BIG5)" msgstr "China (BIG5)" -#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:4356 +#. i18n: A double underscore "__" is used to prevent the mnemonic +#: ../midori/midori-browser.c:5432 msgid "Japanese (SHIFT__JIS)" msgstr "Jepang (SHIFT__JIS)" -#: ../midori/midori-browser.c:4359 ../midori/midori-websettings.c:216 +#: ../midori/midori-browser.c:5435 ../midori/midori-websettings.c:234 +msgid "Korean (EUC-KR)" +msgstr "Korea (EUC-KR)" + +#: ../midori/midori-browser.c:5438 ../midori/midori-websettings.c:235 msgid "Russian (KOI8-R)" msgstr "Rusia (KOI8-R)" -#: ../midori/midori-browser.c:4362 ../midori/midori-websettings.c:217 +#: ../midori/midori-browser.c:5441 ../midori/midori-websettings.c:236 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:4365 ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5444 ../midori/midori-websettings.c:237 msgid "Western (ISO-8859-1)" msgstr "Barat (ISO-8859-1)" -#: ../midori/midori-browser.c:4368 ../midori/midori-websettings.c:219 -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-browser.c:5447 ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:313 ../katze/katze-utils.c:635 msgid "Custom..." msgstr "Suai..." -#: ../midori/midori-browser.c:4806 +#: ../midori/midori-browser.c:5952 msgid "_Separator" msgstr "_Pemisah" -#: ../midori/midori-browser.c:4813 +#: ../midori/midori-browser.c:5959 msgid "_Location..." msgstr "_Lokasi..." -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:5961 msgid "Open a particular location" msgstr "Buka lokasi khusus" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:5983 msgid "_Web Search..." msgstr "Penelusuran _Web..." -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:5985 msgid "Run a web search" msgstr "Jalankan penelusuran web" -#: ../midori/midori-browser.c:4862 +#: ../midori/midori-browser.c:6012 msgid "Reopen a previously closed tab or window" msgstr "Buka kembali tab atau jendela yang sebelumnya tertutup" -#: ../midori/midori-browser.c:4877 -msgid "_Recently visited pages" -msgstr "_Halaman yang baru dikunjungi" - -#: ../midori/midori-browser.c:4879 -msgid "Reopen pages that you visited earlier" -msgstr "Buka kembali halaman yang sebelumnya anda kunjungi" - -#: ../midori/midori-browser.c:4894 ../midori/sokoke.c:857 -msgid "_Bookmarks" -msgstr "B_ookmark" - -#: ../midori/midori-browser.c:4896 +#: ../midori/midori-browser.c:6029 msgid "Show the saved bookmarks" msgstr "Tampilkan penanda tersimpan" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:6046 msgid "_Tools" msgstr "_Alat" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:6062 msgid "_Window" msgstr "_Jendela" -#: ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:6064 msgid "Show a list of all open tabs" msgstr "Tampilkan senarai semua tab yang terbuka" -#: ../midori/midori-browser.c:4939 +#: ../midori/midori-browser.c:6078 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:6080 msgid "Menu" msgstr "Menu" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:5127 -msgid "_Inline Find:" -msgstr "_Cari Dalam Baris:" - -#: ../midori/midori-browser.c:5152 -msgid "Previous" -msgstr "Sebelumnya" - -#: ../midori/midori-browser.c:5157 -msgid "Next" -msgstr "Berikutnya" +#: ../midori/midori-browser.c:6776 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Pengaturan tak diharapkan '%s'" -#: ../midori/midori-browser.c:5162 -msgid "Match Case" -msgstr "Cocokkan Huruf" +#: ../midori/midori-extension.c:310 +#, c-format +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "Konfigurasi dari ekstensi '%s' tak dapat dimuat: %s\n" -#: ../midori/midori-browser.c:5170 -msgid "Highlight Matches" -msgstr "Sorot Kecocokan" +#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1695 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Konfigurasi dari ekstensi '%s' tak dapat disimpan: %s\n" -#: ../midori/midori-browser.c:5180 -msgid "Close Findbar" -msgstr "Tutup batang cari" +#: ../midori/midori-locationaction.c:394 +#, c-format +msgid "Search with %s" +msgstr "Cari %s" -#: ../midori/midori-browser.c:5215 -#: ../extensions/cookie-manager/cookie-manager-page.c:109 -msgid "Delete All" -msgstr "Hapus Semua" +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Cari dengan..." -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-locationaction.c:537 #, c-format -msgid "Unexpected setting '%s'" -msgstr "Pengaturan tak diharapkan '%s'" +msgid "Failed to select from history\n" +msgstr "Gagal memilih dari riwayat\n" -#: ../midori/midori-locationaction.c:901 +#: ../midori/midori-locationaction.c:624 #, c-format -msgid "Search with %s" -msgstr "Cari %s" +msgid "Search for %s" +msgstr "Mencari %s" + +#. i18n: Right-click on Location, Open an URL from the clipboard +#: ../midori/midori-locationaction.c:1399 +msgid "Paste and p_roceed" +msgstr "Tempel dan l_anjutkan" -#: ../midori/midori-panel.c:382 ../midori/midori-panel.c:384 -msgid "Detach chosen panel from the window" -msgstr "Lepaskan panel terpilih dari jendela" +#: ../midori/midori-locationaction.c:1767 +msgid "Not verified" +msgstr "Tidak diverifikasi" -#: ../midori/midori-panel.c:394 ../midori/midori-panel.c:396 -#: ../midori/midori-panel.c:577 ../midori/midori-panel.c:580 +#: ../midori/midori-locationaction.c:1787 +msgid "Verified and encrypted connection" +msgstr "Koneksi terverifikasi dan terenkripsi" + +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" msgstr "Ratakan panel sisi ke kanan" -#: ../midori/midori-panel.c:406 ../midori/midori-panel.c:407 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Tutup panel" -#: ../midori/midori-panel.c:578 ../midori/midori-panel.c:581 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Ratakan panel sisi ke kiri" -#: ../midori/midori-panel.c:704 -msgid "Show panel _titles" -msgstr "Tampilkan _judul panel" - -#: ../midori/midori-panel.c:712 -msgid "Show operating _controls" -msgstr "Tampilkan _kendali operasi" - -#: ../midori/midori-panel.c:783 -msgid "Options" -msgstr "Opsi" - -#: ../midori/midori-websettings.c:197 -msgid "Show Blank page" -msgstr "Tampilkan halaman Kosong" +#: ../midori/midori-websettings.c:214 +msgid "Show Speed Dial" +msgstr "Tampilkan Panggil cepat" -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-websettings.c:215 msgid "Show Homepage" msgstr "Tampilkan Beranda" -#: ../midori/midori-websettings.c:199 -msgid "Show last open tabs" -msgstr "Tampilkan tab yang terakhir terbuka" - -#: ../midori/midori-websettings.c:215 +#: ../midori/midori-websettings.c:233 msgid "Japanese (SHIFT_JIS)" msgstr "Jepang (SHIFT_JIS)" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:253 msgid "New tab" msgstr "Tab baru" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:254 msgid "New window" msgstr "Jendela baru" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:255 msgid "Current tab" msgstr "Tab saat ini" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:270 msgid "Default" msgstr "Standar" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:271 msgid "Icons" msgstr "Ikon" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:272 +msgid "Small icons" +msgstr "Ikon kecil" + +#: ../midori/midori-websettings.c:273 msgid "Text" msgstr "Teks" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:274 msgid "Icons and text" msgstr "Ikon dan teks" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:275 msgid "Text beside icons" msgstr "Teks di samping ikon" -#: ../midori/midori-websettings.c:270 -msgid "All cookies" -msgstr "Semua kuki" +#: ../midori/midori-websettings.c:290 +msgid "Automatic (GNOME or environment)" +msgstr "Otomatis (GNOME atau lingkungan)" -#: ../midori/midori-websettings.c:271 -msgid "Session cookies" -msgstr "Kuki sesi" +#: ../midori/midori-websettings.c:291 +msgid "HTTP proxy server" +msgstr "Server proxy HTTP" -#: ../midori/midori-websettings.c:272 ../panels/midori-addons.c:94 -#: ../extensions/shortcuts.c:93 -msgid "None" -msgstr "Tak ada" +#: ../midori/midori-websettings.c:292 +msgid "No proxy server" +msgstr "Tak ada server proxy" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:309 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-websettings.c:310 +msgid "iPhone" +msgstr "iPhone" + +#: ../midori/midori-websettings.c:311 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:312 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:388 msgid "Remember last window size" msgstr "Ingat ukuran jendela terakhir" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:389 msgid "Whether to save the last window size" msgstr "Apakah ingin menyimpan ukuran jendela yang terakhir tersimpan" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:397 msgid "Last window width" msgstr "Lebar jendela terakhir" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:398 msgid "The last saved window width" msgstr "Lebar jendela terakhir tersimpan" -#: ../midori/midori-websettings.c:361 +#: ../midori/midori-websettings.c:406 msgid "Last window height" msgstr "Tinggi jendela terakhir" -#: ../midori/midori-websettings.c:362 +#: ../midori/midori-websettings.c:407 msgid "The last saved window height" msgstr "Tinggi jendela terakhir tersimpan" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:432 msgid "Last panel position" msgstr "Posisi panel terakhir" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:433 msgid "The last saved panel position" msgstr "Posisi panel terakhir tersimpan" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:442 msgid "Last panel page" msgstr "Halaman panel terakhir" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:443 msgid "The last saved panel page" msgstr "Halaman panel terakhir tersimpan" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:451 msgid "Last Web search" msgstr "Penelusuran Web terakhir" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:452 msgid "The last saved Web search" msgstr "Penelusuran Web terakhir tersimpan" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:461 msgid "Show Menubar" msgstr "Tampilkan Batang Menu" -#: ../midori/midori-websettings.c:417 +#: ../midori/midori-websettings.c:462 msgid "Whether to show the menubar" msgstr "Apakah ingin menampilkan batang menu" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:470 msgid "Show Navigationbar" msgstr "Tampilkan Batang Navigasi" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:471 msgid "Whether to show the navigationbar" msgstr "Apakah ingin menampilkan batang navigasi" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:479 msgid "Show Bookmarkbar" msgstr "Tampilkan Batang Penanda" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:480 msgid "Whether to show the bookmarkbar" msgstr "Apakah ingin menampilkan batang penanda" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:488 msgid "Show Panel" msgstr "Tampilkan Panel" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:489 msgid "Whether to show the panel" msgstr "Apakah ingin menampilkan panel" -#: ../midori/midori-websettings.c:459 -msgid "Show Transferbar" -msgstr "Tampilkan Batang Transfer" - -#: ../midori/midori-websettings.c:460 -msgid "Whether to show the transferbar" -msgstr "Apakah ingin menampilkan batang transfer" - -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:497 msgid "Show Statusbar" msgstr "Tampilkan Batang Status" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:498 msgid "Whether to show the statusbar" msgstr "Apakah ingin menampilkan batang status" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:507 msgid "Toolbar Style:" msgstr "Gaya Batang Alat:" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:508 msgid "The style of the toolbar" msgstr "Gaya dari batang alat" -#: ../midori/midori-websettings.c:495 -msgid "Show progress in location entry" -msgstr "Tampilkan progres di lema lokasi" - -#: ../midori/midori-websettings.c:496 -msgid "Whether to show loading progress in the location entry" -msgstr "Apakah ingin menampilkan progres memuat di lema lokasi" - -#: ../midori/midori-websettings.c:511 -msgid "Search engines in location completion" -msgstr "Mesin pencari di penyelesai lokasi" - -#: ../midori/midori-websettings.c:512 -msgid "Whether to show search engines in the location completion" -msgstr "Apakah akan menampilkan mesin pencari di penyelesai lokasi" - -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:517 msgid "Toolbar Items" msgstr "Item Batang Alat" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:518 msgid "The items to show on the toolbar" msgstr "Item yang akan ditampilkan di batang alat" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:526 msgid "Compact Sidepanel" msgstr "Panel Sisi Kompak" -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:527 msgid "Whether to make the sidepanel compact" msgstr "Apakah ingin membuat panel sisi kompak" -#: ../midori/midori-websettings.c:545 -msgid "Show operating controls of the panel" -msgstr "Tampilkan kendali operasi dari panel" - -#: ../midori/midori-websettings.c:546 -msgid "Whether to show the operating controls of the panel" -msgstr "Apakah ingin menampilkan kendali operasi dari panel" - -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:542 msgid "Align sidepanel on the right" msgstr "Ratakan panel sisi di kanan" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:543 msgid "Whether to align the sidepanel on the right" msgstr "Apakah ingin meratakan panel sisi di sebelah kanan" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:558 +msgid "Open panels in separate windows" +msgstr "Buka panel di jendela yang terpisah" + +#: ../midori/midori-websettings.c:559 +msgid "Whether to always open panels in separate windows" +msgstr "Apakah ingin selalu membuka panel jendela yang terpisah" + +#: ../midori/midori-websettings.c:568 msgid "When Midori starts:" msgstr "Jika Midori dijalankan:" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:569 msgid "What to do when Midori starts" msgstr "Apa yang akan dilakukan saat Midori dijalankan" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:578 msgid "Homepage:" msgstr "Beranda:" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:579 msgid "The homepage" msgstr "Laman" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:594 msgid "Show crash dialog" msgstr "Tampilkan dialog macet" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:595 msgid "Show a dialog after Midori crashed" msgstr "Tampilkan sebuah dialog setelah Midori macet" -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:614 -msgid "Show speed dial in new tabs" -msgstr "Tampilkan panggil cepat di tab baru" - -#: ../midori/midori-websettings.c:615 -msgid "Show speed dial in newly opened tabs" -msgstr "Tampilkan panggil cepat di tab yang baru dibuka" - -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:603 msgid "Save downloaded files to:" msgstr "Simpan berkas yang diunduh ke:" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:604 msgid "The folder downloaded files are saved to" msgstr "Folder berkas terunduh disimpan di" -#: ../midori/midori-websettings.c:643 -msgid "Ask for the destination folder" -msgstr "Tanya folder tujuan" - -#: ../midori/midori-websettings.c:644 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "Apakah akan menanyakan folder tujuan ketika mengunduh sebuah berkas" - -#: ../midori/midori-websettings.c:663 -msgid "Notify when a transfer has been completed" -msgstr "Beritahu jika sebuah transfer telah selesai" - -#: ../midori/midori-websettings.c:664 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "Apakah akan menampilkan sebuah notifikasi ketika sebuah transfer " -"telah selesai" - -#: ../midori/midori-websettings.c:676 -msgid "Download Manager" -msgstr "Manajer Unduh" - -#: ../midori/midori-websettings.c:677 -msgid "An external download manager" -msgstr "Manajer unduh eksternal" - -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:612 msgid "Text Editor" msgstr "Penyunting Teks" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:613 msgid "An external text editor" msgstr "Penyunting teks eksternal" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:628 msgid "News Aggregator" msgstr "Agregator Berita" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:629 msgid "An external news aggregator" msgstr "Sebuah agregator berita eksternal" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:637 msgid "Location entry Search" msgstr "Pencari entri lokasi" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:638 msgid "The search to perform inside the location entry" msgstr "Pencarian yang dilakukan di dalam entri lokasi" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:646 msgid "Preferred Encoding" msgstr "Penyandian Kesukaan" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:647 msgid "The preferred character encoding" msgstr "Penyandian karakter kesukaan" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:657 msgid "Always Show Tabbar" msgstr "Selalu Tampilkan Batang Tab" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:658 msgid "Always show the tabbar" msgstr "Selalu tampilkan batang tab" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:672 msgid "Close Buttons on Tabs" msgstr "Tutup Tombol di Tab" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:673 msgid "Whether tabs have close buttons" msgstr "Apakah tab memiliki tombol tutup" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:698 msgid "Open new pages in:" msgstr "Buka halaman baru di:" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:699 msgid "Where to open new pages" msgstr "Dimana membuka halaman baru" -#: ../midori/midori-websettings.c:758 -msgid "Open external pages in:" -msgstr "Buka halaman eksternal di:" - -#: ../midori/midori-websettings.c:759 -msgid "Where to open externally opened pages" -msgstr "Dimana ingin membuka halaman yang dibuka secara eksternal" - -#: ../midori/midori-websettings.c:768 +#: ../midori/midori-websettings.c:708 msgid "Middle click opens Selection" msgstr "Klik Tengah Membuka Pilihan" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:709 msgid "Load an address from the selection via middle click" msgstr "Muat sebuah alamat dari pilihan via klik tengah" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:717 msgid "Open tabs in the background" msgstr "Buka Tab di Latar Belakang" -#: ../midori/midori-websettings.c:778 +#: ../midori/midori-websettings.c:718 msgid "Whether to open new tabs in the background" msgstr "Apakah ingin membuka tab baru di latar belakang" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:726 msgid "Open Tabs next to Current" msgstr "Buka Tab di Samping Saat Ini" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:727 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" "Apakah ingin membuka tab baru di sebelah tab saat ini atau setelah tab " "terakhir" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:735 msgid "Open popups in tabs" msgstr "Buka popup di tab" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:736 msgid "Whether to open popup windows in tabs" msgstr "Apakah ingin membuka jendela popup di tab" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:746 ../extensions/statusbar-features.c:134 +msgid "Load images automatically" +msgstr "Muat gambar secara otomatis" + +#: ../midori/midori-websettings.c:747 +msgid "Load and display images automatically" +msgstr "Muat dan tampilkan gambar secara otomatis" + +#: ../midori/midori-websettings.c:754 ../extensions/statusbar-features.c:143 +msgid "Enable scripts" +msgstr "Aktifkan skrip" + +#: ../midori/midori-websettings.c:755 +msgid "Enable embedded scripting languages" +msgstr "Aktifkan bahasa skrip terbenam" + +#: ../midori/midori-websettings.c:762 ../extensions/statusbar-features.c:154 +msgid "Enable Netscape plugins" +msgstr "Aktifkan plugin Netscape" + +#: ../midori/midori-websettings.c:763 +msgid "Enable embedded Netscape plugin objects" +msgstr "Aktifkan objek plugin Netscape terbenam" + +#: ../midori/midori-websettings.c:778 +msgid "Enable Spell Checking" +msgstr "Aktifkan Pemeriksa Ejaan" + +#: ../midori/midori-websettings.c:779 +msgid "Enable spell checking while typing" +msgstr "Aktifkan pemeriksa ejaan ketika mengetik" + +#: ../midori/midori-websettings.c:785 +msgid "Enable HTML5 database support" +msgstr "Aktifkan dukungan basis data HTML5" + +#: ../midori/midori-websettings.c:786 +msgid "Whether to enable HTML5 database support" +msgstr "Apakah akan mengaktifkan dukungan basis data HTML5" + +#: ../midori/midori-websettings.c:792 +msgid "Enable HTML5 local storage support" +msgstr "Aktifkan dukungan penyimpanan lokal HTML5" + +#: ../midori/midori-websettings.c:793 +msgid "Whether to enable HTML5 local storage support" +msgstr "Apakah akan mengaktifkan dukungan penyimpanan lokal HTML5" + +#: ../midori/midori-websettings.c:799 +msgid "Enable offline web application cache" +msgstr "Aktifkan tembolok aplikasi web luring" + +#: ../midori/midori-websettings.c:800 +msgid "Whether to enable offline web application cache" +msgstr "Apakah akan mengaktifkan tembolok aplikasi web luring" + +#: ../midori/midori-websettings.c:816 +msgid "Flash window on background tabs" +msgstr "Kedipkan jendela yang membuka tab di latar belakang" + +#: ../midori/midori-websettings.c:817 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "Kedipkan jendela peramban jika tab baru dibuka di latar belakang" + +#: ../midori/midori-websettings.c:825 +msgid "Enable WebGL support" +msgstr "Aktifkan dukungan WebGL" + +#: ../midori/midori-websettings.c:826 +msgid "Allow websites to use OpenGL rendering" +msgstr "Izinkan situs web untuk menggunakan sesuaian OpenGL" + +#: ../midori/midori-websettings.c:852 msgid "Zoom Text and Images" msgstr "Pembesaran Teks dan Gambar" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:853 msgid "Whether to zoom text and images" msgstr "Apakah ingin memperbesar teks dan gambar" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:868 msgid "Find inline while typing" msgstr "Cari dalam baris ketika mengetik" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:869 msgid "Whether to automatically find inline while typing" msgstr "Apakah akan secara otomatis mencari dalam baris ketika mengetik" -#: ../midori/midori-websettings.c:837 -msgid "Accept cookies" -msgstr "Terima kuki" - -#: ../midori/midori-websettings.c:838 -msgid "What type of cookies to accept" -msgstr "Tipe kuki apa yang diterima" - -#: ../midori/midori-websettings.c:847 -msgid "Original cookies only" -msgstr "Hanya kuki asli" - -#: ../midori/midori-websettings.c:848 -msgid "Accept cookies from the original website only" -msgstr "Terima kuki hanya dari situs web asli" - -#: ../midori/midori-websettings.c:856 -msgid "Maximum cookie age" -msgstr "Usia kuki maksimum" +#: ../midori/midori-websettings.c:884 +msgid "Kinetic scrolling" +msgstr "Menggulung kinetis" -#: ../midori/midori-websettings.c:857 -msgid "The maximum number of days to save cookies for" -msgstr "Jumlah maksimum hari untuk menyimpan kuki" +#: ../midori/midori-websettings.c:885 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "Apakah menggulung harus bergeser secara kinetis tergantung kecepatan" -#: ../midori/midori-websettings.c:867 -msgid "Remember last visited pages" -msgstr "Ingat halaman terakhir dikunjungi" +#: ../midori/midori-websettings.c:893 +msgid "Delete old Cookies after:" +msgstr "Hapus kuki lama setelah:" -#: ../midori/midori-websettings.c:868 -msgid "Whether the last visited pages are saved" -msgstr "Apakah halaman terakhir dikunjungi tersimpan" +#: ../midori/midori-websettings.c:894 +msgid "The maximum number of days to save cookies for" +msgstr "Jumlah maksimum hari untuk menyimpan kuki" -#: ../midori/midori-websettings.c:876 -msgid "Maximum history age" -msgstr "Usia riwayat maksimum" +#: ../midori/midori-websettings.c:910 +msgid "Only accept Cookies from sites you visit" +msgstr "Hanya terima kuki dari situs yang anda kunjungi" + +#: ../midori/midori-websettings.c:911 +msgid "Block cookies sent by third-party websites" +msgstr "Blok kuki yang dikirim dari situs web pihak ketiga" + +#: ../midori/midori-websettings.c:925 +msgid "Delete pages from history after:" +msgstr "Hapus halaman dari riwayat setelah:" -#: ../midori/midori-websettings.c:877 +#: ../midori/midori-websettings.c:926 msgid "The maximum number of days to save the history for" msgstr "Jumlah maksimum hari untuk tetap menyimpan riwayat" -#: ../midori/midori-websettings.c:885 -msgid "Remember last form inputs" -msgstr "Ingat bentuk terakhir masukan" - -#: ../midori/midori-websettings.c:886 -msgid "Whether the last form inputs are saved" -msgstr "Apakah bentuk terakhir masukan disimpan" +#: ../midori/midori-websettings.c:941 +msgid "Proxy server" +msgstr "Server proxy" + +#: ../midori/midori-websettings.c:942 +msgid "The type of proxy server to use" +msgstr "Tipe server proxy yang akan digunakan" + +#: ../midori/midori-websettings.c:951 +msgid "HTTP Proxy Server" +msgstr "Server Proxy HTTP" -#: ../midori/midori-websettings.c:894 -msgid "Remember last downloaded files" -msgstr "Ingat berkas terakhir diunduh" +#: ../midori/midori-websettings.c:952 +msgid "The proxy server used for HTTP connections" +msgstr "Proxy server yang digunakan untuk koneksi HTTP" -#: ../midori/midori-websettings.c:895 -msgid "Whether the last downloaded files are saved" -msgstr "Apakah berkas terakhir diunduh akan disimpan" - -#: ../midori/midori-websettings.c:905 -msgid "Proxy Server" -msgstr "Server Proxy" +#: ../midori/midori-websettings.c:967 +msgid "Port" +msgstr "Pangkalan" -#: ../midori/midori-websettings.c:906 -msgid "The proxy server used for HTTP connections" +#: ../midori/midori-websettings.c:968 +msgid "The proxy server port used for HTTP connections" msgstr "Proxy server yang digunakan untuk koneksi HTTP" -#: ../midori/midori-websettings.c:921 -msgid "Detect proxy server automatically" -msgstr "Deteksi server proxy secara otomatis" - -#: ../midori/midori-websettings.c:922 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Apakah akan mendeteksi server proxy secara otomatis dari lingkungan" +#: ../midori/midori-websettings.c:986 +msgid "The maximum size of cached pages on disk" +msgstr "Ukuran maksimum dari halaman tembolok di cakram" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:938 +#: ../midori/midori-websettings.c:1003 msgid "Identify as" msgstr "Identifikasi sebagai" -#: ../midori/midori-websettings.c:939 +#: ../midori/midori-websettings.c:1004 msgid "What to identify as to web pages" msgstr "Apa yang diidentifikasi sebagai halaman web" -#: ../midori/midori-websettings.c:955 +#: ../midori/midori-websettings.c:1020 msgid "Identification string" msgstr "Tali identifikasi" -#: ../midori/midori-websettings.c:956 +#: ../midori/midori-websettings.c:1021 msgid "The application identification string" msgstr "Tali identifikasi aplikasi" -#: ../midori/midori-websettings.c:964 -msgid "Cache size" -msgstr "Ukuran tembolok" - -#: ../midori/midori-websettings.c:965 -msgid "The allowed size of the cache" -msgstr "Ukuran tembolok yang diizinkan" +#: ../midori/midori-websettings.c:1037 +msgid "Preferred languages" +msgstr "Penyandian kesukaan" + +#: ../midori/midori-websettings.c:1038 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"Senarai yang dipisahkan koma dari bahasa yang dipilih untuk merender halaman " +"web multibahasa, misalnya \"de\", \"ru,nl\" atau \"en-us;q=1.0, fr-fr;" +"q=0.667\"" -#: ../midori/midori-websettings.c:980 +#: ../midori/midori-websettings.c:1053 msgid "Clear private data" msgstr "Hapus data pribadi" -#: ../midori/midori-websettings.c:981 +#: ../midori/midori-websettings.c:1054 msgid "The private data selected for deletion" msgstr "Data pribadi yang dipilih untuk dihapus" -#: ../midori/midori-view.c:781 +#: ../midori/midori-websettings.c:1069 +msgid "Clear data" +msgstr "Hapus data" + +#: ../midori/midori-websettings.c:1070 +msgid "The data selected for deletion" +msgstr "Data terpilih untuk dihapus" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1119 +msgid "Strip referrer details sent to websites" +msgstr "Hapus detail rujukan yang dikirim ke situs web" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1121 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Apakah tajuk \"Rujukan\" harus dipendekkan ke nama host" + +#: ../midori/midori-websettings.c:1135 +msgid "Always use my font choices" +msgstr "Selalu gunakan fonta pilihan saya" + +#: ../midori/midori-websettings.c:1136 +msgid "Override fonts picked by websites with user preferences" +msgstr "Timpa fonta yang dipilih oleh situs web dengan pengaturan pengguna" + +#: ../midori/midori-view.c:1345 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s ingin menyimpan basis data HTML5." + +#: ../midori/midori-view.c:1349 ../midori/midori-view.c:1381 +msgid "_Deny" +msgstr "_Tolak" + +#: ../midori/midori-view.c:1349 ../midori/midori-view.c:1381 +msgid "_Allow" +msgstr "_Izinkan" + +#: ../midori/midori-view.c:1377 +#, c-format +msgid "%s wants to know your location." +msgstr "%s ingin mengetahui lokasi anda." + +#: ../midori/midori-view.c:1468 +#, c-format +msgid "Error - %s" +msgstr "Galat - %s" + +#: ../midori/midori-view.c:1469 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Halaman bernama '%s' tak dapat dimuat" -#. 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 "Galat" - -#: ../midori/midori-view.c:786 +#: ../midori/midori-view.c:1471 msgid "Try again" msgstr "Coba lagi" -#. 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 "Tak ditemukan - %s" - -#: ../midori/midori-view.c:1205 -msgid "Open _Link" -msgstr "Buka _Tautan" +#: ../midori/midori-view.c:1668 ../midori/midori-view.c:2573 +#, c-format +msgid "Send a message to %s" +msgstr "Kirim sebuah pesan ke %s" + +#: ../midori/midori-view.c:2403 ../midori/midori-view.c:2722 +msgid "Inspect _Element" +msgstr "Inspeksi _Elemen" -#: ../midori/midori-view.c:1207 +#: ../midori/midori-view.c:2455 msgid "Open Link in New _Tab" msgstr "Buka Taut di _Tab Baru" -#: ../midori/midori-view.c:1224 +#: ../midori/midori-view.c:2459 +msgid "Open Link in _Foreground Tab" +msgstr "Buka Tautan di _Tab Depan" + +#: ../midori/midori-view.c:2460 +msgid "Open Link in _Background Tab" +msgstr "Buka Tautan di _Tab Belakang" + +#: ../midori/midori-view.c:2463 msgid "Open Link in New _Window" msgstr "Buka Tautan di _Jendela Baru" -#: ../midori/midori-view.c:1230 -msgid "_Download Link destination" -msgstr "_Unduh Taut tujuan" - -#: ../midori/midori-view.c:1236 -msgid "_Save Link destination" -msgstr "_Simpan Taut tujuan" - -#: ../midori/midori-view.c:1245 -msgid "Download with Download _Manager" -msgstr "Unduh Dengan _Manajer Unduh" +#: ../midori/midori-view.c:2466 +msgid "Open Link as Web A_pplication" +msgstr "Buka Tautan Sebagai A_plikasi Web" + +#: ../midori/midori-view.c:2471 +msgid "Copy Link de_stination" +msgstr "Salin Tu_juan Tautan" + +#: ../midori/midori-view.c:2487 +msgid "Open _Image in New Tab" +msgstr "Buka Gambar di _Tab Baru" + +#: ../midori/midori-view.c:2490 +msgid "Copy Image _Address" +msgstr "Salin _Alamat Gambar" + +#: ../midori/midori-view.c:2493 +msgid "Save I_mage" +msgstr "Simpan Ga_mbar" + +#: ../midori/midori-view.c:2496 +msgid "Open in Image _Viewer" +msgstr "Buka di _Penampil Gambar" + +#: ../midori/midori-view.c:2503 +msgid "Copy Video _Address" +msgstr "Salin _Alamat Video" + +#: ../midori/midori-view.c:2506 +msgid "Save _Video" +msgstr "Simpan _Video" + +#: ../midori/midori-view.c:2506 +msgid "Download _Video" +msgstr "Unduh _Video" -#: ../midori/midori-view.c:1274 +#: ../midori/midori-view.c:2532 msgid "Search _with" msgstr "Cari _dengan" -#: ../midori/midori-view.c:1306 +#: ../midori/midori-view.c:2564 msgid "_Search the Web" msgstr "_Cari web" -#: ../midori/midori-view.c:1316 +#: ../midori/midori-view.c:2581 msgid "Open Address in New _Tab" msgstr "Buka Alamat di _Tab Baru" -#: ../midori/midori-view.c:1494 +#: ../midori/midori-view.c:2870 msgid "Open or download file" msgstr "Buka atau unduh berkas" -#: ../midori/midori-view.c:1511 +#: ../midori/midori-view.c:2889 #, c-format msgid "File Type: '%s'" msgstr "Tipe Berkas: '%s'" -#: ../midori/midori-view.c:1514 +#: ../midori/midori-view.c:2891 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipe Berkas: %s ('%s')" +#: ../midori/midori-view.c:2895 +#, c-format +msgid "File Name: %s" +msgstr "Nama Berkas: %s" + #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1518 +#: ../midori/midori-view.c:2914 #, c-format msgid "Open %s" msgstr "Buka %s" -#: ../midori/midori-view.c:1957 +#: ../midori/midori-view.c:3539 #, c-format msgid "Inspect page - %s" msgstr "Periksa halaman - %s" -#: ../midori/midori-view.c:2147 -msgid "Speed dial" +#: ../midori/midori-view.c:3840 +msgid "Speed Dial" msgstr "Panggil cepat" -#: ../midori/midori-view.c:2148 +#: ../midori/midori-view.c:3841 ../midori/midori-view.c:3937 msgid "Click to add a shortcut" msgstr "Klik untuk menambah jalan pintas" -#: ../midori/midori-view.c:2149 +#: ../midori/midori-view.c:3842 msgid "Enter shortcut address" msgstr "Masukkan alamat jalan pintas" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:3843 msgid "Enter shortcut title" msgstr "Masukkan judul jalan pintas" -#: ../midori/midori-view.c:2151 +#: ../midori/midori-view.c:3844 msgid "Are you sure you want to delete this shortcut?" msgstr "Anda yakin ingin menghapus jalan pintas ini?" -#: ../midori/midori-view.c:2181 -#, c-format -msgid "Document cannot be displayed" -msgstr "Dokumen tak dapat ditampilkan" - -#: ../midori/midori-view.c:2198 +#: ../midori/midori-view.c:4006 #, c-format msgid "No documentation installed" msgstr "Tak ada dokumentasi yang terinstal" -#: ../midori/midori-view.c:2323 +#: ../midori/midori-view.c:4082 +msgid "Midori doesn't store any personal data:" +msgstr "Midori tidak menyimpan data pribadi apapun:" + +#: ../midori/midori-view.c:4083 +msgid "No history or web cookies are being saved." +msgstr "Tak ada riwayat atau kuki web yang disimpan." + +#: ../midori/midori-view.c:4084 +msgid "Extensions are disabled." +msgstr "Ekstensi dinonaktifkan." + +#: ../midori/midori-view.c:4085 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "" +"Penyimpanan HTML5, basis data lokal dan tembolok aplikasi dinonaktifkan." + +#: ../midori/midori-view.c:4086 +msgid "Midori prevents websites from tracking the user:" +msgstr "Midori mencegah situs web melacak pengguna:" + +#: ../midori/midori-view.c:4087 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "Perujuk URL dicopot dari nama host." + +#: ../midori/midori-view.c:4088 +msgid "DNS prefetching is disabled." +msgstr "Praambil DNS dinonaktifkan." + +#: ../midori/midori-view.c:4089 +msgid "The language and timezone are not revealed to websites." +msgstr "Bahasa dan zona waktu tidak diberikan ke situs web." + +#: ../midori/midori-view.c:4090 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "" +"Flash dan plugin Netscape lainnya tidak bisa ditampilkan oleh situs web." + +#: ../midori/midori-view.c:4128 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "" +"Nomor versi dalam kurung menunjukkan versi yang digunakan dalam runtime." + +#: ../midori/midori-view.c:4184 +msgid "Page loading delayed" +msgstr "Memuat halaman ditunda" + +#: ../midori/midori-view.c:4185 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "Memuat ditunda karena macet yang baru terjadi atau pengaturan awal." + +#: ../midori/midori-view.c:4186 +msgid "Load Page" +msgstr "Memuat Halaman" + +#: ../midori/midori-view.c:4325 msgid "Blank page" msgstr "Halaman kosong" -#: ../midori/midori-view.c:2551 ../midori/sokoke.c:865 -msgid "New _Tab" -msgstr "Tab _Baru" - -#: ../midori/midori-view.c:2565 +#: ../midori/midori-view.c:4587 msgid "_Duplicate Tab" msgstr "_Duplikasi Tab" -#: ../midori/midori-view.c:2570 -msgid "_Restore Tab" -msgstr "_Kembalikan Tab" - -#: ../midori/midori-view.c:2570 -msgid "_Minimize Tab" -msgstr "_Kecilkan Tab" +#: ../midori/midori-view.c:4592 +msgid "Show Tab _Label" +msgstr "Tampilkan _Label Tab" + +#: ../midori/midori-view.c:4592 +msgid "Show Tab _Icon Only" +msgstr "Hanya Tampilkan _Ikon Tab" + +#: ../midori/midori-view.c:4598 +msgid "Close ot_her Tabs" +msgstr "Tutup Tab _Lainnya" + +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5369 +msgid "previous" +msgstr "sebelumnya" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5388 +msgid "next" +msgstr "berikutnya" -#: ../midori/midori-preferences.c:91 -#, c-format -msgid "Preferences for %s" -msgstr "Pengaturan untuk %s" +#: ../midori/midori-view.c:5401 +msgid "Print background images" +msgstr "Cetak gambar latar belakang" + +#: ../midori/midori-view.c:5402 +msgid "Whether background images should be printed" +msgstr "Apakah gambar latar belakang harus dicetak" -#. Page "General" -#: ../midori/midori-preferences.c:398 -msgid "General" -msgstr "Umum" +#: ../midori/midori-view.c:5434 +msgid "Features" +msgstr "Fitur" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Mulai" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Gunakan _halaman saat ini" + +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Gunakan halaman saat ini sebagai beranda" -#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88 -msgid "Transfers" -msgstr "Transfer" - #. Page "Appearance" -#: ../midori/midori-preferences.c:440 -msgid "Appearance" -msgstr "Tampilan" - -#: ../midori/midori-preferences.c:441 -msgid "Font settings" -msgstr "Pengaturan fonta" - -#: ../midori/midori-preferences.c:443 -msgid "Default Font Family" -msgstr "Keluarga Fonta Standar" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Fonta" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Keluarga Fonta Proporsional" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "Keluarga fonta standar yang digunakan untuk menampilkan teks" -#: ../midori/midori-preferences.c:450 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "Ukuran fonta standar yang digunakan untuk menampilkan teks" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Keluarga Fonta Sesuai Lebar" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "Keluarga fonta yang digunakan untuk menampilkan teks sesuai lebar" -#: ../midori/midori-preferences.c:460 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" msgstr "Ukuran fonta yang digunakan untuk menampilkan teks sesuai lebar" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Ukuran Fonta Minimum" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "Ukuran fonta minimum yang digunakan untuk menampilkan teks" -#: ../midori/midori-preferences.c:473 -msgid "Encoding" -msgstr "Penyandian" - -#: ../midori/midori-preferences.c:476 -msgid "The character encoding to use by default" -msgstr "Penyandian karakter untuk digunakan sebagai standar" - #. Page "Behavior" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Perilaku" -#: ../midori/midori-preferences.c:484 -msgid "Features" -msgstr "Fitur" - -#: ../midori/midori-preferences.c:487 ../extensions/statusbar-features.c:88 -msgid "Load images automatically" -msgstr "Muat gambar secara otomatis" - -#: ../midori/midori-preferences.c:488 -msgid "Load and display images automatically" -msgstr "Muat dan tampilkan gambar secara otomatis" - -#: ../midori/midori-preferences.c:491 -msgid "Shrink images automatically" -msgstr "Kecilkan gambar secara otomatis" - -#: ../midori/midori-preferences.c:492 -msgid "Automatically shrink standalone images to fit" -msgstr "Secara otomatis mengecilkan gambar tunggal agar muat" - -#: ../midori/midori-preferences.c:495 -msgid "Print background images" -msgstr "Cetak gambar latar belakang" - -#: ../midori/midori-preferences.c:496 -msgid "Whether background images should be printed" -msgstr "Apakah gambar latar belakang harus dicetak" - -#: ../midori/midori-preferences.c:499 -msgid "Resizable text areas" -msgstr "Area teks dapat diubah ukurannya" - -#: ../midori/midori-preferences.c:500 -msgid "Whether text areas are resizable" -msgstr "Apakah area teks dapat diubah ukurannya" - -#: ../midori/midori-preferences.c:503 ../extensions/statusbar-features.c:100 -msgid "Enable scripts" -msgstr "Aktifkan skrip" - -#: ../midori/midori-preferences.c:504 -msgid "Enable embedded scripting languages" -msgstr "Aktifkan bahasa skrip terbenam" - -#: ../midori/midori-preferences.c:507 ../extensions/statusbar-features.c:112 -msgid "Enable Netscape plugins" -msgstr "Aktifkan plugin Netscape" - -#: ../midori/midori-preferences.c:508 -msgid "Enable embedded Netscape plugin objects" -msgstr "Aktifkan objek plugin Netscape terbenam" - -#: ../midori/midori-preferences.c:511 -msgid "Enforce 96 dots per inch" -msgstr "Paksa 96 titik per inci" - -#: ../midori/midori-preferences.c:512 -msgid "Enforce a video dot density of 96 DPI" -msgstr "Paksa kerapatan titik video 96 DPI" - -#: ../midori/midori-preferences.c:515 -msgid "Enable developer tools" -msgstr "Aktifkan alat pengembang" - -#: ../midori/midori-preferences.c:516 -msgid "Enable special extensions for developers" -msgstr "Aktifkan ekstensi khusus untuk pengembang" - -#: ../midori/midori-preferences.c:523 -msgid "Spell Checking" -msgstr "Pemeriksa Ejaan" - -#: ../midori/midori-preferences.c:526 -msgid "Enable Spell Checking" -msgstr "Aktifkan Pemeriksa Ejaan" - -#: ../midori/midori-preferences.c:527 -msgid "Enable spell checking while typing" -msgstr "Aktifkan pemeriksa ejaan ketika mengetik" - -#. 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 "" -"Senarai dipisahkan koma dari bahasa yang akan digunakan untuk pemeriksa " -"ejaan, misalnya \"en_GB,de_DE\"" +#: ../midori/midori-preferences.c:385 +msgid "Allow scripts to open popups" +msgstr "Izinkan skrip untuk membuka popup" + +#: ../midori/midori-preferences.c:386 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "Apakah skrip diizinkan untuk membuka popup jendela secara otomatis" #. Page "Interface" -#: ../midori/midori-preferences.c:536 -msgid "Interface" -msgstr "Antarmuka" - -#: ../midori/midori-preferences.c:537 -msgid "Navigationbar" -msgstr "Batang navigasi" - -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Meramban" -#. Page "Applications" -#: ../midori/midori-preferences.c:574 -msgid "Applications" -msgstr "Aplikasi" - -#: ../midori/midori-preferences.c:575 -msgid "External applications" -msgstr "Aplikasi Eksternal" - #. Page "Network" -#: ../midori/midori-preferences.c:621 ../midori/midori-preferences.c:622 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "Jaringan" -#: ../midori/midori-preferences.c:649 +#: ../midori/midori-preferences.c:463 +msgid "Hostname" +msgstr "Nama Host" + +#: ../midori/midori-preferences.c:487 msgid "MB" msgstr "MB" -#. Page "Privacy" -#: ../midori/midori-preferences.c:654 -msgid "Privacy" -msgstr "Privasi" - -#: ../midori/midori-preferences.c:655 -msgid "Web Cookies" -msgstr "Kuki Web" - -#: ../midori/midori-preferences.c:668 ../midori/midori-preferences.c:678 -msgid "days" -msgstr "hari" - -#: ../midori/midori-searchaction.c:488 ../katze/katze-arrayaction.c:335 -msgid "Empty" -msgstr "Kosong" - -#: ../midori/midori-searchaction.c:908 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Tambah mesin pencari" -#: ../midori/midori-searchaction.c:908 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Sunting mesin pencari" -#: ../midori/midori-searchaction.c:936 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Nama:" -#: ../midori/midori-searchaction.c:980 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Keterangan:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "_Ikon:" -#: ../midori/midori-searchaction.c:994 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "_Token:" -#: ../midori/midori-searchaction.c:1213 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "Atur Mesin Pencari" -#: ../midori/midori-searchaction.c:1312 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "Gunakan sebagai stan_dar" -#: ../midori/sokoke.c:162 ../midori/sokoke.c:174 +#: ../midori/sokoke.c:412 +msgid "Open with" +msgstr "Buka dengan" + +#: ../midori/sokoke.c:420 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Pilih sebuah aplikasi atau perintah untuk membuka \"%s\":" + +#: ../midori/sokoke.c:461 ../midori/sokoke.c:471 ../midori/sokoke.c:499 +#: ../midori/sokoke.c:528 ../midori/sokoke.c:542 msgid "Could not run external program." msgstr "Tak dapat menjalankan program eksternal." -#: ../midori/sokoke.c:856 -msgid "_Bookmark" -msgstr "B_ookmark" +#: ../midori/sokoke.c:1653 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d jam" -#: ../midori/sokoke.c:858 -msgid "Add Boo_kmark" -msgstr "Tambah P_enanda" +#: ../midori/sokoke.c:1654 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d menit" -#: ../midori/sokoke.c:859 -msgid "_Console" -msgstr "_Konsol" +#: ../midori/sokoke.c:1655 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d detik" -#: ../midori/sokoke.c:860 -msgid "_Extensions" -msgstr "_Ekstensi" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1663 ../panels/midori-transfers.c:267 +#, c-format +msgid "%s of %s" +msgstr "%s dari %s" -#: ../midori/sokoke.c:861 -msgid "_History" -msgstr "_Riwayat" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1672 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1675 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/sokoke.c:862 -msgid "_Homepage" -msgstr "_Beranda" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1692 +#, c-format +msgid " - %s remaining" +msgstr " - %s tersisa" -#: ../midori/sokoke.c:863 -msgid "_Userscripts" -msgstr "_Skrip pengguna" +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:263 +msgid "_Inline Find:" +msgstr "_Cari Dalam Baris:" -#: ../midori/sokoke.c:864 -msgid "User_styles" -msgstr "Ga_ya pengguna" +#: ../toolbars/midori-findbar.c:289 +msgid "Previous" +msgstr "Sebelumnya" -#: ../midori/sokoke.c:866 -msgid "_Transfers" -msgstr "_Transfer" +#: ../toolbars/midori-findbar.c:295 +msgid "Next" +msgstr "Berikutnya" -#: ../midori/sokoke.c:867 -msgid "Netscape p_lugins" -msgstr "P_lugin Netscape" +#: ../toolbars/midori-findbar.c:299 +msgid "Match Case" +msgstr "Cocokkan Huruf" -#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 -msgid "Userscripts" -msgstr "Skrip pengguna" +#: ../toolbars/midori-findbar.c:308 +msgid "Highlight Matches" +msgstr "Sorot Kecocokan" -#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 -msgid "Userstyles" -msgstr "Gaya pengguna" +#: ../toolbars/midori-findbar.c:319 +msgid "Close Findbar" +msgstr "Tutup batang cari" + +#: ../toolbars/midori-transferbar.c:122 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "Berkas '%s' telah diunduh." + +#: ../toolbars/midori-transferbar.c:125 +msgid "Transfer completed" +msgstr "Transfer selesai" + +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "Berkas yang diunduh galat." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"Checksum yang disediakan oleh tautan tidak cocok. Hal ini mungkin berarti " +"berkas tidak lengkap atau dimodifikasi setelahnya." + +#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "Bersihkan Semua" + +#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 +msgid "Some files are being downloaded" +msgstr "Beberapa berkas sedang diunduh" + +#: ../toolbars/midori-transferbar.c:374 +msgid "_Quit Midori" +msgstr "_Keluar Midori" + +#: ../toolbars/midori-transferbar.c:376 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Transfer akan dibatalkan jika Midori keluar." -#: ../panels/midori-bookmarks.c:108 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Penanda" -#: ../panels/midori-bookmarks.c:239 +#: ../panels/midori-bookmarks.c:257 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Gagal menambah item penanda: %s\n" + +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "Sunting penanda terpilih" -#: ../panels/midori-bookmarks.c:247 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "Hapus penanda terpilih" -#: ../panels/midori-bookmarks.c:260 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" msgstr "Tambah folder baru" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 msgid "Separator" msgstr "Pemisah" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "Konsol" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "Riwayat" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Ekstensi" +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "Hari Ini" -#: ../panels/midori-history.c:162 -msgid "Are you sure you want to remove all history items?" -msgstr "Anda yakin ingin menghapus semua item riwayat?" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "Kemarin" + +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "%d hari yang lalu" + +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "Seminggu yang lalu" -#: ../panels/midori-history.c:217 +#: ../panels/midori-history.c:360 +msgid "Are you sure you want to remove all history items?" +msgstr "Anda yakin ingin menghapus semua item riwayat?" + +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" msgstr "Bookmark item riwayat terpilih" -#: ../panels/midori-history.c:226 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" msgstr "Hapus item riwayat terpilih" -#: ../panels/midori-history.c:234 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "Bersihkan seluruh riwayat" -#: ../panels/midori-history.c:601 -msgid "A week ago" -msgstr "Seminggu yang lalu" - -#: ../panels/midori-history.c:606 -#, c-format -msgid "%d day ago" -msgid_plural "%d days ago" -msgstr[0] "%d hari yang lalu" - -#: ../panels/midori-history.c:614 -msgid "Today" -msgstr "Hari Ini" - -#: ../panels/midori-history.c:616 -msgid "Yesterday" -msgstr "Kemarin" - -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:108 -msgid "Netscape plugins" -msgstr "Plugin Netscape" - -#: ../panels/midori-transfers.c:271 -#, c-format -msgid "%s of %s" -msgstr "%s dari %s" +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Transfer" -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "Buka _Folder Tujuan" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" msgstr "Salin Tautan Lok_asi" -#: ../katze/katze-http-auth.c:97 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Otentikasi Diperlukan" -#: ../katze/katze-http-auth.c:113 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" @@ -1876,75 +2209,216 @@ "Sebuah nama pengguna dan sebuah sandi diperlukan\n" "untuk membuka lokasi ini:" -#: ../katze/katze-http-auth.c:127 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "Nama Pengguna" -#: ../katze/katze-http-auth.c:138 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "Sandi" -#: ../katze/katze-throbber.c:828 +#: ../katze/katze-http-auth.c:267 +msgid "_Remember password" +msgstr "_Ingat sandi" + +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Ikon bernama '%s' tak dapat dimuat" -#: ../katze/katze-throbber.c:841 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Stok ikon '%s' tak dapat dimuat" -#: ../katze/katze-throbber.c:907 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "Bingkai animasi rusak" -#: ../katze/katze-utils.c:200 ../katze/katze-utils.c:407 +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Properti '%s' tidak sah untuk %s" -#: ../katze/katze-utils.c:235 ../katze/katze-utils.c:264 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Pilih berkas" -#: ../katze/katze-utils.c:250 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "Pilih folder" -#: ../extensions/adblock.c:167 +#: ../katze/katze-utils.c:604 +msgid "None" +msgstr "Tak ada" + +#: ../katze/katze-utils.c:719 +msgid "1 hour" +msgstr "1 jam" + +#: ../katze/katze-utils.c:720 +msgid "1 day" +msgstr "1 hari" + +#: ../katze/katze-utils.c:721 +msgid "1 week" +msgstr "1 minggu" + +#: ../katze/katze-utils.c:722 +msgid "1 month" +msgstr "1 bulan" + +#: ../katze/katze-utils.c:723 +msgid "1 year" +msgstr "1 tahun" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 +#, c-format +msgid "Preferences for %s" +msgstr "Pengaturan untuk %s" + +#: ../extensions/adblock.c:467 msgid "Configure Advertisement filters" msgstr "Atur filter Iklan" -#: ../extensions/adblock.c:304 -msgid "Configure _Advertisement filters..." -msgstr "Atur filter _Iklan..." +#: ../extensions/adblock.c:498 +#, 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 "" +"Masukkan alamat dari senarai filter yang telah dikonfigurasikan sebelumnya " +"dalam entri teks dan klik \"Tambah\" untuk menambahkannya ke senarai. Anda " +"dapat menemukan lebih banyak senarai di %s." + +#: ../extensions/adblock.c:846 +msgid "Edit rule" +msgstr "Sunting aturan" + +#: ../extensions/adblock.c:860 +msgid "_Rule:" +msgstr "_Aturan:" + +#: ../extensions/adblock.c:914 +msgid "Bl_ock image" +msgstr "Bl_ok gambar" + +#: ../extensions/adblock.c:919 +msgid "Bl_ock link" +msgstr "Bl_ok tautan" -#: ../extensions/adblock.c:562 +#: ../extensions/adblock.c:1620 msgid "Advertisement blocker" msgstr "Pemblokir Iklan" -#: ../extensions/adblock.c:563 +#: ../extensions/adblock.c:1621 msgid "Block advertisements according to a filter list" msgstr "Blok iklan berdasarkan sebuah senarai filter" -#: ../extensions/colorful-tabs.c:115 -msgid "Tint tabs distinctly" -msgstr "Warnai tab dengan jelas" +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "" +"Halaman ini sepertinya berisi sebuah skrip pengguna. Anda ingin " +"menginstalnya?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "_Instal skrip pengguna" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "" +"Halaman ini sepertinya berisi sebuah gaya pengguna. Anda ingin menginstalnya?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_Instal gaya pengguna" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Jangan instal" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 +msgid "Userscripts" +msgstr "Skrip pengguna" + +#: ../extensions/addons.c:324 ../extensions/addons.c:683 +msgid "Userstyles" +msgstr "Gaya pengguna" + +#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Galat" + +#: ../extensions/addons.c:421 +#, c-format +msgid "Do you want to delete '%s'?" +msgstr "Anda ingin menghapus '%s'?" + +#: ../extensions/addons.c:427 +msgid "Delete user script" +msgstr "Hapys skrip pengguna" -#: ../extensions/colorful-tabs.c:151 +#: ../extensions/addons.c:428 +msgid "Delete user style" +msgstr "Hapus gaya pengguna" + +#: ../extensions/addons.c:431 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "Berkas '%s' akan secara permanen dihapus." + +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "Buka di Penyunting Teks" + +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "Buka Folder Tujuan" + +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "Tambah pengaya baru" + +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "Hapus pengaya terpilih" + +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 +msgid "User addons" +msgstr "Pengaya pengguna" + +#: ../extensions/addons.c:1826 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "Tak dapat memonitor folder '%s': %s" + +#: ../extensions/addons.c:1915 +msgid "Support for userscripts and userstyles" +msgstr "Dukungan untuk skrip pengguna dan gaya pengguna" + +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "Tab Penuh Warna" -#: ../extensions/colorful-tabs.c:152 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Warnai tiap tab dengan jelas" -#: ../extensions/cookie-manager/cookie-manager-page.c:79 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Manajer Kuki" -#: ../extensions/cookie-manager/cookie-manager-page.c:111 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 +msgid "Delete All" +msgstr "Hapus Semua" + +#: ../extensions/cookie-manager/cookie-manager-page.c:105 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." @@ -1952,31 +2426,31 @@ "Hapus semua kuki yang ditampilkan. Jika sebuah filter diatur, hanya kuki " "yang cocok dengan filter yang dihapus." -#: ../extensions/cookie-manager/cookie-manager-page.c:126 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "Perluas Semua" -#: ../extensions/cookie-manager/cookie-manager-page.c:133 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "Perkecil Semua" -#: ../extensions/cookie-manager/cookie-manager-page.c:460 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" msgstr "Anda yakin ingin menghapus semua kuki?" -#: ../extensions/cookie-manager/cookie-manager-page.c:462 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Pertanyaan" -#: ../extensions/cookie-manager/cookie-manager-page.c:471 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." msgstr "Hanya kuki yang cocok dengan filter yang akan dihapus." -#: ../extensions/cookie-manager/cookie-manager-page.c:539 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "Di akhir sesi" -#: ../extensions/cookie-manager/cookie-manager-page.c:542 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -1993,31 +2467,40 @@ "Keamanan: %s\n" "Kadaluwarsa: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:548 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Ya" -#: ../extensions/cookie-manager/cookie-manager-page.c:548 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "Tidak" -#: ../extensions/cookie-manager/cookie-manager-page.c:811 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#, c-format +msgid "" +"Domain: %s\n" +"Cookies: %d" +msgstr "" +"Ranah: %s\n" +"Kuki: %d" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Nama" -#: ../extensions/cookie-manager/cookie-manager-page.c:862 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "_Perluas Semua" -#: ../extensions/cookie-manager/cookie-manager-page.c:870 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "P_erkecil Semua" -#: ../extensions/cookie-manager/cookie-manager-page.c:923 +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 msgid "Filter:" msgstr "Filter:" -#: ../extensions/cookie-manager/cookie-manager-page.c:928 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "" "Enter a filter string to show only cookies whose name or domain field match " "the entered filter" @@ -2025,56 +2508,64 @@ "Masukkan sebuah tali filter untuk menampilkan hanya kuki yang nama atau " "daerah ranahnya cocok dengan filter yang dimasukkan" -#: ../extensions/cookie-manager/main.c:40 -msgid "_Cookie Manager" -msgstr "Manajer _Kuki" - -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Senarai, tampilan dan hapus kuki" -#: ../extensions/feed-panel/feed-atom.c:242 +#: ../extensions/copy-tabs.c:38 +msgid "Copy Tab _Addresses" +msgstr "Salin _Alamat Tab" + +#: ../extensions/copy-tabs.c:95 +msgid "Copy Addresses of Tabs" +msgstr "Salin Alamat Tab" + +#: ../extensions/copy-tabs.c:96 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Salin alamat semua tab ke papan klip" + +#: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Gagal untuk mencari elemen Atom \"lema\" yang diperlukan di data XML." -#: ../extensions/feed-panel/feed-atom.c:348 +#: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Gagal untuk mencari elemen Atom \"umpan\" yang diperlukan di data XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Terakhir dimutakhirkan: %s." -#: ../extensions/feed-panel/feed-panel.c:664 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "Umpan" -#: ../extensions/feed-panel/feed-panel.c:717 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "Tambah umpan baru" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "Hapus umpan" -#: ../extensions/feed-panel/feed-panel.c:807 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "_Umpan" -#: ../extensions/feed-panel/feed-parse.c:185 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Gagal mencari elemen root di umpan data XML." -#: ../extensions/feed-panel/feed-parse.c:225 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Format umpan tak didukung." -#: ../extensions/feed-panel/feed-parse.c:255 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Gagal menguraikan umpan XML: %s" @@ -2095,123 +2586,755 @@ msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Gagal mencari elemen \"kanal\" RSS yang diperlukan di data XML." -#: ../extensions/feed-panel/main.c:114 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "Umpan '%s' telah ada" -#: ../extensions/feed-panel/main.c:191 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Gagal memuat umpan '%s'" -#: ../extensions/feed-panel/main.c:331 -msgid "New feed" -msgstr "Umpan baru" - -#: ../extensions/feed-panel/main.c:489 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "Panel Umpan" -#: ../extensions/feed-panel/main.c:490 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Baca umpan Atom/ RSS" -#: ../extensions/mouse-gestures/main.c:236 +#: ../extensions/formhistory/formhistory.c:39 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "Gagal menambah nilai bentuk: %s\n" + +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "Riwayat bentuk" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Sebuah nama pengguna dan sebuah sandi diperlukan\n" +"untuk membuka lokasi ini:" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "Ingat sandi di halaman ini?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Ingat" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "Jangan sekarang" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Tidak pernah untuk halaman ini" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "Ubah status formulir riwayat" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "Ubah status aktif formulir riwayat untuk tab ini." + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Gagal mengeksekusi pernyataan basis data: %s\n" + +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" +"Hanya aktifkan formulir riwayat melalui tombol pintas (Ctrl+Shift+F) pada " +"tiap-tiap tab" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "Formulir pengisi riwayat" + +#: ../extensions/formhistory/formhistory.c:669 +msgid "Stores history of entered form data" +msgstr "Simpan riwayat dari data bentuk yang dimasukkan" + +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#, c-format +msgid "Failed to select suggestions\n" +msgstr "Gagal memilih saran\n" + +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Tidak ada tab yang belum dikunjungi" + +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "Senarai-Riwayat" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Perilaku menutup tab" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Jangan lakukan apapun" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Pindah ke tab terakhir yang ditampilkan" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Pindah ke tab terbaru" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Tab baru Berikutnya (Senarai Riwayat)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Tab baru berikutnya dari riwayat" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Tab baru Sebelumnya (Senarai Riwayat)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Tab baru sebelumnya dari riwayat" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Tampilkan tab di latar belakang (Senarai Riwayat)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Tampilkan tab terpilih saat ini di latar belakang" + +#: ../extensions/history-list.vala:569 +msgid "History List" +msgstr "Senarai Riwayat" + +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "Pindah ke tab terakhir digunakan ketika berpindah atau menutup tab" + +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Gerak Tetikus" -#: ../extensions/mouse-gestures/main.c:237 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Kendalikan Midori dengan menggerakkan tetikus" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 -msgid "Pageholder" -msgstr "Pageholder" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "_Pageholder" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "Muat ulang halamat atau stop memuat" -#: ../extensions/shortcuts.c:172 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "Sesuaikan jalan pintas Papan Ketik" -#: ../extensions/shortcuts.c:264 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "Sesuaikan J_alan Pintas..." -#: ../extensions/shortcuts.c:303 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Jalan Pintas" -#: ../extensions/shortcuts.c:304 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "Tampilkan dan sunting jalan pintas papan ketik" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/status-clock.c:174 +msgid "Statusbar Clock" +msgstr "Jam Batang Status" + +#: ../extensions/status-clock.c:175 +msgid "Display date and time in the statusbar" +msgstr "Tampilkan tanggal dan waktu di batang status" + +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Gambar" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Skrip" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:151 +msgid "Netscape plugins" +msgstr "Plugin Netscape" + +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "Fitur Batang Status" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" msgstr "Matikan atau hidupkan dengan mudah fitur-fitur di halaman web" -#: ../extensions/tab-panel.c:383 ../extensions/tab-panel.c:443 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Panel Tab" -#: ../extensions/tab-panel.c:427 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "Panel T_ab" -#: ../extensions/tab-panel.c:444 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Tampilkan tab di sebuah panel vertikal" -#: ../extensions/toolbar-editor.c:391 +#: ../extensions/tabs-minimized.c:76 +msgid "Only Icons on Tabs by default" +msgstr "Hanya Ikon di Tab sebagai standar" + +#: ../extensions/tabs-minimized.c:77 +msgid "New tabs have no label by default" +msgstr "Tab baru tidak mempunyai label sebagai standar" + +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Sesuaikan Batang Alat" -#: ../extensions/toolbar-editor.c:407 +#: ../extensions/toolbar-editor.c:409 msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " +"Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" "Pilih item yang akan ditampilkan di batang alat. Item dapat diubah urutannya " "dengan seret dan taruh." -#: ../extensions/toolbar-editor.c:423 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Item Tersedia" -#: ../extensions/toolbar-editor.c:444 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Item Ditampilkan" -#: ../extensions/toolbar-editor.c:579 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "Sesuaikan _Batang Alat..." -#: ../extensions/toolbar-editor.c:611 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Sesuaikan..." + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" msgstr "Penyunting Batang Alat" -#: ../extensions/toolbar-editor.c:612 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" msgstr "Sunting tata letak batang alat dengan mudah" -#~ msgid "_Closed Tabs and Windows" -#~ msgstr "Tutup Tab dan _Jendela" +#: ../extensions/web-cache.c:463 +msgid "Cache HTTP communication on disk" +msgstr "Tembolok komunikasi HTTP di cakram" + +#~ msgid "Cookies" +#~ msgstr "Kuki" + +#~ msgid "'Flash' Cookies" +#~ msgstr "Kuki 'Flash'" + +#~ msgid "HTML5 _Databases" +#~ msgstr "Basis _Data HTML5" + +#~ msgid "Offline Application Cache" +#~ msgstr "Tembolok Aplikasi Luring" + +#~ msgid "Lightweight web browser" +#~ msgstr "Peramban web ringan" + +#~ msgid "No filename specified" +#~ msgstr "Tak ada nama berkas yang ditentukan" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "Jangan simpan data privat ketika meramban" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Tambah jalan pintas ke panggil cepat" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Tambah jalan pintas ke desktop" + +#~ msgid "Create a launcher" +#~ msgstr "Buat sebuah peluncur" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "Berlangganan ke umpan berita ini" + +#~ msgid "Close this window" +#~ msgstr "Tutup jendela ini" + +#~ msgid "Close all open windows" +#~ msgstr "Tutup semua jendela yang terbuka" + +#~ msgid "Undo the last modification" +#~ msgstr "Tak jadi modifikasi terakhir" + +#~ msgid "Redo the last modification" +#~ msgstr "Jadi lagi modifikasi terakhir" + +#~ msgid "Cut the selected text" +#~ msgstr "Potong teks terpilih" + +#~ msgid "Copy the selected text" +#~ msgstr "Salin teks terpilih" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "Tempel teks dari papan klip" + +#~ msgid "Delete the selected text" +#~ msgstr "Hapus teks terpilih" + +#~ msgid "Select all text" +#~ msgstr "Pilih semua teks" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Cari kejadian berikutnya dari kata atau frasa" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Cari kejadian sebelumnya dari kata atau frasa" + +#~ msgid "Reset the zoom level" +#~ msgstr "Reset level pembesaran" + +#~ msgid "View the source code of the page" +#~ msgstr "Tampilkan kode program dari halaman" + +#~ msgid "Scroll to the left" +#~ msgstr "Gulung ke kiri" + +#~ msgid "Scroll down" +#~ msgstr "Gulung bawah" + +#~ msgid "Scroll up" +#~ msgstr "Gulung atas" + +#~ msgid "Scroll to the right" +#~ msgstr "Gulung ke kanan" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "Hapus isi tempat sampah" + +#~ msgid "Open the last closed tab" +#~ msgstr "Buka tab yang terakhir ditutup" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Tambah sebuah folder penanda baru" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Tambah, sunting dan hapus mesin pencari..." + +#~ msgid "Clear private data..." +#~ msgstr "Hapus data pribadi..." + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "Inspeksi detail halaman dan akses alat pengembang..." + +#~ msgid "Switch to the previous tab" +#~ msgstr "Pindah ke tab sebelumnya" + +#~ msgid "Switch to the next tab" +#~ msgstr "Pindah ke tab berikutnya" + +#~ msgid "Move tab behind the previous tab" +#~ msgstr "Pindah tab ke belakang tab sebelumnya" + +#~ msgid "Move tab in front of the next tab" +#~ msgstr "Pindah tab ke depan tab berikutnya" + +#~ msgid "Focus the current tab" +#~ msgstr "Fokus tab saat ini" + +#~ msgid "Cycle focus between views" +#~ msgstr "Daur fokus di antara tampilan" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Hanya tampilkan ikon dari tab saat ini" + +#~ msgid "Duplicate the current tab" +#~ msgstr "Duplikasi tab saat ini" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Tutup semua tab kecuali tab saat ini" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Buka tab yang tersimpan di sesi terakhir" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Tampilkan Pertanyaan Acapkali Diajukan" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Buka pelacak kutu Midori" + +#~ msgid "Show information about the program" +#~ msgstr "Tampilkan informasi tentang program" + +#~ msgid "Show menubar" +#~ msgstr "Tampilkan batang menu" + +#~ msgid "Show navigationbar" +#~ msgstr "Tampilkan batang navigasi" + +#~ msgid "Show sidepanel" +#~ msgstr "Tampilkan panel sisi" + +#~ msgid "Show bookmarkbar" +#~ msgstr "Tampilkan batang penanda" + +#~ msgid "Show statusbar" +#~ msgstr "Tampilkan batang status" + +#~ msgid "MD5-Checksum:" +#~ msgstr "MD5-Checksum:" + +#~ msgid "SHA1-Checksum:" +#~ msgstr "SHA1-Checksum:" + +#~ msgid "Set number of columns and rows" +#~ msgstr "Atur jumlah kolom dan baris" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Masukkan jumlah kolom dan baris:" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "Masukan tidak valid untuk ukuran panggil cepat" + +#~ msgid "Thumb size:" +#~ msgstr "Ukuran miniatur:" + +#~ msgid "Small" +#~ msgstr "Kecil" + +#~ msgid "Medium" +#~ msgstr "Sedang" + +#~ msgid "Big" +#~ msgstr "Besar" + +#~ msgid "Not available: %s" +#~ msgstr "Tidak tersedia: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "Berkas sumber daya tak terinstal" + +#~ msgid "Reset the last _session" +#~ msgstr "Atur ulang _sesi terakhir" + +#~ msgid "Not found - %s" +#~ msgstr "Tak ditemukan - %s" + +#~ msgid "Document cannot be displayed" +#~ msgstr "Dokumen tak dapat ditampilkan" + +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "Paksa 96 titik per inci" + +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "Paksa kerapatan titik video 96 DPI" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Atur filter _Iklan..." + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "" +#~ "Ganti tab menggunakan Ctrl+Tab yang diurutkan berdasarkan penggunaan " +#~ "terakhir" + +#~ msgid "Quit the application" +#~ msgstr "Keluar aplikasi" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "Gagal mengeksekusi pernyataan basis data\n" + +#~ msgid "Show Blank page" +#~ msgstr "Tampilkan halaman Kosong" + +#~ msgid "All cookies" +#~ msgstr "Semua kuki" + +#~ msgid "Session cookies" +#~ msgstr "Kuki sesi" + +#~ msgid "Show Transferbar" +#~ msgstr "Tampilkan Batang Transfer" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "Apakah ingin menampilkan batang transfer" + +#~ msgid "Search engines in location completion" +#~ msgstr "Mesin pencari di penyelesai lokasi" + +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "Apakah akan menampilkan mesin pencari di penyelesai lokasi" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "Tampilkan kendali operasi dari panel" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "Apakah ingin menampilkan kendali operasi dari panel" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Tampilkan panggil cepat di tab baru" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Tampilkan panggil cepat di tab yang baru dibuka" + +#~ msgid "Download Manager" +#~ msgstr "Manajer Unduh" + +#~ msgid "An external download manager" +#~ msgstr "Manajer unduh eksternal" + +#~ msgid "Open external pages in:" +#~ msgstr "Buka halaman eksternal di:" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "Dimana ingin membuka halaman yang dibuka secara eksternal" + +#~ msgid "Accept cookies" +#~ msgstr "Terima kuki" + +#~ msgid "What type of cookies to accept" +#~ msgstr "Tipe kuki apa yang diterima" + +#~ msgid "Maximum cookie age" +#~ msgstr "Usia kuki maksimum" + +#~ msgid "Maximum history age" +#~ msgstr "Usia riwayat maksimum" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Ingat berkas terakhir diunduh" + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "Apakah berkas terakhir diunduh akan disimpan" + +#~ msgid "Download with Download _Manager" +#~ msgstr "Unduh Dengan _Manajer Unduh" + +#~ msgid "General" +#~ msgstr "Umum" + +#~ msgid "Appearance" +#~ msgstr "Tampilan" + +#~ msgid "Font settings" +#~ msgstr "Pengaturan fonta" + +#~ msgid "Interface" +#~ msgstr "Antarmuka" + +#~ msgid "Navigationbar" +#~ msgstr "Batang navigasi" + +#~ msgid "Applications" +#~ msgstr "Aplikasi" + +#~ msgid "External applications" +#~ msgstr "Aplikasi Eksternal" + +#~ msgid "Web Cookies" +#~ msgstr "Kuki Web" + +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "Hapus kuki ketika keluar Midori" + +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "Hapus kuki lama setelah 1 jam" + +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "Hapus kuki lama setelah 1 minggu" + +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "Hapus kuki lama setelah 1 bulan" + +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "Hapus kuki lama setelah 1 tahun" + +#~ msgid "%s of %s, %s/s" +#~ msgstr "%s dari %s, %s/s" + +#~ msgid "Open target folder for selected addon" +#~ msgstr "Buka folder target untuk pengaya terpilih" + +#~ msgid "Next Tab (History List)" +#~ msgstr "Tab Berikutnya (Senarai Riwayat)" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "Tab Sebelumnya (Senarai Riwayat)" + +#~ msgid "Previous tab from history" +#~ msgstr "Tab sebelumnya dari riwayat" + +#~ msgid "Pageholder" +#~ msgstr "Pageholder" + +#~ msgid "_Pageholder" +#~ msgstr "_Pageholder" + +#~ msgid "Keep one or multiple pages open in parallel to your tabs" +#~ msgstr "Simpan satu atau beberapa halaman terbuka sebagai paralel tab anda" + +#~ msgid "_Contents" +#~ msgstr "_Isi" + +#~ msgid "Show the documentation" +#~ msgstr "Tampilkan dokumentasi" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% termuat" + +#~ msgid "View Selection Source" +#~ msgstr "Tampilkan Pemilihan Sumber" + +#~ msgid "View the source code of the selection" +#~ msgstr "Tampilkan kode program dari pemilihan" + +#~ msgid "_Transferbar" +#~ msgstr "Batang _transfer" + +#~ msgid "Show transferbar" +#~ msgstr "Tampilkan batang transfer" + +#~ msgid "_Recently visited pages" +#~ msgstr "_Halaman yang baru dikunjungi" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Buka kembali halaman yang sebelumnya anda kunjungi" + +#~ msgid "Detach chosen panel from the window" +#~ msgstr "Lepaskan panel terpilih dari jendela" + +#~ msgid "Show panel _titles" +#~ msgstr "Tampilkan _judul panel" + +#~ msgid "Show operating _controls" +#~ msgstr "Tampilkan _kendali operasi" + +#~ msgid "Options" +#~ msgstr "Opsi" + +#~ msgid "Show progress in location entry" +#~ msgstr "Tampilkan progres di lema lokasi" + +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "Apakah ingin menampilkan progres memuat di lema lokasi" + +#~ msgid "Ask for the destination folder" +#~ msgstr "Tanya folder tujuan" + +#~ msgid "Whether to ask for the destination folder when downloading a file" +#~ msgstr "Apakah akan menanyakan folder tujuan ketika mengunduh sebuah berkas" + +#~ msgid "Whether to show a notification when a transfer has been completed" +#~ msgstr "" +#~ "Apakah akan menampilkan sebuah notifikasi ketika sebuah transfer telah " +#~ "selesai" + +#~ msgid "Original cookies only" +#~ msgstr "Hanya kuki asli" + +#~ msgid "Remember last visited pages" +#~ msgstr "Ingat halaman terakhir dikunjungi" + +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "Apakah halaman terakhir dikunjungi tersimpan" + +#~ msgid "Remember last form inputs" +#~ msgstr "Ingat bentuk terakhir masukan" + +#~ msgid "Whether the last form inputs are saved" +#~ msgstr "Apakah bentuk terakhir masukan disimpan" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "Deteksi server proxy secara otomatis" + +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" +#~ msgstr "Apakah akan mendeteksi server proxy secara otomatis dari lingkungan" + +#~ msgid "Cache size" +#~ msgstr "Ukuran tembolok" + +#~ msgid "The allowed size of the cache" +#~ msgstr "Ukuran tembolok yang diizinkan" + +#~ msgid "Open _Link" +#~ msgstr "Buka _Tautan" + +#~ msgid "_Download Link destination" +#~ msgstr "_Unduh Taut tujuan" + +#~ msgid "_Save Link destination" +#~ msgstr "_Simpan Taut tujuan" + +#~ msgid "_Restore Tab" +#~ msgstr "_Kembalikan Tab" + +#~ msgid "_Minimize Tab" +#~ msgstr "_Kecilkan Tab" + +#~ msgid "Encoding" +#~ msgstr "Penyandian" + +#~ msgid "The character encoding to use by default" +#~ msgstr "Penyandian karakter untuk digunakan sebagai standar" + +#~ msgid "Shrink images automatically" +#~ msgstr "Kecilkan gambar secara otomatis" + +#~ msgid "Automatically shrink standalone images to fit" +#~ msgstr "Secara otomatis mengecilkan gambar tunggal agar muat" + +#~ msgid "Resizable text areas" +#~ msgstr "Area teks dapat diubah ukurannya" + +#~ msgid "Whether text areas are resizable" +#~ msgstr "Apakah area teks dapat diubah ukurannya" + +#~ msgid "Enable developer tools" +#~ msgstr "Aktifkan alat pengembang" + +#~ msgid "Enable special extensions for developers" +#~ msgstr "Aktifkan ekstensi khusus untuk pengembang" + +#~ msgid "Spell Checking" +#~ msgstr "Pemeriksa Ejaan" + +#~ msgid "" +#~ "A comma separated list of languages to be used for spell checking, for " +#~ "example \"en_GB,de_DE\"" +#~ msgstr "" +#~ "Senarai dipisahkan koma dari bahasa yang akan digunakan untuk pemeriksa " +#~ "ejaan, misalnya \"en_GB,de_DE\"" + +#~ msgid "User_styles" +#~ msgstr "Ga_ya pengguna" + +#~ msgid "Console" +#~ msgstr "Konsol" + +#~ msgid "Tint tabs distinctly" +#~ msgstr "Warnai tab dengan jelas" + +#~ msgid "_Cookie Manager" +#~ msgstr "Manajer _Kuki" #~ msgid "URIs" #~ msgstr "URI" @@ -2231,9 +3354,6 @@ #~ msgid "Quickly jump to a word or phrase" #~ msgstr "Lompat segera ke kata atau frasa" -#~ msgid "Last open pages" -#~ msgstr "Halaman terakhir dibuka" - #~ msgid "Both" #~ msgstr "Keduanya" @@ -2243,9 +3363,6 @@ #~ msgid "Load on Startup" #~ msgstr "Dimuat Saat Hidupkan" -#~ msgid "Download Folder" -#~ msgstr "Folder Unduh" - #~ msgid "HTTP Proxy" #~ msgstr "Proxy HTTP" diff -Nru midori-0.2.8/po/it.po midori-0.4.6/po/it.po --- midori-0.2.8/po/it.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/it.po 2012-05-14 22:13:42.000000000 +0000 @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-19 10:08+0000\n" -"PO-Revision-Date: 2010-08-20 15:50+0100\n" -"Last-Translator: Gianluca Foddis \n" +"POT-Creation-Date: 2012-04-22 02:48+0000\n" +"PO-Revision-Date: 2011-12-24 09:51+0100\n" +"Last-Translator: Cristian Marchi \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,2291 +19,2246 @@ "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -# GLOSSARIO -# transfer=trasferimento -# download=scaricamento (come in gnome e in kde) #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Browser web leggero" +msgid "Browse the Web" +msgstr "Naviga nel web" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1331 -#: ../midori/main.c:1660 -#: ../midori/main.c:1668 -#: ../midori/main.c:1684 -#: ../midori/midori-websettings.c:310 +msgid "Internet;WWW;Explorer" +msgstr "Internet;WWW;Explorer" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072 +#: ../midori/main.c:2086 ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Browser web" -#: ../midori/main.c:99 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Navigazione privata di Midori" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Apre una nuova finestra di navigazione privata" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164 +msgid "Private Browsing" +msgstr "Navigazione privata" + +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" -msgstr "Le impostazioni non possono essere caricate: %s\n" +msgstr "Le impostazioni non possono essere caricate: %s\n" -#: ../midori/main.c:148 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Il valore «%s» non è valido per %s" -#: ../midori/main.c:155 -#: ../midori/main.c:241 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valore di configurazione «%s» non valido" -#: ../midori/main.c:368 -#: ../midori/main.c:472 -#: ../extensions/formhistory.c:440 +#: ../midori/main.c:380 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "I motori di ricerca non possono essere caricati. %s\n" + +#: ../midori/main.c:434 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Errore nella cancellazione della cronologia: %s\n" + +#: ../midori/main.c:454 ../midori/main.c:581 +#: ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" msgstr "Errore nella connessione al database: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:424 +#: ../midori/main.c:524 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Errore nella cancellazione dei vecchi elementi della cronologia: %s\n" -#: ../midori/main.c:455 -#: ../panels/midori-history.c:169 -#: ../panels/midori-history.c:199 +#: ../midori/main.c:564 ../panels/midori-history.c:232 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Errore nell'eliminazione dell'elemento della cronologia: %s\n" -#: ../midori/main.c:500 +#: ../midori/main.c:611 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "I segnalibri non possono essere salvati. %s" -#: ../midori/main.c:531 +#: ../midori/main.c:633 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Le impostazioni non possono essere salvate. %s" -#: ../midori/main.c:569 +#: ../midori/main.c:668 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "I motori di ricerca non possono essere salvati. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:589 -#: ../midori/main.c:612 +#: ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Il cestino non può essere salvato. %s" -#: ../midori/main.c:671 -#: ../midori/main.c:911 +#: ../midori/main.c:746 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Estensioni" + +#: ../midori/main.c:760 +msgid "Privacy" +msgstr "Privacy" + +#: ../midori/main.c:772 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"I cookie immagazzinano i dati di accesso, i giochi salvati o i profili " +"dell'utente per scopi pubblicitari." + +#: ../midori/main.c:828 #, c-format msgid "The session couldn't be saved. %s" msgstr "La sessione non può essere salvata. %s" -#: ../midori/main.c:855 -msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "Non è disponibile nessun certificato di root. I certificati SSL non possono essere verificati." - -#: ../midori/main.c:945 -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 sembra essersi chiuso inaspettatamente l'ultima volta che è stato usato. Se dovesse capitare spesso, provare una delle seguenti opzioni per risolvere il problema." +#: ../midori/main.c:1046 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" +"Non è disponibile nessun certificato di root. I certificati SSL non possono " +"essere verificati." + +#: ../midori/main.c:1115 +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 sembra essersi chiuso inaspettatamente l'ultima volta che è stato " +"usato. Se dovesse capitare spesso, provare una delle seguenti opzioni per " +"risolvere il problema." -#: ../midori/main.c:960 +#: ../midori/main.c:1134 msgid "Modify _preferences" msgstr "Modifica _preferenze" -#: ../midori/main.c:964 -msgid "Reset the last _session" -msgstr "Reimposta l'ultima _sessione" - -#: ../midori/main.c:969 +#: ../midori/main.c:1138 msgid "Disable all _extensions" msgstr "Disabilita tutte le _estensioni" -#: ../midori/main.c:1209 -#: ../midori/main.c:1955 +#: ../midori/main.c:1151 +msgid "Discard old tabs" +msgstr "Scarta le schede vecchie" + +#: ../midori/main.c:1152 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "Mostra le ultime schede senza caricarle" + +#: ../midori/main.c:1153 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "Mostra le ultime schede aperte" + +#: ../midori/main.c:1400 ../midori/main.c:2464 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La sessione non può essere caricata: %s\n" -#: ../midori/main.c:1331 -msgid "No filename specified" -msgstr "Nessun file specificato" - -#: ../midori/main.c:1350 -msgid "An unknown error occured." -msgstr "Si è presentato un errore sconosciuto" - -#: ../midori/main.c:1381 +#: ../midori/main.c:1538 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Istantanea salvata in: %s\n" -#: ../midori/main.c:1553 +#: ../midori/main.c:1951 msgid "Run ADDRESS as a web application" -msgstr "Esegui INDIRIZZO come applicazione web" +msgstr "Esegue INDIRIZZO come applicazione web" -#: ../midori/main.c:1553 +#: ../midori/main.c:1951 msgid "ADDRESS" msgstr "INDIRIZZO" -#: ../midori/main.c:1556 +#: ../midori/main.c:1954 msgid "Use FOLDER as configuration folder" msgstr "Usa CARTELLA come cartella di configurazione" -#: ../midori/main.c:1556 +#: ../midori/main.c:1954 msgid "FOLDER" msgstr "CARTELLA" -#: ../midori/main.c:1559 +#: ../midori/main.c:1957 +msgid "Private browsing, no changes are saved" +msgstr "Navigazione privata: non verrà salvata alcuna modifica" + +#: ../midori/main.c:1959 msgid "Show a diagnostic dialog" msgstr "Mostra finestra di diagnostica" -#: ../midori/main.c:1561 +#: ../midori/main.c:1961 msgid "Run the specified filename as javascript" msgstr "Esegue il file specificato come javascript" -#: ../midori/main.c:1564 +#: ../midori/main.c:1963 msgid "Take a snapshot of the specified URI" msgstr "Scatta istantanea dell'URL specificato" -#: ../midori/main.c:1567 +#: ../midori/main.c:1965 msgid "Execute the specified command" msgstr "Esegue il comando specificato" -#: ../midori/main.c:1569 +#: ../midori/main.c:1967 +msgid "List available commands to execute with -e/ --execute" +msgstr "Elenca i comandi disponibili per l'esecuzione con -e/ --execute" + +#: ../midori/main.c:1969 msgid "Display program version" msgstr "Visualizza la versione dell'applicazione" -#: ../midori/main.c:1571 +#: ../midori/main.c:1971 msgid "Addresses" msgstr "Indirizzi" -#: ../midori/main.c:1573 +#: ../midori/main.c:1973 msgid "Block URIs according to regular expression PATTERN" msgstr "Blocca le URI secondo l'espressione regolare SCHEMA" -#: ../midori/main.c:1573 +#: ../midori/main.c:1973 msgid "PATTERN" msgstr "SCHEMA" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1577 +#: ../midori/main.c:1977 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Riavvia Midori dopo SECONDI secondi di inattività" -#: ../midori/main.c:1577 +#: ../midori/main.c:1977 msgid "SECONDS" msgstr "SECONDI" -#: ../midori/main.c:1657 +#: ../midori/main.c:1980 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Redirige gli avvisi di console al NOMEFILE specificato" + +#: ../midori/main.c:1980 +msgid "FILENAME" +msgstr "NOMEFILE" + +#: ../midori/main.c:2045 msgid "[Addresses]" msgstr "[Indirizzi]" # fp suggerisce "a:", mantengo "su:" per uniformita´ con le trad xfce -#: ../midori/main.c:1685 +#: ../midori/main.c:2087 msgid "Please report comments, suggestions and bugs to:" msgstr "Segnalare commenti, suggerimenti e bug su:" -#: ../midori/main.c:1687 +#: ../midori/main.c:2089 msgid "Check for new versions at:" msgstr "Controlla nuove versioni su:" -#: ../midori/main.c:1804 -msgid "The specified configuration folder is invalid." -msgstr "La cartella di configurazione specificata non è accettabile. %s" +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2173 +msgid "Saved logins and _passwords" +msgstr "_Password e login salvati" + +#: ../midori/main.c:2175 +msgid "Cookies and Website data" +msgstr "Dati dei siti web e cookie" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2179 ../midori/midori-websettings.c:996 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Cache web" + +#: ../midori/main.c:2182 +msgid "Website icons" +msgstr "Icone dei siti" + +#: ../midori/main.c:2288 +msgid "An unknown error occured" +msgstr "Si è verificato un errore sconosciuto" -#: ../midori/main.c:1852 +#: ../midori/main.c:2395 msgid "An instance of Midori is already running but not responding.\n" msgstr "Un'istanza di Midori è già in esecuzione, ma non risponde.\n" -#: ../midori/main.c:1907 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "I motori di ricerca non possono essere caricati. %s\n" - -#: ../midori/main.c:1928 +#: ../midori/main.c:2431 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "I segnalibri non possono essere caricati: %s\n" -#: ../midori/main.c:1970 +#: ../midori/main.c:2479 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Il cestino non può essere caricato: %s\n" -#: ../midori/main.c:1983 +#: ../midori/main.c:2492 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "La cronologia non può essere caricata: %s\n" -#: ../midori/main.c:1997 +#: ../midori/main.c:2508 msgid "The following errors occured:" msgstr "Si sono presentati i seguenti errori:" -#: ../midori/main.c:2013 +#: ../midori/main.c:2524 msgid "_Ignore" msgstr "_Ignora" -#: ../midori/midori-array.c:429 +#: ../midori/midori-app.c:1334 +msgid "_Bookmark" +msgstr "S_egnalibro" + +#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060 +msgid "_Bookmarks" +msgstr "Segnali_bri" + +#: ../midori/midori-app.c:1336 +msgid "Add Boo_kmark" +msgstr "Aggiungi se_gnalibro" + +#: ../midori/midori-app.c:1337 +msgid "_Console" +msgstr "_Console" + +#: ../midori/midori-app.c:1338 +msgid "_Extensions" +msgstr "_Estensioni" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589 +msgid "_History" +msgstr "C_ronologia" + +#: ../midori/midori-app.c:1340 +msgid "_Homepage" +msgstr "_Pagina iniziale" + +#: ../midori/midori-app.c:1341 +msgid "_Userscripts" +msgstr "Script dell'_utente" + +#: ../midori/midori-app.c:1342 +msgid "New _Tab" +msgstr "Nuova _scheda" + +#: ../midori/midori-app.c:1343 +msgid "_Transfers" +msgstr "_Trasferimenti" + +#: ../midori/midori-app.c:1344 +msgid "Netscape p_lugins" +msgstr "Plugin N_etscape" + +#: ../midori/midori-app.c:1345 +msgid "_Closed Tabs" +msgstr "Schede _chiuse" + +#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216 +msgid "New _Window" +msgstr "N_uova finestra" + +#: ../midori/midori-app.c:1347 +msgid "New _Folder" +msgstr "Nuova _cartella" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "File non trovato." -#: ../midori/midori-array.c:463 -#: ../midori/midori-array.c:486 -#: ../midori/midori-array.c:496 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Documento corrotto." -#: ../midori/midori-array.c:505 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "Formato del segnalibro non riconosciuto." -#: ../midori/midori-array.c:719 +#: ../midori/midori-array.c:915 msgid "Writing failed." msgstr "Errore di scrittura." -#: ../midori/midori-browser.c:336 -#: ../midori/midori-browser.c:4909 -#: ../midori/midori-browser.c:4915 +#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298 +#: ../midori/midori-browser.c:5307 msgid "Reload the current page" msgstr "Ricarica la pagina corrente" -#: ../midori/midori-browser.c:346 -#: ../midori/midori-browser.c:4912 +#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304 msgid "Stop loading the current page" msgstr "Interrompe il caricamento della pagina corrente" -#: ../midori/midori-browser.c:453 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% caricato" - -#: ../midori/midori-browser.c:491 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" msgstr "Errore nell'aggiornamento del titolo: %s\n" -#: ../midori/midori-browser.c:504 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." -msgstr "Azione inaspettata: '%s'" +msgstr "Azione \"%s\" inaspettata." -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:569 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Navigazione privata)" + +#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716 +msgid "Toplevel folder" +msgstr "Livello principale" + +#: ../midori/midori-browser.c:774 msgid "New folder" msgstr "Nuova cartella" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:774 msgid "Edit folder" msgstr "Modifica cartella" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "New bookmark" msgstr "Nuovo segnalibro" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "Edit bookmark" msgstr "Modifica segnalibro" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:818 msgid "_Title:" msgstr "_Titolo:" -#: ../midori/midori-browser.c:779 -#: ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "_Descrizione:" - -#: ../midori/midori-browser.c:798 -#: ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Indirizzo:" -#: ../midori/midori-browser.c:830 -#: ../midori/midori-browser.c:4028 +#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326 msgid "_Folder:" msgstr "_Cartella:" -#: ../midori/midori-browser.c:840 -#: ../midori/midori-browser.c:934 -#: ../midori/midori-browser.c:4033 -#: ../midori/midori-browser.c:4062 -msgid "Toplevel folder" -msgstr "Livello principale" - -#: ../midori/midori-browser.c:872 +#: ../midori/midori-browser.c:877 msgid "Add to _Speed Dial" msgstr "Aggiungi a _selezione veloce" -#: ../midori/midori-browser.c:885 +#: ../midori/midori-browser.c:890 msgid "Show in the tool_bar" msgstr "Mostra nella _barra degli strumenti" -#: ../midori/midori-browser.c:900 +#: ../midori/midori-browser.c:905 msgid "Run as _web application" msgstr "Esegui come applicazione _web" -#: ../midori/midori-browser.c:979 +#: ../midori/midori-browser.c:976 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Il file «%s» non può essere salvato in questa cartella." + +#: ../midori/midori-browser.c:978 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Non si ha il permesso di scrivere in questa posizione." + +#: ../midori/midori-browser.c:985 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Spazio insufficiente per scaricare \"%s\"." -#: ../midori/midori-browser.c:983 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "Il file ha bisogno di %s ma sono rimasti solo %s." -#: ../midori/midori-browser.c:1040 -#: ../midori/midori-browser.c:4070 -#: ../midori/midori-browser.c:4105 +#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395 msgid "Save file as" msgstr "Salva come" -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1320 +msgid "New Window" +msgstr "Nuova finestra" + +#: ../midori/midori-browser.c:1320 +msgid "A new window has been opened" +msgstr "È stata aperta una nuova finestra" + +#: ../midori/midori-browser.c:1323 +msgid "New Tab" +msgstr "Nuova scheda" + +#: ../midori/midori-browser.c:1323 +msgid "A new tab has been opened" +msgstr "È stata aperta una nuova scheda" + +#: ../midori/midori-browser.c:1358 +msgid "Error opening the image!" +msgstr "Errore di apertura dell'immagine" + +#: ../midori/midori-browser.c:1359 +msgid "Can not open selected image in a default viewer." +msgstr "" +"Impossibile aprire l'immagine selezionata in un visualizzatore predefinito." + +#: ../midori/midori-browser.c:1365 +msgid "Error downloading the image!" +msgstr "Errore di scaricamento dell'immagine" + +#: ../midori/midori-browser.c:1366 +msgid "Can not download selected image." +msgstr "Impossibile scaricare l'immagine selezionata." + +#: ../midori/midori-browser.c:1492 msgid "Save file" msgstr "Salva file" -#: ../midori/midori-browser.c:2150 +#: ../midori/midori-browser.c:2367 msgid "Open file" -msgstr "Apri file" +msgstr "Apre file" -#: ../midori/midori-browser.c:2228 +#: ../midori/midori-browser.c:2499 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." msgstr "" -"Per usare questa URI usare un aggregatore di notizie; di solito vi è un pulsante \"Nuova sottoscrizione\", \"Nuovo Feed Notizie\" o simile;\n" -"in alternativa andare in Preferenze, Applicazioni in Midori, e selezionare un Aggregatore di notizie; al prossim clic sull'icona del fedd delle notizie, questo verrà aggiunto automaticamente" +"Per usare questa URI usare un aggregatore di notizie; di solito vi è un " +"pulsante \"Nuova sottoscrizione\", \"Nuovo Feed Notizie\" o simile;\n" +"in alternativa andare in Preferenze, Applicazioni in Midori, e selezionare " +"un aggregatore di notizie; al prossimo clic sull'icona del feed delle " +"notizie, questo verrà aggiunto automaticamente" -#: ../midori/midori-browser.c:2234 -#: ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nuovo feed" -#: ../midori/midori-browser.c:2277 -#: ../midori/midori-browser.c:4974 -#: ../panels/midori-bookmarks.c:406 +#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "Aggiunge un nuovo segnalibro" -#: ../midori/midori-browser.c:3283 -#: ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 -#: ../midori/sokoke.c:436 -#: ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "Non è possibile eseguire l'applicazione esterna." +#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "Vuoto" + +#: ../midori/midori-browser.c:3467 +msgid "Toggle text cursor navigation" +msgstr "Abilita o disabilita la navigazione a cursore" -#: ../midori/midori-browser.c:3546 -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Errore nell'inserimento dell'elemento della cronologia: %s\n" -#: ../midori/midori-browser.c:3863 -#: ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:734 +#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 msgid "Open all in _Tabs" msgstr "Apri _tutti in nuove schede" -#: ../midori/midori-browser.c:3870 -#: ../panels/midori-bookmarks.c:727 -#: ../panels/midori-history.c:740 -#: ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Apri in una nuova sc_heda" -#: ../midori/midori-browser.c:3873 -#: ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4011 -#: ../panels/midori-bookmarks.c:729 -#: ../panels/midori-history.c:742 -#: ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657 +#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Apri in una nuova _finestra" -#: ../midori/midori-browser.c:3951 +#: ../midori/midori-browser.c:4213 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3952 +#: ../midori/midori-browser.c:4214 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3953 +#: ../midori/midori-browser.c:4215 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3954 +#: ../midori/midori-browser.c:4216 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3955 +#: ../midori/midori-browser.c:4217 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3979 +#: ../midori/midori-browser.c:4218 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4239 msgid "Import bookmarks..." msgstr "Importa segnalibri..." -#: ../midori/midori-browser.c:3982 -#: ../midori/midori-browser.c:4979 +#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372 msgid "_Import bookmarks" msgstr "_Importa segnalibri" -#: ../midori/midori-browser.c:3993 +#: ../midori/midori-browser.c:4253 msgid "_Application:" msgstr "_Applicazione:" -#: ../midori/midori-browser.c:4020 -#: ../midori/midori-browser.c:5092 -#: ../midori/midori-websettings.c:224 -#: ../midori/midori-websettings.c:315 -#: ../katze/katze-utils.c:692 -msgid "Custom..." -msgstr "Personalizzato..." +#: ../midori/midori-browser.c:4318 +msgid "Import from XBEL or HTML file" +msgstr "Importa da un file XBEL o HTML" -#: ../midori/midori-browser.c:4081 +#: ../midori/midori-browser.c:4353 +msgid "Import from a file" +msgstr "Importa da un file" + +#: ../midori/midori-browser.c:4365 msgid "Failed to import bookmarks" msgstr "Impossibile importare i segnalibri" -#: ../midori/midori-browser.c:4122 -msgid "Failed to export bookmarks" -msgstr "Impossibile esportare i segnalibri" +#: ../midori/midori-browser.c:4400 +msgid "XBEL Bookmarks" +msgstr "Segnalibri XBEL" + +#: ../midori/midori-browser.c:4405 +msgid "Netscape Bookmarks" +msgstr "Segnalibri Netscape" -#: ../midori/midori-browser.c:4175 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "Errore nella cancellazione della cronologia: %s\n" +#: ../midori/midori-browser.c:4419 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "" +"Midori può esportare solamente in formato XBEL (*.xbel) e Netscape (*.html)" -# c-format -#: ../midori/midori-browser.c:4183 -msgid "Failed to clear search history: %s\n" -msgstr "Errore nella cancellazione della cronologia delle ricerche: %s\n" +#: ../midori/midori-browser.c:4434 +msgid "Failed to export bookmarks" +msgstr "Impossibile esportare i segnalibri" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4290 +#: ../midori/midori-browser.c:4556 msgid "Clear Private Data" msgstr "Pulizia dati personali" -#: ../midori/midori-browser.c:4294 +#: ../midori/midori-browser.c:4560 msgid "_Clear private data" msgstr "_Pulizia dati personali" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4573 msgid "Clear the following data:" msgstr "Rimuovi i seguenti dati:" -#: ../midori/midori-browser.c:4318 -#: ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:114 -msgid "History" -msgstr "Cronologia" - -#: ../midori/midori-browser.c:4323 -msgid "Cookies" -msgstr "Cookie" - -#: ../midori/midori-browser.c:4328 -msgid "'Flash' Cookies" -msgstr "Cookie 'Flash'" - -#: ../midori/midori-browser.c:4333 -msgid "Website icons" -msgstr "Icone dei siti" - -#: ../midori/midori-browser.c:4338 -#: ../midori/sokoke.c:1314 -msgid "_Closed Tabs" -msgstr "Schede _chiuse" - -#: ../midori/midori-browser.c:4343 -#: ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "Web Cache" +#: ../midori/midori-browser.c:4583 +msgid "Last open _tabs" +msgstr "Ultime sc_hede aperte" # cri.penta version -#: ../midori/midori-browser.c:4351 +#: ../midori/midori-browser.c:4609 msgid "Clear private data when _quitting Midori" msgstr "Cancella i dati personali _quando Midori viene chiuso" -#: ../midori/midori-browser.c:4492 +#: ../midori/midori-browser.c:4804 msgid "A lightweight web browser." msgstr "Un browser web leggero" -#: ../midori/midori-browser.c:4494 -msgid "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." -msgstr "Questa libreria è software libero; può essere redistribuito e/o modificato in accordo ai temrini della GNU Lesser General Public License così come pubblicata dalla Free Software Foundation; sia nella versione 2.1 della licenza che (a scelta) in una versiona successiva." +#: ../midori/midori-browser.c:4805 +msgid "See about:version for version info." +msgstr "Consultare about:info per le informazioni di versione." + +#: ../midori/midori-browser.c:4807 +msgid "" +"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." +msgstr "" +"Questa libreria è software libero; può essere redistribuito e/o modificato " +"in accordo ai termini della GNU Lesser General Public License così come " +"pubblicata dalla Free Software Foundation; sia nella versione 2.1 della " +"licenza che (a scelta) in una versione successiva." -#: ../midori/midori-browser.c:4513 +#: ../midori/midori-browser.c:4828 msgid "translator-credits" msgstr "" "Sergio Durzu \n" "Luca Perri \n" "Fabio Pozzi \n" -"Gianluca Foddis " +"Gianluca Foddis \n" +"Cristian Marchi , 2010" -#: ../midori/midori-browser.c:4822 +#: ../midori/midori-browser.c:5214 msgid "_File" msgstr "_File" -#: ../midori/midori-browser.c:4824 -#: ../midori/sokoke.c:1315 -msgid "New _Window" -msgstr "N_uova finestra" - -#: ../midori/midori-browser.c:4825 +#: ../midori/midori-browser.c:5217 msgid "Open a new window" msgstr "Apre una nuova finestra" -#: ../midori/midori-browser.c:4828 +#: ../midori/midori-browser.c:5220 msgid "Open a new tab" msgstr "Apre una nuova scheda" -#: ../midori/midori-browser.c:4830 -msgid "P_rivate Browsing" -msgstr "Navi_gazione privata" - -#: ../midori/midori-browser.c:4831 -msgid "Don't save any private data while browsing" -msgstr "Non memorizza i dati personali durante la navigazione" +#: ../midori/midori-browser.c:5222 +msgid "New P_rivate Browsing Window" +msgstr "Nuova _finestra di navigazione privata" -#: ../midori/midori-browser.c:4835 +#: ../midori/midori-browser.c:5226 msgid "Open a file" msgstr "Apre un file" -#: ../midori/midori-browser.c:4838 +#: ../midori/midori-browser.c:5228 +msgid "_Save Page As..." +msgstr "Sa_lva pagina come..." + +#: ../midori/midori-browser.c:5229 msgid "Save to a file" msgstr "Salva in un file" -#: ../midori/midori-browser.c:4840 +#: ../midori/midori-browser.c:5231 msgid "Add to Speed _dial" msgstr "Aggiungi a selezione _veloce" -#: ../midori/midori-browser.c:4841 -msgid "Add shortcut to speed dial" -msgstr "Aggiungi collegamento a selezione veloce" - -#: ../midori/midori-browser.c:4843 +#: ../midori/midori-browser.c:5235 msgid "Add Shortcut to the _desktop" msgstr "Aggiungi collegamento sulla _scrivania" -#: ../midori/midori-browser.c:4844 -msgid "Add shortcut to the desktop" -msgstr "Aggiunge collegamento sulla scrivania" +#: ../midori/midori-browser.c:5237 +msgid "Create _Launcher" +msgstr "Crea avvia_tore" -#: ../midori/midori-browser.c:4846 +#: ../midori/midori-browser.c:5241 msgid "Subscribe to News _feed" msgstr "Abbonati al _feed di notizie" -#: ../midori/midori-browser.c:4847 -msgid "Subscribe to this news feed" -msgstr "Sottoscrivi questo feed di notizie" - -#: ../midori/midori-browser.c:4852 +#: ../midori/midori-browser.c:5247 msgid "_Close Tab" msgstr "_Chiudi scheda" -#: ../midori/midori-browser.c:4853 +#: ../midori/midori-browser.c:5248 msgid "Close the current tab" msgstr "Chiude la scheda corrente" -#: ../midori/midori-browser.c:4855 +#: ../midori/midori-browser.c:5250 msgid "C_lose Window" msgstr "C_hiudi finestra" -#: ../midori/midori-browser.c:4856 -msgid "Close this window" -msgstr "Chiude la finestra" - -#: ../midori/midori-browser.c:4859 +#: ../midori/midori-browser.c:5254 msgid "Print the current page" msgstr "Stampa la pagina corrente" -#: ../midori/midori-browser.c:4862 -msgid "Quit the application" -msgstr "Esce dall'applicazione" +#: ../midori/midori-browser.c:5256 +msgid "Close a_ll Windows" +msgstr "Chiudi _tutte le finestre" -#: ../midori/midori-browser.c:4864 +#: ../midori/midori-browser.c:5259 msgid "_Edit" msgstr "Mo_difica" -#: ../midori/midori-browser.c:4868 -msgid "Undo the last modification" -msgstr "Annulla l'ultima modifica" - -#: ../midori/midori-browser.c:4871 -msgid "Redo the last modification" -msgstr "Riesegui l'ultima modifica" - -#: ../midori/midori-browser.c:4875 -msgid "Cut the selected text" -msgstr "Taglia il testo selezionato" - -#: ../midori/midori-browser.c:4878 -#: ../midori/midori-browser.c:4881 -msgid "Copy the selected text" -msgstr "Copia il testo selezionato" - -#: ../midori/midori-browser.c:4884 -msgid "Paste text from the clipboard" -msgstr "Incolla il testo dagli appunti" - -#: ../midori/midori-browser.c:4887 -msgid "Delete the selected text" -msgstr "Elimina il testo selezionato" - -#: ../midori/midori-browser.c:4890 -msgid "Select all text" -msgstr "Seleziona tutto" +#: ../midori/midori-browser.c:5282 +msgid "_Find..." +msgstr "_Cerca..." -#: ../midori/midori-browser.c:4893 +#: ../midori/midori-browser.c:5283 msgid "Find a word or phrase in the page" msgstr "Cerca una parola o una frase nella pagina" -#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:5285 msgid "Find _Next" msgstr "Trova s_uccessivo" -#: ../midori/midori-browser.c:4896 -msgid "Find the next occurrence of a word or phrase" -msgstr "Trova la parola o frase successiva" - -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:5288 msgid "Find _Previous" msgstr "Trova _precedente" -#: ../midori/midori-browser.c:4899 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Trova la parola o frase precedente" - -#: ../midori/midori-browser.c:4903 +#: ../midori/midori-browser.c:5292 msgid "Configure the application preferences" msgstr "Imposta le preferenze dell'applicazione" -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:5294 msgid "_View" msgstr "_Visualizza" -#: ../midori/midori-browser.c:4906 +#: ../midori/midori-browser.c:5295 msgid "_Toolbars" msgstr "Barre degli _strumenti" -#: ../midori/midori-browser.c:4918 +#: ../midori/midori-browser.c:5300 +msgid "Reload page without caching" +msgstr "Ricarica la pagina senza effettuare il caching" + +#: ../midori/midori-browser.c:5310 msgid "Increase the zoom level" msgstr "Aumenta il livello di ingrandimento" -#: ../midori/midori-browser.c:4921 +#: ../midori/midori-browser.c:5313 msgid "Decrease the zoom level" msgstr "Diminuisce il livello di ingrandimento" -#: ../midori/midori-browser.c:4924 -msgid "Reset the zoom level" -msgstr "Azzera il livello di ingrandimento" - -#: ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:5317 msgid "_Encoding" msgstr "_Codifica" -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:5319 msgid "View So_urce" msgstr "Visualizza s_orgente" -#: ../midori/midori-browser.c:4928 -msgid "View the source code of the page" -msgstr "Visualizza il codice sorgente della pagina" +#: ../midori/midori-browser.c:5322 +msgid "Ca_ret Browsing" +msgstr "Navigazione ca_ret" -#: ../midori/midori-browser.c:4931 +#: ../midori/midori-browser.c:5326 msgid "Toggle fullscreen view" msgstr "Schermo intero" -#: ../midori/midori-browser.c:4934 +#: ../midori/midori-browser.c:5328 msgid "Scroll _Left" msgstr "Scorri a _sinistra" -#: ../midori/midori-browser.c:4935 -msgid "Scroll to the left" -msgstr "Scorre verso sinistra" - -#: ../midori/midori-browser.c:4937 +#: ../midori/midori-browser.c:5331 msgid "Scroll _Down" msgstr "Scorri in _basso" -#: ../midori/midori-browser.c:4938 -msgid "Scroll down" -msgstr "Scorre in basso" - -#: ../midori/midori-browser.c:4940 +#: ../midori/midori-browser.c:5334 msgid "Scroll _Up" msgstr "Scorri in _alto" -#: ../midori/midori-browser.c:4941 -msgid "Scroll up" -msgstr "Scorre in alto" - -#: ../midori/midori-browser.c:4943 +#: ../midori/midori-browser.c:5337 msgid "Scroll _Right" msgstr "Scorri a _destra" -#: ../midori/midori-browser.c:4944 -msgid "Scroll to the right" -msgstr "Scorre verso destra" - -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:5340 msgid "_Go" msgstr "V_ai" -#: ../midori/midori-browser.c:4950 +#: ../midori/midori-browser.c:5343 msgid "Go back to the previous page" msgstr "Va alla pagina precedente" -#: ../midori/midori-browser.c:4953 +#: ../midori/midori-browser.c:5346 msgid "Go forward to the next page" msgstr "Va alla pagina successiva" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:5350 msgid "Go to the previous sub-page" -msgstr "Va alla pagina precedente" +msgstr "Va alla sottopagina precedente" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:5354 msgid "Go to the next sub-page" msgstr "Va alla sottopagina successiva" -#: ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:5357 msgid "Go to your homepage" msgstr "Va alla pagina iniziale" -#: ../midori/midori-browser.c:4966 +#: ../midori/midori-browser.c:5359 msgid "Empty Trash" msgstr "Svuota cestino" -#: ../midori/midori-browser.c:4967 -msgid "Delete the contents of the trash" -msgstr "Elimina il contenuto del cestino" - -#: ../midori/midori-browser.c:4969 +#: ../midori/midori-browser.c:5362 msgid "Undo _Close Tab" -msgstr "Annulla chiu_sura scheda" - -#: ../midori/midori-browser.c:4970 -msgid "Open the last closed tab" -msgstr "Apre l'ultima scheda chiusa" +msgstr "Annulla chi_usura scheda" -#: ../midori/midori-browser.c:4976 +#: ../midori/midori-browser.c:5369 msgid "Add a new _folder" msgstr "Aggiungi una nuova _cartella" -#: ../midori/midori-browser.c:4977 -msgid "Add a new bookmark folder" -msgstr "Aggiunge un nuova cartella di preferiti" - -#: ../midori/midori-browser.c:4982 +#: ../midori/midori-browser.c:5375 msgid "_Export bookmarks" msgstr "Esp_orta segnalibri" -#: ../midori/midori-browser.c:4985 -#: ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" -msgstr "Gestisci _motori di ricerca" - -#: ../midori/midori-browser.c:4986 -msgid "Add, edit and remove search engines..." -msgstr "Aggiunge, modifica e elimina motori di ricerca..." +msgstr "Gestione _motori di ricerca" -#: ../midori/midori-browser.c:4989 +#: ../midori/midori-browser.c:5381 msgid "_Clear Private Data" msgstr "_Rimuovi dati privati" -#: ../midori/midori-browser.c:4990 -msgid "Clear private data..." -msgstr "Rimozione dati privati..." - -#: ../midori/midori-browser.c:4994 +#: ../midori/midori-browser.c:5384 msgid "_Inspect Page" -msgstr "_Ispeziona la pagina" - -#: ../midori/midori-browser.c:4995 -msgid "Inspect page details and access developer tools..." -msgstr "Vedi i dettagli della pagina ed accedi agli strumenti per sviluppatori..." +msgstr "Ispeziona pa_gina" -#: ../midori/midori-browser.c:5000 +#: ../midori/midori-browser.c:5388 msgid "_Previous Tab" msgstr "Scheda _precedente" -#: ../midori/midori-browser.c:5001 -msgid "Switch to the previous tab" -msgstr "Passa alla scheda precedente" - -#: ../midori/midori-browser.c:5003 +#: ../midori/midori-browser.c:5391 msgid "_Next Tab" msgstr "Scheda _successiva" -#: ../midori/midori-browser.c:5004 -msgid "Switch to the next tab" -msgstr "Passa alla scheda successiva" +#: ../midori/midori-browser.c:5393 +msgid "Move Tab _Backward" +msgstr "Sposta scheda in_dietro" + +#: ../midori/midori-browser.c:5395 +msgid "_Move Tab Forward" +msgstr "Sposta scheda da_vanti" # comando per selezionare la scheda corrente -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:5398 msgid "Focus _Current Tab" msgstr "Scheda _corrente" -#: ../midori/midori-browser.c:5007 -msgid "Focus the current tab" -msgstr "Posiziona il fuoco sulla scheda corrente" - -#: ../midori/midori-browser.c:5009 -msgid "Minimize _Current Tab" -msgstr "Minimizza la scheda _corrente" - -#: ../midori/midori-browser.c:5010 -msgid "Minimize the current tab" -msgstr "Minimizza la scheda corrente" +#: ../midori/midori-browser.c:5401 +msgid "Focus _Next view" +msgstr "Metti a fuoco la vista _successiva" + +#: ../midori/midori-browser.c:5404 +msgid "Only show the Icon of the _Current Tab" +msgstr "Mostra solo l'icona della scheda corren_te" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:5407 msgid "_Duplicate Current Tab" msgstr "_Duplica la scheda corrente" -#: ../midori/midori-browser.c:5013 -msgid "Duplicate the current tab" -msgstr "Duplica la scheda corrente" - # acceleratore sulla h per evitare conflitti -#: ../midori/midori-browser.c:5015 +#: ../midori/midori-browser.c:5410 msgid "Close Ot_her Tabs" msgstr "Chiudi le altre sc_hede" -#: ../midori/midori-browser.c:5016 -msgid "Close all tabs except the current tab" -msgstr "Chiude tutte le schede eccetto la corrente" - -#: ../midori/midori-browser.c:5018 +#: ../midori/midori-browser.c:5413 msgid "Open last _session" msgstr "Apri ultima s_essione" -#: ../midori/midori-browser.c:5019 -msgid "Open the tabs saved in the last session" -msgstr "Apre le schede salvate nell'ultima sessione" - -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:5416 msgid "_Help" msgstr "A_iuto" -#: ../midori/midori-browser.c:5023 -msgid "_Contents" -msgstr "_Contenuti" - -#: ../midori/midori-browser.c:5024 -msgid "Show the documentation" -msgstr "Mostra la documentazione" - -#: ../midori/midori-browser.c:5026 +#: ../midori/midori-browser.c:5418 msgid "_Frequent Questions" msgstr "Domande fre_quenti" -#: ../midori/midori-browser.c:5027 -msgid "Show the Frequently Asked Questions" -msgstr "Mostra le domande e risposte frequenti (F.A.Q.)" - -#: ../midori/midori-browser.c:5029 -msgid "_Report a Bug" -msgstr "Segnala un _problema" - -#: ../midori/midori-browser.c:5030 -msgid "Open Midori's bug tracker" -msgstr "Apre lo strumento di segnalazione bug di Midori" - -#: ../midori/midori-browser.c:5033 -msgid "Show information about the program" -msgstr "Mostra le informazioni sull'applicazione" +#: ../midori/midori-browser.c:5421 +msgid "_Report a Problem..." +msgstr "Segnala un _problema..." -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:5433 msgid "_Menubar" msgstr "Barra dei _menu" -#: ../midori/midori-browser.c:5042 -msgid "Show menubar" -msgstr "Mostra la barra dei menu" - -#: ../midori/midori-browser.c:5045 +#: ../midori/midori-browser.c:5437 msgid "_Navigationbar" msgstr "Barra di _navigazione" -#: ../midori/midori-browser.c:5046 -msgid "Show navigationbar" -msgstr "Mostra la barra di navigazione" - -#: ../midori/midori-browser.c:5049 +#: ../midori/midori-browser.c:5441 msgid "Side_panel" msgstr "Pannello _laterale" -#: ../midori/midori-browser.c:5050 -msgid "Show sidepanel" -msgstr "Mostra il pannello laterale" +#: ../midori/midori-browser.c:5442 +msgid "Sidepanel" +msgstr "Pannello laterale" -#: ../midori/midori-browser.c:5053 +#: ../midori/midori-browser.c:5445 msgid "_Bookmarkbar" msgstr "Barra dei s_egnalibri" -#: ../midori/midori-browser.c:5054 -msgid "Show bookmarkbar" -msgstr "Mostra la barra dei segnalibri" - -#: ../midori/midori-browser.c:5057 -msgid "_Transferbar" -msgstr "Barra dei _trasferimenti" - -#: ../midori/midori-browser.c:5058 -msgid "Show transferbar" -msgstr "Mostra la barra dei trasferimenti" - -#: ../midori/midori-browser.c:5061 +#: ../midori/midori-browser.c:5449 msgid "_Statusbar" msgstr "Barra di stat_o" -#: ../midori/midori-browser.c:5062 -msgid "Show statusbar" -msgstr "Mostra la barra di stato" - -#: ../midori/midori-browser.c:5070 +#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311 msgid "_Automatic" msgstr "_Automatico" -#: ../midori/midori-browser.c:5073 -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236 msgid "Chinese (BIG5)" msgstr "Cinese (BIGS)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5077 +#: ../midori/midori-browser.c:5465 msgid "Japanese (SHIFT__JIS)" msgstr "Giapponese (SHIFT__JIS)" -#: ../midori/midori-browser.c:5080 -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5083 -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:5086 -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5089 -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241 msgid "Western (ISO-8859-1)" msgstr "Occidentale (ISO-8859-1)" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "Personalizzato..." + +#: ../midori/midori-browser.c:5985 msgid "_Separator" msgstr "_Separatore" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5992 msgid "_Location..." msgstr "I_ndirizzo..." -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5994 msgid "Open a particular location" msgstr "Apre un indirizzo specifico" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:6016 msgid "_Web Search..." msgstr "Ricerca sul _web..." -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:6018 msgid "Run a web search" msgstr "Esegue una ricerca sul web" -#: ../midori/midori-browser.c:5664 +#: ../midori/midori-browser.c:6045 msgid "Reopen a previously closed tab or window" msgstr "Riapre una scheda o una finestra chiusa precedentemente" -#: ../midori/midori-browser.c:5679 +#: ../midori/midori-browser.c:6062 +msgid "Show the saved bookmarks" +msgstr "Mostra i segnalibri salvati" + +#: ../midori/midori-browser.c:6079 msgid "_Tools" msgstr "_Strumenti" -#: ../midori/midori-browser.c:5696 +#: ../midori/midori-browser.c:6095 msgid "_Window" msgstr "Fi_nestra" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:6097 msgid "Show a list of all open tabs" msgstr "Mostra un elenco delle schede aperte" -#: ../midori/midori-browser.c:5712 +#: ../midori/midori-browser.c:6111 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:6113 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:6291 +#: ../midori/midori-browser.c:6927 #, c-format msgid "Unexpected setting '%s'" -msgstr "Impostazione «%s» non prevista" +msgstr "Impostazione \"%s\" non prevista" -#: ../midori/midori-locationaction.c:390 +#: ../midori/midori-extension.c:329 #, c-format -msgid "Failed to select from history\n" -msgstr "Impossibile selezionare dalla cronologia: %s\n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "La configurazione dell'estensione \"%s\" non può essere caricata: %s\n" -#: ../midori/midori-locationaction.c:478 +#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "Cerca %s" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "La configurazione dell'estensione \"%s\" non può essere salvata: %s\n" -#: ../midori/midori-locationaction.c:501 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "Cerca con %s" -#: ../midori/midori-locationaction.c:1268 +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Cerca con..." + +#: ../midori/midori-locationaction.c:537 +#, c-format +msgid "Failed to select from history\n" +msgstr "Impossibile selezionare dalla cronologia\n" + +#: ../midori/midori-locationaction.c:624 #, c-format -msgid "Failed to execute database statement\n" -msgstr "Impossibile eseguire la richiesta al database\n" +msgid "Search for %s" +msgstr "Cerca %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1324 +#: ../midori/midori-locationaction.c:1398 msgid "Paste and p_roceed" msgstr "Incolla e p_rocedi" -#: ../midori/midori-panel.c:412 -#: ../midori/midori-panel.c:414 -msgid "Detach chosen panel from the window" -msgstr "Stacca il pannello selezionato dalla finestra" - -#: ../midori/midori-panel.c:424 -#: ../midori/midori-panel.c:426 -#: ../midori/midori-panel.c:613 -#: ../midori/midori-panel.c:616 +#: ../midori/midori-locationaction.c:1739 +msgid "Not verified" +msgstr "Non verificata" + +#: ../midori/midori-locationaction.c:1759 +msgid "Verified and encrypted connection" +msgstr "Connessione verificata e cifrata" + +#: ../midori/midori-locationaction.c:1771 +msgid "Open, unencrypted connection" +msgstr "Connessione aperta, non cifrata" + +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" msgstr "Allinea il pannello laterale a destra" -#: ../midori/midori-panel.c:436 -#: ../midori/midori-panel.c:437 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" -msgstr "Chiudi pannello" +msgstr "Chiude il pannello" -#: ../midori/midori-panel.c:614 -#: ../midori/midori-panel.c:617 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Allinea il pannello laterale a sinistra" -#: ../midori/midori-panel.c:771 -msgid "Hide operating controls" -msgstr "Nascondi i controlli operativi" - -#: ../midori/midori-websettings.c:200 -msgid "Show Blank page" -msgstr "Mostra una pagina vuota" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "Mostra selezione veloce" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" msgstr "Mostra la pagina iniziale" -#: ../midori/midori-websettings.c:202 -msgid "Show last open tabs" -msgstr "Mostra le ultime schede aperte" - -#: ../midori/midori-websettings.c:203 -msgid "Show last tabs without loading" -msgstr "Mostra le ultime schede senza caricarle" - -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:237 msgid "Japanese (SHIFT_JIS)" msgstr "Giapponese (SHIFT_JIS)" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:257 msgid "New tab" msgstr "Nuova scheda" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:258 msgid "New window" msgstr "Nuova finestra" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:259 msgid "Current tab" msgstr "Scheda corrente" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:274 msgid "Default" msgstr "Predefinito" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:275 msgid "Icons" msgstr "Icone" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:276 msgid "Small icons" msgstr "Icone piccole" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:277 msgid "Text" msgstr "Testo" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:278 msgid "Icons and text" msgstr "Icone e testo" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:279 msgid "Text beside icons" msgstr "Testo accanto alle icone" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:294 msgid "Automatic (GNOME or environment)" msgstr "Automatico (GNOME o ambiente)" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:295 msgid "HTTP proxy server" msgstr "Server proxy HTTP" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:296 msgid "No proxy server" msgstr "Nessun proxy" -#: ../midori/midori-websettings.c:293 -msgid "All cookies" -msgstr "Tutti i cookie" - -#: ../midori/midori-websettings.c:294 -msgid "Session cookies" -msgstr "Cookie di sessione" - -#: ../midori/midori-websettings.c:295 -#: ../katze/katze-utils.c:668 -msgid "None" -msgstr "Nessuno" - -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:400 msgid "Remember last window size" msgstr "Ricorda la dimensione dell'ultima finestra" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:401 msgid "Whether to save the last window size" -msgstr "Abilitare questa opzione per salvare le dimensioni dell'ultima finestra" +msgstr "" +"Abilitare questa opzione per salvare le dimensioni dell'ultima finestra" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:409 msgid "Last window width" msgstr "Larghezza dell'ultima finestra" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:410 msgid "The last saved window width" msgstr "L'ultima larghezza salvata per la finestra" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:418 msgid "Last window height" msgstr "Altezza dell'ultima finestra" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:419 msgid "The last saved window height" msgstr "L'ultima altezza salvata per la finestra" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:444 msgid "Last panel position" msgstr "Posizione del pannello" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:445 msgid "The last saved panel position" msgstr "L'ultima posizione salvata per il pannello" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:454 msgid "Last panel page" msgstr "Pagina dell'ultimo pannello" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:455 msgid "The last saved panel page" msgstr "L'ultima pagina salvata per il pannello" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:463 msgid "Last Web search" msgstr "Ultima ricerca web" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:464 msgid "The last saved Web search" msgstr "L'ultima ricerca web salvata" -#: ../midori/midori-websettings.c:440 +#: ../midori/midori-websettings.c:473 msgid "Show Menubar" msgstr "Mostra barra dei menu" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:474 msgid "Whether to show the menubar" msgstr "Abilitare questa opzione per mostrare la barra dei menu" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:482 msgid "Show Navigationbar" msgstr "Mostra barra di navigazione" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:483 msgid "Whether to show the navigationbar" msgstr "Abilitare questa opzione per mostrare la barra di navigazione" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:491 msgid "Show Bookmarkbar" msgstr "Mostra barra dei segnalibri" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:492 msgid "Whether to show the bookmarkbar" msgstr "Abilitare questa opzione per mostrare la barra dei segnalibri" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:500 msgid "Show Panel" msgstr "Mostra pannello" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:501 msgid "Whether to show the panel" msgstr "Abilitare questa opzione per mostrare il pannello" -#: ../midori/midori-websettings.c:483 -msgid "Show Transferbar" -msgstr "Mostra la barra dei trasferimenti" - -#: ../midori/midori-websettings.c:484 -msgid "Whether to show the transferbar" -msgstr "Abilitare questa opzione per mostrare la barra degli scaricamenti" - -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:509 msgid "Show Statusbar" msgstr "Mostra barra di stato" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:510 msgid "Whether to show the statusbar" msgstr "Abilitare questa opzione per mostrare la barra di stato" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:519 msgid "Toolbar Style:" msgstr "Stile della barra degli strumenti:" -#: ../midori/midori-websettings.c:503 +#: ../midori/midori-websettings.c:520 msgid "The style of the toolbar" msgstr "Scegliere lo stile della barra degli strumenti" -#: ../midori/midori-websettings.c:519 -msgid "Show progress in location entry" -msgstr "Mostra caricamento nella barra degli indirizzi" - -#: ../midori/midori-websettings.c:520 -msgid "Whether to show loading progress in the location entry" -msgstr "Abilitare questa opzione per mostrare la percentuale di caricamento della pagina nella barra degli indirizzi" - -#: ../midori/midori-websettings.c:535 -msgid "Search engines in location completion" -msgstr "Motori di ricerca nell'autocompletamento" - -#: ../midori/midori-websettings.c:536 -msgid "Whether to show search engines in the location completion" -msgstr "Abilitare questa opzione per mostrare i motori di ricerca durante il completamento dell'indirizzo" - -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:529 msgid "Toolbar Items" msgstr "Elementi barra degli strumenti" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:530 msgid "The items to show on the toolbar" msgstr "Indicare gli elementi da mostrare nella barra degli strumenti" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:538 msgid "Compact Sidepanel" msgstr "Pannello compatto" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:539 msgid "Whether to make the sidepanel compact" msgstr "Abilitare questa opzione per la visualizzazione compatta del pannello" -#: ../midori/midori-websettings.c:569 -msgid "Show operating controls of the panel" -msgstr "Mostra i controlli operativi del pannello" - -#: ../midori/midori-websettings.c:570 -msgid "Whether to show the operating controls of the panel" -msgstr "Abilitare questa opzione per mostrare i controlli operativi del pannello" - -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:554 msgid "Align sidepanel on the right" msgstr "Allinea a destra il pannello laterale" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:555 msgid "Whether to align the sidepanel on the right" msgstr "Abilitare questa opzione per allineare il pannello laterale a destra" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:570 msgid "Open panels in separate windows" msgstr "Apri i pannelli in finestre separate" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:571 msgid "Whether to always open panels in separate windows" -msgstr "Abilitare questa opzione per aprire sempre i pannelli in finestre separate" +msgstr "" +"Abilitare questa opzione per aprire sempre i pannelli in finestre separate" -#: ../midori/midori-websettings.c:611 +#: ../midori/midori-websettings.c:580 msgid "When Midori starts:" msgstr "All'avvio di Midori:" -#: ../midori/midori-websettings.c:612 +#: ../midori/midori-websettings.c:581 msgid "What to do when Midori starts" msgstr "Cosa fare all'avvio di Midori" -#: ../midori/midori-websettings.c:621 +#: ../midori/midori-websettings.c:590 msgid "Homepage:" msgstr "Pagina iniziale:" -#: ../midori/midori-websettings.c:622 +#: ../midori/midori-websettings.c:591 msgid "The homepage" msgstr "La pagina iniziale" -#: ../midori/midori-websettings.c:637 +#: ../midori/midori-websettings.c:606 msgid "Show crash dialog" msgstr "Mostra finestra di errore" -#: ../midori/midori-websettings.c:638 +#: ../midori/midori-websettings.c:607 msgid "Show a dialog after Midori crashed" -msgstr "Abilitare questa opzione per mostrare una finestra nel caso Midori si sia chiuso inaspettatamente" - -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:654 -msgid "Show speed dial in new tabs" -msgstr "Mostra le selezioni veloci nelle nuove schede" - -#: ../midori/midori-websettings.c:655 -msgid "Show speed dial in newly opened tabs" -msgstr "Abilitare questa opzione per mostrare la selezione veloce nelle nuove tab" +msgstr "" +"Abilitare questa opzione per mostrare una finestra nel caso Midori si sia " +"chiuso inaspettatamente" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:615 msgid "Save downloaded files to:" msgstr "Salva i file scaricati in:" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:616 msgid "The folder downloaded files are saved to" msgstr "Scegliere la cartella dove devono essere salvati i file scaricati" -#: ../midori/midori-websettings.c:685 -msgid "Ask for the destination folder" -msgstr "Richiedi cartella di destinazione" - -#: ../midori/midori-websettings.c:686 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "Abilitare questa opzione per chiedere la cartella di destinazione quando si scarica un file" - -#: ../midori/midori-websettings.c:705 -msgid "Notify when a transfer has been completed" -msgstr "Notifica quando un trasferimento è stato completato" - -#: ../midori/midori-websettings.c:706 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "Abilitare questa opzione per mostrare una notifica quando viene completato un trasferimento" - -#: ../midori/midori-websettings.c:718 -msgid "Download Manager" -msgstr "Gestione scaricamenti" - -#: ../midori/midori-websettings.c:719 -msgid "An external download manager" -msgstr "Un gestore di scaricamenti esterno" - -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:624 msgid "Text Editor" msgstr "Editor di testo" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:625 msgid "An external text editor" msgstr "Inserire un editor di testo esterno" -#: ../midori/midori-websettings.c:743 +#: ../midori/midori-websettings.c:640 msgid "News Aggregator" msgstr "Aggregatore notizie" -#: ../midori/midori-websettings.c:744 +#: ../midori/midori-websettings.c:641 msgid "An external news aggregator" msgstr "Aggregatore di notizie esterno" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:649 msgid "Location entry Search" msgstr "Motore di ricerca predefinito" -#: ../midori/midori-websettings.c:753 +#: ../midori/midori-websettings.c:650 msgid "The search to perform inside the location entry" -msgstr "Inserire il motore di ricerca predefinito da utilizzare dalla barra degli indirizzi" +msgstr "" +"Inserire il motore di ricerca predefinito da utilizzare dalla barra degli " +"indirizzi" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:658 msgid "Preferred Encoding" msgstr "Codifica preferita" -#: ../midori/midori-websettings.c:762 +#: ../midori/midori-websettings.c:659 msgid "The preferred character encoding" msgstr "Scegliere la codifica dei caratteri preferita" -#: ../midori/midori-websettings.c:772 +#: ../midori/midori-websettings.c:669 msgid "Always Show Tabbar" msgstr "Mostra sempre le schede" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:670 msgid "Always show the tabbar" msgstr "Abilitare questa opzione per mostrare sempre le etichette delle schede" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:683 msgid "Close Buttons on Tabs" msgstr "Pulsante di chiusura schede" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:684 msgid "Whether tabs have close buttons" -msgstr "Abilitare questa opzione per visualizzare il pulsante di chiusura nelle schede" +msgstr "" +"Abilitare questa opzione per visualizzare il pulsante di chiusura nelle " +"schede" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:709 msgid "Open new pages in:" msgstr "Apri le nuove pagine in:" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:710 msgid "Where to open new pages" msgstr "Scegliere dove aprire le nuove pagine" -#: ../midori/midori-websettings.c:800 -msgid "Open external pages in:" -msgstr "Apri le pagine esterne in:" - -#: ../midori/midori-websettings.c:801 -msgid "Where to open externally opened pages" -msgstr "Scegliere dove aprire le pagine aperte da applicazioni esterne" - -#: ../midori/midori-websettings.c:810 +#: ../midori/midori-websettings.c:719 msgid "Middle click opens Selection" msgstr "Tasto centrale apre la selezione" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:720 msgid "Load an address from the selection via middle click" -msgstr "Abilitare questa opzione per poter caricare un indirizzo da una selezione tramite il clic col tasto centrale" +msgstr "" +"Abilitare questa opzione per poter caricare un indirizzo da una selezione " +"tramite il clic col tasto centrale" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:728 msgid "Open tabs in the background" msgstr "Apri schede sullo sfondo" -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:729 msgid "Whether to open new tabs in the background" msgstr "Abilitare questa opzione per aprire le nuove schede sullo sfondo" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:737 msgid "Open Tabs next to Current" msgstr "Apri schede dopo quella corrente" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:738 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Abilitare questa opzione per aprire le nuove schede dopo la scheda attuale oppure disabilitarla per aprirle dopo l'ultima" +msgstr "" +"Abilitare questa opzione per aprire le nuove schede dopo la scheda attuale " +"oppure disabilitarla per aprirle dopo l'ultima" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:746 msgid "Open popups in tabs" msgstr "Apri popup in schede" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:747 msgid "Whether to open popup windows in tabs" msgstr "Abilitare questa opzione per aprire le finestre popup in schede" -#: ../midori/midori-websettings.c:848 -#: ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Carica immagini automaticamente" -#: ../midori/midori-websettings.c:849 +#: ../midori/midori-websettings.c:758 msgid "Load and display images automatically" -msgstr "Abilitare questa opzione per caricare e visualizzare automaticamente le immagini" +msgstr "" +"Abilitare questa opzione per caricare e visualizzare automaticamente le " +"immagini" -#: ../midori/midori-websettings.c:856 -#: ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 msgid "Enable scripts" msgstr "Abilita script" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:766 msgid "Enable embedded scripting languages" -msgstr "Abilitare questa opzione per attivare i linguaggi di scripting integrati" +msgstr "" +"Abilitare questa opzione per attivare i linguaggi di scripting integrati" -#: ../midori/midori-websettings.c:864 -#: ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" msgstr "Abilita plugin di Netscape" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:774 msgid "Enable embedded Netscape plugin objects" -msgstr "Abilitare questa opzione per attivare gli oggetti integrati con i plugin di Netscape" +msgstr "" +"Abilitare questa opzione per attivare gli oggetti integrati con i plugin di " +"Netscape" + +#: ../midori/midori-websettings.c:789 +msgid "Enable Spell Checking" +msgstr "Abilita controllo ortografico" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:790 +msgid "Enable spell checking while typing" +msgstr "" +"Abilita questa opzione per attivare il controllo ortografico durante la " +"digitazione" + +#: ../midori/midori-websettings.c:796 msgid "Enable HTML5 database support" msgstr "Abilita il supporto al database HTML5" -#: ../midori/midori-websettings.c:882 +#: ../midori/midori-websettings.c:797 msgid "Whether to enable HTML5 database support" msgstr "Abilitare questa opzione per attivare il supporto al database HTML5" -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:803 msgid "Enable HTML5 local storage support" msgstr "Abilita il supporto allo storage locale HTML5" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:804 msgid "Whether to enable HTML5 local storage support" -msgstr "Abilitare questa opzione per attivare il supporto allo storage locale HTML5" +msgstr "" +"Abilitare questa opzione per attivare il supporto allo storage locale HTML5" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:810 msgid "Enable offline web application cache" msgstr "Abilita la cache delle applicazioni web offline" -#: ../midori/midori-websettings.c:898 +#: ../midori/midori-websettings.c:811 msgid "Whether to enable offline web application cache" -msgstr "Abilitare questa opzione per attivare la cache delle applicazioni web quando offline" +msgstr "" +"Abilitare questa opzione per attivare la cache delle applicazioni web quando " +"offline" + +#: ../midori/midori-websettings.c:827 +msgid "Flash window on background tabs" +msgstr "Lampeggia la finestra se ci sono schede in secondo piano" + +#: ../midori/midori-websettings.c:828 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "" +"Lampeggia la finestra del browser se viene aperta una nuova scheda in " +"secondo piano" + +#: ../midori/midori-websettings.c:836 +msgid "Enable WebGL support" +msgstr "Abilita il supporto a WebGL" -#: ../midori/midori-websettings.c:923 +#: ../midori/midori-websettings.c:837 +msgid "Allow websites to use OpenGL rendering" +msgstr "Permette ai siti internet di utilizzare la visualizzazione OpenGL" + +#: ../midori/midori-websettings.c:863 msgid "Zoom Text and Images" msgstr "Ingrandimento testo e immagini" -#: ../midori/midori-websettings.c:924 +#: ../midori/midori-websettings.c:864 msgid "Whether to zoom text and images" msgstr "Abilitare questa opzione per ingrandire il testo e le immagini" -#: ../midori/midori-websettings.c:939 +#: ../midori/midori-websettings.c:879 msgid "Find inline while typing" msgstr "Cerca nella pagina durante la digitazione" -#: ../midori/midori-websettings.c:940 +#: ../midori/midori-websettings.c:880 msgid "Whether to automatically find inline while typing" -msgstr "Abilitare questa opzione per cercare automaticamente nella pagina durante la digitazione" +msgstr "" +"Abilitare questa opzione per cercare automaticamente nella pagina durante la " +"digitazione" -#: ../midori/midori-websettings.c:955 +#: ../midori/midori-websettings.c:895 msgid "Kinetic scrolling" msgstr "Scorrimento per movimento" -#: ../midori/midori-websettings.c:956 +#: ../midori/midori-websettings.c:896 msgid "Whether scrolling should kinetically move according to speed" -msgstr "Se durante lo scorrimento si deve tener conto della velocità del movimento" - -#: ../midori/midori-websettings.c:964 -msgid "Accept cookies" -msgstr "Accetta cookie" - -#: ../midori/midori-websettings.c:965 -msgid "What type of cookies to accept" -msgstr "Indicare che tipo di cookie devono essere accettati" +msgstr "" +"Se durante lo scorrimento si deve tener conto della velocità del movimento" -#: ../midori/midori-websettings.c:974 -msgid "Maximum cookie age" -msgstr "Durata massima dei cookie" +#: ../midori/midori-websettings.c:904 +msgid "Delete old Cookies after:" +msgstr "Elimina i cookie obsoleti dopo:" -#: ../midori/midori-websettings.c:975 +#: ../midori/midori-websettings.c:905 msgid "The maximum number of days to save cookies for" msgstr "Numero massimo di giorni per cui possono essere validi i cookie" -#: ../midori/midori-websettings.c:984 -msgid "Maximum history age" -msgstr "Durata cronologia" +#: ../midori/midori-websettings.c:921 +msgid "Only accept Cookies from sites you visit" +msgstr "Accettare i cookie solo dai siti visitati" + +#: ../midori/midori-websettings.c:922 +msgid "Block cookies sent by third-party websites" +msgstr "Blocca i cookie inviati da siti di terze parti" + +#: ../midori/midori-websettings.c:936 +msgid "Delete pages from history after:" +msgstr "Elimina le pagine dalla cronologia dopo:" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:937 msgid "The maximum number of days to save the history for" msgstr "Numero massimo di giorni per cui deve essere salvata la cronologia" -#: ../midori/midori-websettings.c:993 -msgid "Remember last downloaded files" -msgstr "Ricorda gli ultimi file scaricati" - -#: ../midori/midori-websettings.c:994 -msgid "Whether the last downloaded files are saved" -msgstr "Abilitare questa opzione per salvare l'elenco degli ultimi file scaricati" - -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:952 msgid "Proxy server" msgstr "Server proxy" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:953 msgid "The type of proxy server to use" msgstr "Il tipo di server proxy da usare" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:962 msgid "HTTP Proxy Server" msgstr "Server proxy HTTP" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:963 msgid "The proxy server used for HTTP connections" -msgstr "Inserire il server proxy usato per le connessioni HTTP" +msgstr "Il server proxy usato per le connessioni HTTP" + +#: ../midori/midori-websettings.c:978 +msgid "Port" +msgstr "Porta" + +#: ../midori/midori-websettings.c:979 +msgid "The proxy server port used for HTTP connections" +msgstr "La porta per il server proxy usato per le connessioni HTTP" + +#: ../midori/midori-websettings.c:997 +msgid "The maximum size of cached pages on disk" +msgstr "La dimensione massima della cache delle pagine su disco" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1038 +#: ../midori/midori-websettings.c:1014 msgid "Identify as" msgstr "Identifica come" -#: ../midori/midori-websettings.c:1039 +#: ../midori/midori-websettings.c:1015 msgid "What to identify as to web pages" msgstr "Come essere identificati sul web" -#: ../midori/midori-websettings.c:1055 +#: ../midori/midori-websettings.c:1031 msgid "Identification string" msgstr "Stringa di identificazione" -#: ../midori/midori-websettings.c:1056 +#: ../midori/midori-websettings.c:1032 msgid "The application identification string" msgstr "Inserire la stringa di identificazione dell'applicazione" -#: ../midori/midori-websettings.c:1071 +#: ../midori/midori-websettings.c:1048 msgid "Preferred languages" msgstr "Lingue preferite" -#: ../midori/midori-websettings.c:1072 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "Una lista separata da virgole dei linguaggi preferiti per la visualizzazione di pagine web multilingua, per esempio \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +#: ../midori/midori-websettings.c:1049 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"Una lista separata da virgole dei linguaggi preferiti per la visualizzazione " +"di pagine web multilingua, per esempio \"de\", \"ru,nl\" o \"en-us;q=1.0, fr-" +"fr;q=0.667\"" -#: ../midori/midori-websettings.c:1087 +#: ../midori/midori-websettings.c:1064 msgid "Clear private data" msgstr "Cancella i dati personali" -#: ../midori/midori-websettings.c:1088 +#: ../midori/midori-websettings.c:1065 msgid "The private data selected for deletion" msgstr "Dati privati selezionati per la cancellazione" -#. 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:1227 -#: ../midori/midori-view.c:4439 -#: ../midori/midori-view.c:4443 +#: ../midori/midori-websettings.c:1080 +msgid "Clear data" +msgstr "Cancella i dati" + +#: ../midori/midori-websettings.c:1081 +msgid "The data selected for deletion" +msgstr "I dati selezionati per la cancellazione" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1130 +msgid "Strip referrer details sent to websites" +msgstr "Scarta i dettagli del referer inviati ai siti web" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1132 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Se il \"referer\" deve essere accorciato al nome host" + +#: ../midori/midori-websettings.c:1146 +msgid "Always use my font choices" +msgstr "Usa sempre il tipo di carattere di mia scelta" + +#: ../midori/midori-websettings.c:1147 +msgid "Override fonts picked by websites with user preferences" +msgstr "" +"Preferisci le impostazioni utente degli stili di carattere a quelle dei siti" + +#: ../midori/midori-view.c:1360 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s vuole salvare un database HTML5." + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Deny" +msgstr "_Nega" + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Allow" +msgstr "_Permetti" + +#: ../midori/midori-view.c:1392 +#, c-format +msgid "%s wants to know your location." +msgstr "%s vuole conoscere la propria posizione." + +#: ../midori/midori-view.c:1485 #, c-format msgid "Error - %s" msgstr "Errore - %s" -#: ../midori/midori-view.c:1228 +#: ../midori/midori-view.c:1486 #, c-format msgid "The page '%s' couldn't be loaded." -msgstr "La pagina '%s' non può essere caricata." +msgstr "La pagina \"%s\" non può essere caricata." -#: ../midori/midori-view.c:1230 +#: ../midori/midori-view.c:1488 msgid "Try again" msgstr "Riprova" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1249 -#, c-format -msgid "Not found - %s" -msgstr "Non trovato - %s" - -#: ../midori/midori-view.c:1433 -#: ../midori/midori-view.c:2279 +#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598 #, c-format msgid "Send a message to %s" msgstr "Invia un messaggio a %s" -#: ../midori/midori-view.c:2061 -#: ../midori/midori-view.c:2446 +#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747 msgid "Inspect _Element" -msgstr "Ispeziona _Elemento" +msgstr "Ispeziona _elemento" -#: ../midori/midori-view.c:2113 -#: ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2480 msgid "Open Link in New _Tab" msgstr "Apri collegamento in una nuova sc_heda" -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2484 msgid "Open Link in _Foreground Tab" msgstr "Apri collegamento in una scheda in primo _piano" -#: ../midori/midori-view.c:2118 +#: ../midori/midori-view.c:2485 msgid "Open Link in _Background Tab" msgstr "Apri collegamento in una scheda in secondo p_iano" -#: ../midori/midori-view.c:2121 -#: ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2488 msgid "Open Link in New _Window" msgstr "Apri collegamento in una nuova _finestra" -#: ../midori/midori-view.c:2124 +#: ../midori/midori-view.c:2491 msgid "Open Link as Web A_pplication" msgstr "Apri il collegamento come applicazione _web" -#: ../midori/midori-view.c:2127 +#: ../midori/midori-view.c:2496 msgid "Copy Link de_stination" msgstr "Copia l'indirizzo di de_stinazione" -#: ../midori/midori-view.c:2130 -#: ../midori/midori-view.c:2202 -msgid "_Save Link destination" -msgstr "_Salva indirizzo collegamento" - -#: ../midori/midori-view.c:2131 -#: ../midori/midori-view.c:2196 -msgid "_Download Link destination" -msgstr "Scarica in_dirizzo collegamento" - -#: ../midori/midori-view.c:2135 -#: ../midori/midori-view.c:2165 -#: ../midori/midori-view.c:2207 -msgid "Download with Download _Manager" -msgstr "Scarica con Gestore scarica_menti" - -#: ../midori/midori-view.c:2144 +#: ../midori/midori-view.c:2512 msgid "Open _Image in New Tab" msgstr "Apri _immagine in nuova scheda" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2515 msgid "Copy Image _Address" msgstr "Copi_a indirizzo immagine" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2518 msgid "Save I_mage" msgstr "Salva i_mmagine" -#: ../midori/midori-view.c:2151 -msgid "Download I_mage" -msgstr "Scarica i_mmagine" +#: ../midori/midori-view.c:2521 +msgid "Open in Image _Viewer" +msgstr "Apri immagine nel _visualizzatore" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2528 msgid "Copy Video _Address" msgstr "Copi_a indirizzo video" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2531 msgid "Save _Video" msgstr "Salva _video" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2531 msgid "Download _Video" msgstr "Scarica _video" -#: ../midori/midori-view.c:2224 +#: ../midori/midori-view.c:2557 msgid "Search _with" msgstr "Cerca _con" -#: ../midori/midori-view.c:2259 -#: ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2589 msgid "_Search the Web" msgstr "_Cerca nel web" -#: ../midori/midori-view.c:2287 +#: ../midori/midori-view.c:2606 msgid "Open Address in New _Tab" msgstr "Apri indirizzi in una nuova _scheda" -#: ../midori/midori-view.c:2591 +#: ../midori/midori-view.c:2909 msgid "Open or download file" msgstr "Apri o scarica file" -#: ../midori/midori-view.c:2610 +#: ../midori/midori-view.c:2929 #, c-format msgid "File Type: '%s'" -msgstr "Tipo di file: '%s'" +msgstr "Tipo di file: \"%s\"" -#: ../midori/midori-view.c:2613 +#: ../midori/midori-view.c:2931 #, c-format msgid "File Type: %s ('%s')" -msgstr "Tipo di file: %s ('%s')" +msgstr "Tipo di file: %s (\"%s\")" -#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2617 +#: ../midori/midori-view.c:2935 +#, c-format +msgid "File Name: %s" +msgstr "Nome file: %s" + +#: ../midori/midori-view.c:2955 #, c-format msgid "Open %s" msgstr "Apri %s" -#: ../midori/midori-view.c:3158 +#: ../midori/midori-view.c:3576 #, c-format msgid "Inspect page - %s" -msgstr "Controlla pagina - %s" +msgstr "Controllo pagina - %s" -#: ../midori/midori-view.c:3439 -msgid "Speed dial" +#: ../midori/midori-view.c:3923 +msgid "Speed Dial" msgstr "Selezione veloce" -#: ../midori/midori-view.c:3440 +#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020 msgid "Click to add a shortcut" -msgstr "Clicca per aggiungere un collegamento" +msgstr "Fare clic per aggiungere un collegamento" -#: ../midori/midori-view.c:3441 +#: ../midori/midori-view.c:3925 msgid "Enter shortcut address" -msgstr "Inserisci indirizzo del collegamento" +msgstr "Inserire l'indirizzo del collegamento" -#: ../midori/midori-view.c:3442 +#: ../midori/midori-view.c:3926 msgid "Enter shortcut title" -msgstr "Inserisci titolo del collegamento" +msgstr "Inserire il titolo del collegamento" -#: ../midori/midori-view.c:3443 +#: ../midori/midori-view.c:3927 msgid "Are you sure you want to delete this shortcut?" -msgstr "Sicuro di voler eliminare questo collegamento?" - -#: ../midori/midori-view.c:3444 -msgid "Set number of columns and rows" -msgstr "Imposta il numero di righe e colonne" - -#: ../midori/midori-view.c:3445 -msgid "Enter number of columns and rows:" -msgstr "Inserisci il numero di righe e colonne" +msgstr "Eliminare davvero questo collegamento?" -#: ../midori/midori-view.c:3446 -msgid "Invalid input for the size of the speed dial" -msgstr "Valore non valido per la dimensione della selezione veloce" +#: ../midori/midori-view.c:4089 +#, c-format +msgid "No documentation installed" +msgstr "La documentazione non è installata" -#: ../midori/midori-view.c:3447 -msgid "Thumb size:" -msgstr "Dimensione della miniatura:" +#: ../midori/midori-view.c:4165 +msgid "Midori doesn't store any personal data:" +msgstr "Midori non salva alcun dato personale:" + +#: ../midori/midori-view.c:4166 +msgid "No history or web cookies are being saved." +msgstr "Non sono salvati cronologia o cookie." + +#: ../midori/midori-view.c:4167 +msgid "Extensions are disabled." +msgstr "Le estensioni sono disabilitate." -#: ../midori/midori-view.c:3448 -msgid "Small" -msgstr "Piccolo" +#: ../midori/midori-view.c:4168 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "" +"L'immagazzinamento HTML5, i database locali e le cache dell'applicazione " +"sono disabilitati." -#: ../midori/midori-view.c:3449 -msgid "Medium" -msgstr "Medio" +#: ../midori/midori-view.c:4169 +msgid "Midori prevents websites from tracking the user:" +msgstr "Midori impedisce ai siti web di tracciare l'utente:" + +#: ../midori/midori-view.c:4170 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "Gli URL referenti sono limitati al nome host." + +#: ../midori/midori-view.c:4171 +msgid "DNS prefetching is disabled." +msgstr "Il prefetching DNS è disabilitato." -#: ../midori/midori-view.c:3450 -msgid "Big" -msgstr "Grande" +#: ../midori/midori-view.c:4172 +msgid "The language and timezone are not revealed to websites." +msgstr "" +"La lingua e il fuso orario di appartenenza non sono rivelati ai siti web." -#: ../midori/midori-view.c:3476 -#, c-format -msgid "Document cannot be displayed" -msgstr "Il documento non può essere visualizzato" +#: ../midori/midori-view.c:4173 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "" +"Flash e gli altri plugin di Netscape non possono essere elencati dai siti " +"web." -#: ../midori/midori-view.c:3499 -#, c-format -msgid "No documentation installed" -msgstr "La documentazione non è installata" +#: ../midori/midori-view.c:4222 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "" +"I numeri di versione tra parentesi indicano la versione usata durante " +"l'esecuzione." -#: ../midori/midori-view.c:3617 +#: ../midori/midori-view.c:4278 msgid "Page loading delayed" msgstr "Caricamento pagina ritardato" -#: ../midori/midori-view.c:3618 +#: ../midori/midori-view.c:4279 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "Caricamento ritardato a causa di un errore recente o delle preferenze di avvio" +msgstr "" +"Caricamento ritardato a causa di un errore recente o delle preferenze di " +"avvio" -#: ../midori/midori-view.c:3619 +#: ../midori/midori-view.c:4280 msgid "Load Page" msgstr "Carica pagina" -#: ../midori/midori-view.c:3761 +#: ../midori/midori-view.c:4446 msgid "Blank page" msgstr "Pagina vuota" -#: ../midori/midori-view.c:4015 +#: ../midori/midori-view.c:4708 msgid "_Duplicate Tab" msgstr "_Duplica scheda" -#: ../midori/midori-view.c:4020 -msgid "_Restore Tab" -msgstr "_Ripristina scheda" - -#: ../midori/midori-view.c:4020 -msgid "_Minimize Tab" -msgstr "_Minimizza scheda" +#: ../midori/midori-view.c:4713 +msgid "Show Tab _Label" +msgstr "Mostra l'_etichetta nelle schede" + +#: ../midori/midori-view.c:4713 +msgid "Show Tab _Icon Only" +msgstr "Mostra solo l'_icona nelle schede" -#: ../midori/midori-view.c:4026 +#: ../midori/midori-view.c:4719 msgid "Close ot_her Tabs" msgstr "Chiudi le altre sc_hede" -#: ../midori/midori-view.c:4676 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5532 +msgid "previous" +msgstr "precedente" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5551 +msgid "next" +msgstr "successiva" + +#: ../midori/midori-view.c:5564 msgid "Print background images" msgstr "Stampa immagini di sfondo" -#: ../midori/midori-view.c:4677 +#: ../midori/midori-view.c:5565 msgid "Whether background images should be printed" msgstr "Abilitare questa opzione per stampare le immagini di sfondo" -#: ../midori/midori-view.c:4729 -#: ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:5597 msgid "Features" msgstr "Opzioni" -#. Page "General" -#: ../midori/midori-preferences.c:301 -msgid "General" -msgstr "Generale" - -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Avvio" -#: ../midori/midori-preferences.c:317 -#: ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Usa la pagina co_rrente" + +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Usa la pagina corrente come homepage" -#: ../midori/midori-preferences.c:334 -#: ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Trasferimenti" - #. Page "Appearance" -#: ../midori/midori-preferences.c:352 -msgid "Appearance" -msgstr "Visualizzazione" - -#: ../midori/midori-preferences.c:353 -msgid "Font settings" -msgstr "Impostazioni caratteri" - -#: ../midori/midori-preferences.c:355 -msgid "Default Font Family" -msgstr "Famiglia di caratteri predefinita" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Carattere" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Famiglia di caratteri proporzionale" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" -msgstr "Scegliere la famiglia predefinita dei caratteri per visualizzare il testo" +msgstr "" +"Scegliere la famiglia predefinita dei caratteri per visualizzare il testo" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" -msgstr "Scegliere la dimensione predefinita dei caratteri per visualizzare il testo" +msgstr "" +"Scegliere la dimensione predefinita dei caratteri per visualizzare il testo" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Caratteri a larghezza fissa" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" -msgstr "Dimensione dei caratteri del testo per visualizzare testi di larghezza predefinita" +msgstr "" +"Dimensione dei caratteri del testo per visualizzare testi di larghezza " +"predefinita" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" -msgstr "Dimensione dei caratteri utilizzati per visualizzare il testo di altezza fissa" +msgstr "" +"Dimensione dei caratteri utilizzati per visualizzare il testo di altezza " +"fissa" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Dimensione minima caratteri" -#: ../midori/midori-preferences.c:374 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "Scegliere la dimensione minima dei caratteri per visualizzare il testo" #. Page "Behavior" -#: ../midori/midori-preferences.c:383 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:396 -msgid "Enforce 96 dots per inch" -msgstr "Forza 96 punti per pollice" - -#: ../midori/midori-preferences.c:397 -msgid "Enforce a video dot density of 96 DPI" -msgstr "Abilitare questa opzione per forzare la densità dei punti a 96 DPI" - -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Permetti agli script di aprire popup" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "Abilitare questa opzione per consentire l' apertura automatica delle finestre di popup" - -#: ../midori/midori-preferences.c:422 -msgid "Spell Checking" -msgstr "Controllo dell'ortografia" - -#: ../midori/midori-preferences.c:425 -msgid "Enable Spell Checking" -msgstr "Abilita controllo ortografico" - -#: ../midori/midori-preferences.c:426 -msgid "Enable spell checking while typing" -msgstr "Abilita questa opzione per attivare il controllo ortografico durante la digitazione" - -#: ../midori/midori-preferences.c:428 -msgid "Spelling dictionaries:" -msgstr "Dizionari di controllo ortografico:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:432 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "Una lista separata da virgole da usare per il controllo ortografico, per esempio \"en_GB,de_DE\"" +msgstr "" +"Abilitare questa opzione per consentire l'apertura automatica delle finestre " +"di popup" #. Page "Interface" -#: ../midori/midori-preferences.c:438 -msgid "Interface" -msgstr "Interfaccia" - -#: ../midori/midori-preferences.c:439 -msgid "Navigationbar" -msgstr "Barra di navigazione" - -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Navigazione" -#. Page "Applications" -#: ../midori/midori-preferences.c:471 -msgid "Applications" -msgstr "Applicazioni" - -#: ../midori/midori-preferences.c:472 -msgid "External applications" -msgstr "Applicazioni esterne" - #. Page "Network" -#: ../midori/midori-preferences.c:488 -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "Rete" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:463 msgid "Hostname" msgstr "Nome host" -#. Page "Privacy" -#: ../midori/midori-preferences.c:514 -msgid "Privacy" -msgstr "Privacy" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "MB" -#: ../midori/midori-preferences.c:515 -msgid "Web Cookies" -msgstr "Cookie" - -#: ../midori/midori-preferences.c:524 -#: ../midori/midori-preferences.c:538 -msgid "days" -msgstr "giorni" - -#: ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Vuoto" - -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Aggiungi motore di ricerca" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Modifica motore di ricerca" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Nome:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Descrizione:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "I_cona:" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "Parame_tro:" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" -msgstr "Gestisci motori di ricerca" +msgstr "Gestione motori di ricerca" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "Usa come _predefinito" -#: ../midori/sokoke.c:1303 -msgid "_Bookmark" -msgstr "S_egnalibro" - -#: ../midori/sokoke.c:1304 -msgid "_Bookmarks" -msgstr "Segnali_bri" - -#: ../midori/sokoke.c:1305 -msgid "Add Boo_kmark" -msgstr "Aggiungi se_gnalibro" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "Apri con" -#: ../midori/sokoke.c:1306 -msgid "_Console" -msgstr "_Console" - -#: ../midori/sokoke.c:1307 -msgid "_Extensions" -msgstr "_Estensioni" +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Selezionare un'applicazione o un comando per aprire \"%s\":" -#: ../midori/sokoke.c:1308 -msgid "_History" -msgstr "C_ronologia" +#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "Non è possibile eseguire l'applicazione esterna." -#: ../midori/sokoke.c:1309 -msgid "_Homepage" -msgstr "_Pagina iniziale" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d ora" +msgstr[1] "%d ore" -#: ../midori/sokoke.c:1310 -msgid "_Userscripts" -msgstr "Script dell'_utente" +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minuto" +msgstr[1] "%d minuti" -#: ../midori/sokoke.c:1311 -msgid "New _Tab" -msgstr "Nuova _scheda" +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d secondo" +msgstr[1] "%d secondi" -#: ../midori/sokoke.c:1312 -msgid "_Transfers" -msgstr "_Trasferimenti" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s di %s" -#: ../midori/sokoke.c:1313 -msgid "Netscape p_lugins" -msgstr "Plugins n_avigatore" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/sokoke.c:1316 -msgid "New _Folder" -msgstr "Nuova _cartella" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr " - %s restanti" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:201 +#: ../toolbars/midori-findbar.c:291 msgid "_Inline Find:" msgstr "Cerca nel _testo:" -#: ../toolbars/midori-findbar.c:233 +#: ../toolbars/midori-findbar.c:317 msgid "Previous" -msgstr "Successivo" +msgstr "Precedente" -#: ../toolbars/midori-findbar.c:239 +#: ../toolbars/midori-findbar.c:323 msgid "Next" -msgstr "Precedente" +msgstr "Successiva" -#: ../toolbars/midori-findbar.c:243 +#: ../toolbars/midori-findbar.c:327 msgid "Match Case" msgstr "Maiuscole/minuscole" -#: ../toolbars/midori-findbar.c:252 +#: ../toolbars/midori-findbar.c:336 msgid "Highlight Matches" msgstr "Evidenzia risultati" -#: ../toolbars/midori-findbar.c:263 +#: ../toolbars/midori-findbar.c:347 msgid "Close Findbar" msgstr "Chiudi barra ricerca" -#: ../toolbars/midori-transferbar.c:88 -#: ../panels/midori-transfers.c:273 -#, c-format -msgid "%s of %s" -msgstr "%s di %s" - -#: ../toolbars/midori-transferbar.c:123 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." -msgstr "Il file '%s' è stato traferito." +msgstr "Il file «%s» è stato trasferito." -#: ../toolbars/midori-transferbar.c:126 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Trasferimento completato" -#: ../toolbars/midori-transferbar.c:257 -#: ../panels/midori-transfers.c:144 +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "Il file scaricato è erroneo." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"Il checksum fornito con il collegamento non corrisponde. Ciò significa che " +"il file è probabilmente incompleto o è stato modificato successivamente." + +#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Cancella tutto" -#: ../toolbars/midori-transferbar.c:300 -#: ../toolbars/midori-transferbar.c:302 +#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 msgid "Some files are being downloaded" msgstr "Alcuni file sono stati scaricati" -#: ../toolbars/midori-transferbar.c:306 +#: ../toolbars/midori-transferbar.c:377 msgid "_Quit Midori" msgstr "_Chiudi Midori" -#: ../toolbars/midori-transferbar.c:308 +#: ../toolbars/midori-transferbar.c:379 msgid "The transfers will be cancelled if Midori quits." msgstr "I trasferimenti verranno cancellati se Midori viene chiuso" -#: ../panels/midori-bookmarks.c:116 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Segnalibri" -#: ../panels/midori-bookmarks.c:275 +#: ../panels/midori-bookmarks.c:257 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Impossibile aggiungere il segnalibro: %s\n" -#: ../panels/midori-bookmarks.c:414 +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "Modifica il segnalibro selezionato" -#: ../panels/midori-bookmarks.c:422 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "Elimina il segnalibro selezionato" -#: ../panels/midori-bookmarks.c:436 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" -msgstr "Aggiungi una nuova cartella" +msgstr "Aggiunge una nuova cartella" -#: ../panels/midori-bookmarks.c:568 -#: ../panels/midori-history.c:569 +#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 msgid "Separator" msgstr "Separatore" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "Console" - -#: ../panels/midori-console.c:361 -msgid "Copy _All" -msgstr "Copi_a Tutto" - -#: ../panels/midori-console.c:362 -msgid "Copy All" -msgstr "Copia tutto" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "Cronologia" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Estensioni" +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "Oggi" -#: ../panels/midori-history.c:146 -msgid "A week ago" -msgstr "Una settimana fa" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "Ieri" -#: ../panels/midori-history.c:148 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d giorno fa" msgstr[1] "%d giorni fa" -#: ../panels/midori-history.c:151 -msgid "Today" -msgstr "Oggi" - -#: ../panels/midori-history.c:153 -msgid "Yesterday" -msgstr "Ieri" +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "Una settimana fa" -#: ../panels/midori-history.c:324 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" msgstr "Cancellare completamente la cronologia?" -#: ../panels/midori-history.c:369 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" msgstr "Crea un segnalibro dall'elemento della cronologia selezionato" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" msgstr "Elimina l'elemento selezionato dalla cronologia" -#: ../panels/midori-history.c:386 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "Cancella l'intera cronologia" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Trasferimenti" + +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" msgstr "Apri _cartella di destinazione" -#: ../panels/midori-transfers.c:484 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" msgstr "Copia l'indirizzo del colle_gamento" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Autenticazione richiesta" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" @@ -2311,167 +2266,245 @@ "Sono necessari un nome utente e una password\n" "per aprire questo indirizzo:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "Nome utente" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "Password" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "Memo_rizza password" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "L'icona denominata '%s' non può essere caricata" +msgstr "L'icona denominata \"%s\" non può essere caricata" -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "L'icona «%s» dello stock non può essere caricata" +msgstr "L'icona \"%s\" dello stock non può essere caricata" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "I fotogrammi dell'animazione sono danneggiati" -#: ../katze/katze-utils.c:499 -#: ../katze/katze-utils.c:894 +#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" -msgstr "La proprietà «%s» non è valida per %s" +msgstr "La proprietà \"%s\" non è valida per %s" -#: ../katze/katze-utils.c:545 -#: ../katze/katze-utils.c:574 +#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" -msgstr "Scegli un file" +msgstr "Selezionare un file" -#: ../katze/katze-utils.c:560 +#: ../katze/katze-utils.c:506 msgid "Choose folder" -msgstr "Scegli una cartella" +msgstr "Selezionare una cartella" + +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "Nessuno" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "1 ora" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "1 giorno" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "1 settimana" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "1 mese" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "1 anno" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Preferenze per %s" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:473 msgid "Configure Advertisement filters" msgstr "Configurazione dei filtri per gli avvisi pubblicitari" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:504 #, 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 "Digitare l'indirizzo della lista dei filtri preconfigurati nel campo di testo e fare clic su \"Aggiungi\" per aggiungerlo alla lista. E' possibile trovare altre liste su %s." - -#: ../extensions/adblock.c:587 -msgid "Configure _Advertisement filters..." -msgstr "Configura i filtri per gli av_visi pubblicitari..." +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 "" +"Digitare l'indirizzo della lista dei filtri preconfigurati nel campo di " +"testo e fare clic su \"Aggiungi\" per aggiungerlo alla lista. È possibile " +"trovare altre liste su %s." -#: ../extensions/adblock.c:841 +#: ../extensions/adblock.c:882 msgid "Edit rule" msgstr "Modifica regola" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:896 msgid "_Rule:" msgstr "_Regola:" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:950 msgid "Bl_ock image" msgstr "Bl_occa immagine" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:955 msgid "Bl_ock link" -msgstr "Bl_occa link" +msgstr "Bl_occa collegamento" -#: ../extensions/adblock.c:1494 +#: ../extensions/adblock.c:1670 msgid "Advertisement blocker" msgstr "Blocca avvisi pubblicitari" -#: ../extensions/adblock.c:1495 +#: ../extensions/adblock.c:1671 msgid "Block advertisements according to a filter list" msgstr "Blocca gli avvisi pubblicitari in accordo alla lista dei filtri" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "Copia %s nella cartella %s." +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "La pagina sembra contenere uno script utente. Si desidera installarlo?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "_Installa script utente" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "La pagina sembra contenere uno stile utente. Si desidera installarlo?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_Installa stile utente" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Non installare" -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Script dell'utente" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Stili dell'utente" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Errore" + +#: ../extensions/addons.c:421 #, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "La configurazione dell'estensione '%s' non possono essere salvate: %s\n" +msgid "Do you want to delete '%s'?" +msgstr "Cancellare \"%s\"?" + +#: ../extensions/addons.c:427 +msgid "Delete user script" +msgstr "Elimina script dell'utente" + +#: ../extensions/addons.c:428 +msgid "Delete user style" +msgstr "Elimina stile utente" -#: ../extensions/addons.c:1086 -#: ../extensions/addons.c:1253 +#: ../extensions/addons.c:431 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "Il file «%s» verrà eliminato definitivamente." + +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "Apre nell'editor di testo" + +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "Apri cartella di destinazione" + +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "Aggiunge nuovo addon" + +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "Rimuove l'addon selezionato" + +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" msgstr "Estensioni utente" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" -msgstr "Impossibile monitorare la cartella '%s': %s" +msgstr "Impossibile monitorare la cartella «%s»: %s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" -msgstr "Supporto per userscripts ed userstyles" +msgstr "Supporto per script utente e stili utente" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" -msgstr "Tab colorate" +msgstr "Schede colorate" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Colora ogni etichetta in modo differente" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Gestore Cookie" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "Rimuovi tutto" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "Elimina tutti i cookie mostrati. Se è stato impostato un filtro, verranno eliminati solo quelli risultanti dalla filtrazione." +#: ../extensions/cookie-manager/cookie-manager-page.c:105 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"Elimina tutti i cookie mostrati; se è stato impostato un filtro, verranno " +"eliminati solo quelli risultanti dal filtraggio" -#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "Espandi tutto" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "Riduci tutto" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" msgstr "Vuoi davvero cancellare tutti i cookie?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Domanda" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." msgstr "Solo i cookie che combaciano col filtro verranno eliminati." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "Alla fine della sessione" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2488,111 +2521,103 @@ "Protezione: %s\n" "Scadenza: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Si" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "No" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" "Cookies: %d" msgstr "" "Dominio: %s\n" -"Cookies: %d" +"Cookie: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" -msgstr "Nome:" +msgstr "Nome" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "_Espandi tutto" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "_Riduci tutto" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 msgid "Filter:" msgstr "Filtro:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "Inserisci una stringa filtro per mostrare i soli cookie il cui nome o dominio corrisponda a quello del filtro inserito" - -#: ../extensions/cookie-manager/main.c:40 -msgid "_Cookie Manager" -msgstr "Gestore _Cookie" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Inserisci una stringa filtro per mostrare i soli cookie il cui nome o " +"dominio corrisponda a quello del filtro inserito" -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Elenca, mostra o elimina i cookie" -#: ../extensions/copy-tabs.c:39 +#: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" -msgstr "Copia gli indirizzi delle schede" +msgstr "Copia in_dirizzi delle schede" -#: ../extensions/copy-tabs.c:98 +#: ../extensions/copy-tabs.c:95 msgid "Copy Addresses of Tabs" msgstr "Copia gli indirizzi delle schede" -#: ../extensions/copy-tabs.c:99 +#: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Copia gli indirizzi di tutte le schede negli appunti" -#: ../extensions/external-applications.vala:93 -msgid "External Applications" -msgstr "Applicazioni esterne" - -#: ../extensions/external-applications.vala:94 -msgid "Associate URL schemes with external commands" -msgstr "Associa gli schemi URL con comandi esterni" - #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "Impossibile trovare gli elementi Atom \"entry\" nei dati XML." +msgstr "Impossibile trovare gli elementi \"entry\" Atom nei dati XML." #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Impossibile trovare l'elemento Atom \"feed\" nell'XML indicato." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Ultimo aggiornamento: %s." -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "Feed" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" -msgstr "Aggiungi nuovo feed" +msgstr "Aggiunge un nuovo feed" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "Elimina feed" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "_Feeds" #: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." -msgstr "Impossibile trovare elemento root nel file XML del feed." +msgstr "Impossibile trovare l'elemento radice nel file XML del feed." #: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." -msgstr "Format del feed non supportato." +msgstr "Formato del feed non supportato." #: ../extensions/feed-panel/feed-parse.c:265 #, c-format @@ -2601,7 +2626,7 @@ #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "Impossibile trovare l'emento \"channel\" nell'XML del flusso RSS." +msgstr "Impossibile trovare l'elemento \"channel\" nell'XML del flusso RSS." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." @@ -2615,305 +2640,862 @@ msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Impossibile trovare l'elemento RSS \"channel\" nell'XML indicato." -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "Errore" - #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" -msgstr "Il Feed '%s' già esiste." +msgstr "Il feed \"%s\" esiste già." #: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" -msgstr "Errore nel caricare feed '%s'" +msgstr "Errore nel caricare il feed \"%s\"" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "Pannello Feed" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" -msgstr "Leggi feed Atom/RSS" +msgstr "Leggi feed Atom o RSS" -#: ../extensions/formhistory.c:142 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" msgstr "Errore nell'aggiunta del valore della form: %s\n" -#: ../extensions/formhistory.c:455 -#: ../extensions/formhistory.c:459 +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "Cronologia form" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Sono necessari un nome utente e una password\n" +"per aprire questo indirizzo:" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "Memorizzare la password per questo pagina?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Memorizza" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "Non ora" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Mai per questa pagine" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "Attiva/disattiva la cronologia dei form" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "Attiva o disattiva la cronologia dei form per la scheda corrente" + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Errore nell'esecuzione della richiesta al database: %s\n" -#: ../extensions/formhistory.c:503 +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" +"Attivare la cronologia dei form con i tasti Ctrl+Maiusc+F per ogni scheda" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "Gestore cronologia form" + +#: ../extensions/formhistory/formhistory.c:669 msgid "Stores history of entered form data" msgstr "Memorizza una cronologia dei dati inseriti nei form" -#: ../extensions/formhistory.c:507 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 #, c-format -msgid "Not available: %s" -msgstr "Non disponibile: %s" +msgid "Failed to select suggestions\n" +msgstr "Impossibile selezionare i suggerimenti\n" -#: ../extensions/formhistory.c:508 -msgid "Resource files not installed" -msgstr "I file della risorsa non sono installati" +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Sono presenti schede non viste" -#: ../extensions/formhistory.c:514 -msgid "Form history filler" -msgstr "Gestore cronologia form" +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "Lista-cronologia" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Comportamento alla chiusura della scheda " + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Non fare niente" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Vai all'ultima scheda visitata" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Vai alla scheda più recente" -#: ../extensions/history-list.vala:174 -msgid "Next Tab (History List)" -msgstr "Scheda successiva (lista cronologia)" - -#: ../extensions/history-list.vala:175 -msgid "Next tab from history" -msgstr "Scheda successiva dalla cronologia" - -#: ../extensions/history-list.vala:184 -msgid "Previous Tab (History List)" -msgstr "Scheda precedente (lista cronologia)" - -#: ../extensions/history-list.vala:185 -msgid "Previous tab from history" -msgstr "Scheda precedente dalla cornologia" +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Nuova scheda successiva (lista cronologia)" -#: ../extensions/history-list.vala:245 +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Nuova scheda successiva dalla cronologia" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Nuova scheda precedente (lista cronologia)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Nuova scheda precedente dalla cronologia" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Visualizza scheda in secondo piano (lista cronologia)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Visualizza la scheda selezionata in secondo piano" + +#: ../extensions/history-list.vala:569 msgid "History List" msgstr "Lista cronologia" -#: ../extensions/history-list.vala:246 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Consente di cambiare scheda scegliendo da una lista ordinata per ultimo utilizzo" +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "" +"Va all'ultima scheda utilizzata quando si cambia o si chiude una scheda" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Gesti del mouse" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Permette di controllare Midori con i movimenti del mouse" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 -#: ../extensions/page-holder.c:177 -msgid "Pageholder" -msgstr "Cornice della pagina" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "_Cornice della pagina" - -#: ../extensions/page-holder.c:178 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "Mantiene una o più pagine aperte in parallelo alla schede" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "Ricarica la pagina o interrompe il caricamento" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" -msgstr "Personalizza le scorciatoie da tastiera" +msgstr "Personalizzazione delle scorciatoie da tastiera" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "Personalizza sc_orciatoie..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Scorciatoie" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "Visualizza e modifica le scorciatoie da tastiera" -#: ../extensions/status-clock.c:176 +#: ../extensions/status-clock.c:174 msgid "Statusbar Clock" msgstr "Orologio della barra di stato" -#: ../extensions/status-clock.c:177 +#: ../extensions/status-clock.c:175 msgid "Display date and time in the statusbar" msgstr "Mostra la data e l'ora nella barra di stato" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Immagini" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Script" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" -msgstr "Plugin di netscape" +msgstr "Plugin di Netscape" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "Proprietà della barra di stato" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" -msgstr "Permette di attivare o disattivare facilmente determinate funzionalità sulle pagine internet" +msgstr "" +"Permette di attivare o disattivare facilmente determinate funzionalità sulle " +"pagine internet" -#: ../extensions/tab-panel.c:568 -#: ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Pannello a scheda" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "Pannello _a scheda" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Mostra le schede in un pannello verticale" -#: ../extensions/tabs-minimized.c:79 -msgid "Minimize new Tabs" -msgstr "Minimizza le nuove schede" - -#: ../extensions/tabs-minimized.c:80 -msgid "New tabs open minimized" -msgstr "Le nuove schede sono aperte minimizzate" +#: ../extensions/tabs-minimized.c:76 +msgid "Only Icons on Tabs by default" +msgstr "Solo icone sulle schede" + +#: ../extensions/tabs-minimized.c:77 +msgid "New tabs have no label by default" +msgstr "Le nuove schede non hanno alcuna etichetta di default" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Personalizza la barra degli strumenti" -#: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "Seleziona gli oggetti da visualizzare nella barra degli strumenti. Gli oggetti possono essere riordinati tramite trascinamento." +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"Selezionare gli oggetti da visualizzare nella barra degli strumenti. Gli " +"oggetti possono essere riordinati tramite trascinamento." -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Oggetti disponibili" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Oggetti visualizzati" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "Personalizza barra degli s_trumenti..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Personalizza..." + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" msgstr "Editor della barra degli strumenti" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" -msgstr "Permette di modificare facilmente la disposizione della barra degli strumenti" +msgstr "" +"Permette di modificare facilmente la disposizione della barra degli strumenti" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "Memorizza la comunicazione HTTP sul disco" +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "La cartella di configurazione specificata non è valida." + +#~ msgid "Cookies" +#~ msgstr "Cookie" + +#~ msgid "'Flash' Cookies" +#~ msgstr "Cookie \"Flash\"" + +#~ msgid "HTML5 _Databases" +#~ msgstr "_Database HTML5" + +#~ msgid "Offline Application Cache" +#~ msgstr "Cache dell'applicazioni offline" + +#~ msgid "Lightweight web browser" +#~ msgstr "Browser web leggero" + +#~ msgid "Not available: %s" +#~ msgstr "Non disponibile: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "I file della risorsa non sono installati" + +#~ msgid "No filename specified" +#~ msgstr "Nessun file specificato" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "Non memorizza i dati personali durante la navigazione" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Aggiungi collegamento a selezione veloce" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Aggiunge collegamento sulla scrivania" + +#~ msgid "Create a launcher" +#~ msgstr "Crea un avviatore" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "Sottoscrivi questo feed di notizie" + +#~ msgid "Close this window" +#~ msgstr "Chiude la finestra" + +#~ msgid "Close all open windows" +#~ msgstr "Chiude tutte le finestre aperte" + +#~ msgid "Undo the last modification" +#~ msgstr "Annulla l'ultima modifica" + +#~ msgid "Redo the last modification" +#~ msgstr "Riesegui l'ultima modifica" + +#~ msgid "Cut the selected text" +#~ msgstr "Taglia il testo selezionato" + +#~ msgid "Copy the selected text" +#~ msgstr "Copia il testo selezionato" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "Incolla il testo dagli appunti" + +#~ msgid "Delete the selected text" +#~ msgstr "Elimina il testo selezionato" + +#~ msgid "Select all text" +#~ msgstr "Seleziona tutto" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Trova la parola o frase successiva" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Trova la parola o frase precedente" + +#~ msgid "Reset the zoom level" +#~ msgstr "Azzera il livello di ingrandimento" + +#~ msgid "View the source code of the page" +#~ msgstr "Visualizza il codice sorgente della pagina" + +#~ msgid "Scroll to the left" +#~ msgstr "Scorre verso sinistra" + +#~ msgid "Scroll down" +#~ msgstr "Scorre in basso" + +#~ msgid "Scroll up" +#~ msgstr "Scorre in alto" + +#~ msgid "Scroll to the right" +#~ msgstr "Scorre verso destra" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "Elimina il contenuto del cestino" + +#~ msgid "Open the last closed tab" +#~ msgstr "Apre l'ultima scheda chiusa" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Aggiunge un nuova cartella di preferiti" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Aggiunge, modifica e elimina motori di ricerca..." + +#~ msgid "Clear private data..." +#~ msgstr "Rimozione dati privati..." + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "" +#~ "Vedi i dettagli della pagina ed accedi agli strumenti per sviluppatori..." + +#~ msgid "Switch to the previous tab" +#~ msgstr "Passa alla scheda precedente" + +#~ msgid "Switch to the next tab" +#~ msgstr "Passa alla scheda successiva" + +#~ msgid "Move tab behind the previous tab" +#~ msgstr "Sposta la scheda dietro a di quella precedente" + +#~ msgid "Move tab in front of the next tab" +#~ msgstr "Sposta la scheda davanti a quella successiva" + +#~ msgid "Focus the current tab" +#~ msgstr "Posiziona il fuoco sulla scheda corrente" + +#~ msgid "Cycle focus between views" +#~ msgstr "Scorre il fuoco tra le viste" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Mostra solo l'icona della scheda corrente" + +#~ msgid "Duplicate the current tab" +#~ msgstr "Duplica la scheda corrente" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Chiude tutte le schede eccetto la corrente" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Apre le schede salvate nell'ultima sessione" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Mostra le domande e risposte frequenti (F.A.Q.)" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Apre lo strumento di segnalazione bug di Midori" + +#~ msgid "Show information about the program" +#~ msgstr "Mostra le informazioni sull'applicazione" + +#~ msgid "Show menubar" +#~ msgstr "Mostra la barra dei menu" + +#~ msgid "Show navigationbar" +#~ msgstr "Mostra la barra di navigazione" + +#~ msgid "Show sidepanel" +#~ msgstr "Mostra il pannello laterale" + +#~ msgid "Show bookmarkbar" +#~ msgstr "Mostra la barra dei segnalibri" + +#~ msgid "Show statusbar" +#~ msgstr "Mostra la barra di stato" + +#~ msgid "MD5-Checksum:" +#~ msgstr "MD5-Checksum:" + +#~ msgid "SHA1-Checksum:" +#~ msgstr "SHA1-Checksum:" + +#~ msgid "Set number of columns and rows" +#~ msgstr "Imposta il numero di righe e colonne" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Inserire il numero di righe e colonne" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "Valore non valido per la dimensione della selezione veloce" + +#~ msgid "Thumb size:" +#~ msgstr "Dimensione della miniatura:" + +#~ msgid "Small" +#~ msgstr "Piccolo" + +#~ msgid "Medium" +#~ msgstr "Medio" + +#~ msgid "Big" +#~ msgstr "Grande" + +#~ msgid "Reset the last _session" +#~ msgstr "Reimposta l'ultima _sessione" + +#~ msgid "Not found - %s" +#~ msgstr "Non trovato - %s" + +#~ msgid "Document cannot be displayed" +#~ msgstr "Il documento non può essere visualizzato" + +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "Forza 96 punti per pollice" + +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "Abilitare questa opzione per forzare la densità dei punti a 96 DPI" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Configura i filtri per gli av_visi pubblicitari..." + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "Scorre tra le schede con i tasti Ctrl+Tab in ordine di utilizzo" + +#~ msgid "Web Cookies" +#~ msgstr "Cookie" + +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "Cancella i cookie quando Midori viene chiuso" + +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "Elimina i cookie obsoleti dopo 1 ora" + +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "Elimina i cookie obsoleti dopo 1 settimana" + +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "Elimina i cookie obsoleti dopo 1 mese" + +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "Elimina i cookie obsoleti dopo 1 anno" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "Impossibile eseguire la richiesta al database\n" + +#~ msgid "All cookies" +#~ msgstr "Tutti i cookie" + +#~ msgid "Session cookies" +#~ msgstr "Cookie di sessione" + +#~ msgid "Show Transferbar" +#~ msgstr "Mostra la barra dei trasferimenti" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "Abilitare questa opzione per mostrare la barra degli scaricamenti" + +#~ msgid "Search engines in location completion" +#~ msgstr "Motori di ricerca nell'autocompletamento" + +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "" +#~ "Abilitare questa opzione per mostrare i motori di ricerca durante il " +#~ "completamento dell'indirizzo" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "Mostra i controlli operativi del pannello" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "" +#~ "Abilitare questa opzione per mostrare i controlli operativi del pannello" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Mostra le selezioni veloci nelle nuove schede" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "" +#~ "Abilitare questa opzione per mostrare la selezione veloce nelle nuove " +#~ "schede" + +#~ msgid "Download Manager" +#~ msgstr "Gestione scaricamenti" + +#~ msgid "An external download manager" +#~ msgstr "Un gestore di scaricamenti esterno" + +#~ msgid "Open external pages in:" +#~ msgstr "Apri le pagine esterne in:" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "Scegliere dove aprire le pagine aperte da applicazioni esterne" + +#~ msgid "Accept cookies" +#~ msgstr "Accetta cookie" + +#~ msgid "What type of cookies to accept" +#~ msgstr "Indicare che tipo di cookie devono essere accettati" + +#~ msgid "Maximum cookie age" +#~ msgstr "Durata massima dei cookie" + +#~ msgid "Maximum history age" +#~ msgstr "Durata cronologia" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Ricorda gli ultimi file scaricati" + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "" +#~ "Abilitare questa opzione per salvare l'elenco degli ultimi file scaricati" + +#~ msgid "General" +#~ msgstr "Generale" + +#~ msgid "Appearance" +#~ msgstr "Visualizzazione" + +#~ msgid "Font settings" +#~ msgstr "Impostazioni caratteri" + +#~ msgid "Interface" +#~ msgstr "Interfaccia" + +#~ msgid "Navigationbar" +#~ msgstr "Barra di navigazione" + +#~ msgid "Next Tab (History List)" +#~ msgstr "Scheda successiva (lista cronologia)" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "Scheda precedente (lista cronologia)" + +#~ msgid "Previous tab from history" +#~ msgstr "Scheda precedente dalla cronologia" + +#~ msgid "Quit the application" +#~ msgstr "Esce dall'applicazione" + +#~ msgid "Download with Download _Manager" +#~ msgstr "Scarica con Gestore scarica_menti" + +#~ msgid "Applications" +#~ msgstr "Applicazioni" + +#~ msgid "External applications" +#~ msgstr "Applicazioni esterne" + +#~ msgid "%s of %s, %s/s" +#~ msgstr "%s di %s, %s/s" + +#~ msgid "Open target folder for selected addon" +#~ msgstr "Apre la cartella di destinazione dell'addon selezionato" + +#~ msgid "Pageholder" +#~ msgstr "Cornice della pagina" + +#~ msgid "_Pageholder" +#~ msgstr "_Cornice della pagina" + +#~ msgid "Keep one or multiple pages open in parallel to your tabs" +#~ msgstr "Mantiene una o più pagine aperte in parallelo alla schede" + +#~ msgid "Show Blank page" +#~ msgstr "Mostra una pagina vuota" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% caricato" + +#~ msgid "_Contents" +#~ msgstr "_Contenuti" + +#~ msgid "Show the documentation" +#~ msgstr "Mostra la documentazione" + +#~ msgid "_Transferbar" +#~ msgstr "Barra dei _trasferimenti" + +#~ msgid "Show transferbar" +#~ msgstr "Mostra la barra dei trasferimenti" + +#~ msgid "Show progress in location entry" +#~ msgstr "Mostra caricamento nella barra degli indirizzi" + +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "" +#~ "Abilitare questa opzione per mostrare la percentuale di caricamento della " +#~ "pagina nella barra degli indirizzi" + +#~ msgid "_Save Link destination" +#~ msgstr "_Salva indirizzo collegamento" + +#~ msgid "_Download Link destination" +#~ msgstr "Scarica in_dirizzo collegamento" + +#~ msgid "Ask for the destination folder" +#~ msgstr "Richiedi cartella di destinazione" + +#~ msgid "Whether to ask for the destination folder when downloading a file" +#~ msgstr "" +#~ "Abilitare questa opzione per chiedere la cartella di destinazione quando " +#~ "si scarica un file" + +#~ msgid "Whether to show a notification when a transfer has been completed" +#~ msgstr "" +#~ "Abilitare questa opzione per mostrare una notifica quando viene " +#~ "completato un trasferimento" + +#~ msgid "Download I_mage" +#~ msgstr "Scarica i_mmagine" + +#~ msgid "Failed to clear search history: %s\n" +#~ msgstr "Errore nella cancellazione della cronologia delle ricerche: %s\n" + +#~ msgid "Detach chosen panel from the window" +#~ msgstr "Stacca il pannello selezionato dalla finestra" + +#~ msgid "Hide operating controls" +#~ msgstr "Nasconde i controlli operativi" + +#~ msgid "Spell Checking" +#~ msgstr "Controllo dell'ortografia" + +#~ msgid "" +#~ "A comma separated list of languages to be used for spell checking, for " +#~ "example \"en_GB,de_DE\"" +#~ msgstr "" +#~ "Una lista separata da virgole da usare per il controllo ortografico, per " +#~ "esempio \"en_GB, de_DE\"" + +#~ msgid "Minimize _Current Tab" +#~ msgstr "Minimizza la scheda _corrente" + +#~ msgid "Minimize the current tab" +#~ msgstr "Minimizza la scheda corrente" + +#~ msgid "Spelling dictionaries:" +#~ msgstr "Dizionari di controllo ortografico:" + +#~ msgid "Console" +#~ msgstr "Console" + +#~ msgid "Copy _All" +#~ msgstr "Copi_a Tutto" + +#~ msgid "Copy All" +#~ msgstr "Copia tutto" + +#~ msgid "_Cookie Manager" +#~ msgstr "Gestore _Cookie" + +#~ msgid "External Applications" +#~ msgstr "Applicazioni esterne" + +#~ msgid "Associate URL schemes with external commands" +#~ msgstr "Associa gli schemi URL con comandi esterni" + +#~ msgid "_Restore Tab" +#~ msgstr "_Ripristina scheda" + +#~ msgid "_Minimize Tab" +#~ msgstr "_Minimizza scheda" + +#~ msgid "Copy %s to the folder %s." +#~ msgstr "Copia %s nella cartella %s." + +#~ msgid "Minimize new Tabs" +#~ msgstr "Minimizza le nuove schede" + +#~ msgid "New tabs open minimized" +#~ msgstr "Le nuove schede sono aperte minimizzate" + #~ msgid "_Recently visited pages" #~ msgstr "Pagine visitate _recentemente" + #~ msgid "Reopen pages that you visited earlier" #~ msgstr "Riapre le pagine visitate recentemente" -#~ msgid "Show the saved bookmarks" -#~ msgstr "Mostra i segnalibri salvati" + #~ msgid "Original cookies only" #~ msgstr "Cookie originali" -#~ msgid "Accept cookies from the original website only" -#~ msgstr "" -#~ "Abilitare questa opzione per accettare i cookie solo dai siti originali" + #~ msgid "Remember last visited pages" #~ msgstr "Ricorda ultime pagine visitate" + #~ msgid "Whether the last visited pages are saved" #~ msgstr "" #~ "Abilitare questa opzione per salvare l'elenco delle ultime pagine visitate" + #~ msgid "Detect proxy server automatically" #~ msgstr "Riconosci automaticamente il server proxy" + #~ msgid "" #~ "Whether to detect the proxy server automatically from the environment" #~ msgstr "" #~ "Abilitare questa opzione per riconoscere automaticamente il server proxy " #~ "di sistema" + #~ msgid "Open _Link" #~ msgstr "Apri co_llegamento" + #~ msgid "Open Image in New Wi_ndow" #~ msgstr "Apri immagine in nuova fi_nestra" + #~ msgid "Enable developer tools" #~ msgstr "Abilita strumenti di sviluppo" + #~ msgid "Enable special extensions for developers" #~ msgstr "" #~ "Abilitare questa opzione per utilizzare le estensioni per gli sviluppatori" + #~ msgid "" #~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." #~ msgstr "" #~ "Copia gli script utente nella cartella %s e copia gli stili utente nella " #~ "cartella %s." -#~ msgid "DNS prefetching" -#~ msgstr "Precaricamento DNS" + #~ msgid "Prefetch IP addresses of hovered links" #~ msgstr "Precarica gli indirizzi IP dei collegamenti attraversati" + #~ msgid "Not available on this platform" #~ msgstr "Non disponibile in questa piattaforma" + #~ msgid "Shrink images automatically" #~ msgstr "Ridimensiona immagini" + #~ msgid "Automatically shrink standalone images to fit" #~ msgstr "" #~ "Abilitare per ridimensionare automaticamente le immagini caricate da sole" + #~ msgid "Tint tabs distinctly" #~ msgstr "Colora le etichette in modo distinto" + #~ msgid "_Quick Find" #~ msgstr "Ricerca _veloce" + #~ msgid "Quickly jump to a word or phrase" #~ msgstr "Salta velocemente a una parola o frase" -#~ msgid "Last open pages" -#~ msgstr "Ultime pagine visitate" + #~ msgid "Both" #~ msgstr "Entrambi" + #~ msgid "Both horizontal" #~ msgstr "Entrambi orizzontalmente" + #~ msgid "Load on Startup" #~ msgstr "Carica all'avvio" + #~ msgid "Remember last form inputs" #~ msgstr "Ricorda i moduli compilati" + #~ msgid "Whether the last form inputs are saved" #~ msgstr "Abilitare per salvare le informazioni inserite nei moduli." + #~ msgid "Cache size" #~ msgstr "File temporanei" + #~ msgid "The allowed size of the cache" #~ msgstr "Dimensione massima consentita per i file temporanei" + #~ msgid "Search" #~ msgstr "Cerca" + #~ msgid "Encoding" #~ msgstr "Codifica" + #~ msgid "The character encoding to use by default" #~ msgstr "Scegliere la codifica predefinita dei caratteri" + #~ msgid "Resizable text areas" #~ msgstr "Aree di testo ridimensionabili" + #~ msgid "Whether text areas are resizable" #~ msgstr "Abilitare per rendere le aree di testo ridimensionabili" -#~ msgid "MB" -#~ msgstr "MB" + #~ msgid "Warning: You are using a superuser account!" #~ msgstr "Attenzione: si sta eseguendo l'applicazione come amministratore." + #~ msgid "User_styles" #~ msgstr "_Stili dell'utente" -#~ msgid "_Closed Tabs and Windows" -#~ msgstr "_Finestre e schede chiuse" + #~ msgid "_Enable" #~ msgstr "_Abilita" + #~ msgid "Enable" #~ msgstr "Abilita" + #~ msgid "_Disable" #~ msgstr "_Disabilita" + #~ msgid "Disable" #~ msgstr "Disabilita" + #~ msgid "Source" #~ msgstr "Sorgente" + #~ msgid "%s has no property '%s'" #~ msgstr "%s non ha la proprietà «%s»" + #~ msgid "%s cannot be assigned to %s.%s" #~ msgstr "%s non può essere assegnato a %s.%s" + #~ msgid "%s.%s cannot be accessed" #~ msgstr "%s.%s non è accessibile" + #~ msgid "Plugins" #~ msgstr "Plugin" + #~ msgid "_Icon (name or file):" #~ msgstr "_Icona (nome o file):" - diff -Nru midori-0.2.8/po/ja.po midori-0.4.6/po/ja.po --- midori-0.2.8/po/ja.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/ja.po 2012-05-14 22:13:42.000000000 +0000 @@ -1,14 +1,14 @@ # Japanese translations for midori package. -# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# Copyright (C) 2008-2012 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. -# Masato Hashimoto 2008-2009 +# Masato Hashimoto 2008-2012 # msgid "" msgstr "" "Project-Id-Version: Midori 0.1.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-29 20:44+0900\n" -"PO-Revision-Date: 2010-08-29 20:43+0900\n" +"POT-Creation-Date: 2012-04-22 16:34+0900\n" +"PO-Revision-Date: 2012-04-25 20:31+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -17,349 +17,516 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=0;\n" -#: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "軽量級ウェブブラウザ" - -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 -#: ../midori/main.c:1665 ../midori/main.c:1681 -#: ../midori/midori-websettings.c:312 +#: ../data/midori.desktop.in.h:1 ../midori/main.c:2048 ../midori/main.c:2072 +#: ../midori/main.c:2086 ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:2 msgid "Web Browser" -msgstr "ウェブブラウザ" +msgstr "ウェブブラウザー" + +#: ../data/midori.desktop.in.h:3 +msgid "Browse the Web" +msgstr "ウェブを閲覧します" -#: ../midori/main.c:99 +#: ../data/midori.desktop.in.h:4 +msgid "Internet;WWW;Explorer" +msgstr "インターネット;WWW;エクスプローラー" + +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Midori プライベートブラウジング" + +#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:4164 +msgid "Private Browsing" +msgstr "プライベートブラウジング" + +#: ../data/midori-private.desktop.in.h:3 +msgid "Open a new private browsing window" +msgstr "新しいプライベートブラウジングウィンドウを開きます" + +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "設定を読み込めませんでした: %s\n" -#: ../midori/main.c:148 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "'%s' は %s の値として無効です" -#: ../midori/main.c:155 ../midori/main.c:241 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr "無効な設定値 '%s'" -#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 +#: ../midori/main.c:380 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "検索エンジンを読み込めませんでした。%s\n" + +#: ../midori/main.c:434 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "履歴のクリアに失敗しました: %s\n" + +#: ../midori/main.c:454 ../midori/main.c:581 +#: ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" msgstr "データベースのオープンに失敗しました: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:424 +#: ../midori/main.c:524 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "古い履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:455 ../panels/midori-history.c:169 -#: ../panels/midori-history.c:199 +#: ../midori/main.c:564 ../panels/midori-history.c:232 #, c-format msgid "Failed to remove history item: %s\n" msgstr "履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:500 +#: ../midori/main.c:611 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "ブックマークを保存できませんでした。%s" -#: ../midori/main.c:528 +#: ../midori/main.c:633 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "設定を保存できませんでした。%s" -#: ../midori/main.c:566 +#: ../midori/main.c:668 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "検索エンジンを保存できませんでした。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:586 ../midori/main.c:609 +#: ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" msgstr "ゴミ箱を保存できませんでした。%s" -#: ../midori/main.c:668 ../midori/main.c:908 +#: ../midori/main.c:746 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "エクステンション" + +#: ../midori/main.c:760 +msgid "Privacy" +msgstr "プライバシー" + +#: ../midori/main.c:772 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"Cookie には、ログインデータやゲームデータ、広告用のユーザープロファイルなどが" +"格納されます。" + +#: ../midori/main.c:828 #, c-format msgid "The session couldn't be saved. %s" msgstr "セッションは保存できませんでした。%s" -#: ../midori/main.c:852 +#: ../midori/main.c:1046 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "ルート証明書が利用できません。SSL 認証書を照合できませんでした。" -#: ../midori/main.c:942 +#: ../midori/main.c:1115 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 は最後に開いた時にクラッシュしたようです。もしこれが繰り返し発生するよ" +"うであれば、問題解決のために以下のオプションのいずれかを試してみてください。" -#: ../midori/main.c:957 +#: ../midori/main.c:1134 msgid "Modify _preferences" msgstr "設定を変更する(_P)" -#: ../midori/main.c:961 -msgid "Reset the last _session" -msgstr "最後のセッションをリセットする(_S)" - -#: ../midori/main.c:966 +#: ../midori/main.c:1138 msgid "Disable all _extensions" msgstr "すべてのエクステンションを無効にする(_E)" -#: ../midori/main.c:1206 ../midori/main.c:1952 +#: ../midori/main.c:1151 +msgid "Discard old tabs" +msgstr "以前のタブを破棄" + +#: ../midori/main.c:1152 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "最後のタブを読み込まずに表示" + +#: ../midori/main.c:1153 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "最後に開いたタブを表示" + +#: ../midori/main.c:1400 ../midori/main.c:2464 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "セッションを読み込めませんでした: %s\n" -#: ../midori/main.c:1328 -msgid "No filename specified" -msgstr "ファイル名が指定されていません" - -#: ../midori/main.c:1347 -msgid "An unknown error occured." -msgstr "未知のエラーが発生しました。" - -#: ../midori/main.c:1378 +#: ../midori/main.c:1538 #, c-format msgid "Snapshot saved to: %s\n" msgstr "スナップショットを取得しました: %s\n" # CLI --help -#: ../midori/main.c:1550 +#: ../midori/main.c:1951 msgid "Run ADDRESS as a web application" msgstr "ADDRESS をウェブアプリケーションとして実行する" -#: ../midori/main.c:1550 +#: ../midori/main.c:1951 msgid "ADDRESS" msgstr "ADDRESS" # CLI --help -#: ../midori/main.c:1553 +#: ../midori/main.c:1954 msgid "Use FOLDER as configuration folder" -msgstr "設定フォルダとして FOLDER を使用する" +msgstr "設定フォルダーとして FOLDER を使用する" -#: ../midori/main.c:1553 +#: ../midori/main.c:1954 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1556 +# CLI --help +#: ../midori/main.c:1957 +msgid "Private browsing, no changes are saved" +msgstr "プライベートブラウジングで変更を保存しない" + +#: ../midori/main.c:1959 msgid "Show a diagnostic dialog" msgstr "診断ダイアログを表示する" # CLI --help -#: ../midori/main.c:1558 +#: ../midori/main.c:1961 msgid "Run the specified filename as javascript" msgstr "指定されたファイル名を javascript として実行する" # CLI --help -#: ../midori/main.c:1561 +#: ../midori/main.c:1963 msgid "Take a snapshot of the specified URI" msgstr "指定された URI のスナップショットを取得する" # CLI --help -#: ../midori/main.c:1564 +#: ../midori/main.c:1965 msgid "Execute the specified command" msgstr "指定されたコマンドを実行する" +# CLI help +#: ../midori/main.c:1967 +msgid "List available commands to execute with -e/ --execute" +msgstr "-e/ --execute で実行できるコマンドの一覧を表示する" + # CLI --help -#: ../midori/main.c:1566 +#: ../midori/main.c:1969 msgid "Display program version" msgstr "プログラムのバージョンを表示する" -#: ../midori/main.c:1568 +#: ../midori/main.c:1971 msgid "Addresses" msgstr "アドレス" -#: ../midori/main.c:1570 +# CLI --help +#: ../midori/main.c:1973 msgid "Block URIs according to regular expression PATTERN" msgstr "正規表現 PATTERN に従って URI をブロックする" -#: ../midori/main.c:1570 +#: ../midori/main.c:1973 msgid "PATTERN" msgstr "PATTERN" # CLI --help #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1574 +#: ../midori/main.c:1977 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "非アクティブになって SECONDS 秒後に Midori をリセットする" -#: ../midori/main.c:1574 +#: ../midori/main.c:1977 msgid "SECONDS" msgstr "SECONDS" -#: ../midori/main.c:1654 +# CLI --help +#: ../midori/main.c:1980 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "コンソール警告を指定された FILENAME にリダイレクトする" + +#: ../midori/main.c:1980 +msgid "FILENAME" +msgstr "FILENAME" + +#: ../midori/main.c:2045 msgid "[Addresses]" msgstr "[アドレス]" -#: ../midori/main.c:1682 +#: ../midori/main.c:2087 msgid "Please report comments, suggestions and bugs to:" msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" -#: ../midori/main.c:1684 +#: ../midori/main.c:2089 msgid "Check for new versions at:" msgstr "新しいバージョンのチェックはこちら:" -#: ../midori/main.c:1801 -msgid "The specified configuration folder is invalid." -msgstr "指定された設定フォルダが正しくありません。" +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2173 +msgid "Saved logins and _passwords" +msgstr "ログインおよびパスワード情報(_P)" + +#: ../midori/main.c:2175 +msgid "Cookies and Website data" +msgstr "Cookie およびウェブサイトデータ" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2179 ../midori/midori-websettings.c:996 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "ウェブキャッシュ" + +#: ../midori/main.c:2182 +msgid "Website icons" +msgstr "ウェブサイトアイコン" + +#: ../midori/main.c:2288 +msgid "An unknown error occured" +msgstr "未知のエラーが発生しました" -#: ../midori/main.c:1849 +#: ../midori/main.c:2395 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" -#: ../midori/main.c:1904 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "検索エンジンを読み込めませんでした。%s\n" - -#: ../midori/main.c:1925 +#: ../midori/main.c:2431 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "ブックマークを読み込めませんでした: %s\n" -#: ../midori/main.c:1967 +#: ../midori/main.c:2479 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "ゴミ箱を読み込めませんでした: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:2492 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "履歴を読み込めませんでした: %s\n" -#: ../midori/main.c:1994 +#: ../midori/main.c:2508 msgid "The following errors occured:" msgstr "次のエラーが発生しました:" -#: ../midori/main.c:2010 +#: ../midori/main.c:2524 msgid "_Ignore" msgstr "無視(_I)" -#: ../midori/midori-array.c:429 +#: ../midori/midori-app.c:1334 +msgid "_Bookmark" +msgstr "ブックマーク(_B)" + +#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060 +msgid "_Bookmarks" +msgstr "ブックマーク(_B)" + +#: ../midori/midori-app.c:1336 +msgid "Add Boo_kmark" +msgstr "ブックマークに追加(_K)" + +#: ../midori/midori-app.c:1337 +msgid "_Console" +msgstr "コンソール(_C)" + +#: ../midori/midori-app.c:1338 +msgid "_Extensions" +msgstr "エクステンション(_E)" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589 +msgid "_History" +msgstr "履歴(_H)" + +#: ../midori/midori-app.c:1340 +msgid "_Homepage" +msgstr "ホームページ(_H)" + +#: ../midori/midori-app.c:1341 +msgid "_Userscripts" +msgstr "ユーザースクリプト(_U)" + +#: ../midori/midori-app.c:1342 +msgid "New _Tab" +msgstr "新しいタブ(_T)" + +#: ../midori/midori-app.c:1343 +msgid "_Transfers" +msgstr "転送(_T)" + +#: ../midori/midori-app.c:1344 +msgid "Netscape p_lugins" +msgstr "Netscape プラグイン(_L)" + +#: ../midori/midori-app.c:1345 +msgid "_Closed Tabs" +msgstr "閉じたタブ(_C)" + +#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216 +msgid "New _Window" +msgstr "新しいウィンドウ(_W)" + +#: ../midori/midori-app.c:1347 +msgid "New _Folder" +msgstr "新しいフォルダー(_F)" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "ファイルが見つかりません。" -#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 -#: ../midori/midori-array.c:496 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "不正な形式のドキュメントです。" -#: ../midori/midori-array.c:505 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "認識できないブックマーク形式です。" -#: ../midori/midori-array.c:719 +#: ../midori/midori-array.c:915 msgid "Writing failed." msgstr "書き込みに失敗しました。" -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 -#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298 +#: ../midori/midori-browser.c:5307 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 +#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" -#: ../midori/midori-browser.c:453 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% ロードしました" - -#: ../midori/midori-browser.c:491 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" msgstr "タイトルの更新に失敗しました: %s\n" -#: ../midori/midori-browser.c:504 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." msgstr "'%s' は想定外のアクションです。" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:569 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (プライベートブラウジング)" + +#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716 +msgid "Toplevel folder" +msgstr "トップレベルフォルダー" + +#: ../midori/midori-browser.c:774 msgid "New folder" -msgstr "新しいフォルダ" +msgstr "新しいフォルダー" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:774 msgid "Edit folder" -msgstr "フォルダの編集" +msgstr "フォルダーの編集" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "New bookmark" msgstr "新しいブックマーク" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "Edit bookmark" msgstr "ブックマークの編集" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:818 msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "説明(_D):" - -#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "アドレス(_A):" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326 msgid "_Folder:" -msgstr "フォルダ(_F):" - -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 -#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 -msgid "Toplevel folder" -msgstr "トップレベルフォルダ" +msgstr "フォルダー(_F):" -#: ../midori/midori-browser.c:872 +#: ../midori/midori-browser.c:877 msgid "Add to _Speed Dial" msgstr "スピードダイアルに追加(_S)" -#: ../midori/midori-browser.c:885 +#: ../midori/midori-browser.c:890 msgid "Show in the tool_bar" msgstr "ツールバーに表示する(_B)" -#: ../midori/midori-browser.c:900 +#: ../midori/midori-browser.c:905 msgid "Run as _web application" msgstr "ウェブアプリケーションとして実行する(_W)" -#: ../midori/midori-browser.c:979 +#: ../midori/midori-browser.c:976 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "ファイル \"%s\" をこのフォルダーに保存することはできません。" + +#: ../midori/midori-browser.c:978 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "この場所への書き込み権がありません。" + +#: ../midori/midori-browser.c:985 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "\"%s\" をダウンロードする十分な空きスペースがありません。" -#: ../midori/midori-browser.c:983 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "ファイルのダウンロードには %s 必要ですが、%s しか空きがありません。" -#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 -#: ../midori/midori-browser.c:4085 +#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395 msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1320 +msgid "New Window" +msgstr "新しいウィンドウ" + +#: ../midori/midori-browser.c:1320 +msgid "A new window has been opened" +msgstr "新しいウィンドウが開かれました" + +#: ../midori/midori-browser.c:1323 +msgid "New Tab" +msgstr "新しいタブ" + +#: ../midori/midori-browser.c:1323 +msgid "A new tab has been opened" +msgstr "新しいタブが開かれました" + +#: ../midori/midori-browser.c:1358 +msgid "Error opening the image!" +msgstr "画像を開く際にエラーが発生しました" + +#: ../midori/midori-browser.c:1359 +msgid "Can not open selected image in a default viewer." +msgstr "デフォルトの画像ビューアーでは選択された画像を開けません。" + +#: ../midori/midori-browser.c:1365 +msgid "Error downloading the image!" +msgstr "画像をダウンロードする際にエラーが発生しました" + +#: ../midori/midori-browser.c:1366 +msgid "Can not download selected image." +msgstr "選択された画像をダウンロードできません。" + +#: ../midori/midori-browser.c:1492 msgid "Save file" msgstr "ファイルの保存" -#: ../midori/midori-browser.c:2150 +#: ../midori/midori-browser.c:2367 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2228 +#: ../midori/midori-browser.c:2499 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -367,153 +534,148 @@ "Aggregator. Next time you click the news feed icon, it will be added " "automatically." msgstr "" -"上記 URI を使用するにはフィードリーダを開いてください。通常「新規に購読」、" +"上記 URI を使用するにはフィードリーダーを開いてください。通常「新規に購読」、" "「新規ニュースフィード」などのメニューやボタンがあります。\n" -"もしくは Midori の設定のアプリケーションタブでフィードリーダを指定してくださ" -"い。次にニュースフィードアイコンをクリックしたときに自動的に追加されます。" +"もしくは Midori の設定のアプリケーションタブでフィードリーダーを指定してくだ" +"さい。次にニュースフィードアイコンをクリックした時に自動的に追加されます。" -#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "新しいフィード" # tooltip -#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 -#: ../panels/midori-bookmarks.c:406 +#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "外部プログラムを実行できませんでした。" +#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "空です" -#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:3467 +msgid "Toggle text cursor navigation" +msgstr "テキストカーソルでのナビゲーションに切り替えます" + +#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "新規履歴アイテムの挿入に失敗しました: %s\n" -#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:734 +#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 msgid "Open all in _Tabs" msgstr "タブですべて開く(_T)" -#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 -#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 -#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657 +#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" -#: ../midori/midori-browser.c:3931 +#: ../midori/midori-browser.c:4213 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3932 +#: ../midori/midori-browser.c:4214 msgid "Kazehakase" msgstr "風博士" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:4215 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:4216 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3935 +#: ../midori/midori-browser.c:4217 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3959 +#: ../midori/midori-browser.c:4218 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4239 msgid "Import bookmarks..." msgstr "ブックマークのインポート..." -#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372 msgid "_Import bookmarks" msgstr "ブックマークのインポート(_I)" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:4253 msgid "_Application:" msgstr "アプリケーション(_A):" -#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 -#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 -#: ../katze/katze-utils.c:696 -msgid "Custom..." -msgstr "カスタム..." +#: ../midori/midori-browser.c:4318 +msgid "Import from XBEL or HTML file" +msgstr "XBEL または HTML ファイルからインポート" + +#: ../midori/midori-browser.c:4353 +msgid "Import from a file" +msgstr "ファイルからインポート" -#: ../midori/midori-browser.c:4061 +#: ../midori/midori-browser.c:4365 msgid "Failed to import bookmarks" msgstr "ブックマークのインポートに失敗しました" -#: ../midori/midori-browser.c:4102 -msgid "Failed to export bookmarks" -msgstr "ブックマークのエクスポートに失敗しました" +#: ../midori/midori-browser.c:4400 +msgid "XBEL Bookmarks" +msgstr "XBEL ブックマーク" + +#: ../midori/midori-browser.c:4405 +msgid "Netscape Bookmarks" +msgstr "Netscape ブックマーク" -#: ../midori/midori-browser.c:4155 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "履歴のクリアに失敗しました: %s\n" +#: ../midori/midori-browser.c:4419 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "" +"Midori は XBEL (*.xbel) および Netscape (*.html) へのみエクスポートできます" -#: ../midori/midori-browser.c:4163 -#, c-format -msgid "Failed to clear search history: %s\n" -msgstr "検索履歴のクリアに失敗しました: %s\n" +#: ../midori/midori-browser.c:4434 +msgid "Failed to export bookmarks" +msgstr "ブックマークのエクスポートに失敗しました" # Dialog title #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4270 +#: ../midori/midori-browser.c:4556 msgid "Clear Private Data" msgstr "プライベートデータのクリア" # Button label -#: ../midori/midori-browser.c:4274 +#: ../midori/midori-browser.c:4560 msgid "_Clear private data" msgstr "プライベートデータのクリア(_C)" -#: ../midori/midori-browser.c:4288 +#: ../midori/midori-browser.c:4573 msgid "Clear the following data:" msgstr "以下のデータをクリアします:" -#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:114 -msgid "History" -msgstr "履歴" - -#: ../midori/midori-browser.c:4303 -msgid "Cookies" -msgstr "Cookie" - -#: ../midori/midori-browser.c:4308 -msgid "'Flash' Cookies" -msgstr "'Flash' Cookie" - -#: ../midori/midori-browser.c:4313 -msgid "Website icons" -msgstr "ウェブサイトアイコン" +#: ../midori/midori-browser.c:4583 +msgid "Last open _tabs" +msgstr "最後に開いたタブ(_T)" -#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 -msgid "_Closed Tabs" -msgstr "閉じたタブ(_C)" - -#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "ウェブキャッシュ" - -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4609 msgid "Clear private data when _quitting Midori" msgstr "Midori 終了時にプライベートデータをクリアする(_Q)" -#: ../midori/midori-browser.c:4472 +#: ../midori/midori-browser.c:4804 msgid "A lightweight web browser." -msgstr "軽快なウェブブラウザ" +msgstr "軽快なウェブブラウザー" + +#: ../midori/midori-browser.c:4805 +msgid "See about:version for version info." +msgstr "バージョン情報は about:version をご覧ください。" -#: ../midori/midori-browser.c:4474 +#: ../midori/midori-browser.c:4807 msgid "" "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 " @@ -524,691 +686,511 @@ "団が発行する GNU 劣等一般公衆利用許諾契約書バージョン 2.1 あるいはそれ以降の" "いずれかの版で定める条件下で再配布および/または改変することができます。" -#: ../midori/midori-browser.c:4493 +#: ../midori/midori-browser.c:4828 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:4802 +#: ../midori/midori-browser.c:5214 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 -msgid "New _Window" -msgstr "新しいウィンドウ(_W)" - # tooltip -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:5217 msgid "Open a new window" msgstr "新しいウィンドウを開きます" # tooltip -#: ../midori/midori-browser.c:4808 +#: ../midori/midori-browser.c:5220 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:4810 -msgid "P_rivate Browsing" -msgstr "プライベートブラウジング(_R)" +#: ../midori/midori-browser.c:5222 +msgid "New P_rivate Browsing Window" +msgstr "新しいプライベートブラウジングウィンドウ(_R)" # tooltip -#: ../midori/midori-browser.c:4811 -msgid "Don't save any private data while browsing" -msgstr "閲覧中に個人データを保存しません" - -# tooltip -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:5226 msgid "Open a file" msgstr "ファイルを開きます" +#: ../midori/midori-browser.c:5228 +msgid "_Save Page As..." +msgstr "名前を付けてページを保存(_S)" + # tooltip -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:5229 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:4820 +#: ../midori/midori-browser.c:5231 msgid "Add to Speed _dial" msgstr "スピードダイアルに追加(_D)" -# tooltip -#: ../midori/midori-browser.c:4821 -msgid "Add shortcut to speed dial" -msgstr "ショートカットをスピードダイアルに追加します" - -#: ../midori/midori-browser.c:4823 +#: ../midori/midori-browser.c:5235 msgid "Add Shortcut to the _desktop" msgstr "デスクトップにショートカットを追加(_D)" -# tooltip -#: ../midori/midori-browser.c:4824 -msgid "Add shortcut to the desktop" -msgstr "デスクトップにショートカットを追加します" +#: ../midori/midori-browser.c:5237 +msgid "Create _Launcher" +msgstr "ランチャーの作成(_L)" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:5241 msgid "Subscribe to News _feed" msgstr "ニュースフィードを購読(_F)" -#: ../midori/midori-browser.c:4827 -msgid "Subscribe to this news feed" -msgstr "このニュースフィードを購読します" - -#: ../midori/midori-browser.c:4832 +#: ../midori/midori-browser.c:5247 msgid "_Close Tab" msgstr "タブを閉じる(_C)" # tooltip -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:5248 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:4835 +#: ../midori/midori-browser.c:5250 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" # tooltip -#: ../midori/midori-browser.c:4836 -msgid "Close this window" -msgstr "このウィンドウを閉じます" - -# tooltip -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:5254 msgid "Print the current page" msgstr "現在のページを印刷します" -# tooltip -#: ../midori/midori-browser.c:4842 -msgid "Quit the application" -msgstr "このアプリケーションを終了します" +#: ../midori/midori-browser.c:5256 +msgid "Close a_ll Windows" +msgstr "すべてのウィンドウを閉じる(_L)" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:5259 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:4848 -msgid "Undo the last modification" -msgstr "最後の修正を元に戻す" - -#: ../midori/midori-browser.c:4851 -msgid "Redo the last modification" -msgstr "最後の修正をやり直す" - -# tooltip -#: ../midori/midori-browser.c:4855 -msgid "Cut the selected text" -msgstr "選択した文字を切り取ります" - -# tooltip -#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 -msgid "Copy the selected text" -msgstr "選択した文字をコピーします" - -# tooltip -#: ../midori/midori-browser.c:4864 -msgid "Paste text from the clipboard" -msgstr "クリップボードから文字を貼り付けます" - -# tooltip -#: ../midori/midori-browser.c:4867 -msgid "Delete the selected text" -msgstr "選択した文字を削除します" +#: ../midori/midori-browser.c:5282 +msgid "_Find..." +msgstr "検索(_F)..." # tooltip -#: ../midori/midori-browser.c:4870 -msgid "Select all text" -msgstr "すべての文字を選択します" - -# tooltip -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:5283 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:4875 +#: ../midori/midori-browser.c:5285 msgid "Find _Next" msgstr "次を検索(_N)" -# tooltip -#: ../midori/midori-browser.c:4876 -msgid "Find the next occurrence of a word or phrase" -msgstr "指定文字列に一致する次の候補を検索します" - -#: ../midori/midori-browser.c:4878 +#: ../midori/midori-browser.c:5288 msgid "Find _Previous" msgstr "前を検索(_P)" # tooltip -#: ../midori/midori-browser.c:4879 -msgid "Find the previous occurrence of a word or phrase" -msgstr "指定文字列に一致する前の候補を検索します" - -# tooltip -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:5292 msgid "Configure the application preferences" msgstr "このアプリケーションの設定を行います" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:5294 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:4886 +#: ../midori/midori-browser.c:5295 msgid "_Toolbars" msgstr "ツールバー(_T)" +#: ../midori/midori-browser.c:5300 +msgid "Reload page without caching" +msgstr "ページをキャッシュせずに再読み込み" + # tooltip -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:5310 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" # tooltip -#: ../midori/midori-browser.c:4901 +#: ../midori/midori-browser.c:5313 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" -# tooltip -#: ../midori/midori-browser.c:4904 -msgid "Reset the zoom level" -msgstr "ズームレベルをリセットします" - -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:5317 msgid "_Encoding" msgstr "エンコーディング(_E)" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:5319 msgid "View So_urce" msgstr "ソースを表示(_U)" -# tooltip -#: ../midori/midori-browser.c:4908 -msgid "View the source code of the page" -msgstr "ページのソースコードを表示します" +#: ../midori/midori-browser.c:5322 +msgid "Ca_ret Browsing" +msgstr "キャレットブラウジング(_R)" # tooltip -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:5326 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:5328 msgid "Scroll _Left" msgstr "左へスクロール(_L)" -#: ../midori/midori-browser.c:4915 -msgid "Scroll to the left" -msgstr "左へスクロールします" - -#: ../midori/midori-browser.c:4917 +#: ../midori/midori-browser.c:5331 msgid "Scroll _Down" msgstr "下へスクロール(_D)" -#: ../midori/midori-browser.c:4918 -msgid "Scroll down" -msgstr "下へスクロール" - -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:5334 msgid "Scroll _Up" msgstr "上へスクロール(_U)" -#: ../midori/midori-browser.c:4921 -msgid "Scroll up" -msgstr "上へスクロール" - -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:5337 msgid "Scroll _Right" msgstr "右へスクロール(_R)" -#: ../midori/midori-browser.c:4924 -msgid "Scroll to the right" -msgstr "右へスクロールします" - -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:5340 msgid "_Go" msgstr "移動(_G)" # tooltip -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:5343 msgid "Go back to the previous page" msgstr "前のページへ戻ります" # tooltip -#: ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:5346 msgid "Go forward to the next page" msgstr "次のページへ進みます" # tooltip #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4937 +#: ../midori/midori-browser.c:5350 msgid "Go to the previous sub-page" msgstr "前のサブページへ戻ります" # tooltip #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:5354 msgid "Go to the next sub-page" msgstr "次のサブページへ進みます" # tooltip -#: ../midori/midori-browser.c:4944 +#: ../midori/midori-browser.c:5357 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:5359 msgid "Empty Trash" msgstr "ゴミ箱を空にする" -# tooltip -#: ../midori/midori-browser.c:4947 -msgid "Delete the contents of the trash" -msgstr "ゴミ箱の中身を削除します" - -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:5362 msgid "Undo _Close Tab" msgstr "閉じたタブを元に戻す(_C)" -# tooltip -#: ../midori/midori-browser.c:4950 -msgid "Open the last closed tab" -msgstr "最後に閉じたタブを開きます" - -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:5369 msgid "Add a new _folder" -msgstr "新しいフォルダの追加(_F)" +msgstr "新しいフォルダーの追加(_F)" -# tooltip -#: ../midori/midori-browser.c:4957 -msgid "Add a new bookmark folder" -msgstr "新しいブックマークフォルダを追加します" - -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:5375 msgid "_Export bookmarks" msgstr "ブックマークのエクスポート(_E)" -#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" -# tooltip -#: ../midori/midori-browser.c:4966 -msgid "Add, edit and remove search engines..." -msgstr "検索エンジンを追加、編集、または削除します..." - -#: ../midori/midori-browser.c:4969 +#: ../midori/midori-browser.c:5381 msgid "_Clear Private Data" msgstr "プライベートデータのクリア(_C)" -# tooltip -#: ../midori/midori-browser.c:4970 -msgid "Clear private data..." -msgstr "プライベートデータをクリアします..." - -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:5384 msgid "_Inspect Page" msgstr "ページの調査(_I)" -#: ../midori/midori-browser.c:4975 -msgid "Inspect page details and access developer tools..." -msgstr "ページの詳細を調査し開発者用ツールにアクセスします..." - -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:5388 msgid "_Previous Tab" msgstr "前のタブ(_P)" -# tooltip -#: ../midori/midori-browser.c:4981 -msgid "Switch to the previous tab" -msgstr "前のタブへ切り替えます" - -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:5391 msgid "_Next Tab" msgstr "次のタブ(_N)" -# tooltip -#: ../midori/midori-browser.c:4984 -msgid "Switch to the next tab" -msgstr "次のタブへ切り替えます" +#: ../midori/midori-browser.c:5393 +msgid "Move Tab _Backward" +msgstr "後ろのタブへ移動(_B)" + +#: ../midori/midori-browser.c:5395 +msgid "_Move Tab Forward" +msgstr "前のタブへ移動(_M)" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:5398 msgid "Focus _Current Tab" msgstr "現在のタブにフォーカス(_C)" -# tooltip -#: ../midori/midori-browser.c:4987 -msgid "Focus the current tab" -msgstr "現在のタブにフォーカスを移動します" - -#: ../midori/midori-browser.c:4989 -msgid "Minimize _Current Tab" -msgstr "現在のタブの最小化(_C)" - -# tooltip -#: ../midori/midori-browser.c:4990 -msgid "Minimize the current tab" -msgstr "現在のタブを最小化します" +#: ../midori/midori-browser.c:5401 +msgid "Focus _Next view" +msgstr "次のビューをフォーカス(_N)" + +#: ../midori/midori-browser.c:5404 +msgid "Only show the Icon of the _Current Tab" +msgstr "現在のタブのアイコンのみ表示(_C)" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:5407 msgid "_Duplicate Current Tab" msgstr "現在のタブの複製(_D)" -# tooltip -#: ../midori/midori-browser.c:4993 -msgid "Duplicate the current tab" -msgstr "現在のタブを複製します" - -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:5410 msgid "Close Ot_her Tabs" msgstr "他のタブを閉じる(_H)" -# tooltip -#: ../midori/midori-browser.c:4996 -msgid "Close all tabs except the current tab" -msgstr "現在のタブ以外を全て閉じます" - -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5413 msgid "Open last _session" msgstr "最後のセッションを開く(_S)" -#: ../midori/midori-browser.c:4999 -msgid "Open the tabs saved in the last session" -msgstr "最後のセッションで保存されたタブを開きます" - -#: ../midori/midori-browser.c:5001 +#: ../midori/midori-browser.c:5416 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:5003 -msgid "_Contents" -msgstr "目次(_C)" - -# tooltip -#: ../midori/midori-browser.c:5004 -msgid "Show the documentation" -msgstr "ドキュメントを表示します" - -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:5418 msgid "_Frequent Questions" msgstr "よくある質問(_F)" -# tooltip -#: ../midori/midori-browser.c:5007 -msgid "Show the Frequently Asked Questions" -msgstr "よくある質問とその回答を表示します" - -#: ../midori/midori-browser.c:5009 -msgid "_Report a Bug" -msgstr "バグを報告(_R)" +#: ../midori/midori-browser.c:5421 +msgid "_Report a Problem..." +msgstr "問題を報告(_R)" -# tooltip -#: ../midori/midori-browser.c:5010 -msgid "Open Midori's bug tracker" -msgstr "Midori のバグトラッカーを開きます" - -# tooltip -#: ../midori/midori-browser.c:5013 -msgid "Show information about the program" -msgstr "このプログラムについての情報を表示します" - -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:5433 msgid "_Menubar" msgstr "メニューバー(_M)" -# tooltip -#: ../midori/midori-browser.c:5022 -msgid "Show menubar" -msgstr "メニューバーを表示します" - -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:5437 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" -# tooltip -#: ../midori/midori-browser.c:5026 -msgid "Show navigationbar" -msgstr "ナビゲーションバーを表示します" - -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5441 msgid "Side_panel" msgstr "サイドパネル(_P)" -# tooltip -#: ../midori/midori-browser.c:5030 -msgid "Show sidepanel" -msgstr "サイドパネルを表示します" +#: ../midori/midori-browser.c:5442 +msgid "Sidepanel" +msgstr "サイドパネル" -#: ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:5445 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" -# tooltip -#: ../midori/midori-browser.c:5034 -msgid "Show bookmarkbar" -msgstr "ブックマークバーを表示します" - -#: ../midori/midori-browser.c:5037 -msgid "_Transferbar" -msgstr "転送バー(_T)" - -# tooltip -#: ../midori/midori-browser.c:5038 -msgid "Show transferbar" -msgstr "転送バーを表示します" - -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:5449 msgid "_Statusbar" msgstr "ステータスバー(_S)" -# tooltip -#: ../midori/midori-browser.c:5042 -msgid "Show statusbar" -msgstr "ステータスバーを表示します" - -#: ../midori/midori-browser.c:5050 +#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311 msgid "_Automatic" msgstr "自動(_A)" -#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236 msgid "Chinese (BIG5)" msgstr "中国語 (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5465 msgid "Japanese (SHIFT__JIS)" msgstr "日本語 (SHIFT__JIS)" -#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238 msgid "Korean (EUC-KR)" msgstr "韓国語 (EUC-KR)" -#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "カスタム..." + +#: ../midori/midori-browser.c:5985 msgid "_Separator" -msgstr "セパレータ(_S)" +msgstr "セパレーター(_S)" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5992 msgid "_Location..." msgstr "場所(_L)..." # tooltip -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5994 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:6016 msgid "_Web Search..." msgstr "ウェブ検索(_W)..." # tooltip -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:6018 msgid "Run a web search" msgstr "ウェブ検索を実行します" # tooltip -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:6045 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:5659 +# tooltip +#: ../midori/midori-browser.c:6062 +msgid "Show the saved bookmarks" +msgstr "ブックマークを表示します" + +#: ../midori/midori-browser.c:6079 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:6095 msgid "_Window" msgstr "ウィンドウ(_W)" # tooltip -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:6097 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:6111 msgid "_Menu" msgstr "メニュー(_M)" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:6113 msgid "Menu" msgstr "メニュー" -#: ../midori/midori-browser.c:6262 +#: ../midori/midori-browser.c:6927 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" -#: ../midori/midori-locationaction.c:390 +#: ../midori/midori-extension.c:329 #, c-format -msgid "Failed to select from history\n" -msgstr "履歴からの選択に失敗しました\n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "エクステンション '%s' の設定を読み込めませんでした: %s\n" -#: ../midori/midori-locationaction.c:474 +#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "%s を検索" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "エクステンション '%s' の設定を保存できませんでした: %s\n" -#: ../midori/midori-locationaction.c:497 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "%s で検索" -#: ../midori/midori-locationaction.c:1307 +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "他の検索エンジンで検索..." + +#: ../midori/midori-locationaction.c:537 +#, c-format +msgid "Failed to select from history\n" +msgstr "履歴からの選択に失敗しました\n" + +#: ../midori/midori-locationaction.c:624 #, c-format -msgid "Failed to execute database statement\n" -msgstr "データベース文の実行に失敗しました\n" +msgid "Search for %s" +msgstr "%s を検索" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1363 +#: ../midori/midori-locationaction.c:1398 msgid "Paste and p_roceed" -msgstr "貼り付けて続行(_R)" +msgstr "貼り付けて開く(_R)" -# tooltip -#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 -msgid "Detach chosen panel from the window" -msgstr "選択したパネルをウィンドウから切り離します" +#: ../midori/midori-locationaction.c:1739 +msgid "Not verified" +msgstr "未検証" + +#: ../midori/midori-locationaction.c:1759 +msgid "Verified and encrypted connection" +msgstr "検証済および暗号化接続" + +#: ../midori/midori-locationaction.c:1771 +msgid "Open, unencrypted connection" +msgstr "公開、非暗号化接続" # tooltip -#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 -#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" msgstr "サイドパネルを右側に配置します" # tooltip -#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "パネルを閉じます" # tooltip -#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "サイドパネルを左側に配置します" -# tooltip -#: ../midori/midori-panel.c:771 -msgid "Hide operating controls" -msgstr "操作コントロールを隠します" - -#: ../midori/midori-websettings.c:200 -msgid "Show Blank page" -msgstr "空白ページを表示" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "スピードダイアルを表示" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" msgstr "ホームページを表示" -#: ../midori/midori-websettings.c:202 -msgid "Show last open tabs" -msgstr "最後に開いたタブを表示" - -#: ../midori/midori-websettings.c:204 -msgid "Show last tabs without loading" -msgstr "最後のタブを読み込まずに表示" - -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:237 msgid "Japanese (SHIFT_JIS)" msgstr "日本語 (SHIFT_JIS)" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:257 msgid "New tab" msgstr "新しいタブ" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:258 msgid "New window" msgstr "新しいウィンドウ" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:259 msgid "Current tab" msgstr "現在のタブ" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:274 msgid "Default" msgstr "デフォルト" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:275 msgid "Icons" msgstr "アイコン" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:276 msgid "Small icons" msgstr "小さいアイコン" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:277 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:278 msgid "Icons and text" msgstr "アイコンと文字" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:279 msgid "Text beside icons" msgstr "アイコンと文字 (横方向)" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:294 msgid "Automatic (GNOME or environment)" msgstr "自動 (GNOME または環境変数)" -#: ../midori/midori-websettings.c:279 -msgid "HTTP proxy server" -msgstr "HTTP プロキシサーバ" - -#: ../midori/midori-websettings.c:280 -msgid "No proxy server" -msgstr "プロキシサーバなし" - #: ../midori/midori-websettings.c:295 -msgid "All cookies" -msgstr "すべての Cookie" +msgid "HTTP proxy server" +msgstr "HTTP プロキシサーバー" #: ../midori/midori-websettings.c:296 -msgid "Session cookies" -msgstr "セッションの Cookie" - -#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 -msgid "None" -msgstr "なし" +msgid "No proxy server" +msgstr "プロキシサーバーなし" #: ../midori/midori-websettings.c:313 msgid "Safari" @@ -1226,1352 +1208,1351 @@ msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:400 msgid "Remember last window size" msgstr "最後のウィンドウサイズを記憶する" # tooltip -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:401 msgid "Whether to save the last window size" msgstr "最後のウィンドウサイズを記憶します" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:409 msgid "Last window width" msgstr "最後のウィンドウの幅" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:410 msgid "The last saved window width" msgstr "最後に保存されたウィンドウ幅" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:418 msgid "Last window height" msgstr "最後のウィンドウの高さ" # tooltip -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:419 msgid "The last saved window height" msgstr "最後に保存されたウィンドウの高さにします" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:444 msgid "Last panel position" msgstr "最後のパネルの位置" # tooltip -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:445 msgid "The last saved panel position" msgstr "最後に保存されたパネルの位置にします" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:454 msgid "Last panel page" msgstr "最後のパネルページ" # tooltip -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:455 msgid "The last saved panel page" msgstr "最後に保存されたパネルのページです" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:463 msgid "Last Web search" msgstr "最後のウェブ検索" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:464 msgid "The last saved Web search" msgstr "最後に保存されたウェブ検索です" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:473 msgid "Show Menubar" msgstr "メニューバーを表示する" # tooltip -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:474 msgid "Whether to show the menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:482 msgid "Show Navigationbar" msgstr "ナビゲーションバーを表示する" # tooltip -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:483 msgid "Whether to show the navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:491 msgid "Show Bookmarkbar" msgstr "ブックマークバーを表示する" # tooltip -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:492 msgid "Whether to show the bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:500 msgid "Show Panel" msgstr "パネルを表示する" # tooltip -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:501 msgid "Whether to show the panel" msgstr "パネルを表示します" -#: ../midori/midori-websettings.c:485 -msgid "Show Transferbar" -msgstr "転送バーを表示する" - -# tooltip -#: ../midori/midori-websettings.c:486 -msgid "Whether to show the transferbar" -msgstr "転送バーを表示します" - -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:509 msgid "Show Statusbar" msgstr "ステータスバーを表示する" # tooltip -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:510 msgid "Whether to show the statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:519 msgid "Toolbar Style:" msgstr "ツールバー方式:" # tooltip -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:520 msgid "The style of the toolbar" msgstr "ツールバーの表示方式を指定します" -#: ../midori/midori-websettings.c:521 -msgid "Show progress in location entry" -msgstr "ロケーションエントリに進捗を表示する" - -# tooltip -#: ../midori/midori-websettings.c:522 -msgid "Whether to show loading progress in the location entry" -msgstr "ロケーションエントリ内に読み込みの進捗状況を表示します" - -#: ../midori/midori-websettings.c:537 -msgid "Search engines in location completion" -msgstr "場所の補完に検索エンジンを使用する" - -# tooltip -#: ../midori/midori-websettings.c:538 -msgid "Whether to show search engines in the location completion" -msgstr "場所の補完候補内から検索エンジンを使用できるようにします" - -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:529 msgid "Toolbar Items" msgstr "ツールバーアイテム" # tooltip -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:530 msgid "The items to show on the toolbar" msgstr "ツールバーに表示するアイテムを指定します" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:538 msgid "Compact Sidepanel" msgstr "サイドパネルをコンパクトにする" # tooltip -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:539 msgid "Whether to make the sidepanel compact" msgstr "サイドパネルの表示をコンパクトにします" -#: ../midori/midori-websettings.c:571 -msgid "Show operating controls of the panel" -msgstr "パネルの操作コントロールを表示する" - -# tooltip -#: ../midori/midori-websettings.c:572 -msgid "Whether to show the operating controls of the panel" -msgstr "パネルに操作コントロールを表示します" - -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:554 msgid "Align sidepanel on the right" msgstr "サイドパネルを右側に配置する" # tooltip -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:555 msgid "Whether to align the sidepanel on the right" msgstr "サイドパネルを右側に表示します" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:570 msgid "Open panels in separate windows" msgstr "パネルを別のウィンドウで開く" # tooltip -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:571 msgid "Whether to always open panels in separate windows" msgstr "パネルを常に別のウィンドウで開きます" -#: ../midori/midori-websettings.c:613 +#: ../midori/midori-websettings.c:580 msgid "When Midori starts:" msgstr "Midori を起動した時:" # tooltip -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:581 msgid "What to do when Midori starts" msgstr "Midori の起動時に表示するページを指定します" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:590 msgid "Homepage:" msgstr "ホームページ:" # tooltip -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:591 msgid "The homepage" msgstr "ホームページを指定します" -#: ../midori/midori-websettings.c:639 +#: ../midori/midori-websettings.c:606 msgid "Show crash dialog" msgstr "クラッシュダイアログを表示する" # tooltip -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:607 msgid "Show a dialog after Midori crashed" msgstr "Midori がクラッシュした後の起動時にダイアログを表示します" -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:656 -msgid "Show speed dial in new tabs" -msgstr "新しいタブにスピードダイアルを表示する" - -# tooltip -#: ../midori/midori-websettings.c:657 -msgid "Show speed dial in newly opened tabs" -msgstr "新しく開かれたタブにスピードダイアルを表示します" - -#: ../midori/midori-websettings.c:665 -msgid "Save downloaded files to:" -msgstr "ダウンロードファイルの保存先:" - -# tooltip -#: ../midori/midori-websettings.c:666 -msgid "The folder downloaded files are saved to" -msgstr "ダウンロードファイルの保存先を指定します" - -#: ../midori/midori-websettings.c:687 -msgid "Ask for the destination folder" -msgstr "保存先フォルダを問い合わせる" - -# tooltip -#: ../midori/midori-websettings.c:688 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "ファイルをダウンロードする時に保存先フォルダを問い合わせます" - -#: ../midori/midori-websettings.c:707 -msgid "Notify when a transfer has been completed" -msgstr "転送が完了したら通知する" - -# tooltip -#: ../midori/midori-websettings.c:708 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "転送が完了したら通知します" - -#: ../midori/midori-websettings.c:720 -msgid "Download Manager" -msgstr "ダウンロードマネージャ" +#: ../midori/midori-websettings.c:615 +msgid "Save downloaded files to:" +msgstr "ダウンロードファイルの保存先:" # tooltip -#: ../midori/midori-websettings.c:721 -msgid "An external download manager" -msgstr "外部ダウンロードマネージャを指定します" +#: ../midori/midori-websettings.c:616 +msgid "The folder downloaded files are saved to" +msgstr "ダウンロードファイルの保存先を指定します" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:624 msgid "Text Editor" -msgstr "テキストエディタ" +msgstr "テキストエディター" # tooltip -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:625 msgid "An external text editor" -msgstr "外部テキストエディタを指定します" +msgstr "外部テキストエディターを指定します" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:640 msgid "News Aggregator" -msgstr "フィードリーダ" +msgstr "フィードリーダー" # tooltip -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:641 msgid "An external news aggregator" -msgstr "外部フィードリーダを指定します" +msgstr "外部フィードリーダーを指定します" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:649 msgid "Location entry Search" msgstr "ロケーションエントリの検索" # tooltip -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:650 msgid "The search to perform inside the location entry" msgstr "ロケーションエントリに入力された文字列の検索エンジンを指定します" -#: ../midori/midori-websettings.c:763 +#: ../midori/midori-websettings.c:658 msgid "Preferred Encoding" msgstr "文字のエンコーディング" # tooltip -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:659 msgid "The preferred character encoding" msgstr "文字のエンコーディングを指定します" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:669 msgid "Always Show Tabbar" msgstr "常にタブバーを表示する" # tooltip -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:670 msgid "Always show the tabbar" msgstr "常にタブバーを表示します" -#: ../midori/midori-websettings.c:783 +#: ../midori/midori-websettings.c:683 msgid "Close Buttons on Tabs" msgstr "タブに閉じるボタンを表示する" # tooltip -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:684 msgid "Whether tabs have close buttons" msgstr "タブに閉じるボタンを表示します" -#: ../midori/midori-websettings.c:792 +#: ../midori/midori-websettings.c:709 msgid "Open new pages in:" msgstr "新しくページを開く時:" # tooltip -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:710 msgid "Where to open new pages" msgstr "新しいページをどこに開くか指定します" -#: ../midori/midori-websettings.c:802 -msgid "Open external pages in:" -msgstr "外部ページを開く時:" - -# tooltip -#: ../midori/midori-websettings.c:803 -msgid "Where to open externally opened pages" -msgstr "外部のページをどこに開くか指定します" - -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:719 msgid "Middle click opens Selection" msgstr "選択範囲を中央クリックで開く" # tooltip -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:720 msgid "Load an address from the selection via middle click" msgstr "選択したアドレスをマウスの中央クリックで読み込みます" -#: ../midori/midori-websettings.c:821 +#: ../midori/midori-websettings.c:728 msgid "Open tabs in the background" msgstr "タブをバックグラウンドで開く" # tooltip -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:729 msgid "Whether to open new tabs in the background" msgstr "新しいタブをバックグラウンドで開きます" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:737 msgid "Open Tabs next to Current" msgstr "現在のタブの隣に開く" # tooltip -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:738 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "新しいタブを現在のタブの隣に開くか、最後のタブの隣に開くかを指定します" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:746 msgid "Open popups in tabs" msgstr "ポップアップをタブに開く" # tooltip -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:747 msgid "Whether to open popup windows in tabs" msgstr "ポップアップウィンドウをタブに開きます" -#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "画像を自動的に読み込む" # tooltip -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:758 msgid "Load and display images automatically" msgstr "画像を自動的に読み込んで表示します" -#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 msgid "Enable scripts" msgstr "スクリプトを有効にする" # tooltip -#: ../midori/midori-websettings.c:859 +#: ../midori/midori-websettings.c:766 msgid "Enable embedded scripting languages" msgstr "組み込みスクリプト言語を有効にします" -#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" msgstr "Netscape プラグインを有効にする" # tooltip -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:774 msgid "Enable embedded Netscape plugin objects" msgstr "組み込み Netscape プラグインオブジェクトを有効にします" -#: ../midori/midori-websettings.c:883 +#: ../midori/midori-websettings.c:789 +msgid "Enable Spell Checking" +msgstr "スペルチェックを有効にする" + +# tooltip +#: ../midori/midori-websettings.c:790 +msgid "Enable spell checking while typing" +msgstr "キー入力中のスペルチェックを有効にします" + +#: ../midori/midori-websettings.c:796 msgid "Enable HTML5 database support" msgstr "HTML5 データベースサポートを有効にする" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:797 msgid "Whether to enable HTML5 database support" msgstr "HTML5 データベースサポートを有効にします" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:803 msgid "Enable HTML5 local storage support" msgstr "HTML5 ローカルストレージサポートを有効にする" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:804 msgid "Whether to enable HTML5 local storage support" msgstr "HTML5 ローカルストレージサポートを有効にします" -#: ../midori/midori-websettings.c:899 +#: ../midori/midori-websettings.c:810 msgid "Enable offline web application cache" msgstr "オフラインウェブアプリケーションキャッシュを有効にする" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:811 msgid "Whether to enable offline web application cache" msgstr "オフラインウェブアプリケーションキャッシュを有効にします" -#: ../midori/midori-websettings.c:925 +#: ../midori/midori-websettings.c:827 +msgid "Flash window on background tabs" +msgstr "バックグラウンドでタブが開いた時にウィンドウを点滅する" + +#: ../midori/midori-websettings.c:828 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "" +"新しいタブがバックグラウンドで開かれたときにブラウザーウィンドウを点滅します" + +#: ../midori/midori-websettings.c:836 +msgid "Enable WebGL support" +msgstr "WebGL サポートを有効にする" + +#: ../midori/midori-websettings.c:837 +msgid "Allow websites to use OpenGL rendering" +msgstr "すべてのウェブサイトで OpenGL レンダリングを許可します" + +#: ../midori/midori-websettings.c:863 msgid "Zoom Text and Images" msgstr "文字や画像を拡大/縮小する" # tooltip -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:864 msgid "Whether to zoom text and images" msgstr "文字や画像の拡大/縮小を可能にします" -#: ../midori/midori-websettings.c:941 +#: ../midori/midori-websettings.c:879 msgid "Find inline while typing" msgstr "キー入力中に自動的に検索する" # tooltip -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:880 msgid "Whether to automatically find inline while typing" msgstr "インライン検索において、キー入力に従い自動的に検索します" -#: ../midori/midori-websettings.c:957 +#: ../midori/midori-websettings.c:895 msgid "Kinetic scrolling" msgstr "慣性スクロール" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:896 msgid "Whether scrolling should kinetically move according to speed" msgstr "速度にしたがって慣性がかかったようにスクロールします" -#: ../midori/midori-websettings.c:966 -msgid "Accept cookies" -msgstr "Cookie の受け入れ" - -# tooltip -#: ../midori/midori-websettings.c:967 -msgid "What type of cookies to accept" -msgstr "Cookie を受け入れる方式を選択します" - -#: ../midori/midori-websettings.c:976 -msgid "Maximum cookie age" -msgstr "Cookie の最大保存日数" +#: ../midori/midori-websettings.c:904 +msgid "Delete old Cookies after:" +msgstr "古い Cookie を削除:" # tooltip -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:905 msgid "The maximum number of days to save cookies for" -msgstr "Cookie を保存する最大の日数です" +msgstr "Cookie を保存する最大日数です" -#: ../midori/midori-websettings.c:986 -msgid "Maximum history age" -msgstr "履歴の最大保存日数" +#: ../midori/midori-websettings.c:921 +msgid "Only accept Cookies from sites you visit" +msgstr "訪問したウェブサイトからの Cookie のみ受け入れる" -# tooltip -#: ../midori/midori-websettings.c:987 -msgid "The maximum number of days to save the history for" -msgstr "履歴を保存する最大の日数です" +#: ../midori/midori-websettings.c:922 +msgid "Block cookies sent by third-party websites" +msgstr "サードパーティウェブサイトから送られた Cookie はブロックします" -#: ../midori/midori-websettings.c:995 -msgid "Remember last downloaded files" -msgstr "最後のダウンロードファイルを記憶する" +#: ../midori/midori-websettings.c:936 +msgid "Delete pages from history after:" +msgstr "履歴から古いページを削除:" # tooltip -#: ../midori/midori-websettings.c:996 -msgid "Whether the last downloaded files are saved" -msgstr "最後にダウンロードしたファイルを記憶します" +#: ../midori/midori-websettings.c:937 +msgid "The maximum number of days to save the history for" +msgstr "履歴を保存する最大日数です" -#: ../midori/midori-websettings.c:1013 +#: ../midori/midori-websettings.c:952 msgid "Proxy server" -msgstr "プロキシサーバ" +msgstr "プロキシサーバー" -#: ../midori/midori-websettings.c:1014 +#: ../midori/midori-websettings.c:953 msgid "The type of proxy server to use" -msgstr "使用するプロキシサーバの種類を指定します" +msgstr "使用するプロキシサーバーの種類を指定します" -#: ../midori/midori-websettings.c:1023 +#: ../midori/midori-websettings.c:962 msgid "HTTP Proxy Server" -msgstr "HTTP プロキシサーバ" +msgstr "HTTP プロキシサーバー" # tooltip -#: ../midori/midori-websettings.c:1024 +#: ../midori/midori-websettings.c:963 msgid "The proxy server used for HTTP connections" -msgstr "HTTP 接続でプロキシサーバを使用する場合に設定します" +msgstr "HTTP 接続でプロキシサーバーを使用する場合に設定します" + +#: ../midori/midori-websettings.c:978 +msgid "Port" +msgstr "ポート" + +# tooltip +#: ../midori/midori-websettings.c:979 +msgid "The proxy server port used for HTTP connections" +msgstr "HTTP 接続で使用するプロキシサーバーのポート番号を設定します" + +# tooltip +#: ../midori/midori-websettings.c:997 +msgid "The maximum size of cached pages on disk" +msgstr "ディスクのキャッシュページの最大サイズを指定します" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1040 +#: ../midori/midori-websettings.c:1014 msgid "Identify as" msgstr "識別名" # tooltip -#: ../midori/midori-websettings.c:1041 +#: ../midori/midori-websettings.c:1015 msgid "What to identify as to web pages" -msgstr "ウェブページに報告するユーザエージェントの識別名を指定します" +msgstr "ウェブページに報告するユーザーエージェントの識別名を指定します" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1031 msgid "Identification string" msgstr "識別文字列" # tooltip -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1032 msgid "The application identification string" msgstr "アプリケーション識別文字列です" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1048 msgid "Preferred languages" msgstr "言語の優先度" -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:1049 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "" "複数言語で構成されたウェブページを描画する際の言語の優先度をカンマで区切って" -"指定します。例 \"ja\"、\"en-us\" または \"ja;q=1.0, en-us;q=0.667\"" +"指定します。例: \"ja\"、\"en-us\"、\"ja;q=1.0, en-us;q=0.667\" など" # Button title -#: ../midori/midori-websettings.c:1089 +#: ../midori/midori-websettings.c:1064 msgid "Clear private data" msgstr "プライベートデータのクリア" # FIXME: -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1065 msgid "The private data selected for deletion" 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:1227 ../midori/midori-view.c:4442 -#: ../midori/midori-view.c:4446 +#: ../midori/midori-websettings.c:1080 +msgid "Clear data" +msgstr "データのクリア" + +# FIXME: +#: ../midori/midori-websettings.c:1081 +msgid "The data selected for deletion" +msgstr "選択されているデータを削除します" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1130 +msgid "Strip referrer details sent to websites" +msgstr "外部サイトへ送るリファラーの詳細情報を除去する" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1132 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "\"Referer\" ヘッダーはホスト名に短縮されます" + +#: ../midori/midori-websettings.c:1146 +msgid "Always use my font choices" +msgstr "常にこの設定を使用する" + +#: ../midori/midori-websettings.c:1147 +msgid "Override fonts picked by websites with user preferences" +msgstr "ウェブサイトで指定されているフォントより本設定を優先します" + +#: ../midori/midori-view.c:1360 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s は HTML5 データベースの保存を要求しています。" + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Deny" +msgstr "許可しない(_D)" + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Allow" +msgstr "許可する(_A)" + +#: ../midori/midori-view.c:1392 +#, c-format +msgid "%s wants to know your location." +msgstr "%s はあなたの場所を知ろうとしています。" + +#: ../midori/midori-view.c:1485 #, c-format msgid "Error - %s" msgstr "エラー - %s" -#: ../midori/midori-view.c:1228 +#: ../midori/midori-view.c:1486 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "ページ '%s' を読み込めませんでした" -#: ../midori/midori-view.c:1230 +#: ../midori/midori-view.c:1488 msgid "Try again" msgstr "再試行" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1249 -#, c-format -msgid "Not found - %s" -msgstr "ページが見つかりません - %s" - -#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 +#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598 #, c-format msgid "Send a message to %s" msgstr "メッセージを送信します 宛先: %s" -#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 +#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747 msgid "Inspect _Element" msgstr "要素の検証(_E)" -#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2480 msgid "Open Link in New _Tab" msgstr "リンクを新しいタブで開く(_T)" -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2484 msgid "Open Link in _Foreground Tab" -msgstr "リンクをフォアグラウンドのタブで開く(_T)" +msgstr "リンクをフォアグラウンドのタブで開く(_F)" -#: ../midori/midori-view.c:2118 +#: ../midori/midori-view.c:2485 msgid "Open Link in _Background Tab" -msgstr "リンクをバックグラウンドのタブで開く(_T)" +msgstr "リンクをバックグラウンドのタブで開く(_B)" -#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2488 msgid "Open Link in New _Window" msgstr "リンクを新しいウィンドウで開く(_W)" -#: ../midori/midori-view.c:2124 +#: ../midori/midori-view.c:2491 msgid "Open Link as Web A_pplication" msgstr "ウェブアプリケーションとして実行する(_P)" -#: ../midori/midori-view.c:2127 +#: ../midori/midori-view.c:2496 msgid "Copy Link de_stination" msgstr "リンク先をコピー(_S)" -#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 -msgid "_Save Link destination" -msgstr "リンク先を保存(_S)" - -#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 -msgid "_Download Link destination" -msgstr "リンク先をダウンロード(_D)" - -#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 -#: ../midori/midori-view.c:2207 -msgid "Download with Download _Manager" -msgstr "ダウンロードマネージャでダウンロード(_M)" - -#: ../midori/midori-view.c:2144 +#: ../midori/midori-view.c:2512 msgid "Open _Image in New Tab" msgstr "画像を新しいタブで開く(_I)" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2515 msgid "Copy Image _Address" msgstr "画像のアドレスをコピー(_A)" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2518 msgid "Save I_mage" msgstr "画像を保存(_M)" -#: ../midori/midori-view.c:2151 -msgid "Download I_mage" -msgstr "画像をダウンロード(_M)" +#: ../midori/midori-view.c:2521 +msgid "Open in Image _Viewer" +msgstr "画像ビューアーで開く(_V)" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2528 msgid "Copy Video _Address" msgstr "動画のアドレスをコピー(_A)" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2531 msgid "Save _Video" msgstr "動画を保存(_V)" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2531 msgid "Download _Video" msgstr "動画をダウンロード(_V)" -#: ../midori/midori-view.c:2224 +#: ../midori/midori-view.c:2557 msgid "Search _with" msgstr "検索(_W)" -#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2589 msgid "_Search the Web" msgstr "ウェブで検索(_S)" -#: ../midori/midori-view.c:2287 +#: ../midori/midori-view.c:2606 msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:2591 +#: ../midori/midori-view.c:2909 msgid "Open or download file" msgstr "ファイルを開きますか、保存しますか?" -#: ../midori/midori-view.c:2610 +#: ../midori/midori-view.c:2929 #, c-format msgid "File Type: '%s'" msgstr "ファイルタイプ: '%s'" -#: ../midori/midori-view.c:2613 +#: ../midori/midori-view.c:2931 #, 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:2617 +#: ../midori/midori-view.c:2935 +#, c-format +msgid "File Name: %s" +msgstr "ファイル名: %s" + +#: ../midori/midori-view.c:2955 #, c-format msgid "Open %s" msgstr "%s を開く" -#: ../midori/midori-view.c:3158 +#: ../midori/midori-view.c:3576 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:3439 -msgid "Speed dial" +#: ../midori/midori-view.c:3923 +msgid "Speed Dial" msgstr "スピードダイアル" -#: ../midori/midori-view.c:3440 +#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020 msgid "Click to add a shortcut" msgstr "クリックするとショートカットを追加できます" -#: ../midori/midori-view.c:3441 +#: ../midori/midori-view.c:3925 msgid "Enter shortcut address" msgstr "ショートカットのアドレスを入力してください" -#: ../midori/midori-view.c:3442 +#: ../midori/midori-view.c:3926 msgid "Enter shortcut title" msgstr "ショートカットの名前を入力してください" -#: ../midori/midori-view.c:3443 +#: ../midori/midori-view.c:3927 msgid "Are you sure you want to delete this shortcut?" msgstr "このショートカットを削除してもよろしいですか?" -#: ../midori/midori-view.c:3444 -msgid "Set number of columns and rows" -msgstr "行数と列数を設定" - -#: ../midori/midori-view.c:3445 -msgid "Enter number of columns and rows:" -msgstr "行数および列数を入力してください:" - -#: ../midori/midori-view.c:3446 -msgid "Invalid input for the size of the speed dial" -msgstr "入力されたスピードダイアルのサイズは正しくありません" - -#: ../midori/midori-view.c:3447 -msgid "Thumb size:" -msgstr "サムネイルサイズ:" +#: ../midori/midori-view.c:4089 +#, c-format +msgid "No documentation installed" +msgstr "ドキュメントはインストールされていません" -#: ../midori/midori-view.c:3448 -msgid "Small" -msgstr "小さい" +#: ../midori/midori-view.c:4165 +msgid "Midori doesn't store any personal data:" +msgstr "Midori はあらゆる個人データを保存しません:" + +#: ../midori/midori-view.c:4166 +msgid "No history or web cookies are being saved." +msgstr "履歴あるいはウェブ Cookie は保存されません。" + +#: ../midori/midori-view.c:4167 +msgid "Extensions are disabled." +msgstr "エクステンションは無効になります。" -#: ../midori/midori-view.c:3449 -msgid "Medium" -msgstr "普通" +#: ../midori/midori-view.c:4168 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "" +"HTML5 ストレージ、ローカルデータベース、およびアプリケーションキャッシュは無" +"効になります。" -#: ../midori/midori-view.c:3450 -msgid "Big" -msgstr "大きい" +#: ../midori/midori-view.c:4169 +msgid "Midori prevents websites from tracking the user:" +msgstr "Midori はウェブサイトによるユーザーのトラッキングを阻止します:" + +#: ../midori/midori-view.c:4170 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "リファラー URL はホスト名に短縮されます。" + +#: ../midori/midori-view.c:4171 +msgid "DNS prefetching is disabled." +msgstr "DNS プリフェッチは無効になります。" + +#: ../midori/midori-view.c:4172 +msgid "The language and timezone are not revealed to websites." +msgstr "言語およびタイムゾーンはウェブサイトには通知されません。" -#: ../midori/midori-view.c:3476 -#, c-format -msgid "Document cannot be displayed" -msgstr "ドキュメントを表示できません" +#: ../midori/midori-view.c:4173 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "" +"Flash およびその他の Netscape プラグインはウェブサイトには記録されません。" -#: ../midori/midori-view.c:3499 -#, c-format -msgid "No documentation installed" -msgstr "ドキュメントはインストールされていません" +#: ../midori/midori-view.c:4222 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "" +"カッコ内のバージョン番号は実行中に使用されているバージョンを表しています。" -#: ../midori/midori-view.c:3618 +#: ../midori/midori-view.c:4278 msgid "Page loading delayed" -msgstr "ページ読み込みの保留" +msgstr "読み込みが保留されたページ" -#: ../midori/midori-view.c:3619 +#: ../midori/midori-view.c:4279 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "最近のクラッシュか起動設定により読み込みが保留されています。" -#: ../midori/midori-view.c:3620 +#: ../midori/midori-view.c:4280 msgid "Load Page" msgstr "ページを読み込む" -#: ../midori/midori-view.c:3764 +#: ../midori/midori-view.c:4446 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-view.c:4018 +#: ../midori/midori-view.c:4708 msgid "_Duplicate Tab" msgstr "タブの複製(_D)" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4713 msgid "Show Tab _Label" msgstr "タブラベルの表示(_L)" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4713 msgid "Show Tab _Icon Only" msgstr "タブアイコンのみ表示(_I)" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4719 msgid "Close ot_her Tabs" msgstr "他のタブを閉じる(_H)" -#: ../midori/midori-view.c:4680 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5532 +msgid "previous" +msgstr "前" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5551 +msgid "next" +msgstr "次" + +#: ../midori/midori-view.c:5564 msgid "Print background images" msgstr "背景画像を印刷する" # tooltip -#: ../midori/midori-view.c:4681 +#: ../midori/midori-view.c:5565 msgid "Whether background images should be printed" -msgstr "印刷するときに背景画像も印刷します" +msgstr "印刷する時に背景画像も印刷します" -#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:5597 msgid "Features" msgstr "機能" -#. Page "General" -#: ../midori/midori-preferences.c:301 -msgid "General" -msgstr "一般" - -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "起動" -# tooltip -#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 -msgid "Use current page as homepage" -msgstr "現在のページをホームページにします" +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "現在のページを使用(_C)" -#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "転送" +#: ../midori/midori-preferences.c:314 +msgid "Use current page as homepage" +msgstr "現在のページをホームページにする" #. Page "Appearance" -#: ../midori/midori-preferences.c:352 -msgid "Appearance" -msgstr "外観" - -#: ../midori/midori-preferences.c:353 -msgid "Font settings" -msgstr "フォント設定" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "フォント" -#: ../midori/midori-preferences.c:355 -msgid "Default Font Family" -msgstr "デフォルトフォントファミリ" +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "プロポーショナルフォントファミリ" # tooltip -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "文字表示で使用するデフォルトのフォントファミリを指定します" # tooltip -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "文字表示で使用するデフォルトのフォントサイズを指定します" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "等幅フォントファミリ" # tooltip -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "等幅文字表示で使用するフォントファミリを指定します" # tooltip -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" msgstr "等幅文字表示で使用するフォントのサイズを指定します" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "最小フォントサイズ" # tooltip -#: ../midori/midori-preferences.c:374 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "文字表示で使用する最小のフォントサイズを指定します" #. Page "Behavior" -#: ../midori/midori-preferences.c:383 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "振る舞い" -#: ../midori/midori-preferences.c:396 -msgid "Enforce 96 dots per inch" -msgstr "強制的に 96DPI にする" - -# tooltip -#: ../midori/midori-preferences.c:397 -msgid "Enforce a video dot density of 96 DPI" -msgstr "ドット密度を強制的に 96DPI にします" - -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "ポップアップを表示するスクリプトを許可する" # tooltip -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "ポップアップウィンドウを自動的に開くスクリプトの実行を許可します" -#: ../midori/midori-preferences.c:422 -msgid "Spell Checking" -msgstr "スペルチェック" - -#: ../midori/midori-preferences.c:425 -msgid "Enable Spell Checking" -msgstr "スペルチェックを有効にする" - -# tooltip -#: ../midori/midori-preferences.c:426 -msgid "Enable spell checking while typing" -msgstr "キー入力中のスペルチェックを有効にします" - -#: ../midori/midori-preferences.c:428 -msgid "Spelling dictionaries:" -msgstr "スペルチェック辞書:" - -# tooltip -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:432 -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:438 -msgid "Interface" -msgstr "インターフェイス" - -#: ../midori/midori-preferences.c:439 -msgid "Navigationbar" -msgstr "ナビゲーションバー" - -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "ブラウジング" -#. Page "Applications" -#: ../midori/midori-preferences.c:471 -msgid "Applications" -msgstr "アプリケーション" - -#: ../midori/midori-preferences.c:472 -msgid "External applications" -msgstr "外部アプリケーション" - #. Page "Network" -#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "ネットワーク" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:463 msgid "Hostname" msgstr "ホスト名" -#. Page "Privacy" -#: ../midori/midori-preferences.c:514 -msgid "Privacy" -msgstr "プライバシー" - -#: ../midori/midori-preferences.c:515 -msgid "Web Cookies" -msgstr "ウェブ Cookie" - -#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 -msgid "days" -msgstr "日" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "MB" -#: ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "空です" - -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "検索エンジンの追加" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "検索エンジンの編集" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "名前(_N):" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "説明(_D):" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "アイコン(_I):" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "トークン(_T):" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "検索エンジンの管理" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "デフォルトで使う(_D)" -#: ../midori/sokoke.c:1303 -msgid "_Bookmark" -msgstr "ブックマーク(_B)" - -#: ../midori/sokoke.c:1304 -msgid "_Bookmarks" -msgstr "ブックマーク(_B)" - -#: ../midori/sokoke.c:1305 -msgid "Add Boo_kmark" -msgstr "ブックマークに追加(_K)" - -#: ../midori/sokoke.c:1306 -msgid "_Console" -msgstr "コンソール(_C)" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "アプリケーションで開く" -#: ../midori/sokoke.c:1307 -msgid "_Extensions" -msgstr "エクステンション(_E)" +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "\"%s\" を開くアプリケーションまたはコマンドを選択してください:" -#: ../midori/sokoke.c:1308 -msgid "_History" -msgstr "履歴(_H)" +#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "外部プログラムを実行できませんでした。" -#: ../midori/sokoke.c:1309 -msgid "_Homepage" -msgstr "ホームページ(_H)" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d 時間" +msgstr[1] "%d 時間" -#: ../midori/sokoke.c:1310 -msgid "_Userscripts" -msgstr "ユーザスクリプト(_U)" +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d 分" +msgstr[1] "%d 分" -#: ../midori/sokoke.c:1311 -msgid "New _Tab" -msgstr "新しいタブ(_T)" +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d 秒" +msgstr[1] "%d 秒" -#: ../midori/sokoke.c:1312 -msgid "_Transfers" -msgstr "転送(_T)" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s / %s" -#: ../midori/sokoke.c:1313 -msgid "Netscape p_lugins" -msgstr "Netscape プラグイン(_L)" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/sokoke.c:1316 -msgid "New _Folder" -msgstr "新しいフォルダ(_F)" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr " - 残り %s" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:201 +#: ../toolbars/midori-findbar.c:291 msgid "_Inline Find:" msgstr "インライン検索(_I)" -#: ../toolbars/midori-findbar.c:233 +#: ../toolbars/midori-findbar.c:317 msgid "Previous" msgstr "前を検索" -#: ../toolbars/midori-findbar.c:239 +#: ../toolbars/midori-findbar.c:323 msgid "Next" msgstr "次を検索" -#: ../toolbars/midori-findbar.c:243 +#: ../toolbars/midori-findbar.c:327 msgid "Match Case" msgstr "大文字・小文字を区別" -#: ../toolbars/midori-findbar.c:252 +#: ../toolbars/midori-findbar.c:336 msgid "Highlight Matches" msgstr "強調表示" -#: ../toolbars/midori-findbar.c:263 +#: ../toolbars/midori-findbar.c:347 msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 -#, c-format -msgid "%s of %s" -msgstr "%s / %s" - -#: ../toolbars/midori-transferbar.c:123 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "ファイル '%s' をダウンロードしました。" -#: ../toolbars/midori-transferbar.c:126 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "転送完了" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "ダウンロードしたファイルに問題があります。" + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"リンク先で示されているチェックサムとマッチしませんでした。ファイルのダウン" +"ロードが正常に終了しなかったか、その後変更された可能性があります。" + +#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "すべてクリア" -#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 +#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 msgid "Some files are being downloaded" msgstr "ファイルのダウンロード中です" -#: ../toolbars/midori-transferbar.c:306 +#: ../toolbars/midori-transferbar.c:377 msgid "_Quit Midori" msgstr "Midori を終了(_Q)" -#: ../toolbars/midori-transferbar.c:308 +#: ../toolbars/midori-transferbar.c:379 msgid "The transfers will be cancelled if Midori quits." msgstr "Midori を終了すると転送がキャンセルされます。" -#: ../panels/midori-bookmarks.c:116 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "ブックマーク" -#: ../panels/midori-bookmarks.c:275 +#: ../panels/midori-bookmarks.c:257 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "ブックマークアイテムの追加に失敗しました: %s\n" # tooltip -#: ../panels/midori-bookmarks.c:414 +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "選択したブックマークを編集します" # tooltip -#: ../panels/midori-bookmarks.c:422 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "選択したブックマークを削除します" -#: ../panels/midori-bookmarks.c:436 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" -msgstr "新しいフォルダの追加" +msgstr "新しいフォルダーの追加" -#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 +#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 msgid "Separator" -msgstr "セパレータ" - -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "コンソール" - -#: ../panels/midori-console.c:361 -msgid "Copy _All" -msgstr "全てコピー(_A)" +msgstr "セパレーター" -# tooltip -#: ../panels/midori-console.c:362 -msgid "Copy All" -msgstr "全てコピー" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "履歴" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "エクステンション" +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "今日" -#: ../panels/midori-history.c:146 -msgid "A week ago" -msgstr "一週間前" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "昨日" -#: ../panels/midori-history.c:148 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d 日前" msgstr[1] "%d 日前" -#: ../panels/midori-history.c:151 -msgid "Today" -msgstr "今日" - -#: ../panels/midori-history.c:153 -msgid "Yesterday" -msgstr "昨日" +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "一週間前" -#: ../panels/midori-history.c:324 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" msgstr "すべての履歴アイテムを削除してよろしいですか?" # tooltip -#: ../panels/midori-history.c:369 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" msgstr "選択した履歴アイテムをブックマークに追加します" # tooltip -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" msgstr "選択した履歴アイテムを削除します" # tooltip -#: ../panels/midori-history.c:386 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "すべての履歴をクリアします" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "転送" + +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" -msgstr "保存先フォルダを開く(_F)" +msgstr "保存先フォルダーを開く(_F)" -#: ../panels/midori-transfers.c:484 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" msgstr "リンクの場所をコピー(_A)" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "認証が要求されました" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" msgstr "" -"この場所を開くためにはユーザ名とパスワードが\n" +"この場所を開くためにはユーザー名とパスワードが\n" "必要です:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" -msgstr "ユーザ名" +msgstr "ユーザー名" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "パスワード" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "パスワードを記憶する(_R)" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "アイコン名 '%s' を読み込めませんでした" -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "ストックアイコン '%s' を読み込めませんでした" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "アニメーションフレームは壊れています" -#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 +#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" msgstr "'%s' は %s のプロパティとして無効です" -#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 -#: ../extensions/addons.c:119 +#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "ファイルの選択" -#: ../katze/katze-utils.c:564 +#: ../katze/katze-utils.c:506 msgid "Choose folder" -msgstr "フォルダの選択" +msgstr "フォルダーの選択" + +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "なし" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "1 時間以上過去" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "1 日以上過去" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "1 週間以上過去" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "1 ヶ月以上過去" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "1 年以上過去" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "%s の設定" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:473 msgid "Configure Advertisement filters" -msgstr "広告フィルタの設定" +msgstr "広告フィルターの設定" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:504 #, 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:587 -msgid "Configure _Advertisement filters..." -msgstr "広告フィルタの設定(_A)..." +"リストに追加するには、フィルターリストのアドレスを入力し \"追加\" ボタンをク" +"リックしてください。フィルターリストは %s で見つけることができます。" -#: ../extensions/adblock.c:841 +#: ../extensions/adblock.c:882 msgid "Edit rule" msgstr "ルールの編集" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:896 msgid "_Rule:" msgstr "ルール(_R):" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:950 msgid "Bl_ock image" msgstr "画像をブロック(_O)" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:955 msgid "Bl_ock link" msgstr "リンクをブロック(_O)" -#: ../extensions/adblock.c:1494 +#: ../extensions/adblock.c:1670 msgid "Advertisement blocker" -msgstr "広告ブロッカ" +msgstr "広告ブロッカー" # description -#: ../extensions/adblock.c:1495 +#: ../extensions/adblock.c:1671 msgid "Block advertisements according to a filter list" -msgstr "フィルタリストに登録された広告をブロックします" +msgstr "フィルターリストに登録された広告をブロックします" + +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "" +"このページにはユーザースクリプトが含まれているようです。それをインストールし" +"てもよろしいですか?" -#: ../extensions/addons.c:130 ../extensions/addons.c:325 +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "ユーザースクリプトをインストール(_I)" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "" +"このページはユーザースタイルを含んでいるようです。それをインストールしますか?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "ユーザースタイルをインストール(_I)" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "インストールしない" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" -msgstr "ユーザスクリプト" +msgstr "ユーザースクリプト" -#: ../extensions/addons.c:135 ../extensions/addons.c:327 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" -msgstr "ユーザスタイル" +msgstr "ユーザースタイル" -#: ../extensions/addons.c:191 ../extensions/addons.c:256 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "エラー" -#: ../extensions/addons.c:231 +#: ../extensions/addons.c:421 #, c-format -msgid "" -"Do you really want to remove '%s'?\n" -"\n" -"The file '%s' will be permanently lost.\n" -msgstr "" -"'%s' を本当に削除しますか？\n" -"\n" -"ファイル '%s' は完全に失われます｡\n" +msgid "Do you want to delete '%s'?" +msgstr "'%s' を削除してよろしいですか?" + +#: ../extensions/addons.c:427 +msgid "Delete user script" +msgstr "ユーザースクリプトの削除" -#: ../extensions/addons.c:1231 +#: ../extensions/addons.c:428 +msgid "Delete user style" +msgstr "ユーザースタイルの削除" + +#: ../extensions/addons.c:431 #, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "エクステンション '%s' の設定を保存できませんでした: %s\n" +msgid "The file %s will be permanently deleted." +msgstr "ファイル %s は完全に削除されます。" + +# tooltip +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "テキストエディターで開きます" + +# tooltip +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "対象フォルダーを開きます" + +# tooltip +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "新しいアドオンを追加します" + +# tooltip +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "選択したアドオンを削除します" -#: ../extensions/addons.c:1232 ../extensions/addons.c:1397 +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" -msgstr "ユーザアドオン" +msgstr "ユーザーアドオン" -#: ../extensions/addons.c:1354 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" -msgstr "フォルダ '%s' をモニタできません: %s" +msgstr "フォルダー '%s' をモニターできません: %s" -#: ../extensions/addons.c:1398 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" -msgstr "ユーザスクリプトやユーザスタイルをサポートします" +msgstr "ユーザースクリプトやユーザースタイルをサポートします" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "カラフルタブ" # description -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "各タブにそれぞれを区別する色をつけます" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" -msgstr "Cookie マネージャ" +msgstr "Cookie マネージャー" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "すべて削除" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 +#: ../extensions/cookie-manager/cookie-manager-page.c:105 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." msgstr "" -"表示されているすべての cookie を削除します。フィルタが設定されていれば、フィ" -"ルタにマッチした cookie のみ削除されます。" +"表示されているすべての Cookie を削除します。フィルターが設定されていれば、" +"フィルターにマッチした Cookie のみ削除されます。" # tooltip -#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "すべて展開します" # tooltip -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "すべて折り畳みます" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" -msgstr "本当にすべての cookie を削除してよろしいですか?" +msgstr "本当にすべての Cookie を削除してよろしいですか?" # Dialog title -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "確認" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." -msgstr "フィルタに入力された文字列にマッチした cookie のみ削除されます。" +msgstr "フィルターに入力された文字列にマッチした Cookie のみ削除されます。" -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "セッションの終わりまで" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2589,16 +2570,16 @@ "有効期限: %s" # cookie: Secure flag is set. -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "あり" # cookie: Secure flag isn't set. -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "なし" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" @@ -2608,61 +2589,49 @@ "Cookie の数: %d" # Column name of cookie browser -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "名前" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "すべて展開する(_E)" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "すべて折り畳む(_C)" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 msgid "Filter:" -msgstr "フィルタ:" +msgstr "フィルター:" # tooltip -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 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" -msgstr "Cookie マネージャ(_C)" +"フィルターに入力された文字列と、名前またはドメインフィールドがマッチした " +"Cookie のみ表示します。" # description -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Cookie の一覧や内容の表示および削除を行います" -#: ../extensions/copy-tabs.c:39 +#: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" msgstr "タブのアドレスをコピー(_A)" # name of extension -#: ../extensions/copy-tabs.c:98 +#: ../extensions/copy-tabs.c:95 msgid "Copy Addresses of Tabs" msgstr "タブのアドレスのコピー" -#: ../extensions/copy-tabs.c:99 +#: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" msgstr "すべてのタブのアドレスをクリップボードにコピーします" -#: ../extensions/external-applications.vala:93 -msgid "External Applications" -msgstr "外部アプリケーション" - -#: ../extensions/external-applications.vala:94 -msgid "Associate URL schemes with external commands" -msgstr "URL スキームに外部コマンドを割り当てます" - #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "XML データ内に要求された Atom \"entry\" 要素が見つかりませんでした。" @@ -2672,25 +2641,25 @@ msgstr "XML データ内に要求された Atom \"feed\" 要素が見つかりませんでした。" #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "最終更新: %s" -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "フィード" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "新しいフィードの追加" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "フィードの削除" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "フィード(_F)" @@ -2735,308 +2704,279 @@ msgid "Error loading feed '%s'" msgstr "フィード '%s' の読み込みでエラーです" -#: ../extensions/feed-panel/main.c:520 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "フィードパネル" # description -#: ../extensions/feed-panel/main.c:521 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Atom/RSS フィードを購読します" -#: ../extensions/formhistory.c:142 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" msgstr "フォーム値の追加に失敗しました: %s\n" -#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "フォーム履歴" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"パスワードデータベースを開くための\n" +"マスターパスワードが必要です" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "このページのパスワードを記憶しますか?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "記憶する" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "今はしない" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "このページではしない" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "フォーム履歴の切り替え" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "現在のタブでのフォーム履歴を有効または無効にします。" + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "データベース文の実行に失敗しました: %s\n" -#: ../extensions/formhistory.c:503 +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "タブごとにホットキー (Ctrl+Shift+F) でのみフォーム履歴を有効にする" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "入力フォーム履歴フィルター" + +#: ../extensions/formhistory/formhistory.c:669 msgid "Stores history of entered form data" msgstr "入力されたフォームデータの履歴を記憶します" -#: ../extensions/formhistory.c:507 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 #, c-format -msgid "Not available: %s" -msgstr "利用できません: %s" +msgid "Failed to select suggestions\n" +msgstr "サジェスチョンの選択に失敗しました\n" -#: ../extensions/formhistory.c:508 -msgid "Resource files not installed" -msgstr "リソースファイルがインストールされていません" +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "訪れていないタブはありません" -#: ../extensions/formhistory.c:514 -msgid "Form history filler" -msgstr "入力フォーム履歴フィルタ" - -#: ../extensions/history-list.vala:174 -msgid "Next Tab (History List)" -msgstr "次のタブ (履歴リスト)" - -#: ../extensions/history-list.vala:175 -msgid "Next tab from history" -msgstr "履歴から次のタブへ切り替えます" - -#: ../extensions/history-list.vala:184 -msgid "Previous Tab (History List)" -msgstr "前のタブ (履歴リスト)" +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "履歴リスト" -#: ../extensions/history-list.vala:185 -msgid "Previous tab from history" -msgstr "履歴から前のタブへ切り替えます" +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "タブを閉じるときの振る舞い" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "何もしない" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "最後に表示したタブへ切り替える" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "最新のタブへ切り替える" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "次の新しいタブ (履歴リスト)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "履歴から次の新しいタブへ切り替えます" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "前の新しいタブ (履歴リスト)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "履歴から前の新しいタブへ切り替えます" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "タブをバックグラウンドに表示 (履歴リスト)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "現在選択しているタブをバックグラウンドに表示します" -#: ../extensions/history-list.vala:245 +#: ../extensions/history-list.vala:569 msgid "History List" msgstr "履歴リスト" -#: ../extensions/history-list.vala:246 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "最後に使用された順の履歴から選択したタブに切り替えます" +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "タブの切り替えや閉じた時に最後に使用したタブに移動します" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "マウスジェスチャ" # description -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 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 -msgid "Pageholder" -msgstr "ページホルダ" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "ページホルダ(_P)" - -#: ../extensions/page-holder.c:178 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "タブとは別に 1 つ以上のページをパネルに表示します" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "ページの再読み込みまたは読み込みの停止" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "キーボードショートカットのカスタマイズ" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "ショートカットのカスタマイズ(_O)..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "ショートカット" # description -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "キーボードショートカットの表示および編集を行います" -#: ../extensions/status-clock.c:176 +#: ../extensions/status-clock.c:174 msgid "Statusbar Clock" msgstr "ステータスバー時計" -#: ../extensions/status-clock.c:177 +#: ../extensions/status-clock.c:175 msgid "Display date and time in the statusbar" msgstr "ステータスバーに日付と時刻を表示します" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "画像" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "スクリプト" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Netscape プラグイン" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "ステータスバー機能" # description -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" msgstr "ウェブページへの機能のオン/オフを簡単に切り替えます" -#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "タブパネル" -#: ../extensions/tab-panel.c:612 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "タブパネル(_A)" # description -#: ../extensions/tab-panel.c:629 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "タブを縦のパネルに表示します" # name of extension -#: ../extensions/tabs-minimized.c:79 +#: ../extensions/tabs-minimized.c:76 msgid "Only Icons on Tabs by default" msgstr "デフォルトでタブのアイコンのみ表示" -#: ../extensions/tabs-minimized.c:80 +#: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" msgstr "デフォルトで新しいタブのラベルを表示しません" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "ツールバーのカスタマイズ" -#: ../extensions/toolbar-editor.c:405 +#: ../extensions/toolbar-editor.c:409 msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " +"Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" "ツールバーに表示するアイテムを選択してください。表示順はドラッグアンドドロッ" "プで変更できます。" -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "利用可能なアイテム" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "表示するアイテム" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "ツールバーのカスタマイズ(_T)..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "カスタマイズ(_C)..." + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" -msgstr "ツールバーエディタ" +msgstr "ツールバーエディター" # description -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" msgstr "ツールバーのレイアウトを簡単に編集できます" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "HTTP 通信をディスクにキャッシュします" -#~ msgid "_Restore Tab" -#~ msgstr "タブの復元(_R)" - -#~ msgid "_Minimize Tab" -#~ msgstr "タブの最小化(_M)" +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "指定された設定フォルダーが正しくありません。" -#~ msgid "Erroneous clock time" -#~ msgstr "時刻の誤り" +#~ msgid "Cookies" +#~ msgstr "Cookie" -#~ msgid "" -#~ "The clock time lies in the past. Please check the current date and time." -#~ msgstr "" -#~ "時計時刻が過去になっています。現在の日付と時刻をチェックしてください。" +#~ msgid "'Flash' Cookies" +#~ msgstr "'Flash' Cookie" -#~ msgid "Copy %s to the folder %s." -#~ msgstr "%s をフォルダ %s へコピーします。" +#~ msgid "HTML5 _Databases" +#~ msgstr "HTML5 データベース(_D)" -#~ msgid "Minimize new Tabs" -#~ msgstr "新規タブの最小化" +#~ msgid "Offline Application Cache" +#~ msgstr "オフラインアプリケーションキャッシュ" -#~ msgid "New tabs open minimized" -#~ msgstr "新しいタブを最小化して開きます" - -#~ msgid "_Recently visited pages" -#~ msgstr "最近訪れたページ(_R)" - -# tooltip -#~ msgid "Reopen pages that you visited earlier" -#~ msgstr "以前に訪れたページを再び開きます" - -#~ msgid "Original cookies only" -#~ msgstr "オリジナルの Cookie のみ" - -# tooltip -#~ msgid "Accept cookies from the original website only" -#~ msgstr "オリジナルのウェブサイトからの Cookie のみ受け入れます" - -#~ msgid "Remember last visited pages" -#~ msgstr "最後に訪れたページを記憶する" - -# tooltip -#~ msgid "Whether the last visited pages are saved" -#~ msgstr "最後に訪れたページを記憶します" - -#~ msgid "Detect proxy server automatically" -#~ msgstr "プロキシサーバを自動検出する" - -# tooltip -#~ msgid "" -#~ "Whether to detect the proxy server automatically from the environment" -#~ msgstr "プロキシサーバをシステム環境から自動的に検出します" - -# tooltip -#~ msgid "Show the saved bookmarks" -#~ msgstr "ブックマークを表示します" - -#~ msgid "Set number of shortcuts" -#~ msgstr "ショートカットの設定" - -#~ msgid "Enter number of shortcuts:" -#~ msgstr "ショートカット数を入力してください:" - -#, fuzzy -#~ msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" -#~ msgstr "設定を読み込めませんでした: %s\n" - -#~ msgid "" -#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "" -#~ "ユーザスクリプトをフォルダ %s へ、ユーザスタイルをフォルダ %s へコピーしま" -#~ "す。" - -#~ msgid "Open _Link" -#~ msgstr "リンクを開く(_L)" - -#~ msgid "Open Image in New Wi_ndow" -#~ msgstr "画像を新しいウィンドウで開く(_N)" - -#~ msgid "REGEX" -#~ msgstr "REGEX" - -#~ msgid "Not available on this platform" -#~ msgstr "このプラットフォームでは利用できません" - -#~ msgid "Failed to get current time: %s\n" -#~ msgstr "現在時刻の取得に失敗しました: %s\n" - -#~ msgid "Show panel _titles" -#~ msgstr "パネルタイトルの表示(_T)" - -#~ msgid "Options" -#~ msgstr "オプション" - -#~ msgid "Spell checking languages:" -#~ msgstr "スペルチェックする言語:" - -#~ msgid "View Selection Source" -#~ msgstr "選択領域のソースを表示" - -# tooltip -#, fuzzy -#~ msgid "View the source code of the selection" -#~ msgstr "ページのソースコードを表示します" - -#, fuzzy -#~ msgid "Shrink images automatically" -#~ msgstr "画像を自動的に読み込む" - -# description -#, fuzzy -#~ msgid "Tint tabs distinctly" -#~ msgstr "各タブにそれぞれを区別する色をつけます" +#~ msgid "Lightweight web browser" +#~ msgstr "軽量級ウェブブラウザー" -#~ msgid "DNS prefetching" -#~ msgstr "DNS プリフェッチ" +#~ msgid "Not available: %s" +#~ msgstr "利用できません: %s" -#~ msgid "Prefetch IP addresses of hovered links" -#~ msgstr "マウスポインタを置いたリンクの IP アドレスを先読みします" +#~ msgid "Resource files not installed" +#~ msgstr "リソースファイルがインストールされていません" diff -Nru midori-0.2.8/po/ko.po midori-0.4.6/po/ko.po --- midori-0.2.8/po/ko.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/ko.po 2012-05-14 22:13:42.000000000 +0000 @@ -1,358 +1,533 @@ # Korean translations for midori package. -# Copyright (C) 2009 THE midori'S COPYRIGHT HOLDER +# Copyright (C) 2007-2012 Christian Dywan et al. # This file is distributed under the same license as the midori package. # Seo Sanghyeon 2009 -# Kim Boram 2009-2010 -# +# Kim Boram 2009-2012 +# +# Note: Report-Mstid-Bugs-To에는 xfce-i18n 를 넣습니다. +# Lauguage에는 소문자로 ko를 넣습니다. +# +# Please write your name and e-mail into header description and +# "translator-credits" if you update this translation script. +# +# ex ) msgstr "" +# "Gil-dong Hong \n" +# "YourName Kim " +# msgid "" msgstr "" -"Project-Id-Version: midori 0.2.7\n" +"Project-Id-Version: midori 0.2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-15 14:18+0900\n" -"PO-Revision-Date: 2010-07-13 00:30+0900\n" +"POT-Creation-Date: 2012-04-24 12:18+0000\n" +"PO-Revision-Date: 2012-02-13 13:56+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" +"Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "가벼운 웹 브라우저" +msgid "Browse the Web" +msgstr "웹 찾아보기" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1331 ../midori/main.c:1660 -#: ../midori/main.c:1668 ../midori/main.c:1684 -#: ../midori/midori-websettings.c:311 +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "인터넷;WWW;익스플로러" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072 +#: ../midori/main.c:2086 ../midori/midori-websettings.c:312 msgid "Midori" msgstr "미도리" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "웹 브라우저" -#: ../midori/main.c:99 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "미도리 개인 정보 보호 모드" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "새 사생활 보호 모드 창 열기" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164 +msgid "Private Browsing" +msgstr "사생활 보호 모드" + +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "설정을 읽을 수 없습니다: %s\n" -#: ../midori/main.c:148 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" -msgstr "값 '%s'은(는) %s에 대한 잘못된 값입니다" +msgstr "값 '%s'은(는) %s의 잘못된 값입니다" -#: ../midori/main.c:155 ../midori/main.c:241 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr " '%s'은(는) 잘못된 설정 값입니다." -#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 +#: ../midori/main.c:380 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "검색 엔진을 불러올 수 없습니다. %s\n" + +#: ../midori/main.c:434 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "기록을 제거할 수 없습니다: %s\n" + +#: ../midori/main.c:454 ../midori/main.c:581 +#: ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" msgstr "데이터베이스에 접속할 수 없음: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:424 +#: ../midori/main.c:524 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "오래된 기록 항목을 지울 수 없습니다: %s\n" -#: ../midori/main.c:455 ../panels/midori-history.c:169 -#: ../panels/midori-history.c:199 +#: ../midori/main.c:564 ../panels/midori-history.c:232 #, c-format msgid "Failed to remove history item: %s\n" msgstr "기록 항목을 제거할 수 없습니다: %s\n" -#: ../midori/main.c:500 +#: ../midori/main.c:611 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "책갈피를 저장할 수 없습니다.%s" -#: ../midori/main.c:531 +#: ../midori/main.c:633 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "설정을 저장할 수 없습니다. %s" -#: ../midori/main.c:569 +#: ../midori/main.c:668 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "검색 엔진을 저장할 수 없습니다. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:589 ../midori/main.c:612 +#: ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" msgstr "휴지통을 저장할 수 없습니다.%s" -#: ../midori/main.c:671 ../midori/main.c:911 +#: ../midori/main.c:746 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "확장 기능" + +#: ../midori/main.c:760 +msgid "Privacy" +msgstr "개인 정보" + +#: ../midori/main.c:772 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"쿠키는 로그인 데이터, 게임 기록 또는 광고 목적의 사용자 프로필을 보관하고 있" +"습니다." + +#: ../midori/main.c:828 #, c-format msgid "The session couldn't be saved. %s" msgstr "세션을 저장할 수 없습니다.%s" -#: ../midori/main.c:855 +#: ../midori/main.c:1046 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" "사용 가능한 루트 인증서 파일이 없습니다. SSL 인증서를 검증할 수 없습니다." -#: ../midori/main.c:945 +#: ../midori/main.c:1115 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:960 +#: ../midori/main.c:1134 msgid "Modify _preferences" msgstr "기본 설정 수정(_P)" -#: ../midori/main.c:964 -msgid "Reset the last _session" -msgstr "마지막 세션 초기화(_S)" - -#: ../midori/main.c:969 +#: ../midori/main.c:1138 msgid "Disable all _extensions" -msgstr "모든 확장 기능 비 활성화(_E)" +msgstr "모든 확장 기능 사용하지 않기(_E)" + +#: ../midori/main.c:1151 +msgid "Discard old tabs" +msgstr "오래된 탭 버리기" -#: ../midori/main.c:1209 ../midori/main.c:1955 +#: ../midori/main.c:1152 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "마지막 탭을 불러오지는 않고 표시" + +#: ../midori/main.c:1153 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "마지막에 연 탭 표시" + +#: ../midori/main.c:1400 ../midori/main.c:2464 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "세션을 열 수 없습니다: %s\n" -#: ../midori/main.c:1331 -msgid "No filename specified" -msgstr "파일 이름이 지정되지 않았습니다." - -#: ../midori/main.c:1350 -msgid "An unknown error occured." -msgstr "알 수 없는 오류가 발생했습니다." - -#: ../midori/main.c:1381 +#: ../midori/main.c:1538 #, c-format msgid "Snapshot saved to: %s\n" -msgstr "스냅샷이 다음에 저장되었습니다: %s\n" +msgstr "스냅샷을 다음에 저장했습니다: %s\n" -#: ../midori/main.c:1553 +#: ../midori/main.c:1951 msgid "Run ADDRESS as a web application" msgstr "[주소]를 웹 응용 프로그램으로 실행" -#: ../midori/main.c:1553 +#: ../midori/main.c:1951 msgid "ADDRESS" msgstr "[주소]" -#: ../midori/main.c:1556 +#: ../midori/main.c:1954 msgid "Use FOLDER as configuration folder" msgstr "[폴더]를 설정 폴더로 사용" -#: ../midori/main.c:1556 +#: ../midori/main.c:1954 msgid "FOLDER" msgstr "[폴더]" -#: ../midori/main.c:1559 +#: ../midori/main.c:1957 +msgid "Private browsing, no changes are saved" +msgstr "개인 정보 보호 모드, 바뀐 사항을 저장하지 않습니다." + +#: ../midori/main.c:1959 msgid "Show a diagnostic dialog" msgstr "진단 대화 상자 보기" -#: ../midori/main.c:1561 +#: ../midori/main.c:1961 msgid "Run the specified filename as javascript" msgstr "특정한 파일 이름을 자바 스크립트로 실행" -#: ../midori/main.c:1564 +#: ../midori/main.c:1963 msgid "Take a snapshot of the specified URI" msgstr "지정한 주소의 스냅샷 저장" -#: ../midori/main.c:1567 +#: ../midori/main.c:1965 msgid "Execute the specified command" msgstr "실행할 특정 명령어" -#: ../midori/main.c:1569 +#: ../midori/main.c:1967 +msgid "List available commands to execute with -e/ --execute" +msgstr "-e/ --execute와 함께 실행하시면 실행 가능한 명령어의 목록을 표시합니다" + +#: ../midori/main.c:1969 msgid "Display program version" msgstr "프로그램의 버전 표시" -#: ../midori/main.c:1571 +#: ../midori/main.c:1971 msgid "Addresses" msgstr "주소" -#: ../midori/main.c:1573 +#: ../midori/main.c:1973 msgid "Block URIs according to regular expression PATTERN" msgstr "정규 표현 패턴에 따라 주소를 막기" -#: ../midori/main.c:1573 +#: ../midori/main.c:1973 msgid "PATTERN" msgstr "[패턴]" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1577 +#: ../midori/main.c:1977 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "수 초 이상 활동이 없을 경우 미도리 초기화" -#: ../midori/main.c:1577 +#: ../midori/main.c:1977 msgid "SECONDS" msgstr "[초]" -#: ../midori/main.c:1657 +#: ../midori/main.c:1980 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "콘솔 경고를 지정한 파일로 전송합니다." + +#: ../midori/main.c:1980 +msgid "FILENAME" +msgstr "[파일 이름]" + +#: ../midori/main.c:2045 msgid "[Addresses]" msgstr "[주소]" -#: ../midori/main.c:1685 +#: ../midori/main.c:2087 msgid "Please report comments, suggestions and bugs to:" msgstr "코멘트, 제안, 버그 등을 이곳에 보고해 주십시오:" -#: ../midori/main.c:1687 +#: ../midori/main.c:2089 msgid "Check for new versions at:" msgstr "다음에서 새 버전 검색:" -#: ../midori/main.c:1804 -msgid "The specified configuration folder is invalid." -msgstr "지정된 설정 폴더가 유효하지 않습니다." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2173 +msgid "Saved logins and _passwords" +msgstr "저장한 사용자 이름과 암호(_P)" + +#: ../midori/main.c:2175 +msgid "Cookies and Website data" +msgstr "쿠키와 웹사이트 데이터" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2179 ../midori/midori-websettings.c:996 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "웹 캐시" -#: ../midori/main.c:1852 -msgid "An instance of Midori is already running but not responding.\n" -msgstr "미도리가 이미 실행되어 있지만 응답을 하지 않고 있습니다.\n" +#: ../midori/main.c:2182 +msgid "Website icons" +msgstr "웹 사이트 아이콘" -#: ../midori/main.c:1907 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "검색 엔진을 불러올 수 없습니다. %s\n" +#: ../midori/main.c:2288 +msgid "An unknown error occured" +msgstr "알 수 없는 오류가 발생했습니다." -#: ../midori/main.c:1928 +#: ../midori/main.c:2395 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "미도리를 이미 실행했지만 응답이 없습니다.\n" + +#: ../midori/main.c:2431 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "책갈피를 읽어올 수 없습니다: %s\n" -#: ../midori/main.c:1970 +#: ../midori/main.c:2479 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "휴지통을 열 수 없습니다: %s\n" -#: ../midori/main.c:1983 +#: ../midori/main.c:2492 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "기록을 열 수 없습니다: %s\n" -#: ../midori/main.c:1997 +#: ../midori/main.c:2508 msgid "The following errors occured:" msgstr "다음의 오류가 발생했습니다:" -#: ../midori/main.c:2013 +#: ../midori/main.c:2524 msgid "_Ignore" msgstr "무시(_I)" -#: ../midori/midori-array.c:429 +#: ../midori/midori-app.c:1334 +msgid "_Bookmark" +msgstr "책갈피(_B)" + +#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060 +msgid "_Bookmarks" +msgstr "책갈피(_B)" + +#: ../midori/midori-app.c:1336 +msgid "Add Boo_kmark" +msgstr "책갈피 더하기(_K)" + +#: ../midori/midori-app.c:1337 +msgid "_Console" +msgstr "콘솔(_C)" + +#: ../midori/midori-app.c:1338 +msgid "_Extensions" +msgstr "확장 기능(_E)" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589 +msgid "_History" +msgstr "기록(_H)" + +#: ../midori/midori-app.c:1340 +msgid "_Homepage" +msgstr "홈페이지(_H)" + +#: ../midori/midori-app.c:1341 +msgid "_Userscripts" +msgstr "사용자 스크립트(_U)" + +#: ../midori/midori-app.c:1342 +msgid "New _Tab" +msgstr "새 탭(_T)" + +#: ../midori/midori-app.c:1343 +msgid "_Transfers" +msgstr "전송(_T)" + +#: ../midori/midori-app.c:1344 +msgid "Netscape p_lugins" +msgstr "넷스케이프 플러그인(_L)" + +#: ../midori/midori-app.c:1345 +msgid "_Closed Tabs" +msgstr "닫은 탭 (_C)" + +#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216 +msgid "New _Window" +msgstr "새 창(_W)" + +#: ../midori/midori-app.c:1347 +msgid "New _Folder" +msgstr "새 폴더(_F)" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "파일이 없습니다." -#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 -#: ../midori/midori-array.c:496 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "잘못된 문서." -#: ../midori/midori-array.c:505 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "책갈피 형식을 알 수 없습니다." -#: ../midori/midori-array.c:719 +#: ../midori/midori-array.c:915 msgid "Writing failed." msgstr "쓸 수 없습니다." -#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:4923 -#: ../midori/midori-browser.c:4929 +#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298 +#: ../midori/midori-browser.c:5307 msgid "Reload the current page" msgstr "현재 페이지 다시 불러오기" -#: ../midori/midori-browser.c:351 ../midori/midori-browser.c:4926 +#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304 msgid "Stop loading the current page" msgstr "현재 페이지 불러오기 중지" -#: ../midori/midori-browser.c:465 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% 불러옴" - -#: ../midori/midori-browser.c:504 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" msgstr "제목 업데이트 실패: %s\n" -#: ../midori/midori-browser.c:517 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." msgstr "기대하지 않은 동작 '%s'." -#: ../midori/midori-browser.c:743 +#: ../midori/midori-browser.c:569 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (사생활 보호 모드)" + +#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716 +msgid "Toplevel folder" +msgstr "최상위 폴더" + +#: ../midori/midori-browser.c:774 msgid "New folder" msgstr "새 폴더" -#: ../midori/midori-browser.c:743 +#: ../midori/midori-browser.c:774 msgid "Edit folder" msgstr "폴더 편집" -#: ../midori/midori-browser.c:745 +#: ../midori/midori-browser.c:776 msgid "New bookmark" msgstr "새 책갈피" -#: ../midori/midori-browser.c:745 +#: ../midori/midori-browser.c:776 msgid "Edit bookmark" msgstr "책갈피 편집" -#: ../midori/midori-browser.c:776 +#: ../midori/midori-browser.c:818 msgid "_Title:" msgstr "제목(_T):" -#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "설명(_D):" - -#: ../midori/midori-browser.c:812 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "주소(_A):" -#: ../midori/midori-browser.c:844 ../midori/midori-browser.c:4042 +#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326 msgid "_Folder:" msgstr "폴더(_F):" -#: ../midori/midori-browser.c:854 ../midori/midori-browser.c:948 -#: ../midori/midori-browser.c:4047 ../midori/midori-browser.c:4076 -msgid "Toplevel folder" -msgstr "최상위 폴더" - -#: ../midori/midori-browser.c:886 +#: ../midori/midori-browser.c:877 msgid "Add to _Speed Dial" msgstr "단축 번호에 더하기(_S)" -#: ../midori/midori-browser.c:899 +#: ../midori/midori-browser.c:890 msgid "Show in the tool_bar" msgstr "도구 모음에 보이기(_B)" -#: ../midori/midori-browser.c:914 +#: ../midori/midori-browser.c:905 msgid "Run as _web application" msgstr "웹 응용 프로그램으로 실행(_W)" -#: ../midori/midori-browser.c:993 +#: ../midori/midori-browser.c:976 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "이 폴더에 파일 \"%s\"을(를) 저장할 수 없습니다." + +#: ../midori/midori-browser.c:978 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "이 위치에 쓸 수 있는 권한을 가지고 있지 않습니다." + +#: ../midori/midori-browser.c:985 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "\"%s\"을(를) 다운로드 할 빈 공간이 부족합니다." -#: ../midori/midori-browser.c:997 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "파일 다운로드에는 %s이(가) 필요합니다 만 %s 만이 남아있습니다." -#: ../midori/midori-browser.c:1054 ../midori/midori-browser.c:4084 -#: ../midori/midori-browser.c:4119 +#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395 msgid "Save file as" msgstr "다른 이름으로 저장" -#: ../midori/midori-browser.c:1447 +#: ../midori/midori-browser.c:1320 +msgid "New Window" +msgstr "새 창" + +#: ../midori/midori-browser.c:1320 +msgid "A new window has been opened" +msgstr "새 창이 열렸습니다." + +#: ../midori/midori-browser.c:1323 +msgid "New Tab" +msgstr "새 탭" + +#: ../midori/midori-browser.c:1323 +msgid "A new tab has been opened" +msgstr "새 탭이 열렸습니다." + +#: ../midori/midori-browser.c:1358 +msgid "Error opening the image!" +msgstr "그림을 여는 중 오류가 발생했습니다!" + +#: ../midori/midori-browser.c:1359 +msgid "Can not open selected image in a default viewer." +msgstr "기본 그림 보기 프로그램으로 선택할 그림을 열 수 없습니다." + +#: ../midori/midori-browser.c:1365 +msgid "Error downloading the image!" +msgstr "그림을 다운로드하는 중 오류가 발생했습니다!" + +#: ../midori/midori-browser.c:1366 +msgid "Can not download selected image." +msgstr "선택한 그림을 다운로드할 수 없습니다." + +#: ../midori/midori-browser.c:1492 msgid "Save file" msgstr "파일 저장" -#: ../midori/midori-browser.c:2164 +#: ../midori/midori-browser.c:2367 msgid "Open file" msgstr "파일 열기" -#: ../midori/midori-browser.c:2242 +#: ../midori/midori-browser.c:2499 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -365,145 +540,140 @@ "이 외에 미도리 기본 설정 안 프로그램 탭으로 이동하여 뉴스 수집기를 선택하면 " "다음 뉴스 피드 아이콘을 누를 때 자동으로 추가될 것입니다." -#: ../midori/midori-browser.c:2248 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "새 피드" -#: ../midori/midori-browser.c:2291 ../midori/midori-browser.c:4988 -#: ../panels/midori-bookmarks.c:406 +#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "새 책갈피 더하기" -#: ../midori/midori-browser.c:3297 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "외부 프로그램을 실행할 수 없습니다." +#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "비어있음" -#: ../midori/midori-browser.c:3560 ../midori/midori-browser.c:5378 +#: ../midori/midori-browser.c:3467 +msgid "Toggle text cursor navigation" +msgstr "" +"키보드로 커서를 조작하여 페이지의 텍스트 사이를 이동하는 기능을 켜고 끄기" + +#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "새 기록 항목 삽입 실패: %s\n" -#: ../midori/midori-browser.c:3877 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:734 +#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 msgid "Open all in _Tabs" msgstr "전부 탭으로 열기(_T)" -#: ../midori/midori-browser.c:3884 ../panels/midori-bookmarks.c:727 -#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "새 탭에서 열기(_T)" -#: ../midori/midori-browser.c:3887 ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4011 ../panels/midori-bookmarks.c:729 -#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657 +#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "새 창에서 열기(_W)" -#: ../midori/midori-browser.c:3965 +#: ../midori/midori-browser.c:4213 msgid "Arora" msgstr "아로라" -#: ../midori/midori-browser.c:3966 +#: ../midori/midori-browser.c:4214 msgid "Kazehakase" msgstr "카제하카세" -#: ../midori/midori-browser.c:3967 +#: ../midori/midori-browser.c:4215 msgid "Opera" msgstr "오페라" -#: ../midori/midori-browser.c:3968 +#: ../midori/midori-browser.c:4216 msgid "Konqueror" msgstr "컨쿼러" -#: ../midori/midori-browser.c:3969 +#: ../midori/midori-browser.c:4217 msgid "Epiphany" msgstr "에피파니" -#: ../midori/midori-browser.c:3993 +#: ../midori/midori-browser.c:4218 +#, c-format +msgid "Firefox (%s)" +msgstr "파이어폭스 (%s)" + +#: ../midori/midori-browser.c:4239 msgid "Import bookmarks..." msgstr "책갈피 가져오기..." -#: ../midori/midori-browser.c:3996 ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372 msgid "_Import bookmarks" msgstr "책갈피 가져오기(_I)" -#: ../midori/midori-browser.c:4007 +#: ../midori/midori-browser.c:4253 msgid "_Application:" msgstr "응용 프로그램(_A):" -#: ../midori/midori-browser.c:4034 ../midori/midori-browser.c:5106 -#: ../midori/midori-websettings.c:225 ../midori/midori-websettings.c:316 -#: ../katze/katze-utils.c:692 -msgid "Custom..." -msgstr "사용자 지정..." +#: ../midori/midori-browser.c:4318 +msgid "Import from XBEL or HTML file" +msgstr "XBEL 또는 HTML 파일에서 가져오기" + +#: ../midori/midori-browser.c:4353 +msgid "Import from a file" +msgstr "파일에서 가져오기" -#: ../midori/midori-browser.c:4095 +#: ../midori/midori-browser.c:4365 msgid "Failed to import bookmarks" msgstr "책갈피 가져오기 실패" -#: ../midori/midori-browser.c:4136 +#: ../midori/midori-browser.c:4400 +msgid "XBEL Bookmarks" +msgstr "XBEL 책갈피" + +#: ../midori/midori-browser.c:4405 +msgid "Netscape Bookmarks" +msgstr "넷스케이프 책갈피" + +#: ../midori/midori-browser.c:4419 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "미도리는 XBEL(*.xbel) 그리고 넷스케이프(*.html)로만 내보낼 수 있습니다" + +#: ../midori/midori-browser.c:4434 msgid "Failed to export bookmarks" msgstr "책갈피 내보내기 실패" -#: ../midori/midori-browser.c:4189 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "기록을 제거할 수 없습니다: %s\n" - -#: ../midori/midori-browser.c:4197 -#, c-format -msgid "Failed to clear search history: %s\n" -msgstr "검색 기록을 제거할 수 없습니다: %s\n" - #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4304 +#: ../midori/midori-browser.c:4556 msgid "Clear Private Data" msgstr "개인 데이터 모두 지우기" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4560 msgid "_Clear private data" msgstr "개인 데이터 지우기(_C)" -#: ../midori/midori-browser.c:4322 +#: ../midori/midori-browser.c:4573 msgid "Clear the following data:" msgstr "다음의 데이터 지우기:" -#: ../midori/midori-browser.c:4332 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:114 -msgid "History" -msgstr "기록" - -#: ../midori/midori-browser.c:4337 -msgid "Cookies" -msgstr "쿠키" - -#: ../midori/midori-browser.c:4342 -msgid "'Flash' Cookies" -msgstr "'플래시' 쿠키" - -#: ../midori/midori-browser.c:4347 -msgid "Website icons" -msgstr "웹 사이트 아이콘" - -#: ../midori/midori-browser.c:4352 ../midori/sokoke.c:1314 -msgid "_Closed Tabs" -msgstr "닫은 탭 (_C)" - -#: ../midori/midori-browser.c:4357 ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "웹 캐시" +#: ../midori/midori-browser.c:4583 +msgid "Last open _tabs" +msgstr "마지막에 연 탭(_T)" -#: ../midori/midori-browser.c:4365 +#: ../midori/midori-browser.c:4609 msgid "Clear private data when _quitting Midori" msgstr "미도리를 종료할 때 개인 데이터를 제거합니다(_Q)" -#: ../midori/midori-browser.c:4506 +#: ../midori/midori-browser.c:4804 msgid "A lightweight web browser." msgstr "가벼운 웹 브라우저." -#: ../midori/midori-browser.c:4508 +#: ../midori/midori-browser.c:4805 +msgid "See about:version for version info." +msgstr "버전 정보를 보려면 about:version 페이지를 확인하십시오." + +#: ../midori/midori-browser.c:4807 msgid "" "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 " @@ -514,1738 +684,1531 @@ "서 발표한 GNU 약소 일반 공중 사용 허가서 버전 2.1 또는 이후 버전 (선택적)에 " "따라 재배포하거나 수정할 수 있습니다." -#: ../midori/midori-browser.c:4527 +#: ../midori/midori-browser.c:4828 msgid "translator-credits" msgstr "" "Seo Sanghyeon \n" "김보람 " -#: ../midori/midori-browser.c:4836 +#: ../midori/midori-browser.c:5214 msgid "_File" msgstr "파일(_F)" -#: ../midori/midori-browser.c:4838 ../midori/sokoke.c:1315 -msgid "New _Window" -msgstr "새 창(_W)" - -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:5217 msgid "Open a new window" msgstr "새 창을 엽니다" -#: ../midori/midori-browser.c:4842 +#: ../midori/midori-browser.c:5220 msgid "Open a new tab" msgstr "새 탭을 엽니다" -#: ../midori/midori-browser.c:4844 -msgid "P_rivate Browsing" -msgstr "개인 정보 보호 모드(_R)" - -#: ../midori/midori-browser.c:4845 -msgid "Don't save any private data while browsing" -msgstr "브라우저 사용 중 어떤 개인 데이터도 저장하지 않습니다" +#: ../midori/midori-browser.c:5222 +msgid "New P_rivate Browsing Window" +msgstr "새 사생활 보호 모드 창(_R)" -#: ../midori/midori-browser.c:4849 +#: ../midori/midori-browser.c:5226 msgid "Open a file" msgstr "파일을 엽니다" -#: ../midori/midori-browser.c:4852 +#: ../midori/midori-browser.c:5228 +msgid "_Save Page As..." +msgstr "다른 이름으로 페이지 저장(_S)..." + +#: ../midori/midori-browser.c:5229 msgid "Save to a file" msgstr "파일로 저장" -#: ../midori/midori-browser.c:4854 +#: ../midori/midori-browser.c:5231 msgid "Add to Speed _dial" msgstr "단축 번호 더하기(_D)" -#: ../midori/midori-browser.c:4855 -msgid "Add shortcut to speed dial" -msgstr "단축 번호에 바로 가기를 더합니다" - -#: ../midori/midori-browser.c:4857 +#: ../midori/midori-browser.c:5235 msgid "Add Shortcut to the _desktop" msgstr "바로 가기를 바탕 화면에 추가(_D)" -#: ../midori/midori-browser.c:4858 -msgid "Add shortcut to the desktop" -msgstr "바로 가기를 바탕 화면에 추가" +#: ../midori/midori-browser.c:5237 +msgid "Create _Launcher" +msgstr "실행 아이콘 만들기(_L)" -#: ../midori/midori-browser.c:4860 +#: ../midori/midori-browser.c:5241 msgid "Subscribe to News _feed" msgstr "뉴스 피드 구독(_F)" -#: ../midori/midori-browser.c:4861 -msgid "Subscribe to this news feed" -msgstr "뉴스 피드 구독" - -#: ../midori/midori-browser.c:4866 +#: ../midori/midori-browser.c:5247 msgid "_Close Tab" msgstr "탭 닫기(_C)" -#: ../midori/midori-browser.c:4867 +#: ../midori/midori-browser.c:5248 msgid "Close the current tab" msgstr "현재 탭을 닫습니다." -#: ../midori/midori-browser.c:4869 +#: ../midori/midori-browser.c:5250 msgid "C_lose Window" msgstr "창 닫기(_L)" -#: ../midori/midori-browser.c:4870 -msgid "Close this window" -msgstr "이 창을 닫습니다" - -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:5254 msgid "Print the current page" msgstr "현재 페이지를 인쇄합니다" -#: ../midori/midori-browser.c:4876 -msgid "Quit the application" -msgstr "프로그램 끝내기" +#: ../midori/midori-browser.c:5256 +msgid "Close a_ll Windows" +msgstr "모든 창 닫기(_L)" -#: ../midori/midori-browser.c:4878 +#: ../midori/midori-browser.c:5259 msgid "_Edit" msgstr "편집(_E)" -#: ../midori/midori-browser.c:4882 -msgid "Undo the last modification" -msgstr "마지막 수정 되돌리기" - -#: ../midori/midori-browser.c:4885 -msgid "Redo the last modification" -msgstr "마지막 수정 다시 실행" - -#: ../midori/midori-browser.c:4889 -msgid "Cut the selected text" -msgstr "선택한 텍스트를 클립보드로 잘라냅니다" - -#: ../midori/midori-browser.c:4892 ../midori/midori-browser.c:4895 -msgid "Copy the selected text" -msgstr "선택한 텍스트를 클립보드로 복사합니다" - -#: ../midori/midori-browser.c:4898 -msgid "Paste text from the clipboard" -msgstr "클립보드에서 텍스트를 붙여 넣습니다" - -#: ../midori/midori-browser.c:4901 -msgid "Delete the selected text" -msgstr "선택한 텍스트를 지웁니다" - -#: ../midori/midori-browser.c:4904 -msgid "Select all text" -msgstr "모든 텍스트 선택" +#: ../midori/midori-browser.c:5282 +msgid "_Find..." +msgstr "찾기(_F)..." -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:5283 msgid "Find a word or phrase in the page" msgstr "이 페이지에서 단어나 단락을 찾습니다" -#: ../midori/midori-browser.c:4909 +#: ../midori/midori-browser.c:5285 msgid "Find _Next" msgstr "다음 찾기(_N)" -#: ../midori/midori-browser.c:4910 -msgid "Find the next occurrence of a word or phrase" -msgstr "다음에 나타나는 단어나 문장을 찾습니다" - -#: ../midori/midori-browser.c:4912 +#: ../midori/midori-browser.c:5288 msgid "Find _Previous" msgstr "이전 찾기(_P)" -#: ../midori/midori-browser.c:4913 -msgid "Find the previous occurrence of a word or phrase" -msgstr "이전에 나타난 단어나 문장을 찾습니다" - -#: ../midori/midori-browser.c:4917 +#: ../midori/midori-browser.c:5292 msgid "Configure the application preferences" msgstr "프로그램 기본 설정을 편집합니다" -#: ../midori/midori-browser.c:4919 +#: ../midori/midori-browser.c:5294 msgid "_View" msgstr "보기(_V)" -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:5295 msgid "_Toolbars" msgstr "도구 모음(_T)" -#: ../midori/midori-browser.c:4932 +#: ../midori/midori-browser.c:5300 +msgid "Reload page without caching" +msgstr "저장하지 않고 페이지 다시 불러오기" + +#: ../midori/midori-browser.c:5310 msgid "Increase the zoom level" msgstr "확대/축소 단계 키우기" -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:5313 msgid "Decrease the zoom level" msgstr "확대/축소 단계 줄이기" -#: ../midori/midori-browser.c:4938 -msgid "Reset the zoom level" -msgstr "확대/축소 단계 초기화" - -#: ../midori/midori-browser.c:4939 +#: ../midori/midori-browser.c:5317 msgid "_Encoding" msgstr "인코딩(_E)" -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:5319 msgid "View So_urce" msgstr "소스 보기(_U)" -#: ../midori/midori-browser.c:4942 -msgid "View the source code of the page" -msgstr "페이지의 소스 코드를 보여줍니다" +#: ../midori/midori-browser.c:5322 +msgid "Ca_ret Browsing" +msgstr "캐럿 브라우징(_R)" -#: ../midori/midori-browser.c:4945 +#: ../midori/midori-browser.c:5326 msgid "Toggle fullscreen view" msgstr "전체 화면 보기 전환" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:5328 msgid "Scroll _Left" msgstr "왼쪽으로 스크롤(_L)" -#: ../midori/midori-browser.c:4949 -msgid "Scroll to the left" -msgstr "왼쪽으로 스크롤 합니다" - -#: ../midori/midori-browser.c:4951 +#: ../midori/midori-browser.c:5331 msgid "Scroll _Down" msgstr "아래쪽으로 스크롤(_D)" -#: ../midori/midori-browser.c:4952 -msgid "Scroll down" -msgstr "아래쪽으로 스크롤 합니다" - -#: ../midori/midori-browser.c:4954 +#: ../midori/midori-browser.c:5334 msgid "Scroll _Up" msgstr "위쪽으로 스크롤(_U)" -#: ../midori/midori-browser.c:4955 -msgid "Scroll up" -msgstr "위쪽으로 스크롤 합니다" - -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:5337 msgid "Scroll _Right" msgstr "오른쪽으로 스크롤(_R)" -#: ../midori/midori-browser.c:4958 -msgid "Scroll to the right" -msgstr "오른쪽으로 스크롤 합니다" - -#: ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:5340 msgid "_Go" msgstr "이동(_G)" -#: ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:5343 msgid "Go back to the previous page" msgstr "전에 들렀던 페이지로 갑니다" -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:5346 msgid "Go forward to the next page" msgstr "다음 들렀던 페이지로 갑니다" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4971 +#: ../midori/midori-browser.c:5350 msgid "Go to the previous sub-page" msgstr "전에 들렀던 하위 페이지로 갑니다" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:5354 msgid "Go to the next sub-page" msgstr "다음 들렀던 하위 페이지로 갑니다" -#: ../midori/midori-browser.c:4978 +#: ../midori/midori-browser.c:5357 msgid "Go to your homepage" msgstr "홈 페이지로 갑니다." -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:5359 msgid "Empty Trash" msgstr "휴지통 비우기" -#: ../midori/midori-browser.c:4981 -msgid "Delete the contents of the trash" -msgstr "휴지통에 있는 모든 항목을 지웁니다" - -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:5362 msgid "Undo _Close Tab" msgstr "닫은 탭 되돌리기(_C)" -#: ../midori/midori-browser.c:4984 -msgid "Open the last closed tab" -msgstr "마지막에 닫은 탭을 엽니다." - -#: ../midori/midori-browser.c:4990 +#: ../midori/midori-browser.c:5369 msgid "Add a new _folder" msgstr "새 폴더 더하기(_F)" -#: ../midori/midori-browser.c:4991 -msgid "Add a new bookmark folder" -msgstr "새 책갈피 폴더를 더합니다" - -#: ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:5375 msgid "_Export bookmarks" msgstr "책갈피 내보내기(_E)" -#: ../midori/midori-browser.c:4999 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "검색 엔진 관리(_M)" -#: ../midori/midori-browser.c:5000 -msgid "Add, edit and remove search engines..." -msgstr "검색 엔진을 더하고 편집, 제거합니다..." - -#: ../midori/midori-browser.c:5003 +#: ../midori/midori-browser.c:5381 msgid "_Clear Private Data" msgstr "개인 데이터 지우기(_C)" -#: ../midori/midori-browser.c:5004 -msgid "Clear private data..." -msgstr "개인 데이터를 지웁니다..." - -#: ../midori/midori-browser.c:5008 +#: ../midori/midori-browser.c:5384 msgid "_Inspect Page" msgstr "페이지 검사(_I)" -#: ../midori/midori-browser.c:5009 -msgid "Inspect page details and access developer tools..." -msgstr "페이지의 세부 사항을 검사하고 개발자 도구에 접근..." - -#: ../midori/midori-browser.c:5014 +#: ../midori/midori-browser.c:5388 msgid "_Previous Tab" msgstr "이전 탭(_P)" -#: ../midori/midori-browser.c:5015 -msgid "Switch to the previous tab" -msgstr "이전 탭으로 이동합니다" - -#: ../midori/midori-browser.c:5017 +#: ../midori/midori-browser.c:5391 msgid "_Next Tab" msgstr "다음 탭(_N)" -#: ../midori/midori-browser.c:5018 -msgid "Switch to the next tab" -msgstr "다음 탭으로 전환합니다" +#: ../midori/midori-browser.c:5393 +msgid "Move Tab _Backward" +msgstr "탭을 뒤로 옮기기(_B)" + +#: ../midori/midori-browser.c:5395 +msgid "_Move Tab Forward" +msgstr "탭을 앞으로 옮기기(_M)" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:5398 msgid "Focus _Current Tab" msgstr "현재 탭에 포커스 맞추기(_C)" -#: ../midori/midori-browser.c:5021 -msgid "Focus the current tab" -msgstr "현재 탭에 포커스를 맞춥니다" - -#: ../midori/midori-browser.c:5023 -msgid "Minimize _Current Tab" -msgstr "현재 탭 최소화(_C)" - -#: ../midori/midori-browser.c:5024 -msgid "Minimize the current tab" -msgstr "현재 탭 최소화" +#: ../midori/midori-browser.c:5401 +msgid "Focus _Next view" +msgstr "다음 보기에 포커스(_N)" + +#: ../midori/midori-browser.c:5404 +msgid "Only show the Icon of the _Current Tab" +msgstr "현재 탭의 아이콘만 보이기(_C)" -#: ../midori/midori-browser.c:5026 +#: ../midori/midori-browser.c:5407 msgid "_Duplicate Current Tab" msgstr "현재 탭 복제(_D)" -#: ../midori/midori-browser.c:5027 -msgid "Duplicate the current tab" -msgstr "현재 탭 복제" - -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5410 msgid "Close Ot_her Tabs" msgstr "다른 탭 닫기(_H)" -#: ../midori/midori-browser.c:5030 -msgid "Close all tabs except the current tab" -msgstr "현재 탭 이외의 모든 탭을 닫습니다" - -#: ../midori/midori-browser.c:5032 +#: ../midori/midori-browser.c:5413 msgid "Open last _session" msgstr "마지막 세션 열기(_S)" -#: ../midori/midori-browser.c:5033 -msgid "Open the tabs saved in the last session" -msgstr "마지막 세션에서 저장된 탭 엽니다" - -#: ../midori/midori-browser.c:5035 +#: ../midori/midori-browser.c:5416 msgid "_Help" msgstr "도움말(_H)" -#: ../midori/midori-browser.c:5037 -msgid "_Contents" -msgstr "차례(_C)" - -#: ../midori/midori-browser.c:5038 -msgid "Show the documentation" -msgstr "문서 보기" - -#: ../midori/midori-browser.c:5040 +#: ../midori/midori-browser.c:5418 msgid "_Frequent Questions" msgstr "일반적인 질문들(_F)" -#: ../midori/midori-browser.c:5041 -msgid "Show the Frequently Asked Questions" -msgstr "자주 하는 질문의 답변 보기" - -#: ../midori/midori-browser.c:5043 -msgid "_Report a Bug" -msgstr "버그 보고(_R)" - -#: ../midori/midori-browser.c:5044 -msgid "Open Midori's bug tracker" -msgstr "미도리의 버그 트래커를 엽니다" - -#: ../midori/midori-browser.c:5047 -msgid "Show information about the program" -msgstr "프로그램 정보를 보여줍니다" +#: ../midori/midori-browser.c:5421 +msgid "_Report a Problem..." +msgstr "버그 보고(_R)..." -#: ../midori/midori-browser.c:5055 +#: ../midori/midori-browser.c:5433 msgid "_Menubar" msgstr "메뉴 모음(_M)" -#: ../midori/midori-browser.c:5056 -msgid "Show menubar" -msgstr "메뉴 모음 보기" - -#: ../midori/midori-browser.c:5059 +#: ../midori/midori-browser.c:5437 msgid "_Navigationbar" msgstr "내비게이션 줄(_N)" -#: ../midori/midori-browser.c:5060 -msgid "Show navigationbar" -msgstr "내비게이션 줄 보기" - -#: ../midori/midori-browser.c:5063 +#: ../midori/midori-browser.c:5441 msgid "Side_panel" msgstr "가장자리 패널(_P)" -#: ../midori/midori-browser.c:5064 -msgid "Show sidepanel" -msgstr "가장자리 패널 보기" +#: ../midori/midori-browser.c:5442 +msgid "Sidepanel" +msgstr "가장자리 패널" -#: ../midori/midori-browser.c:5067 +#: ../midori/midori-browser.c:5445 msgid "_Bookmarkbar" msgstr "책갈피 모음(_B)" -#: ../midori/midori-browser.c:5068 -msgid "Show bookmarkbar" -msgstr "책갈피 모음 보기" - -#: ../midori/midori-browser.c:5071 -msgid "_Transferbar" -msgstr "전송 줄(_T)" - -#: ../midori/midori-browser.c:5072 -msgid "Show transferbar" -msgstr "전송 줄 보기" - -#: ../midori/midori-browser.c:5075 +#: ../midori/midori-browser.c:5449 msgid "_Statusbar" msgstr "상태 표시줄(_S)" -#: ../midori/midori-browser.c:5076 -msgid "Show statusbar" -msgstr "상태 표시줄을 봅니다" - -#: ../midori/midori-browser.c:5084 +#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311 msgid "_Automatic" msgstr "자동(_A)" -#: ../midori/midori-browser.c:5087 ../midori/midori-websettings.c:219 +#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236 msgid "Chinese (BIG5)" msgstr "중국어 번체 (Big5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5091 +#: ../midori/midori-browser.c:5465 msgid "Japanese (SHIFT__JIS)" msgstr "일본어 (Shift_JIS)" -#: ../midori/midori-browser.c:5094 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238 msgid "Korean (EUC-KR)" msgstr "한국어 (EUC-KR)" -#: ../midori/midori-browser.c:5097 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239 msgid "Russian (KOI8-R)" msgstr "키릴어 (KOI8-R)" -#: ../midori/midori-browser.c:5100 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240 msgid "Unicode (UTF-8)" msgstr "유니코드 (UTF-8)" -#: ../midori/midori-browser.c:5103 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241 msgid "Western (ISO-8859-1)" msgstr "서양어 (ISO-8859-1)" -#: ../midori/midori-browser.c:5622 +#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "사용자 지정..." + +#: ../midori/midori-browser.c:5985 msgid "_Separator" msgstr "구분선(_S)" -#: ../midori/midori-browser.c:5629 +#: ../midori/midori-browser.c:5992 msgid "_Location..." msgstr "위치(_L)..." -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5994 msgid "Open a particular location" msgstr "특정 위치 열기" -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:6016 msgid "_Web Search..." msgstr "웹 검색(_W)..." -#: ../midori/midori-browser.c:5657 +#: ../midori/midori-browser.c:6018 msgid "Run a web search" msgstr "웹 검색 실행" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:6045 msgid "Reopen a previously closed tab or window" msgstr "이전에 닫은 탭이나 창을 다시 엽니다" -#: ../midori/midori-browser.c:5693 +#: ../midori/midori-browser.c:6062 +msgid "Show the saved bookmarks" +msgstr "저장한 책갈피 보기" + +#: ../midori/midori-browser.c:6079 msgid "_Tools" msgstr "도구(_T)" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:6095 msgid "_Window" msgstr "창(_W)" -#: ../midori/midori-browser.c:5712 +#: ../midori/midori-browser.c:6097 msgid "Show a list of all open tabs" msgstr "모든 열려있는 탭의 목록을 표시합니다" -#: ../midori/midori-browser.c:5726 +#: ../midori/midori-browser.c:6111 msgid "_Menu" msgstr "메뉴(_M)" -#: ../midori/midori-browser.c:5728 +#: ../midori/midori-browser.c:6113 msgid "Menu" msgstr "메뉴" -#: ../midori/midori-browser.c:6305 +#: ../midori/midori-browser.c:6927 #, c-format msgid "Unexpected setting '%s'" msgstr "기대하지 않은 설정 '%s'" -#: ../midori/midori-locationaction.c:379 +#: ../midori/midori-extension.c:329 #, c-format -msgid "Failed to select from history\n" -msgstr "기록에서 선택 실패\n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "확장 기능 '%s'의 설정을 불러올 수 없습니다: %s\n" -#: ../midori/midori-locationaction.c:467 +#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "%s을(를) 검색" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "확장 기능 '%s'의 설정을 저장할 수 없습니다: %s\n" -#: ../midori/midori-locationaction.c:490 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "%s(으)로 검색" -#: ../midori/midori-locationaction.c:1169 +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "다음으로 검색..." + +#: ../midori/midori-locationaction.c:537 +#, c-format +msgid "Failed to select from history\n" +msgstr "기록에서 선택 실패\n" + +#: ../midori/midori-locationaction.c:624 #, c-format -msgid "Failed to execute database statement\n" -msgstr "데이터 베이스 문(statement)을 실행 실패\n" +msgid "Search for %s" +msgstr "%s을(를) 검색" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1225 +#: ../midori/midori-locationaction.c:1398 msgid "Paste and p_roceed" msgstr "붙여넣기 후 진행(_R)" -#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 -msgid "Detach chosen panel from the window" -msgstr "선택한 패널 창에서 분리" +#: ../midori/midori-locationaction.c:1739 +msgid "Not verified" +msgstr "확인하지 않음" + +#: ../midori/midori-locationaction.c:1759 +msgid "Verified and encrypted connection" +msgstr "확인하였고 암호화 한 연결" + +#: ../midori/midori-locationaction.c:1771 +msgid "Open, unencrypted connection" +msgstr "열린, 암호화하지 않은 연결" -#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 -#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" msgstr "창을 오른쪽으로 이동" -#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "패널 닫기" -#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "창을 왼쪽으로 이동" -#: ../midori/midori-panel.c:771 -msgid "Hide operating controls" -msgstr "조작 컨트롤 감추기(_C)" - -#: ../midori/midori-websettings.c:201 -msgid "Show Blank page" -msgstr "빈 페이지 표시" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "단축 번호 보이기" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" msgstr "홈 페이지 표시" -#: ../midori/midori-websettings.c:203 -msgid "Show last open tabs" -msgstr "마지막에 연 탭 표시" - -#: ../midori/midori-websettings.c:204 -msgid "Show last tabs without loading" -msgstr "마지막 탭을 불러오지는 않고 표시" - -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-websettings.c:237 msgid "Japanese (SHIFT_JIS)" msgstr "일본어 (Shift_JIS)" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:257 msgid "New tab" msgstr "새 탭" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:258 msgid "New window" msgstr "새 창" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:259 msgid "Current tab" msgstr "현재 탭" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:274 msgid "Default" msgstr "기본 값" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:275 msgid "Icons" msgstr "아이콘" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:276 msgid "Small icons" msgstr "작은 아이콘" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:277 msgid "Text" msgstr "텍스트" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:278 msgid "Icons and text" msgstr "아이콘 및 텍스트" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:279 msgid "Text beside icons" msgstr "아이콘 옆에 글자" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:294 msgid "Automatic (GNOME or environment)" msgstr "자동 (그놈 또는 환경 변수)" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:295 msgid "HTTP proxy server" msgstr "HTTP 프록시 서버" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:296 msgid "No proxy server" msgstr "프록시 서버 없음" -#: ../midori/midori-websettings.c:294 -msgid "All cookies" -msgstr "모든 쿠키" - -#: ../midori/midori-websettings.c:295 -msgid "Session cookies" -msgstr "세션 쿠키" - -#: ../midori/midori-websettings.c:296 ../katze/katze-utils.c:668 -msgid "None" -msgstr "없음" - -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "사파리" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "아이폰" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "파이어폭스" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "인터넷 익스플로러" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:400 msgid "Remember last window size" msgstr "마지막에 연 창 크기 기억" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:401 msgid "Whether to save the last window size" msgstr "마지막에 연 창의 크기를 저장할지 결정합니다." -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:409 msgid "Last window width" msgstr "마지막에 연 창 너비" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:410 msgid "The last saved window width" -msgstr "저장된 마지막에 연 창의 너비" +msgstr "마지막에 저장한 창의 너비" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:418 msgid "Last window height" msgstr "마지막에 연 창 높이" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:419 msgid "The last saved window height" -msgstr "저장된 마지막에 연 창의 높이" +msgstr "마지막에 저장한 창의 높이" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:444 msgid "Last panel position" msgstr "마지막에 연 패널 위치" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:445 msgid "The last saved panel position" -msgstr "저장된 마지막에 연 패널의 위치" +msgstr "마지막에 저장한 연 패널의 위치" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:454 msgid "Last panel page" msgstr "마지막 패널 페이지" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:455 msgid "The last saved panel page" -msgstr "저장된 마지막에 연 패널 페이지" +msgstr "마지막에 저장한 연 패널 페이지" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:463 msgid "Last Web search" msgstr "마지막 웹 검색" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:464 msgid "The last saved Web search" -msgstr "저장된 마지막에 한 검색" +msgstr "마지막에 저장한 한 검색" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:473 msgid "Show Menubar" msgstr "메뉴 모음 표시" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:474 msgid "Whether to show the menubar" msgstr "메뉴 모음을 표시할 지 결정합니다." -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:482 msgid "Show Navigationbar" msgstr "내비게이션 바 표시" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:483 msgid "Whether to show the navigationbar" msgstr "내비게이션 바를 표시할지 결정합니다." -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:491 msgid "Show Bookmarkbar" msgstr "책갈피 모음 표시" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:492 msgid "Whether to show the bookmarkbar" msgstr "책갈피 모음을 표시할 지 결정합니다." -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:500 msgid "Show Panel" msgstr "패널 표시" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:501 msgid "Whether to show the panel" msgstr "패널을 표시할 지 결정합니다." -#: ../midori/midori-websettings.c:484 -msgid "Show Transferbar" -msgstr "전송 줄 표시" - -#: ../midori/midori-websettings.c:485 -msgid "Whether to show the transferbar" -msgstr "전송 줄을 표시할 지 결정합니다." - -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:509 msgid "Show Statusbar" msgstr "상태 표시줄을 보기" -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:510 msgid "Whether to show the statusbar" msgstr "상태를 표시할 지 결정합니다." -#: ../midori/midori-websettings.c:503 +#: ../midori/midori-websettings.c:519 msgid "Toolbar Style:" msgstr "도구 모음 유형:" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:520 msgid "The style of the toolbar" msgstr "도구 모음 유형:" -#: ../midori/midori-websettings.c:520 -msgid "Show progress in location entry" -msgstr "위치 항목에 진행 상태 표시" - -#: ../midori/midori-websettings.c:521 -msgid "Whether to show loading progress in the location entry" -msgstr "불러오기 진행 상태를 위치 입력 줄에 표시할지 선택합니다." - -#: ../midori/midori-websettings.c:536 -msgid "Search engines in location completion" -msgstr "위치를 완성하는데 검색 엔진 사용" - -#: ../midori/midori-websettings.c:537 -msgid "Whether to show search engines in the location completion" -msgstr "위치 입력을 완성하는데 검색 엔진을 사용할지 선택합니다." - -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:529 msgid "Toolbar Items" msgstr "도구 모음 항목" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:530 msgid "The items to show on the toolbar" msgstr "도구 모음에 보일 항목" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:538 msgid "Compact Sidepanel" msgstr "간략한 사이드 패널(_C)" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:539 msgid "Whether to make the sidepanel compact" msgstr "사이드 패널을 간단하게 표시할지 결정합니다." -#: ../midori/midori-websettings.c:570 -msgid "Show operating controls of the panel" -msgstr "기능 조정 콘드롤 패널에 보기" - -#: ../midori/midori-websettings.c:571 -msgid "Whether to show the operating controls of the panel" -msgstr "기능 조절 콘트롤을 패널에 보일지 결정합니다." - -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:554 msgid "Align sidepanel on the right" msgstr "사이드 표시 줄을 오른쪽에" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:555 msgid "Whether to align the sidepanel on the right" msgstr "오른쪽에 사이드 패널을 보여줄 지 결정합니다." -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:570 msgid "Open panels in separate windows" -msgstr "패널 분리된 창에 열기" +msgstr "패널 별도의 창에 열기" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:571 msgid "Whether to always open panels in separate windows" -msgstr "패널을 항상 분리된 창에 보일지 선택합니다." +msgstr "패널을 항상 별도의 창에 보일지 선택합니다." -#: ../midori/midori-websettings.c:612 +#: ../midori/midori-websettings.c:580 msgid "When Midori starts:" -msgstr "미도리 시작 시:" +msgstr "미도리를 시작할 때:" -#: ../midori/midori-websettings.c:613 +#: ../midori/midori-websettings.c:581 msgid "What to do when Midori starts" -msgstr "미도리 시작 시 어떤 것을 할지 결정합니다" +msgstr "미도리를 시작할 때 실행할 동작을 설정합니다." -#: ../midori/midori-websettings.c:622 +#: ../midori/midori-websettings.c:590 msgid "Homepage:" msgstr "홈페이지:" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:591 msgid "The homepage" msgstr "홈페이지" -#: ../midori/midori-websettings.c:638 +#: ../midori/midori-websettings.c:606 msgid "Show crash dialog" msgstr "충돌 대화 상자 보기" -#: ../midori/midori-websettings.c:639 +#: ../midori/midori-websettings.c:607 msgid "Show a dialog after Midori crashed" msgstr "미도리가 충돌한 후 대화 상자를 표시합니다" -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:655 -msgid "Show speed dial in new tabs" -msgstr "단축 번호를 새 탭에 보기" - -#: ../midori/midori-websettings.c:656 -msgid "Show speed dial in newly opened tabs" -msgstr "단축 번호를 새로 열린 탭에 표시합니다." - -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:615 msgid "Save downloaded files to:" msgstr "다운로드한 파일을 저장할 경로:" -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:616 msgid "The folder downloaded files are saved to" -msgstr "다운로드한 파일이 저장되는 폴더" - -#: ../midori/midori-websettings.c:686 -msgid "Ask for the destination folder" -msgstr "저장 할 폴더 물어보기" - -#: ../midori/midori-websettings.c:687 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "파일을 다운로드한 때 저장할 폴더를 물어볼지 선택합니다" - -#: ../midori/midori-websettings.c:706 -msgid "Notify when a transfer has been completed" -msgstr "전송이 완료되면 알려줍니다" - -#: ../midori/midori-websettings.c:707 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "전송이 끝나면 알림을 보여줄지 선택합니다." - -#: ../midori/midori-websettings.c:719 -msgid "Download Manager" -msgstr "다운로드 관리자" - -#: ../midori/midori-websettings.c:720 -msgid "An external download manager" -msgstr "외부 다운로드 관리자" +msgstr "다운로드한 파일을 저장하는 폴더" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:624 msgid "Text Editor" msgstr "텍스트 편집기" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:625 msgid "An external text editor" msgstr "외부 텍스트 편집기" -#: ../midori/midori-websettings.c:744 +#: ../midori/midori-websettings.c:640 msgid "News Aggregator" msgstr "뉴스 수집기" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:641 msgid "An external news aggregator" msgstr "외부 뉴스 수집기" -#: ../midori/midori-websettings.c:753 +#: ../midori/midori-websettings.c:649 msgid "Location entry Search" msgstr "위치 항목에서 검색" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:650 msgid "The search to perform inside the location entry" msgstr "위치 항목 안에서 검색을 실행합니다." -#: ../midori/midori-websettings.c:762 +#: ../midori/midori-websettings.c:658 msgid "Preferred Encoding" msgstr "우선할 인코딩" -#: ../midori/midori-websettings.c:763 +#: ../midori/midori-websettings.c:659 msgid "The preferred character encoding" msgstr "우선할 문자 인코딩" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:669 msgid "Always Show Tabbar" msgstr "탭 모음 항상 보기" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:670 msgid "Always show the tabbar" msgstr "탭 모음을 항상 볼 수 있게 합니다." -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:683 msgid "Close Buttons on Tabs" msgstr "탭에 닫기 단추 표시" -#: ../midori/midori-websettings.c:783 +#: ../midori/midori-websettings.c:684 msgid "Whether tabs have close buttons" msgstr "탭에 닫기 단추를 표시할지 결정합니다." -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:709 msgid "Open new pages in:" msgstr "새 페이지 다음에 열기:" -#: ../midori/midori-websettings.c:792 +#: ../midori/midori-websettings.c:710 msgid "Where to open new pages" msgstr "새 페이지를 어디에서 열지 결정합니다." -#: ../midori/midori-websettings.c:801 -msgid "Open external pages in:" -msgstr "외부 페이지 다음에 열기:" - -#: ../midori/midori-websettings.c:802 -msgid "Where to open externally opened pages" -msgstr "외부적으로 열린 페이지를 어디에 열지 결정합니다." - -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:719 msgid "Middle click opens Selection" msgstr "가운데 버튼 클릭으로 선택한 주소 열기" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:720 msgid "Load an address from the selection via middle click" msgstr "선택 후 마우스 가운데 버튼 클릭으로 주소를 불러옵니다." -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:728 msgid "Open tabs in the background" msgstr "탭을 연 후 바로 전환하지 않음" -#: ../midori/midori-websettings.c:821 +#: ../midori/midori-websettings.c:729 msgid "Whether to open new tabs in the background" msgstr "탭이 열렸을 때 바로 전환할지 결정합니다" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:737 msgid "Open Tabs next to Current" msgstr "탭을 현재 탭 옆에 열기" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:738 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "새 탭을 현재 탭의 옆에 열지 마지막 탭 다음에 열지 결정합니다." -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:746 msgid "Open popups in tabs" msgstr "팝업 창을 탭에 열기" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:747 msgid "Whether to open popup windows in tabs" msgstr "팝업 창을 탭에 열지 결정합니다." -#: ../midori/midori-websettings.c:849 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "자동으로 그림 읽기" -#: ../midori/midori-websettings.c:850 +#: ../midori/midori-websettings.c:758 msgid "Load and display images automatically" msgstr "그림을 자동으로 읽고 표시합니다." -#: ../midori/midori-websettings.c:857 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 msgid "Enable scripts" -msgstr "스크립트 활성화" +msgstr "스크립트 사용" -#: ../midori/midori-websettings.c:858 +#: ../midori/midori-websettings.c:766 msgid "Enable embedded scripting languages" -msgstr "스크립트 언어를 활성화 합니다." +msgstr "스크립트 언어를 사용합니다." -#: ../midori/midori-websettings.c:865 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" -msgstr "넷스케이프 플러그인 활성화" +msgstr "넷스케이프 플러그인 사용" -#: ../midori/midori-websettings.c:866 +#: ../midori/midori-websettings.c:774 msgid "Enable embedded Netscape plugin objects" -msgstr "넷스케이프 플러그인 개체를 활성화 합니다." +msgstr "넷스케이프 플러그인 개체를 사용합니다." + +#: ../midori/midori-websettings.c:789 +msgid "Enable Spell Checking" +msgstr "맞춤법 검사 사용" + +#: ../midori/midori-websettings.c:790 +msgid "Enable spell checking while typing" +msgstr "입력 중 맞춤법 검사를 사용합니다." -#: ../midori/midori-websettings.c:882 +#: ../midori/midori-websettings.c:796 msgid "Enable HTML5 database support" -msgstr "HTML5 데이터 베이스 지원 활성화" +msgstr "HTML5 데이터 베이스 지원 사용" -#: ../midori/midori-websettings.c:883 +#: ../midori/midori-websettings.c:797 msgid "Whether to enable HTML5 database support" -msgstr "HTML5 데이터 베이스 지원을 활성화할지 결정합니다." +msgstr "HTML5 데이터 베이스 지원을 사용할지 결정합니다." -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:803 msgid "Enable HTML5 local storage support" -msgstr "HTML5 로컬 기억 장치 지원 활성화" +msgstr "HTML5 로컬 기억 장치 지원 사용" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:804 msgid "Whether to enable HTML5 local storage support" -msgstr "HTML5 로컬 기억 장치 지원을 활성화할지 결정합니다." +msgstr "HTML5 로컬 기억 장치 지원을 사용할지 결정합니다." -#: ../midori/midori-websettings.c:898 +#: ../midori/midori-websettings.c:810 msgid "Enable offline web application cache" -msgstr "오프라인 웹 응용 프로그램 캐시 활성화" +msgstr "오프라인 웹 응용 프로그램 캐시 사용" -#: ../midori/midori-websettings.c:899 +#: ../midori/midori-websettings.c:811 msgid "Whether to enable offline web application cache" -msgstr "오프라인 웹 응용 프로그램 캐시를 활성화할지 결정합니다." +msgstr "오프라인 웹 응용 프로그램 캐시를 사용할지 결정합니다." + +#: ../midori/midori-websettings.c:827 +msgid "Flash window on background tabs" +msgstr "배경 탭에 있는 창 반짝거리게 하기" + +#: ../midori/midori-websettings.c:828 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "배경에 새 탭이 열리면 브라우저 창을 반짝거리게 합니다" + +#: ../midori/midori-websettings.c:836 +msgid "Enable WebGL support" +msgstr "웹GL 지원 사용" -#: ../midori/midori-websettings.c:924 +#: ../midori/midori-websettings.c:837 +msgid "Allow websites to use OpenGL rendering" +msgstr "웹페이지를 오픈GL을 사용해 표현할 수 있도록 합니다." + +#: ../midori/midori-websettings.c:863 msgid "Zoom Text and Images" msgstr "문자와 그림 확대" -#: ../midori/midori-websettings.c:925 +#: ../midori/midori-websettings.c:864 msgid "Whether to zoom text and images" msgstr "글자와 그림을 확대할지 결정합니다." -#: ../midori/midori-websettings.c:940 +#: ../midori/midori-websettings.c:879 msgid "Find inline while typing" msgstr "주소 창에 입력할 때 바로 찾기" -#: ../midori/midori-websettings.c:941 +#: ../midori/midori-websettings.c:880 msgid "Whether to automatically find inline while typing" msgstr "입력 중 자동으로 찾을지 결정합니다." -#: ../midori/midori-websettings.c:956 +#: ../midori/midori-websettings.c:895 msgid "Kinetic scrolling" msgstr "동역학 스크롤" -#: ../midori/midori-websettings.c:957 +#: ../midori/midori-websettings.c:896 msgid "Whether scrolling should kinetically move according to speed" msgstr "속도에 따라 관성이 걸린 것처럼 스크롤 합니다." -#: ../midori/midori-websettings.c:965 -msgid "Accept cookies" -msgstr "허용할 쿠키" - -#: ../midori/midori-websettings.c:966 -msgid "What type of cookies to accept" -msgstr "허용할 쿠키의 종류를 결정합니다" - -#: ../midori/midori-websettings.c:975 -msgid "Maximum cookie age" -msgstr "쿠키를 보존할 최장 기간" +#: ../midori/midori-websettings.c:904 +msgid "Delete old Cookies after:" +msgstr "쿠키를 보존할 기간:" -#: ../midori/midori-websettings.c:976 +#: ../midori/midori-websettings.c:905 msgid "The maximum number of days to save cookies for" msgstr "쿠키를 저장할 최장 기간을 설정합니다" -#: ../midori/midori-websettings.c:985 -msgid "Maximum history age" -msgstr "기록을 저장할 최대 기간" +#: ../midori/midori-websettings.c:921 +msgid "Only accept Cookies from sites you visit" +msgstr "방문한 사이트의 쿠키만을 허용" + +#: ../midori/midori-websettings.c:922 +msgid "Block cookies sent by third-party websites" +msgstr "서드 파티 웹 사이트가 보낸 쿠키 막기" + +#: ../midori/midori-websettings.c:936 +msgid "Delete pages from history after:" +msgstr "기록에 페이지를 보존할 기간:" -#: ../midori/midori-websettings.c:986 +#: ../midori/midori-websettings.c:937 msgid "The maximum number of days to save the history for" msgstr "방문 기록을 저장할 최대 기간을 설정합니다" -#: ../midori/midori-websettings.c:994 -msgid "Remember last downloaded files" -msgstr "마지막에 다운로드한 파일 기억" - -#: ../midori/midori-websettings.c:995 -msgid "Whether the last downloaded files are saved" -msgstr "마지막으로 다운로드한 파일을 저장할지 결정합니다." - -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:952 msgid "Proxy server" msgstr "프록시 서버" -#: ../midori/midori-websettings.c:1013 +#: ../midori/midori-websettings.c:953 msgid "The type of proxy server to use" msgstr "사용할 프록시 서버의 종류" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:962 msgid "HTTP Proxy Server" msgstr "HTTP 프록시 서버" -#: ../midori/midori-websettings.c:1023 +#: ../midori/midori-websettings.c:963 msgid "The proxy server used for HTTP connections" -msgstr "HTTP 연결에 사용되는 프록시 서버" +msgstr "HTTP 연결에 사용하는 프록시 서버" + +#: ../midori/midori-websettings.c:978 +msgid "Port" +msgstr "포트" + +#: ../midori/midori-websettings.c:979 +msgid "The proxy server port used for HTTP connections" +msgstr "HTTP 연결에 사용하는 프록시 서버 포트" + +#: ../midori/midori-websettings.c:997 +msgid "The maximum size of cached pages on disk" +msgstr "디스크에 페이지를 저장할 최대 공간" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1039 +#: ../midori/midori-websettings.c:1014 msgid "Identify as" msgstr "식별 명" -#: ../midori/midori-websettings.c:1040 +#: ../midori/midori-websettings.c:1015 msgid "What to identify as to web pages" -msgstr "웹 페이지에 보낼 유저 에이전트 식별 명을 지정합니다." +msgstr "웹 페이지에 보낼 식별 명을 지정합니다." -#: ../midori/midori-websettings.c:1056 +#: ../midori/midori-websettings.c:1031 msgid "Identification string" msgstr "식별 문자열" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1032 msgid "The application identification string" msgstr "응용 프로그램 식별 문자열" -#: ../midori/midori-websettings.c:1072 +#: ../midori/midori-websettings.c:1048 msgid "Preferred languages" msgstr "우선할 인코딩" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1049 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "" -"복수의 언어로 작성된 웹 페이지를 읽을 때 사용할 언어의 우선순위를 쉼표로 구분" +"복수의 언어로 작성한 웹 페이지를 읽을 때 사용할 언어의 우선순위를 쉼표로 구분" "해 지정합니다. 예) \"de\", \"ru,nl\" 또는 \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1088 +#: ../midori/midori-websettings.c:1064 msgid "Clear private data" msgstr "개인 데이터 지우기" -#: ../midori/midori-websettings.c:1089 +#: ../midori/midori-websettings.c:1065 msgid "The private data selected for deletion" 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:1227 ../midori/midori-view.c:4439 -#: ../midori/midori-view.c:4443 +#: ../midori/midori-websettings.c:1080 +msgid "Clear data" +msgstr "데이터 지우기" + +#: ../midori/midori-websettings.c:1081 +msgid "The data selected for deletion" +msgstr "삭제할 데이터를 선택했습니다" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1130 +msgid "Strip referrer details sent to websites" +msgstr "외부 사이트에 보낼 리퍼러의 자세한 내용을 제거" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1132 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "\"리퍼러\" 헤더를 호스트 이름으로 줄이기" + +#: ../midori/midori-websettings.c:1146 +msgid "Always use my font choices" +msgstr "항상 사용자가 선택한 글꼴을 사용" + +#: ../midori/midori-websettings.c:1147 +msgid "Override fonts picked by websites with user preferences" +msgstr "웹 사이트에 설정된 글꼴을 사용자 기본 설정으로 대체" + +#: ../midori/midori-view.c:1360 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s이(가) HTML5 데이터 베이스를 저장하려 합니다." + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Deny" +msgstr "거부(_D)" + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Allow" +msgstr "허용(_A)" + +#: ../midori/midori-view.c:1392 +#, c-format +msgid "%s wants to know your location." +msgstr "%s이(가) 위치를 알고 싶어합니다." + +#: ../midori/midori-view.c:1485 #, c-format msgid "Error - %s" msgstr "오류 - %s" -#: ../midori/midori-view.c:1228 +#: ../midori/midori-view.c:1486 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "페이지 '%s'을(를) 불러올 수 없습니다." -#: ../midori/midori-view.c:1230 +#: ../midori/midori-view.c:1488 msgid "Try again" msgstr "다시 시도하십시오" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1249 -#, c-format -msgid "Not found - %s" -msgstr "%s이(가) 발견되지 않았습니다" - -#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 +#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598 #, c-format msgid "Send a message to %s" msgstr "%s에 메시지 보내기" -#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 +#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747 msgid "Inspect _Element" msgstr "요소 검사(_E)" -#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2480 msgid "Open Link in New _Tab" msgstr "새 탭에 링크 열기(_T)" -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2484 msgid "Open Link in _Foreground Tab" msgstr "새 탭에 링크 열고 전환(_F)" -#: ../midori/midori-view.c:2118 +#: ../midori/midori-view.c:2485 msgid "Open Link in _Background Tab" msgstr "새 탭에 링크 열고 전환 안 함(_B)" -#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2488 msgid "Open Link in New _Window" msgstr "새 창에 링크 열기(_W)" -#: ../midori/midori-view.c:2124 +#: ../midori/midori-view.c:2491 msgid "Open Link as Web A_pplication" msgstr "웹 응용 프로그램으로 링크 열기(_P)" -#: ../midori/midori-view.c:2127 +#: ../midori/midori-view.c:2496 msgid "Copy Link de_stination" msgstr "링크 위치 복사(_S)" -#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 -msgid "_Save Link destination" -msgstr "링크 다른 이름으로 저장(_S)" - -#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 -msgid "_Download Link destination" -msgstr "링크 다운로드(_D)" - -#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 -#: ../midori/midori-view.c:2207 -msgid "Download with Download _Manager" -msgstr "다운로드 관리자로 다운로드(_M)" - -#: ../midori/midori-view.c:2144 +#: ../midori/midori-view.c:2512 msgid "Open _Image in New Tab" msgstr "그림 새 탭에서 열기(_I)" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2515 msgid "Copy Image _Address" msgstr "그림 주소 복사(_A)" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2518 msgid "Save I_mage" msgstr "그림 저장(_M)" -#: ../midori/midori-view.c:2151 -msgid "Download I_mage" -msgstr "그림 다운로드(_M)" +#: ../midori/midori-view.c:2521 +msgid "Open in Image _Viewer" +msgstr "그림 보기 프로그램으로 열기(_V)" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2528 msgid "Copy Video _Address" msgstr "비디오 주소 복사(_A)" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2531 msgid "Save _Video" msgstr "비디오 저장(_V)" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2531 msgid "Download _Video" msgstr "비디오 다운로드(_V)" -#: ../midori/midori-view.c:2224 +#: ../midori/midori-view.c:2557 msgid "Search _with" msgstr "다음으로 검색(_W)" -#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2589 msgid "_Search the Web" msgstr "웹 검색(_S)" -#: ../midori/midori-view.c:2287 +#: ../midori/midori-view.c:2606 msgid "Open Address in New _Tab" msgstr "주소 새 탭에서 열기(_T)" -#: ../midori/midori-view.c:2591 +#: ../midori/midori-view.c:2909 msgid "Open or download file" msgstr "파일을 열거나 다운로드 합니다" -#: ../midori/midori-view.c:2610 +#: ../midori/midori-view.c:2929 #, c-format msgid "File Type: '%s'" msgstr "파일 종류: '%s'" -#: ../midori/midori-view.c:2613 +#: ../midori/midori-view.c:2931 #, 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:2617 +#: ../midori/midori-view.c:2935 +#, c-format +msgid "File Name: %s" +msgstr "파일 이름: %s" + +#: ../midori/midori-view.c:2955 #, c-format msgid "Open %s" msgstr "%s 열기" -#: ../midori/midori-view.c:3158 +#: ../midori/midori-view.c:3576 #, c-format msgid "Inspect page - %s" msgstr "페이지 살피기 - %s" -#: ../midori/midori-view.c:3439 -msgid "Speed dial" +#: ../midori/midori-view.c:3923 +msgid "Speed Dial" msgstr "단축 번호" -#: ../midori/midori-view.c:3440 +#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020 msgid "Click to add a shortcut" msgstr "바로 가기를 더하려면 누르십시오" -#: ../midori/midori-view.c:3441 +#: ../midori/midori-view.c:3925 msgid "Enter shortcut address" msgstr "바로 가기 주소 입력" -#: ../midori/midori-view.c:3442 +#: ../midori/midori-view.c:3926 msgid "Enter shortcut title" msgstr "바로 가기 제목 입력" -#: ../midori/midori-view.c:3443 +#: ../midori/midori-view.c:3927 msgid "Are you sure you want to delete this shortcut?" msgstr "이 바로 가기를 정말로 삭제하시겠습니까?" -#: ../midori/midori-view.c:3444 -msgid "Set number of columns and rows" -msgstr "행과 열 개수 설정," +#: ../midori/midori-view.c:4089 +#, c-format +msgid "No documentation installed" +msgstr "설치한 문서 도구가 없습니다" -#: ../midori/midori-view.c:3445 -msgid "Enter number of columns and rows:" -msgstr "행과 열 개수를 입력하세요:" +#: ../midori/midori-view.c:4165 +msgid "Midori doesn't store any personal data:" +msgstr "미도리는 어떤 개인 정보도 보존하지 않습니다:" + +#: ../midori/midori-view.c:4166 +msgid "No history or web cookies are being saved." +msgstr "어떤 기록과 웹 쿠기도 저장하지 않습니다." + +#: ../midori/midori-view.c:4167 +msgid "Extensions are disabled." +msgstr "확장 기능을 사용하지 않습니다." -#: ../midori/midori-view.c:3446 -msgid "Invalid input for the size of the speed dial" -msgstr "유효하지 않은 단축 번호 크기 입력" +#: ../midori/midori-view.c:4168 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "" +"HTML5 저장소, 로컬 데이터베이스 그리고 프로그램 캐시를 사용하지 않습니다." -#: ../midori/midori-view.c:3447 -msgid "Thumb size:" -msgstr "미리 보기 크기:" +#: ../midori/midori-view.c:4169 +msgid "Midori prevents websites from tracking the user:" +msgstr "미도리가 사용자를 추적할 수 없게 합니다.:" -#: ../midori/midori-view.c:3448 -msgid "Small" -msgstr "작게" +#: ../midori/midori-view.c:4170 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "리퍼러 웹 주소는 호스트 이름에서 기본적인 것만 남깁니다." -#: ../midori/midori-view.c:3449 -msgid "Medium" -msgstr "중간" +#: ../midori/midori-view.c:4171 +msgid "DNS prefetching is disabled." +msgstr "DNS 사전 판독을 사용하지 않습니다." -#: ../midori/midori-view.c:3450 -msgid "Big" -msgstr "크게" +#: ../midori/midori-view.c:4172 +msgid "The language and timezone are not revealed to websites." +msgstr "언어와 시간대를 웹 사이트가 모르게합니다." -#: ../midori/midori-view.c:3476 -#, c-format -msgid "Document cannot be displayed" -msgstr "문서를 표시할 수 없습니다." +#: ../midori/midori-view.c:4173 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "플래시와 넷스캐이프 플러그인을 웹 사이트가 알 수 없게 합니다." -#: ../midori/midori-view.c:3499 -#, c-format -msgid "No documentation installed" -msgstr "설치된 문서화 도구가 없습니다" +#: ../midori/midori-view.c:4222 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "괄호 안의 버전 번호는 실행 중인 미도리가 사용하고 있는 버전입니다." -#: ../midori/midori-view.c:3617 +#: ../midori/midori-view.c:4278 msgid "Page loading delayed" -msgstr "페이지 불러오기가 지연되었습니다." +msgstr "페이지 불러오기 연기" -#: ../midori/midori-view.c:3618 +#: ../midori/midori-view.c:4279 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" "최근 발생한 충돌이나 기본 설정 내 시작 페이지 설정으로 인해 페이지 불러오기" -"가 지연되었습니다." +"를 연기합니다." -#: ../midori/midori-view.c:3619 +#: ../midori/midori-view.c:4280 msgid "Load Page" msgstr "페이지 불러오기" -#: ../midori/midori-view.c:3761 +#: ../midori/midori-view.c:4446 msgid "Blank page" msgstr "빈 페이지" -#: ../midori/midori-view.c:4015 +#: ../midori/midori-view.c:4708 msgid "_Duplicate Tab" msgstr "탭 복제(_D)" -#: ../midori/midori-view.c:4020 -msgid "_Restore Tab" -msgstr "탭 되돌리기(_R)" - -#: ../midori/midori-view.c:4020 -msgid "_Minimize Tab" -msgstr "탭 최소화(_M)" +#: ../midori/midori-view.c:4713 +msgid "Show Tab _Label" +msgstr "탭 이름 보이기(_L)" + +#: ../midori/midori-view.c:4713 +msgid "Show Tab _Icon Only" +msgstr "탭 아이콘만 보이기(_I)" -#: ../midori/midori-view.c:4026 +#: ../midori/midori-view.c:4719 msgid "Close ot_her Tabs" msgstr "다른 탭 닫기(_H)" -#: ../midori/midori-view.c:4676 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5532 +msgid "previous" +msgstr "이전" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5551 +msgid "next" +msgstr "다음" + +#: ../midori/midori-view.c:5564 msgid "Print background images" msgstr "배경 그림 인쇄" -#: ../midori/midori-view.c:4677 +#: ../midori/midori-view.c:5565 msgid "Whether background images should be printed" msgstr "배경 그림을 인쇄할 지 결정합니다" -#: ../midori/midori-view.c:4729 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:5597 msgid "Features" msgstr "기능" -#. Page "General" -#: ../midori/midori-preferences.c:301 -msgid "General" -msgstr "일반" - -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "시작" -#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "현재 페이지를 사용(_C)" + +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "현재 페이지를 홈 페이지로 사용" -#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "전송" - #. Page "Appearance" -#: ../midori/midori-preferences.c:352 -msgid "Appearance" -msgstr "모양새" - -#: ../midori/midori-preferences.c:353 -msgid "Font settings" -msgstr "글꼴 설정" - -#: ../midori/midori-preferences.c:355 -msgid "Default Font Family" -msgstr "기본 글꼴 계열" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "글꼴" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "가변 폭 글꼴 계열" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "텍스트를 표시할 기본 글꼴 계열" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "텍스트를 표시할 기본 글꼴 크기" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "고정 폭 글꼴 계열" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "고정 폭 텍스트를 표시할 글꼴 계열" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" msgstr "고정 폭 텍스트를 표시할 글꼴 크기" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "최소 글꼴 크기" -#: ../midori/midori-preferences.c:374 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "문자를 표시할 최소 글꼴 크기" #. Page "Behavior" -#: ../midori/midori-preferences.c:383 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "행동" -#: ../midori/midori-preferences.c:396 -msgid "Enforce 96 dots per inch" -msgstr "96DPI 강제 지정" - -#: ../midori/midori-preferences.c:397 -msgid "Enforce a video dot density of 96 DPI" -msgstr "해상도를 96DPI로 강제합니다" - -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "팝업 열기 스크립트 허용" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "스크립트가 팝업 창을 자동으로 열 수 있게 할지 선택합니다." -#: ../midori/midori-preferences.c:422 -msgid "Spell Checking" -msgstr "맞춤법 검사" - -#: ../midori/midori-preferences.c:425 -msgid "Enable Spell Checking" -msgstr "맞춤법 검사 활성화" - -#: ../midori/midori-preferences.c:426 -msgid "Enable spell checking while typing" -msgstr "입력 중 맞춤법 검사를 활성화 합니다" - -#: ../midori/midori-preferences.c:428 -msgid "Spelling dictionaries:" -msgstr "맞춤법 검사에 사용할 사전:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:432 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" -msgstr "맞춤법 검사를 할 언어는 쉼표로 구분합니다, 예: \"en_GB,de_DE\"" - #. Page "Interface" -#: ../midori/midori-preferences.c:438 -msgid "Interface" -msgstr "인터페이스" - -#: ../midori/midori-preferences.c:439 -msgid "Navigationbar" -msgstr "내비게이션 줄" - -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:416 msgid "Browsing" -msgstr "탐색 중" - -#. Page "Applications" -#: ../midori/midori-preferences.c:471 -msgid "Applications" -msgstr "프로그램" - -#: ../midori/midori-preferences.c:472 -msgid "External applications" -msgstr "외부 프로그램" +msgstr "탐색" #. Page "Network" -#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "네트워크" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:463 msgid "Hostname" msgstr "호스트 이름" -#. Page "Privacy" -#: ../midori/midori-preferences.c:514 -msgid "Privacy" -msgstr "개인 정보" - -#: ../midori/midori-preferences.c:515 -msgid "Web Cookies" -msgstr "웹 쿠키" - -#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 -msgid "days" -msgstr "일" - -#: ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "비어있음" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "MB" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "검색 엔진 더하기" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "검색 엔진 편집" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "이름(_N):" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "설명(_D):" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "아이콘(_I):" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "토큰(_T):" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "검색 엔진 관리" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" -msgstr "기본값으로 사용(_D)" - -#: ../midori/sokoke.c:1303 -msgid "_Bookmark" -msgstr "책갈피(_B)" - -#: ../midori/sokoke.c:1304 -msgid "_Bookmarks" -msgstr "책갈피(_B)" +msgstr "기본 값으로 사용(_D)" -#: ../midori/sokoke.c:1305 -msgid "Add Boo_kmark" -msgstr "책갈피 더하기(_K)" - -#: ../midori/sokoke.c:1306 -msgid "_Console" -msgstr "콘솔(_C)" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "다음으로 열기" -#: ../midori/sokoke.c:1307 -msgid "_Extensions" -msgstr "확장 기능(_E)" +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "\"%s\"을(를) 열기 위한 응용 프로그램 또는 명령어를 선택해 주십시오:" -#: ../midori/sokoke.c:1308 -msgid "_History" -msgstr "기록(_H)" +#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "외부 프로그램을 실행할 수 없습니다." -#: ../midori/sokoke.c:1309 -msgid "_Homepage" -msgstr "홈페이지(_H)" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d 시간" -#: ../midori/sokoke.c:1310 -msgid "_Userscripts" -msgstr "사용자 스크립트(_U)" +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d 분" -#: ../midori/sokoke.c:1311 -msgid "New _Tab" -msgstr "새 탭(_T)" +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d 초" -#: ../midori/sokoke.c:1312 -msgid "_Transfers" -msgstr "전송(_T)" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s / %s" -#: ../midori/sokoke.c:1313 -msgid "Netscape p_lugins" -msgstr "넷스케이프 플러그인(_L)" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr "(%s/초)" -#: ../midori/sokoke.c:1316 -msgid "New _Folder" -msgstr "새 폴더(_F)" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr "- %s 남음" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:201 +#: ../toolbars/midori-findbar.c:291 msgid "_Inline Find:" msgstr "바로 찾기(_I):" -#: ../toolbars/midori-findbar.c:233 +#: ../toolbars/midori-findbar.c:317 msgid "Previous" msgstr "이전" -#: ../toolbars/midori-findbar.c:239 +#: ../toolbars/midori-findbar.c:323 msgid "Next" msgstr "다음" -#: ../toolbars/midori-findbar.c:243 +#: ../toolbars/midori-findbar.c:327 msgid "Match Case" msgstr "대소문자 일치" -#: ../toolbars/midori-findbar.c:252 +#: ../toolbars/midori-findbar.c:336 msgid "Highlight Matches" msgstr "일치하는 단어 강조 표시" -#: ../toolbars/midori-findbar.c:263 +#: ../toolbars/midori-findbar.c:347 msgid "Close Findbar" msgstr "찾기 줄 닫기" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 -#, c-format -msgid "%s of %s" -msgstr "%s / %s" - -#: ../toolbars/midori-transferbar.c:123 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "파일 '%s'을(를) 다운로드 했습니다." -#: ../toolbars/midori-transferbar.c:126 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "전송이 끝났습니다" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "다운로드한 파일에 오류가 있습니다." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"링크가 가리키고 있는 체크섬과 일치하지 않습니다. 이 것은 파일을 온전하게 다운" +"로드하지 못했거나 다운로드한 후 수정했다는 것을 의미합니다." + +#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "모두 지우기" -#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 +#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 msgid "Some files are being downloaded" msgstr "파일을 다운로드 하고 있습니다" -#: ../toolbars/midori-transferbar.c:306 +#: ../toolbars/midori-transferbar.c:377 msgid "_Quit Midori" msgstr "미도리 종료(_Q)" -#: ../toolbars/midori-transferbar.c:308 +#: ../toolbars/midori-transferbar.c:379 msgid "The transfers will be cancelled if Midori quits." -msgstr "미도리를 종료하시면 파일 다운로드가 취소될 것입니다." +msgstr "미도리를 종료하시면 파일 다운로드를 취소합니다." -#: ../panels/midori-bookmarks.c:116 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "책갈피" -#: ../panels/midori-bookmarks.c:275 +#: ../panels/midori-bookmarks.c:257 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "책갈피 항목을 추가하지 못했습니다: %s\n" -#: ../panels/midori-bookmarks.c:414 +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "선택한 책갈피를 편집합니다" -#: ../panels/midori-bookmarks.c:422 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "선택한 책갈피를 지웁니다" -#: ../panels/midori-bookmarks.c:436 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" msgstr "새 폴더를 더합니다" -#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 +#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 msgid "Separator" msgstr "구분선" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "콘솔" - -#: ../panels/midori-console.c:361 -msgid "Copy _All" -msgstr "모두 복사(_A)" - -#: ../panels/midori-console.c:362 -msgid "Copy All" -msgstr "모두 복사" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "기록" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "확장 기능" +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "오늘" -#: ../panels/midori-history.c:146 -msgid "A week ago" -msgstr "일 주 전" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "어제" -#: ../panels/midori-history.c:148 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d 일 전" -#: ../panels/midori-history.c:151 -msgid "Today" -msgstr "오늘" - -#: ../panels/midori-history.c:153 -msgid "Yesterday" -msgstr "어제" +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "일 주 전" -#: ../panels/midori-history.c:324 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" msgstr "정말 모든 기록 항목을 지우시겠습니까?" -#: ../panels/midori-history.c:369 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" msgstr "선택한 기록 항목을 책갈피에 더합니다" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" msgstr "선택한 기록 항목을 지웁니다" -#: ../panels/midori-history.c:386 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "모든 기록 제거" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "전송" + +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" msgstr "다운로드 폴더 열기(_F)" -#: ../panels/midori-transfers.c:484 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" msgstr "링크 위치 복사(_A)" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "인증이 필요합니다" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" @@ -2253,172 +2216,244 @@ "다음의 위치를 열기 위해서는\n" "사용자 이름과 암호를 입력하세요:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "사용자 이름" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "암호" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "암호 저장(_R)" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "'%s'(이)라는 이름을 가진 아이콘을 열 수 없습니다." -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "보관된 '%s'아이콘을 열 수 없습니다." +msgstr "보관한 아이콘 '%s'을(를) 열 수 없습니다." -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "애니메이션 프레임이 망가졌습니다" -#: ../katze/katze-utils.c:499 ../katze/katze-utils.c:894 +#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" msgstr "속성 '%s'은(는) %s에 적당하지 않음" -#: ../katze/katze-utils.c:545 ../katze/katze-utils.c:574 +#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "파일 선택" -#: ../katze/katze-utils.c:560 +#: ../katze/katze-utils.c:506 msgid "Choose folder" msgstr "폴더 선택" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "없음" + +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "한 시간" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "하루" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "일 주" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "한 달" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "일 년" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "%s을(를) 위한 기본 설정" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:473 msgid "Configure Advertisement filters" msgstr "광고 필터 설정" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:504 #, 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:587 -msgid "Configure _Advertisement filters..." -msgstr "광고 필터 설정(_A)..." +"텍스트 항목에 미리 설정한 필터 목록의 주소를 입력하시고, \"추가\"를 눌러 목록" +"에 추가해주십시오. 더 많은 목록은 %s에서 찾을 수 있습니다." -#: ../extensions/adblock.c:841 +#: ../extensions/adblock.c:882 msgid "Edit rule" msgstr "규칙 편집" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:896 msgid "_Rule:" msgstr "규칙(_R):" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:950 msgid "Bl_ock image" msgstr "그림 막기(_O)" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:955 msgid "Bl_ock link" msgstr "링크 막기(_O)" -#: ../extensions/adblock.c:1494 +#: ../extensions/adblock.c:1670 msgid "Advertisement blocker" msgstr "광고 막기" -#: ../extensions/adblock.c:1495 +#: ../extensions/adblock.c:1671 msgid "Block advertisements according to a filter list" msgstr "필터 목록에 따라 광고를 막습니다" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "%1$s을(를) 폴더 %2$s(으)로 복사합니다." +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "이 페이지는 사용자 스크립트를 포함하고 있습니다. 설치하시겠습니까?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "사용자 스크립트 설치(_I)" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "이 페이지는 사용자 스타일을 포함하고 있습니다. 설치하시겠습니까?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "사용자 스타일 설치(_I)" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "설치 안 함" -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "사용자 스크립트" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "사용자 스타일" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "오류" + +#: ../extensions/addons.c:421 #, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "확장 기능 '%s'의 설정을 저장할 수 없습니다: %s\n" +msgid "Do you want to delete '%s'?" +msgstr "'%s'을(를) 삭제하시겠습니까?" + +#: ../extensions/addons.c:427 +msgid "Delete user script" +msgstr "사용자 스크립트 삭제" + +#: ../extensions/addons.c:428 +msgid "Delete user style" +msgstr "사용자 스타일 삭제" + +#: ../extensions/addons.c:431 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "파일 '%s'을(를) 영구적으로 삭제합니다." + +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "텍스트 편집기로 열기" + +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "대상 폴더 열기" + +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "새 추가 기능 추가" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "선택한 추가 기능 제거" + +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" msgstr "사용자 추가 기능" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "폴더 '%s'을(를) 감시할 수 없습니다: %s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" msgstr "사용자 스크립트와 사용자 스타일을 지원합니다." -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "색이 칠해진 탭" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" -msgstr "각 탭이 구분되도록 색을 칠합니다" +msgstr "각 탭을 구분하기 쉽게 색을 칠합니다" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "쿠키 관리자" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "모두 삭제" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 +#: ../extensions/cookie-manager/cookie-manager-page.c:105 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:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "모두 펴기" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "모두 접기" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" -msgstr "정말로 모든 쿠키를 삭제하시겠습니까?" +msgstr "정말 모든 쿠키를 삭제하시겠습니까?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "물음" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." msgstr "이 필터와 맞는 쿠키만 지워집니다." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "현재 세션의 끝" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2435,15 +2470,15 @@ "확인: %s\n" "만료: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "예" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" -msgstr "아니오" +msgstr "아니요" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" @@ -2452,86 +2487,74 @@ "도메인: %s\n" "쿠키: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "이름" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "모두 펴기(_E)" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "모두 접기(_C)" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 msgid "Filter:" msgstr "필터:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 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" -msgstr "쿠키 관리자(_C)" - -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "쿠키의 목록 또는 내용을 보고 삭제합니다" -#: ../extensions/copy-tabs.c:39 +#: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" msgstr "탭 주소 복사(_A)" -#: ../extensions/copy-tabs.c:98 +#: ../extensions/copy-tabs.c:95 msgid "Copy Addresses of Tabs" msgstr "탭 주소를 복사합니다" -#: ../extensions/copy-tabs.c:99 +#: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" msgstr "모든 탭의 주소를 클립보드로 복사합니다" -#: ../extensions/external-applications.vala:93 -msgid "External Applications" -msgstr "외부 응용 프로그램" - -#: ../extensions/external-applications.vala:94 -msgid "Associate URL schemes with external commands" -msgstr "웹 주소를 관련된 외부 명령어와 연결합니다" - #: ../extensions/feed-panel/feed-atom.c:209 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:315 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:398 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "마지막 업데이트: %s." -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "피드" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "새 피드 더하기" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "피드 삭제" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "피드(_F)" @@ -2560,15 +2583,11 @@ #: ../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\" 요소를 찾을 수 없습니다." - -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "오류" +msgstr "XML 데이터가 요구한 RSS \"channel\" 요소를 찾을 수 없습니다." #: ../extensions/feed-panel/main.c:131 #, c-format @@ -2580,231 +2599,252 @@ msgid "Error loading feed '%s'" msgstr "피드 '%s'을(를) 읽어 들이는 중 오류" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "피드 패널" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Atom/RSS 피드를 읽습니다" -#: ../extensions/formhistory.c:142 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" msgstr "폼 값을 추가할 수 없음: %s\n" -#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "폼 기록" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"암호 데이터베이스를 열기 위해서는\n" +"주 암호가 필요합니다." + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "이 페이지에서 암호를 저장하시겠습니까?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "암호 저장" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "나중에 하기" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "이 페이지는 절대 하지 않기" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "폼 기록 상태 켜고 끄기" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "현재 탭의 폼 기록을 사용하거나 사용하지 않습니다." + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "데이터 베이스 문(statement)을 실행할 수 없습니다: %s\n" -#: ../extensions/formhistory.c:503 +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" +"폼 기록을 탭 별로 키보드 바로 가기(컨트롤 + 시프트 + F)로만 활성화합니다." + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "입력 폼 기록 필터" + +#: ../extensions/formhistory/formhistory.c:669 msgid "Stores history of entered form data" -msgstr "입력된 폼 데이터 기록을 보존합니다" +msgstr "입력한 폼 데이터 기록을 보존합니다" -#: ../extensions/formhistory.c:507 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 #, c-format -msgid "Not available: %s" -msgstr "사용 불가: %s" +msgid "Failed to select suggestions\n" +msgstr "제안을 선택할 수 없습니다\n" -#: ../extensions/formhistory.c:508 -msgid "Resource files not installed" -msgstr "리소스 파일이 설치되지 않음" +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "방문하지 않은 탭이 없습니다" -#: ../extensions/formhistory.c:514 -msgid "Form history filler" -msgstr "입력 폼 기록 필터" +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "기록 목록" -#: ../extensions/history-list.vala:174 -msgid "Next Tab (History List)" -msgstr "다음 탭 (기록 목록)" - -#: ../extensions/history-list.vala:175 -msgid "Next tab from history" -msgstr "기록 목록에서 다음 탭으로 전환합니다" - -#: ../extensions/history-list.vala:184 -msgid "Previous Tab (History List)" -msgstr "이전 탭 (기록 목록)" - -#: ../extensions/history-list.vala:185 -msgid "Previous tab from history" -msgstr "기록 목록에서 이전 탭으로 전환합니다" +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "탭을 닫을 때의 행동" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "아무것도 안 함" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "마지막에 본 탭으로 전환" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "최근 연 탭으로 전환" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "다음 새 탭 (기록 목록)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "기록 목록에서 다음 새 탭으로 전환합니다" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "이전 새 탭 (기록 목록)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "기록 목록에서 이전 새 탭으로 전환합니다" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "배경에 탭 표시 (기록 목록)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "지금 선택한 탭을 배경에 표시" -#: ../extensions/history-list.vala:245 +#: ../extensions/history-list.vala:569 msgid "History List" msgstr "기록 목록" -#: ../extensions/history-list.vala:246 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "" -"최근 사용한 순으로 보관된 목록에서 선택하여 탭을 전환할 수 있도록 합니다." +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "탭을 닫거나 전환할 때 마지막에 사용한 탭으로 이동합니다" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "마우스 제스처" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "마우스의 움직임으로 미도리를 조정합니다" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 -msgid "Pageholder" -msgstr "페이지 보관함" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "페이지 보관함(_P)" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "페이지를 다시 불러오거나 불러오는 것을 멈춥니다" -#: ../extensions/page-holder.c:178 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "" -"탭과는 별도로 열려있는 하나 이상의 페이지를 페이지 보관함에 보관합니다." - -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "키보드 바로 가기 설정" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "바로 가기 사용자 설정(_O)..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "바로 가기" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "키보드 바로 가기를 보고 편집합니다" -#: ../extensions/status-clock.c:176 +#: ../extensions/status-clock.c:174 msgid "Statusbar Clock" msgstr "상태 표시줄에 시계 표시" -#: ../extensions/status-clock.c:177 +#: ../extensions/status-clock.c:175 msgid "Display date and time in the statusbar" -msgstr "상태 표지줄에 시간과 날짜를 표시합니다" +msgstr "상태 표시줄에 시간과 날짜를 표시합니다" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "그림" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "스크립트" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "넷스케이프 플러그인" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "상태 표시줄 기능" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" msgstr "웹 페이지의 기능을 쉽게 켜고 끕니다" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "탭 패널" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "탭 패널(_A)" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "탭을 수직 패널에서 보여줍니다" -#: ../extensions/tabs-minimized.c:79 -msgid "Minimize new Tabs" -msgstr "새 탭 최소화" - -#: ../extensions/tabs-minimized.c:80 -msgid "New tabs open minimized" -msgstr "새 탭을 열 때 탭 막대를 최소화하여 표시합니다" +#: ../extensions/tabs-minimized.c:76 +msgid "Only Icons on Tabs by default" +msgstr "기본으로 탭에 아이콘만 표시" + +#: ../extensions/tabs-minimized.c:77 +msgid "New tabs have no label by default" +msgstr "기본으로 새 탭에 이름을 보이지 않습니다." -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "도구 모음 사용자 설정" -#: ../extensions/toolbar-editor.c:405 +#: ../extensions/toolbar-editor.c:409 msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " +"Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" -"도구 모음에 표시할 항목을 설정합니다. 끌어다 놓기로 항목을 재배치 할 수 있습" -"니다." +"도구 모음에 표시할 항목을 설정합니다. 끌어다 놓기로 항목을 다시 배치할 수 있" +"습니다." -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "가능한 항목" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" -msgstr "표시된 항목" +msgstr "표시한 항목" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "도구 모음 사용자 설정(_T)..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "사용자 지정(_C)..." + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" msgstr "도구 모음 편집기" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" -msgstr "도구 모음 배치를 간단히 편집합니다" +msgstr "도구 모음 배치를 쉽게 편집합니다" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "디스크에 HTTP 통신을 저장합니다." -#~ msgid "Erroneous clock time" -#~ msgstr "잘못된 시간" - -#~ msgid "" -#~ "The clock time lies in the past. Please check the current date and time." -#~ msgstr "시간이 잘못되어 있습니다. 현재 날짜와 시간을 확인하십시오." - -#~ msgid "_Recently visited pages" -#~ msgstr "최근 방문한 페이지(_R)" - -#~ msgid "Reopen pages that you visited earlier" -#~ msgstr "이전에 방문한 페이지를 다시 엽니다" - -#~ msgid "Original cookies only" -#~ msgstr "원본 쿠키만" - -#~ msgid "Accept cookies from the original website only" -#~ msgstr "원본 웹 사이트 쿠키만 받아들입니다." - -#~ msgid "Remember last visited pages" -#~ msgstr "마지막으로 방문한 페이지 기억" - -#~ msgid "Whether the last visited pages are saved" -#~ msgstr "마지막으로 방문한 페이지를 저장할지 결정합니다." - -#~ msgid "Detect proxy server automatically" -#~ msgstr "프록시 서버 자동으로 검색" - -#~ msgid "" -#~ "Whether to detect the proxy server automatically from the environment" -#~ msgstr "현재 환경에서 자동으로 프록시 서버를 검색할지 결정합니다." - -#~ msgid "Show the saved bookmarks" -#~ msgstr "저장된 책갈피 보기" - -#~ msgid "Set number of shortcuts" -#~ msgstr "바로 가기 번호 설정" - -#~ msgid "Enter number of shortcuts:" -#~ msgstr "바로 가기 번호를 입력하세요:" - -#~ msgid "" -#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "" -#~ "사용자 스크립트를 폴더%s(으)로 복사하고 사용자 스타일을 폴더 %s(으)로 복사" -#~ "합니다." +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "지정한 설정 폴더가 올바르지 않습니다." diff -Nru midori-0.2.8/po/lt.po midori-0.4.6/po/lt.po --- midori-0.2.8/po/lt.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/lt.po 2012-05-14 22:13:42.000000000 +0000 @@ -2,2460 +2,2461 @@ # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Ričardas Vasiulis 2010 -# +# Algimantas Margevičius , 2012. +# msgid "" msgstr "" -"Project-Id-Version: midori 0.2.7\n" +"Project-Id-Version: midori 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-26 16:08+0000\n" -"PO-Revision-Date: 2010-08-30 13:53+0300\n" -"Last-Translator: Ričardas Vasiulis \n" -"Language-Team: Lithuanian\n" +"POT-Creation-Date: 2012-04-22 02:48+0000\n" +"PO-Revision-Date: 2012-02-03 12:43+0200\n" +"Last-Translator: Algimantas Margevičius \n" +"Language-Team: Lietuvių <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2\n" +"Language: \n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n" "X-Poedit-Language: Lithuanian\n" "X-Poedit-SourceCharset: utf-8\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Paprasta interneto naršyklė" +msgid "Browse the Web" +msgstr "Naršyti internete" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1328 -#: ../midori/main.c:1657 -#: ../midori/main.c:1665 -#: ../midori/main.c:1681 -#: ../midori/midori-websettings.c:310 +msgid "Internet;WWW;Explorer" +msgstr "Internetas;WWW;Naršyklė" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072 +#: ../midori/main.c:2086 ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" -msgstr "Interneto naršyklė" +msgstr "Žiniatinklio naršyklė" + +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Midori privatus naršymas" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Atverti naują _privataus naršymo langą" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164 +msgid "Private Browsing" +msgstr "Privatus naršymas" -#: ../midori/main.c:99 +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Nepavyko įkelti konfigūracijos: %s\n" -#: ../midori/main.c:148 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Reikšmė „%s” yra netinkama su %s " -#: ../midori/main.c:155 -#: ../midori/main.c:241 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr "Netinkama konfigūracijos reikšmė: „%s”" -#: ../midori/main.c:368 -#: ../midori/main.c:472 -#: ../extensions/formhistory.c:440 +#: ../midori/main.c:380 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Paieškos sistemos įkelti nepavyko. %s\n" + +#: ../midori/main.c:434 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Nepavyko ištrinti žurnalo įrašų: %s\n" + +#: ../midori/main.c:454 ../midori/main.c:581 +#: ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" -msgstr "Nepavyko atverti duombaze: %s\n" +msgstr "Nepavyko atverti duomenų bazės: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:424 +#: ../midori/main.c:524 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "Nepavyko pašalinti senus žurnalo įrašus: %s\n" +msgstr "Nepavyko pašalinti senų žurnalo įrašų: %s\n" -#: ../midori/main.c:455 -#: ../panels/midori-history.c:169 -#: ../panels/midori-history.c:199 +#: ../midori/main.c:564 ../panels/midori-history.c:232 #, c-format msgid "Failed to remove history item: %s\n" -msgstr "Nepavyko pašalinti žurnalo įrašą: %s\n" +msgstr "Nepavyko pašalinti žurnalo įrašo: %s\n" -#: ../midori/main.c:500 +#: ../midori/main.c:611 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Adresyno įrašų nepavyko išsaugoti. %s" -#: ../midori/main.c:528 +#: ../midori/main.c:633 #, c-format msgid "The configuration couldn't be saved. %s" -msgstr "" +msgstr "Konfigūracijos nepavyko išsaugoti. %s" -#: ../midori/main.c:566 +#: ../midori/main.c:668 #, c-format msgid "The search engines couldn't be saved. %s" -msgstr "" +msgstr "Paieškos sistemos nepavyko išsaugoti. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:586 -#: ../midori/main.c:609 +#: ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" +msgstr "Šiukšlinės nepavyko išsaugoti. %s" + +#: ../midori/main.c:746 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Plėtiniai" + +#: ../midori/main.c:760 +msgid "Privacy" +msgstr "Privatumas" + +#: ../midori/main.c:772 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." msgstr "" +"Slapukai kaupia prisijungimo duomenis, išsaugotus žaidimus ar naudotojo " +"profilį reklamos reikmėms." -#: ../midori/main.c:668 -#: ../midori/main.c:908 +#: ../midori/main.c:828 #, c-format msgid "The session couldn't be saved. %s" -msgstr "" +msgstr "Sesijos nepavyko išsaugoti. %s" -#: ../midori/main.c:852 -msgid "No root certificate file is available. SSL certificates cannot be verified." +#: ../midori/main.c:1046 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." msgstr "" +"Šakninis sertifikatas neprieinamas. SSL sertifikatai negali būti patikrinti." -#: ../midori/main.c:942 -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." +#: ../midori/main.c:1115 +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 "" +"Panašu, kad paskutinį kartą atidarius „Midori”, ji užstrigo. Jei taip " +"atsitiko pakartotinai, pabandykite vieną iš šių parinkčių, kad išspręsti " +"problemą." -#: ../midori/main.c:957 +#: ../midori/main.c:1134 msgid "Modify _preferences" msgstr "Keisti _nustatymus" -#: ../midori/main.c:961 -msgid "Reset the last _session" -msgstr "" - -#: ../midori/main.c:966 +#: ../midori/main.c:1138 msgid "Disable all _extensions" -msgstr "" +msgstr "Išjungti _visus plėtinius" -#: ../midori/main.c:1206 -#: ../midori/main.c:1952 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "" +#: ../midori/main.c:1151 +msgid "Discard old tabs" +msgstr "Naikinti ankstesnes korteles" -#: ../midori/main.c:1328 -msgid "No filename specified" -msgstr "" +#: ../midori/main.c:1152 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "Rodyti ankstesnes korteles neįkeliant" -#: ../midori/main.c:1347 -msgid "An unknown error occured." -msgstr "" +#: ../midori/main.c:1153 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "Rodyti ankstesnes korteles" + +#: ../midori/main.c:1400 ../midori/main.c:2464 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Sesija negali būti įkelta: %s\n" -#: ../midori/main.c:1378 +#: ../midori/main.c:1538 #, c-format msgid "Snapshot saved to: %s\n" -msgstr "" +msgstr "Momentinė nuotrauka išsaugota: %s\n" -#: ../midori/main.c:1550 +#: ../midori/main.c:1951 msgid "Run ADDRESS as a web application" -msgstr "" +msgstr "Vykdyti ADRESĄ kaip interneto programą" -#: ../midori/main.c:1550 +#: ../midori/main.c:1951 msgid "ADDRESS" -msgstr "" +msgstr "ADRESAS" -#: ../midori/main.c:1553 +#: ../midori/main.c:1954 msgid "Use FOLDER as configuration folder" -msgstr "" +msgstr "Naudokite APLANKĄ kaip konfigūracijos aplanką" -#: ../midori/main.c:1553 +#: ../midori/main.c:1954 msgid "FOLDER" -msgstr "" +msgstr "APLANKAS" + +#: ../midori/main.c:1957 +msgid "Private browsing, no changes are saved" +msgstr "Privatus naršymas, jokie pakeitimai nesaugomi" -#: ../midori/main.c:1556 +#: ../midori/main.c:1959 msgid "Show a diagnostic dialog" -msgstr "" +msgstr "Rodyti diagnostikos dialogą" -#: ../midori/main.c:1558 +#: ../midori/main.c:1961 msgid "Run the specified filename as javascript" -msgstr "" +msgstr "Vykdyti nurodyto pavadinimo failą, kaip JavaScript" -#: ../midori/main.c:1561 +#: ../midori/main.c:1963 msgid "Take a snapshot of the specified URI" -msgstr "" +msgstr "Padaryti nurodyto URI momentinę nuotrauką" -#: ../midori/main.c:1564 +#: ../midori/main.c:1965 msgid "Execute the specified command" -msgstr "" +msgstr "Vykdyti nurodytą komandą" + +#: ../midori/main.c:1967 +msgid "List available commands to execute with -e/ --execute" +msgstr "Parodyti visas komandas, kurias galima vykdyti su e-/ --execute" -#: ../midori/main.c:1566 +#: ../midori/main.c:1969 msgid "Display program version" -msgstr "" +msgstr "Rodyti programos versiją" -#: ../midori/main.c:1568 +#: ../midori/main.c:1971 msgid "Addresses" -msgstr "" +msgstr "Adresai" -#: ../midori/main.c:1570 +#: ../midori/main.c:1973 msgid "Block URIs according to regular expression PATTERN" -msgstr "" +msgstr "Blokuoti URI pagal reguliariųjų išraiškų MODELĮ" -#: ../midori/main.c:1570 +#: ../midori/main.c:1973 msgid "PATTERN" -msgstr "" +msgstr "MODELIS" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1574 +#: ../midori/main.c:1977 msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "" +msgstr "Atstatyti Midori po SEKUNDŽIŲ neaktyvumo" -#: ../midori/main.c:1574 +#: ../midori/main.c:1977 msgid "SECONDS" -msgstr "" +msgstr "SEKUNDĖS" + +#: ../midori/main.c:1980 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Nukreipia konsolės įspėjimus į nurodytą FAILO VARDĄ" -#: ../midori/main.c:1654 +#: ../midori/main.c:1980 +msgid "FILENAME" +msgstr "FAILO VARDAS" + +#: ../midori/main.c:2045 msgid "[Addresses]" -msgstr "" +msgstr "[Adresai]" -#: ../midori/main.c:1682 +#: ../midori/main.c:2087 msgid "Please report comments, suggestions and bugs to:" -msgstr "" +msgstr "Prašome siųsti komentarus, pasiūlymus ir klaidas:" -#: ../midori/main.c:1684 +#: ../midori/main.c:2089 msgid "Check for new versions at:" -msgstr "" +msgstr "Ieškoti naujų versijų:" -#: ../midori/main.c:1801 -msgid "The specified configuration folder is invalid." -msgstr "" +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2173 +msgid "Saved logins and _passwords" +msgstr "Išsaugoti vardai ir sla_ptažodžiai" + +#: ../midori/main.c:2175 +msgid "Cookies and Website data" +msgstr "Slapukai ir tinklalapių duomenys" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2179 ../midori/midori-websettings.c:996 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Žiniatinklio podėlis" -#: ../midori/main.c:1849 -msgid "An instance of Midori is already running but not responding.\n" -msgstr "" +#: ../midori/main.c:2182 +msgid "Website icons" +msgstr "Svetainės piktogramos" -#: ../midori/main.c:1904 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "" +#: ../midori/main.c:2288 +msgid "An unknown error occured" +msgstr "Įvyko nežinoma klaida" + +#: ../midori/main.c:2395 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Midori egzempliorius jau veikia, tačiau neatsako.\n" -#: ../midori/main.c:1925 +#: ../midori/main.c:2431 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" -msgstr "" +msgstr "Adresyno nepavyksta įkelti: %s\n" -#: ../midori/main.c:1967 +#: ../midori/main.c:2479 #, c-format msgid "The trash couldn't be loaded: %s\n" -msgstr "" +msgstr "Šiukšlinės įkelti nepavyko: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:2492 #, c-format msgid "The history couldn't be loaded: %s\n" -msgstr "" +msgstr "Žurnalo įkelti nepavyko: %s\n" -#: ../midori/main.c:1994 +#: ../midori/main.c:2508 msgid "The following errors occured:" -msgstr "" +msgstr "Įvyko šios klaidos:" -#: ../midori/main.c:2010 +#: ../midori/main.c:2524 msgid "_Ignore" -msgstr "" +msgstr "_Nepaisyti" + +#: ../midori/midori-app.c:1334 +msgid "_Bookmark" +msgstr "Ž_ymelės" + +#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060 +msgid "_Bookmarks" +msgstr "Ž_ymelės" + +#: ../midori/midori-app.c:1336 +msgid "Add Boo_kmark" +msgstr "Pridėti ž_ymelę" + +#: ../midori/midori-app.c:1337 +msgid "_Console" +msgstr "_Konsolė" + +#: ../midori/midori-app.c:1338 +msgid "_Extensions" +msgstr "_Plėtiniai" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589 +msgid "_History" +msgstr "_Istorija" + +#: ../midori/midori-app.c:1340 +msgid "_Homepage" +msgstr "_Pradžios tinklalapis" + +#: ../midori/midori-app.c:1341 +msgid "_Userscripts" +msgstr "_Naudotojo scenarijai" -#: ../midori/midori-array.c:429 +#: ../midori/midori-app.c:1342 +msgid "New _Tab" +msgstr "Nauja _kortelė" + +#: ../midori/midori-app.c:1343 +msgid "_Transfers" +msgstr "_Perdavimai" + +#: ../midori/midori-app.c:1344 +msgid "Netscape p_lugins" +msgstr "Netscape _įskiepiai" + +#: ../midori/midori-app.c:1345 +msgid "_Closed Tabs" +msgstr "Už_vertos kortelės" + +#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216 +msgid "New _Window" +msgstr "Naujas _langas" + +#: ../midori/midori-app.c:1347 +msgid "New _Folder" +msgstr "Naujas _aplankas" + +#: ../midori/midori-array.c:522 msgid "File not found." -msgstr "" +msgstr "Failas nerastas." -#: ../midori/midori-array.c:463 -#: ../midori/midori-array.c:486 -#: ../midori/midori-array.c:496 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." -msgstr "" +msgstr "Klaidingas dokumentas." -#: ../midori/midori-array.c:505 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." -msgstr "" +msgstr "Neatpažintas adresyno formatas." -#: ../midori/midori-array.c:719 +#: ../midori/midori-array.c:915 msgid "Writing failed." -msgstr "" +msgstr "Rašymas nepavyko." -#: ../midori/midori-browser.c:336 -#: ../midori/midori-browser.c:4889 -#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298 +#: ../midori/midori-browser.c:5307 msgid "Reload the current page" -msgstr "" +msgstr "Perkrauti šį puslapį" -#: ../midori/midori-browser.c:346 -#: ../midori/midori-browser.c:4892 +#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304 msgid "Stop loading the current page" -msgstr "" +msgstr "Sustabdyti šį puslapį" -#: ../midori/midori-browser.c:453 -#, c-format -msgid "%d%% loaded" -msgstr "" - -#: ../midori/midori-browser.c:491 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" -msgstr "" +msgstr "Nepavyko atnaujinti antraštės: %s\n" -#: ../midori/midori-browser.c:504 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." -msgstr "" +msgstr "Nenumatytas veiksmas „%s”." + +#: ../midori/midori-browser.c:569 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Privatus naršymas)" + +#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716 +msgid "Toplevel folder" +msgstr "Aukščiausiojo lygio aplankas" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:774 msgid "New folder" -msgstr "" +msgstr "Naujas aplankas" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:774 msgid "Edit folder" -msgstr "" +msgstr "Redaguoti aplanką" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "New bookmark" -msgstr "" +msgstr "Naujas adresyno įrašas" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "Edit bookmark" -msgstr "" +msgstr "Taisyti adresyno įrašą" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:818 msgid "_Title:" -msgstr "" - -#: ../midori/midori-browser.c:779 -#: ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "" +msgstr "_Pavadinimas:" -#: ../midori/midori-browser.c:798 -#: ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" -msgstr "" +msgstr "_Adresas:" -#: ../midori/midori-browser.c:830 -#: ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326 msgid "_Folder:" -msgstr "" - -#: ../midori/midori-browser.c:840 -#: ../midori/midori-browser.c:934 -#: ../midori/midori-browser.c:4013 -#: ../midori/midori-browser.c:4042 -msgid "Toplevel folder" -msgstr "" +msgstr "Ap_lankas:" -#: ../midori/midori-browser.c:872 +#: ../midori/midori-browser.c:877 msgid "Add to _Speed Dial" -msgstr "" +msgstr "Pridėti į _spartųjį rinkimą" -#: ../midori/midori-browser.c:885 +#: ../midori/midori-browser.c:890 msgid "Show in the tool_bar" -msgstr "" +msgstr "Rodyti įrankių _juostoj" -#: ../midori/midori-browser.c:900 +#: ../midori/midori-browser.c:905 msgid "Run as _web application" -msgstr "" +msgstr "Veikia kaip _interneto programa" + +#: ../midori/midori-browser.c:976 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Failo „%s” nepavyko išsaugoti šiame aplanke." + +#: ../midori/midori-browser.c:978 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Jūs neturite leidimo rašyti į šią vietą." -#: ../midori/midori-browser.c:979 +#: ../midori/midori-browser.c:985 #, c-format msgid "There is not enough free space to download \"%s\"." -msgstr "" +msgstr "Čia nepakanka laisvos vietos atsisiųsti „%s”." -#: ../midori/midori-browser.c:983 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." -msgstr "" +msgstr "Failui reikia %s bet liko tik %s." -#: ../midori/midori-browser.c:1040 -#: ../midori/midori-browser.c:4050 -#: ../midori/midori-browser.c:4085 +#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395 msgid "Save file as" -msgstr "" +msgstr "Išsaugokite failą kaip" -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1320 +msgid "New Window" +msgstr "Naujas langas" + +#: ../midori/midori-browser.c:1320 +msgid "A new window has been opened" +msgstr "Naujas langas atidarytas" + +#: ../midori/midori-browser.c:1323 +msgid "New Tab" +msgstr "Nauja kortelė" + +#: ../midori/midori-browser.c:1323 +msgid "A new tab has been opened" +msgstr "Nauja kortelė atidaryta" + +#: ../midori/midori-browser.c:1358 +msgid "Error opening the image!" +msgstr "Klaida atveriant paveikslėlį!" + +#: ../midori/midori-browser.c:1359 +msgid "Can not open selected image in a default viewer." +msgstr "Numatytoje žiūryklėje paveikslėlio atverti nepavyko." + +#: ../midori/midori-browser.c:1365 +msgid "Error downloading the image!" +msgstr "Klaida parsiunčiant paveikslėlį!" + +#: ../midori/midori-browser.c:1366 +msgid "Can not download selected image." +msgstr "Nepavyko parsiųst paveikslėlio." + +#: ../midori/midori-browser.c:1492 msgid "Save file" -msgstr "" +msgstr "Išsaugoti failą" -#: ../midori/midori-browser.c:2150 +#: ../midori/midori-browser.c:2367 msgid "Open file" -msgstr "" +msgstr "Atverti failą" -#: ../midori/midori-browser.c:2228 +#: ../midori/midori-browser.c:2499 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." -msgstr "" +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr "" +"Aukščiau esančio URI naudojimui kaip naujienų programa. Paprastai yra meniu " +"arba mygtukai „Nauja prenumerata“, „Naujas naujienų kanalas“ ar panašūs.\n" +"Taipogi galite eiti Nustatymai, Programos Midori ir pasirinkti Naujienų " +"programą. Kitą kartą spustelėjus naujienų piktogramą, ji bus pridėta " +"automatiškai." -#: ../midori/midori-browser.c:2234 -#: ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365 msgid "New feed" -msgstr "" +msgstr "Naujas kanalas" -#: ../midori/midori-browser.c:2277 -#: ../midori/midori-browser.c:4954 -#: ../panels/midori-bookmarks.c:406 +#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" -msgstr "" +msgstr "Pridėti naują įrašą į adresyną" -#: ../midori/midori-browser.c:3283 -#: ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 -#: ../midori/sokoke.c:436 -#: ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "" +#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "Tuščias" -#: ../midori/midori-browser.c:3526 -#: ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:3467 +msgid "Toggle text cursor navigation" +msgstr "Perjungti teksto žymeklio naršymą" + +#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753 #, c-format msgid "Failed to insert new history item: %s\n" -msgstr "" +msgstr "Nepavyko įterpti naujo žurnalo įrašo: %s\n" -#: ../midori/midori-browser.c:3843 -#: ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:734 +#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 msgid "Open all in _Tabs" -msgstr "" +msgstr "Atverti viską _kortelėse" -#: ../midori/midori-browser.c:3850 -#: ../panels/midori-bookmarks.c:727 -#: ../panels/midori-history.c:740 -#: ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" -msgstr "" +msgstr "Atidaryti naujoje _kortelėje" -#: ../midori/midori-browser.c:3853 -#: ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4012 -#: ../panels/midori-bookmarks.c:729 -#: ../panels/midori-history.c:742 -#: ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657 +#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" -msgstr "" +msgstr "Atverti _naujame lange" -#: ../midori/midori-browser.c:3931 +#: ../midori/midori-browser.c:4213 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3932 +#: ../midori/midori-browser.c:4214 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:4215 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:4216 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3935 +#: ../midori/midori-browser.c:4217 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3959 +#: ../midori/midori-browser.c:4218 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4239 msgid "Import bookmarks..." -msgstr "" +msgstr "Importuoti adresyną ..." -#: ../midori/midori-browser.c:3962 -#: ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372 msgid "_Import bookmarks" msgstr "_Importuoti adresyną" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:4253 msgid "_Application:" -msgstr "" +msgstr "_Programa:" -#: ../midori/midori-browser.c:4000 -#: ../midori/midori-browser.c:5072 -#: ../midori/midori-websettings.c:224 -#: ../midori/midori-websettings.c:315 -#: ../katze/katze-utils.c:696 -msgid "Custom..." -msgstr "" +#: ../midori/midori-browser.c:4318 +msgid "Import from XBEL or HTML file" +msgstr "Importuoti iš XBEL ar HTML failo" + +#: ../midori/midori-browser.c:4353 +msgid "Import from a file" +msgstr "Importuoti iš failo" -#: ../midori/midori-browser.c:4061 +#: ../midori/midori-browser.c:4365 msgid "Failed to import bookmarks" -msgstr "" +msgstr "Adresyno importas nepavyko" -#: ../midori/midori-browser.c:4102 -msgid "Failed to export bookmarks" -msgstr "" +#: ../midori/midori-browser.c:4400 +msgid "XBEL Bookmarks" +msgstr "XBEL adresynas" -#: ../midori/midori-browser.c:4155 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "" +#: ../midori/midori-browser.c:4405 +msgid "Netscape Bookmarks" +msgstr "Netscape adresynas" -#: ../midori/midori-browser.c:4163 -#, c-format -msgid "Failed to clear search history: %s\n" -msgstr "" +#: ../midori/midori-browser.c:4419 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "Midori gali eksportuoti tik xbel (*. xbel) ir Netscape (*. html)" + +#: ../midori/midori-browser.c:4434 +msgid "Failed to export bookmarks" +msgstr "Adresyno eksportas nepavyko" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4270 +#: ../midori/midori-browser.c:4556 msgid "Clear Private Data" -msgstr "" +msgstr "Pašalinti asmeninius duomenis" -#: ../midori/midori-browser.c:4274 +#: ../midori/midori-browser.c:4560 msgid "_Clear private data" -msgstr "" +msgstr "Šalinti _asmeninius duomenis" -#: ../midori/midori-browser.c:4288 +#: ../midori/midori-browser.c:4573 msgid "Clear the following data:" -msgstr "" - -#: ../midori/midori-browser.c:4298 -#: ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:114 -msgid "History" -msgstr "" - -#: ../midori/midori-browser.c:4303 -msgid "Cookies" -msgstr "Slapukai" - -#: ../midori/midori-browser.c:4308 -msgid "'Flash' Cookies" -msgstr "" - -#: ../midori/midori-browser.c:4313 -msgid "Website icons" -msgstr "Svetainės piktogramos" - -#: ../midori/midori-browser.c:4318 -#: ../midori/sokoke.c:1314 -msgid "_Closed Tabs" -msgstr "" +msgstr "Šalinti šiuos duomenis:" -#: ../midori/midori-browser.c:4323 -#: ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "Žiniatinklio podėlis" +#: ../midori/midori-browser.c:4583 +msgid "Last open _tabs" +msgstr "Paskutinės atvertos _kortelės" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4609 msgid "Clear private data when _quitting Midori" -msgstr "" +msgstr "Šalinti asmeninius duomenis _uždarant Midori" -#: ../midori/midori-browser.c:4472 +#: ../midori/midori-browser.c:4804 msgid "A lightweight web browser." -msgstr "" +msgstr "Paprasta naršyklė." -#: ../midori/midori-browser.c:4474 -msgid "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." -msgstr "" +#: ../midori/midori-browser.c:4805 +msgid "See about:version for version info." +msgstr "Norėdami pamatyti versijos informaciją pažiūrėkite about:version ." + +#: ../midori/midori-browser.c:4807 +msgid "" +"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." +msgstr "" +"Ši biblioteka yra nemokama programinė įranga, galite ją platinti ir/arba " +"modifikuoti pagal GNU Lesser General Public License kaip paskelbė Free " +"Software Foundation; arba versija 2.1 licencija, arba (Jūsų pasirinkimu) bet " +"kuria vėlesne versija." -#: ../midori/midori-browser.c:4493 +#: ../midori/midori-browser.c:4828 msgid "translator-credits" msgstr "" +"Ričardas Vasiulis \n" +"Algimantas Margevičius " -#: ../midori/midori-browser.c:4802 +#: ../midori/midori-browser.c:5214 msgid "_File" msgstr "_Failas" -#: ../midori/midori-browser.c:4804 -#: ../midori/sokoke.c:1315 -msgid "New _Window" -msgstr "Naujas _langas" - -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:5217 msgid "Open a new window" msgstr "Atverti naują langą" -#: ../midori/midori-browser.c:4808 +#: ../midori/midori-browser.c:5220 msgid "Open a new tab" msgstr "Atverti naują kortelę" -#: ../midori/midori-browser.c:4810 -msgid "P_rivate Browsing" -msgstr "P_rivatus naršymas" - -#: ../midori/midori-browser.c:4811 -msgid "Don't save any private data while browsing" -msgstr "Naršymo metu nesaugoti jokių duomenų " +#: ../midori/midori-browser.c:5222 +msgid "New P_rivate Browsing Window" +msgstr "Naujas _privataus naršymo langas" -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:5226 msgid "Open a file" msgstr "Atverti failą" -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:5228 +msgid "_Save Page As..." +msgstr "_Išsaugoti tinklapį kaip..." + +#: ../midori/midori-browser.c:5229 msgid "Save to a file" -msgstr "" +msgstr "Išsaugoti faile" -#: ../midori/midori-browser.c:4820 +#: ../midori/midori-browser.c:5231 msgid "Add to Speed _dial" -msgstr "" - -#: ../midori/midori-browser.c:4821 -msgid "Add shortcut to speed dial" -msgstr "" +msgstr "Pridėti į spartųjį _rinkimą" -#: ../midori/midori-browser.c:4823 +#: ../midori/midori-browser.c:5235 msgid "Add Shortcut to the _desktop" -msgstr "" +msgstr "Įdėti nuorodą į _darbastalį" -#: ../midori/midori-browser.c:4824 -msgid "Add shortcut to the desktop" -msgstr "" +#: ../midori/midori-browser.c:5237 +msgid "Create _Launcher" +msgstr "Sukurti _leistuką" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:5241 msgid "Subscribe to News _feed" -msgstr "" - -#: ../midori/midori-browser.c:4827 -msgid "Subscribe to this news feed" -msgstr "" +msgstr "_Užsisakyti šį kanalą" -#: ../midori/midori-browser.c:4832 +#: ../midori/midori-browser.c:5247 msgid "_Close Tab" msgstr "_Užverti kortelę" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:5248 msgid "Close the current tab" msgstr "Užverti šią kortelę" -#: ../midori/midori-browser.c:4835 +#: ../midori/midori-browser.c:5250 msgid "C_lose Window" -msgstr "Užverti langą" +msgstr "Užverti _langą" -#: ../midori/midori-browser.c:4836 -msgid "Close this window" -msgstr "Užverti šį langą" - -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:5254 msgid "Print the current page" msgstr "Spausdinti šį puslapį " -#: ../midori/midori-browser.c:4842 -msgid "Quit the application" -msgstr "Uždaryti programą" +#: ../midori/midori-browser.c:5256 +msgid "Close a_ll Windows" +msgstr "Užverti _visus langus" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:5259 msgid "_Edit" -msgstr "_Taisa" - -#: ../midori/midori-browser.c:4848 -msgid "Undo the last modification" -msgstr "" - -#: ../midori/midori-browser.c:4851 -msgid "Redo the last modification" -msgstr "" - -#: ../midori/midori-browser.c:4855 -msgid "Cut the selected text" -msgstr "" - -#: ../midori/midori-browser.c:4858 -#: ../midori/midori-browser.c:4861 -msgid "Copy the selected text" -msgstr "" - -#: ../midori/midori-browser.c:4864 -msgid "Paste text from the clipboard" -msgstr "" - -#: ../midori/midori-browser.c:4867 -msgid "Delete the selected text" -msgstr "" +msgstr "K_eisti" -#: ../midori/midori-browser.c:4870 -msgid "Select all text" -msgstr "" +#: ../midori/midori-browser.c:5282 +msgid "_Find..." +msgstr "Iešk_oti ..." -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:5283 msgid "Find a word or phrase in the page" -msgstr "" +msgstr "Surasti žodį arba frazę puslapyje" -#: ../midori/midori-browser.c:4875 +#: ../midori/midori-browser.c:5285 msgid "Find _Next" -msgstr "" +msgstr "Ieškoti _kito" -#: ../midori/midori-browser.c:4876 -msgid "Find the next occurrence of a word or phrase" -msgstr "" - -#: ../midori/midori-browser.c:4878 +#: ../midori/midori-browser.c:5288 msgid "Find _Previous" -msgstr "" - -#: ../midori/midori-browser.c:4879 -msgid "Find the previous occurrence of a word or phrase" -msgstr "" +msgstr "Ieškoti _ankstesnio" -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:5292 msgid "Configure the application preferences" -msgstr "" +msgstr "Konfigūruoti programos nuostatas" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:5294 msgid "_View" msgstr "_Rodymas" -#: ../midori/midori-browser.c:4886 +#: ../midori/midori-browser.c:5295 msgid "_Toolbars" -msgstr "" +msgstr "Įrankių _juostos" + +#: ../midori/midori-browser.c:5300 +msgid "Reload page without caching" +msgstr "Perkrauti puslapį be spartinimo" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:5310 msgid "Increase the zoom level" -msgstr "" +msgstr "Didinti mastelį" -#: ../midori/midori-browser.c:4901 +#: ../midori/midori-browser.c:5313 msgid "Decrease the zoom level" -msgstr "" - -#: ../midori/midori-browser.c:4904 -msgid "Reset the zoom level" -msgstr "" +msgstr "Sumažinti mastelį" -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:5317 msgid "_Encoding" -msgstr "" +msgstr "_Kodavimas" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:5319 msgid "View So_urce" -msgstr "" +msgstr "Rodyti pirminį _kodą" -#: ../midori/midori-browser.c:4908 -msgid "View the source code of the page" -msgstr "" +#: ../midori/midori-browser.c:5322 +msgid "Ca_ret Browsing" +msgstr "_Privatus naršymas" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:5326 msgid "Toggle fullscreen view" -msgstr "" +msgstr "Perjungti viso ekrano veikseną" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:5328 msgid "Scroll _Left" -msgstr "" - -#: ../midori/midori-browser.c:4915 -msgid "Scroll to the left" -msgstr "" +msgstr "Slinkti _kairėn" -#: ../midori/midori-browser.c:4917 +#: ../midori/midori-browser.c:5331 msgid "Scroll _Down" -msgstr "" +msgstr "Slinkti _žemyn" -#: ../midori/midori-browser.c:4918 -msgid "Scroll down" -msgstr "" - -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:5334 msgid "Scroll _Up" -msgstr "" - -#: ../midori/midori-browser.c:4921 -msgid "Scroll up" -msgstr "" +msgstr "Slinkti _aukštyn" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:5337 msgid "Scroll _Right" -msgstr "" - -#: ../midori/midori-browser.c:4924 -msgid "Scroll to the right" -msgstr "" +msgstr "Slinkti _dešinėn" -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:5340 msgid "_Go" msgstr "_Eiti" -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:5343 msgid "Go back to the previous page" -msgstr "" +msgstr "Grįžti į ankstesnį puslapį" -#: ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:5346 msgid "Go forward to the next page" -msgstr "" +msgstr "Eiti į tolimesnį puslapį" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4937 +#: ../midori/midori-browser.c:5350 msgid "Go to the previous sub-page" -msgstr "" +msgstr "Eiti į ankstesnį popuslapį" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:5354 msgid "Go to the next sub-page" -msgstr "" +msgstr "Eiti į kitą popuslapį" -#: ../midori/midori-browser.c:4944 +#: ../midori/midori-browser.c:5357 msgid "Go to your homepage" -msgstr "" +msgstr "Eiti į jūsų pradžios tinklapį" -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:5359 msgid "Empty Trash" -msgstr "" - -#: ../midori/midori-browser.c:4947 -msgid "Delete the contents of the trash" -msgstr "" +msgstr "Išvalyti šiukšlinę" -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:5362 msgid "Undo _Close Tab" -msgstr "" - -#: ../midori/midori-browser.c:4950 -msgid "Open the last closed tab" -msgstr "" +msgstr "_Atšaukti kortelės užvėrimą" -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:5369 msgid "Add a new _folder" -msgstr "" +msgstr "Pridėti naują _aplanką" -#: ../midori/midori-browser.c:4957 -msgid "Add a new bookmark folder" -msgstr "" - -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:5375 msgid "_Export bookmarks" msgstr "_Eksportuoti adresyną" -#: ../midori/midori-browser.c:4965 -#: ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" -msgstr "" +msgstr "_Tvarkyti paieškos variklius" -#: ../midori/midori-browser.c:4966 -msgid "Add, edit and remove search engines..." -msgstr "" - -#: ../midori/midori-browser.c:4969 +#: ../midori/midori-browser.c:5381 msgid "_Clear Private Data" -msgstr "" - -#: ../midori/midori-browser.c:4970 -msgid "Clear private data..." -msgstr "" +msgstr "Šalinti _asmeninius duomenis" -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:5384 msgid "_Inspect Page" -msgstr "" - -#: ../midori/midori-browser.c:4975 -msgid "Inspect page details and access developer tools..." -msgstr "" +msgstr "Apžiūrėti _tinklapį" -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:5388 msgid "_Previous Tab" -msgstr "" - -#: ../midori/midori-browser.c:4981 -msgid "Switch to the previous tab" -msgstr "" +msgstr "_Ankstesnė kortelė" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:5391 msgid "_Next Tab" -msgstr "" +msgstr "_Sekanti kortelė" -#: ../midori/midori-browser.c:4984 -msgid "Switch to the next tab" -msgstr "" +#: ../midori/midori-browser.c:5393 +msgid "Move Tab _Backward" +msgstr "Perkelti kortelę į _atgal" -#: ../midori/midori-browser.c:4986 -msgid "Focus _Current Tab" -msgstr "" +#: ../midori/midori-browser.c:5395 +msgid "_Move Tab Forward" +msgstr "Perkelti kortelę į _pirmyn" -#: ../midori/midori-browser.c:4987 -msgid "Focus the current tab" -msgstr "" +#: ../midori/midori-browser.c:5398 +msgid "Focus _Current Tab" +msgstr "Fokusuoti dabartinę _kortelę" -#: ../midori/midori-browser.c:4989 -msgid "Minimize _Current Tab" -msgstr "" +#: ../midori/midori-browser.c:5401 +msgid "Focus _Next view" +msgstr "Fokusuoti _sekantį rodinį" -#: ../midori/midori-browser.c:4990 -msgid "Minimize the current tab" -msgstr "" +#: ../midori/midori-browser.c:5404 +msgid "Only show the Icon of the _Current Tab" +msgstr "Rodyti tik dabartinės _kortelės piktogramą" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:5407 msgid "_Duplicate Current Tab" -msgstr "" +msgstr "_Dubliuoti dabartinę kortelę" -#: ../midori/midori-browser.c:4993 -msgid "Duplicate the current tab" -msgstr "" - -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:5410 msgid "Close Ot_her Tabs" -msgstr "" - -#: ../midori/midori-browser.c:4996 -msgid "Close all tabs except the current tab" -msgstr "" +msgstr "Užverti _kitas korteles" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5413 msgid "Open last _session" -msgstr "" - -#: ../midori/midori-browser.c:4999 -msgid "Open the tabs saved in the last session" -msgstr "" +msgstr "Atverti paskutinį _seansą" -#: ../midori/midori-browser.c:5001 +#: ../midori/midori-browser.c:5416 msgid "_Help" msgstr "_Žinynas" -#: ../midori/midori-browser.c:5003 -msgid "_Contents" -msgstr "" - -#: ../midori/midori-browser.c:5004 -msgid "Show the documentation" -msgstr "" - -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:5418 msgid "_Frequent Questions" -msgstr "" +msgstr "_Klausimai ir atsakymai" -#: ../midori/midori-browser.c:5007 -msgid "Show the Frequently Asked Questions" -msgstr "" +#: ../midori/midori-browser.c:5421 +msgid "_Report a Problem..." +msgstr "Pranešti apie pro_blemą..." -#: ../midori/midori-browser.c:5009 -msgid "_Report a Bug" -msgstr "" - -#: ../midori/midori-browser.c:5010 -msgid "Open Midori's bug tracker" -msgstr "" - -#: ../midori/midori-browser.c:5013 -msgid "Show information about the program" -msgstr "" - -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:5433 msgid "_Menubar" -msgstr "" - -#: ../midori/midori-browser.c:5022 -msgid "Show menubar" -msgstr "" +msgstr "_Meniu juosta" -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:5437 msgid "_Navigationbar" -msgstr "" - -#: ../midori/midori-browser.c:5026 -msgid "Show navigationbar" -msgstr "" +msgstr "_Naršymo juosta" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5441 msgid "Side_panel" -msgstr "" +msgstr "Š_oninis skydelis" -#: ../midori/midori-browser.c:5030 -msgid "Show sidepanel" -msgstr "" +#: ../midori/midori-browser.c:5442 +msgid "Sidepanel" +msgstr "Šoninis skydelis" -#: ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:5445 msgid "_Bookmarkbar" -msgstr "" - -#: ../midori/midori-browser.c:5034 -msgid "Show bookmarkbar" -msgstr "" +msgstr "_Adresų juosta" -#: ../midori/midori-browser.c:5037 -msgid "_Transferbar" -msgstr "" - -#: ../midori/midori-browser.c:5038 -msgid "Show transferbar" -msgstr "" - -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:5449 msgid "_Statusbar" -msgstr "" - -#: ../midori/midori-browser.c:5042 -msgid "Show statusbar" -msgstr "" +msgstr "_Būsenos juosta" -#: ../midori/midori-browser.c:5050 +#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311 msgid "_Automatic" -msgstr "" +msgstr "_Automatiškai" -#: ../midori/midori-browser.c:5053 -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236 msgid "Chinese (BIG5)" -msgstr "" +msgstr "Kinų (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5465 msgid "Japanese (SHIFT__JIS)" -msgstr "" +msgstr "Japonų (SHIFT__JIS)" -#: ../midori/midori-browser.c:5060 -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238 msgid "Korean (EUC-KR)" -msgstr "" +msgstr "Korėjiečių (EUC-KR)" -#: ../midori/midori-browser.c:5063 -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239 msgid "Russian (KOI8-R)" -msgstr "" +msgstr "Rusų (KOI8-R)" -#: ../midori/midori-browser.c:5066 -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240 msgid "Unicode (UTF-8)" -msgstr "" +msgstr "Unikodas (UTF-8)" -#: ../midori/midori-browser.c:5069 -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241 msgid "Western (ISO-8859-1)" -msgstr "" +msgstr "Vakarų (ISO-8859-1)" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "Pasirinktas..." + +#: ../midori/midori-browser.c:5985 msgid "_Separator" -msgstr "" +msgstr "_Skirtukas" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5992 msgid "_Location..." -msgstr "" +msgstr "_Vieta..." -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5994 msgid "Open a particular location" -msgstr "" +msgstr "Atverti tam tikrą adresą" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:6016 msgid "_Web Search..." -msgstr "" +msgstr "_Paieška žiniatinklyje ..." -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:6018 msgid "Run a web search" -msgstr "" +msgstr "Vykdyti paiešką žiniatinklyje" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:6045 msgid "Reopen a previously closed tab or window" -msgstr "" +msgstr "Atverti ankščiau užvertas korteles ar langus" -#: ../midori/midori-browser.c:5659 +#: ../midori/midori-browser.c:6062 +msgid "Show the saved bookmarks" +msgstr "Rodyti išsaugotas žymeles" + +#: ../midori/midori-browser.c:6079 msgid "_Tools" -msgstr "_Priemonės" +msgstr "Įra_nkiai" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:6095 msgid "_Window" -msgstr "_Kortelės" +msgstr "_Langas" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:6097 msgid "Show a list of all open tabs" -msgstr "" +msgstr "Rodyti atvertų kortelių sąrašą" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:6111 msgid "_Menu" -msgstr "" +msgstr "_Meniu" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:6113 msgid "Menu" -msgstr "" +msgstr "Meniu" -#: ../midori/midori-browser.c:6262 +#: ../midori/midori-browser.c:6927 #, c-format msgid "Unexpected setting '%s'" -msgstr "" +msgstr "Netikėtas nustatymas „%s“" -#: ../midori/midori-locationaction.c:390 +#: ../midori/midori-extension.c:329 #, c-format -msgid "Failed to select from history\n" -msgstr "" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "Konfigūracijos su plėtiniu „%s“ negalima įkelti: %s\n" -#: ../midori/midori-locationaction.c:474 +#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Plėtinio „%s“ konfigūracijos išsaugoti nepavyko: %s\n" -#: ../midori/midori-locationaction.c:497 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" -msgstr "" +msgstr "Ieškoti su %s" -#: ../midori/midori-locationaction.c:1307 +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Ieškoti su..." + +#: ../midori/midori-locationaction.c:537 #, c-format -msgid "Failed to execute database statement\n" -msgstr "" +msgid "Failed to select from history\n" +msgstr "Nepavyko pažymėti žurnalo įrašo\n" + +#: ../midori/midori-locationaction.c:624 +#, c-format +msgid "Search for %s" +msgstr "Ieškoti %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1363 +#: ../midori/midori-locationaction.c:1398 msgid "Paste and p_roceed" -msgstr "" +msgstr "Įdėti ir _tęsti" -#: ../midori/midori-panel.c:412 -#: ../midori/midori-panel.c:414 -msgid "Detach chosen panel from the window" -msgstr "" +#: ../midori/midori-locationaction.c:1739 +msgid "Not verified" +msgstr "Nepatvirtinta" + +#: ../midori/midori-locationaction.c:1759 +msgid "Verified and encrypted connection" +msgstr "Patikrintas ir užšifruotas ryšys" + +#: ../midori/midori-locationaction.c:1771 +msgid "Open, unencrypted connection" +msgstr "Atviras, nešifruotas ryšys" -#: ../midori/midori-panel.c:424 -#: ../midori/midori-panel.c:426 -#: ../midori/midori-panel.c:613 -#: ../midori/midori-panel.c:616 +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" -msgstr "" +msgstr "Lygiuoti šoninį skydelį dešinėn" -#: ../midori/midori-panel.c:436 -#: ../midori/midori-panel.c:437 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" -msgstr "" +msgstr "Užverti skydelį" -#: ../midori/midori-panel.c:614 -#: ../midori/midori-panel.c:617 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" -msgstr "" +msgstr "Lygiuoti šoninį skydelį kairėn" -#: ../midori/midori-panel.c:771 -msgid "Hide operating controls" -msgstr "" - -#: ../midori/midori-websettings.c:200 -msgid "Show Blank page" -msgstr "" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "Rodyti Sparčiąją rinktį" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" -msgstr "" - -#: ../midori/midori-websettings.c:202 -msgid "Show last open tabs" -msgstr "" - -#: ../midori/midori-websettings.c:203 -msgid "Show last tabs without loading" -msgstr "" +msgstr "Rodyti pradžios tinklapį" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:237 msgid "Japanese (SHIFT_JIS)" -msgstr "" +msgstr "Japonų (Shift_JIS)" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:257 msgid "New tab" -msgstr "" +msgstr "Nauja kortelė" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:258 msgid "New window" msgstr "Naujas langas" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:259 msgid "Current tab" -msgstr "" +msgstr "Dabartinė kortelė" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:274 msgid "Default" -msgstr "" +msgstr "Numatyta" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:275 msgid "Icons" -msgstr "" +msgstr "Piktogramos" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:276 msgid "Small icons" -msgstr "" +msgstr "Mažos piktogramos" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:277 msgid "Text" -msgstr "" +msgstr "Tekstas" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:278 msgid "Icons and text" -msgstr "" +msgstr "Piktogramos ir tekstas" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:279 msgid "Text beside icons" -msgstr "" +msgstr "Tekstas šalia piktogramų" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:294 msgid "Automatic (GNOME or environment)" -msgstr "" +msgstr "Automatinis (GNOME ar aplinkos)" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:295 msgid "HTTP proxy server" -msgstr "" +msgstr "HTTP įgaliotasis serveris" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:296 msgid "No proxy server" -msgstr "" +msgstr "Nėra įgaliotojo serverio" -#: ../midori/midori-websettings.c:293 -msgid "All cookies" -msgstr "" - -#: ../midori/midori-websettings.c:294 -msgid "Session cookies" -msgstr "" - -#: ../midori/midori-websettings.c:295 -#: ../katze/katze-utils.c:672 -msgid "None" -msgstr "" - -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:400 msgid "Remember last window size" -msgstr "" +msgstr "Įsiminti paskutini lango dydį" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:401 msgid "Whether to save the last window size" -msgstr "" +msgstr "Ar išsaugoti paskutinio lango dydį" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:409 msgid "Last window width" -msgstr "" +msgstr "Paskutinio lango plotis" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:410 msgid "The last saved window width" -msgstr "" +msgstr "Paskutinio išsaugoto lango plotis" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:418 msgid "Last window height" -msgstr "" +msgstr "Paskutinio lango aukštis" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:419 msgid "The last saved window height" -msgstr "" +msgstr "Paskutinio išsaugoto lango aukštis" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:444 msgid "Last panel position" -msgstr "" +msgstr "Ankstesnė skydelio padėtis" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:445 msgid "The last saved panel position" -msgstr "" +msgstr "Paskutinė išsaugota skydelio padėtis" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:454 msgid "Last panel page" -msgstr "" +msgstr "Paskutinis skydelio puslapis" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:455 msgid "The last saved panel page" -msgstr "" +msgstr "Paskutinis išsaugotas skydelio puslapis" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:463 msgid "Last Web search" -msgstr "" +msgstr "Paskutinė interneto paieška" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:464 msgid "The last saved Web search" -msgstr "" +msgstr "Paskutinė išsaugota interneto paieška" -#: ../midori/midori-websettings.c:440 +#: ../midori/midori-websettings.c:473 msgid "Show Menubar" -msgstr "" +msgstr "Rodyti meniu juostą" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:474 msgid "Whether to show the menubar" -msgstr "" +msgstr "Ar rodyti meniu juostą" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:482 msgid "Show Navigationbar" -msgstr "" +msgstr "Rodyti naršymo juostą" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:483 msgid "Whether to show the navigationbar" -msgstr "" +msgstr "Ar rodyti naršymo juostą" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:491 msgid "Show Bookmarkbar" -msgstr "" +msgstr "Rodyti žymelių juostą" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:492 msgid "Whether to show the bookmarkbar" -msgstr "" +msgstr "Ar rodyti žymelių juostą" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:500 msgid "Show Panel" -msgstr "" +msgstr "Rodyti skydelį" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:501 msgid "Whether to show the panel" -msgstr "" - -#: ../midori/midori-websettings.c:483 -msgid "Show Transferbar" -msgstr "" +msgstr "Ar rodyti skydelį" -#: ../midori/midori-websettings.c:484 -msgid "Whether to show the transferbar" -msgstr "" - -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:509 msgid "Show Statusbar" -msgstr "" +msgstr "Rodyti būsenos juostą" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:510 msgid "Whether to show the statusbar" -msgstr "" - -#: ../midori/midori-websettings.c:502 -msgid "Toolbar Style:" -msgstr "" - -#: ../midori/midori-websettings.c:503 -msgid "The style of the toolbar" -msgstr "" +msgstr "Ar rodyti būsenos juostą" #: ../midori/midori-websettings.c:519 -msgid "Show progress in location entry" -msgstr "" +msgid "Toolbar Style:" +msgstr "Įrankių juostos stilius:" #: ../midori/midori-websettings.c:520 -msgid "Whether to show loading progress in the location entry" -msgstr "" - -#: ../midori/midori-websettings.c:535 -msgid "Search engines in location completion" -msgstr "" - -#: ../midori/midori-websettings.c:536 -msgid "Whether to show search engines in the location completion" -msgstr "" +msgid "The style of the toolbar" +msgstr "Įrankių juostos stilius" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:529 msgid "Toolbar Items" -msgstr "" +msgstr "Įrankinės elementai" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:530 msgid "The items to show on the toolbar" -msgstr "" +msgstr "Elementai rodomi įrankių juostoje" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:538 msgid "Compact Sidepanel" -msgstr "" +msgstr "Suspaustas šoninis skydelis" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:539 msgid "Whether to make the sidepanel compact" -msgstr "" - -#: ../midori/midori-websettings.c:569 -msgid "Show operating controls of the panel" -msgstr "" +msgstr "Ar suspausti šoninį skydelį" -#: ../midori/midori-websettings.c:570 -msgid "Whether to show the operating controls of the panel" -msgstr "" - -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:554 msgid "Align sidepanel on the right" -msgstr "" +msgstr "Lygiuoti šoninį skydelį dešinėn" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:555 msgid "Whether to align the sidepanel on the right" -msgstr "" +msgstr "Ar lygiuoti šoninį skydelį dešinėn" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:570 msgid "Open panels in separate windows" -msgstr "" +msgstr "Atverti skydelius atskiruose languose" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:571 msgid "Whether to always open panels in separate windows" -msgstr "" +msgstr "Ar visada atverti skydelius atskiruose languose" -#: ../midori/midori-websettings.c:611 +#: ../midori/midori-websettings.c:580 msgid "When Midori starts:" -msgstr "" +msgstr "Paleidžiant „Midori”:" -#: ../midori/midori-websettings.c:612 +#: ../midori/midori-websettings.c:581 msgid "What to do when Midori starts" -msgstr "" +msgstr "Ką daryti paleidžiant „Midori”" -#: ../midori/midori-websettings.c:621 +#: ../midori/midori-websettings.c:590 msgid "Homepage:" -msgstr "" +msgstr "Pradžios tinklapis:" -#: ../midori/midori-websettings.c:622 +#: ../midori/midori-websettings.c:591 msgid "The homepage" -msgstr "" +msgstr "Pradžios tinklapis" -#: ../midori/midori-websettings.c:637 +#: ../midori/midori-websettings.c:606 msgid "Show crash dialog" -msgstr "" +msgstr "Rodyti strigties dialogo langą" -#: ../midori/midori-websettings.c:638 +#: ../midori/midori-websettings.c:607 msgid "Show a dialog after Midori crashed" -msgstr "" - -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:654 -msgid "Show speed dial in new tabs" -msgstr "" - -#: ../midori/midori-websettings.c:655 -msgid "Show speed dial in newly opened tabs" -msgstr "" +msgstr "Rodyti dialogo langą po „Midori” strigties" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:615 msgid "Save downloaded files to:" -msgstr "" +msgstr "Išsaugoti atsiųstus failus į:" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:616 msgid "The folder downloaded files are saved to" -msgstr "" - -#: ../midori/midori-websettings.c:685 -msgid "Ask for the destination folder" -msgstr "" - -#: ../midori/midori-websettings.c:686 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "" - -#: ../midori/midori-websettings.c:705 -msgid "Notify when a transfer has been completed" -msgstr "" +msgstr "Aplankas atsiųstų failų išsaugojimui" -#: ../midori/midori-websettings.c:706 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "" - -#: ../midori/midori-websettings.c:718 -msgid "Download Manager" -msgstr "" - -#: ../midori/midori-websettings.c:719 -msgid "An external download manager" -msgstr "" - -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:624 msgid "Text Editor" -msgstr "" +msgstr "Teksto redaktorius" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:625 msgid "An external text editor" -msgstr "" +msgstr "Išorinė rašyklė" -#: ../midori/midori-websettings.c:743 +#: ../midori/midori-websettings.c:640 msgid "News Aggregator" -msgstr "" +msgstr "Naujienų skaityklė" -#: ../midori/midori-websettings.c:744 +#: ../midori/midori-websettings.c:641 msgid "An external news aggregator" -msgstr "" +msgstr "Išorinė naujienų skaityklė" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:649 msgid "Location entry Search" -msgstr "" +msgstr "Vietos įvesties paieška" -#: ../midori/midori-websettings.c:753 +#: ../midori/midori-websettings.c:650 msgid "The search to perform inside the location entry" -msgstr "" +msgstr "Paieška kuri bus vykdoma vietos įvestyje" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:658 msgid "Preferred Encoding" -msgstr "" +msgstr "Pageidautina koduotė" -#: ../midori/midori-websettings.c:762 +#: ../midori/midori-websettings.c:659 msgid "The preferred character encoding" -msgstr "" +msgstr "Pageidautina simbolių koduotė" -#: ../midori/midori-websettings.c:772 +#: ../midori/midori-websettings.c:669 msgid "Always Show Tabbar" -msgstr "" +msgstr "Visada rodyti ąseles" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:670 msgid "Always show the tabbar" -msgstr "" +msgstr "Visada rodyti kortelių ąseles" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:683 msgid "Close Buttons on Tabs" -msgstr "" +msgstr "Uždarymo mygtukai ant kortelių " -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:684 msgid "Whether tabs have close buttons" -msgstr "" +msgstr "Ar kortelės turi uždarymo mygtukus" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:709 msgid "Open new pages in:" -msgstr "" +msgstr "Atverti naujus tinklapius:" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:710 msgid "Where to open new pages" -msgstr "" +msgstr "Kur atverti naujus tinklapius" -#: ../midori/midori-websettings.c:800 -msgid "Open external pages in:" -msgstr "" - -#: ../midori/midori-websettings.c:801 -msgid "Where to open externally opened pages" -msgstr "" - -#: ../midori/midori-websettings.c:810 +#: ../midori/midori-websettings.c:719 msgid "Middle click opens Selection" -msgstr "" +msgstr "Vidurinis klavišas atveria pasirinkimą" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:720 msgid "Load an address from the selection via middle click" -msgstr "" +msgstr "Įkelti pasirinktą adresą paspaudus per vidurį" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:728 msgid "Open tabs in the background" -msgstr "" +msgstr "Atverti korteles antrame plane" -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:729 msgid "Whether to open new tabs in the background" -msgstr "" +msgstr "Ar atverti naują kortelę antrajam plane" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:737 msgid "Open Tabs next to Current" -msgstr "" +msgstr "Atverti kortelę šalia dabartinės" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:738 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" +msgstr "Atverti naujas korteles toliau už veikiamos kortelės, ar už paskutinės" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:746 msgid "Open popups in tabs" -msgstr "" +msgstr "Atverti iškylančius langus kaip korteles" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:747 msgid "Whether to open popup windows in tabs" -msgstr "" +msgstr "Ar atverti iškylančius langus kaip korteles" -#: ../midori/midori-websettings.c:848 -#: ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 msgid "Load images automatically" -msgstr "" +msgstr "Automatiškai įkelti paveikslus" -#: ../midori/midori-websettings.c:849 +#: ../midori/midori-websettings.c:758 msgid "Load and display images automatically" -msgstr "" +msgstr "Įkelti ir atvaizduoti paveikslus automatiškai" -#: ../midori/midori-websettings.c:856 -#: ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 msgid "Enable scripts" -msgstr "" +msgstr "Leisti scenarijus" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:766 msgid "Enable embedded scripting languages" -msgstr "" +msgstr "Leisti įstatytas scenarijų kalbas" -#: ../midori/midori-websettings.c:864 -#: ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" -msgstr "" +msgstr "Naudoti „Netscape” įskiepius" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:774 msgid "Enable embedded Netscape plugin objects" -msgstr "" +msgstr "Naudoti įmontuotus „Netscape” įskiepius" + +#: ../midori/midori-websettings.c:789 +msgid "Enable Spell Checking" +msgstr "Leisti tikrinti rašybą" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:790 +msgid "Enable spell checking while typing" +msgstr "Leisti tikrinti rašybą berašant" + +#: ../midori/midori-websettings.c:796 msgid "Enable HTML5 database support" -msgstr "" +msgstr "Įjungti HTML5 duomenų bazės palaikymą" -#: ../midori/midori-websettings.c:882 +#: ../midori/midori-websettings.c:797 msgid "Whether to enable HTML5 database support" -msgstr "" +msgstr "Ar įjungti HTML5 duomenų bazės palaikymą" -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:803 msgid "Enable HTML5 local storage support" -msgstr "" +msgstr "Įjungti HTML 5 vietinio kaupimo funkcijos palaikymą" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:804 msgid "Whether to enable HTML5 local storage support" -msgstr "" +msgstr "Ar įjungti HTML5 vietinės saugyklos palaikymą" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:810 msgid "Enable offline web application cache" -msgstr "" +msgstr "Įjungti žiniatinklio programų podėlį darbui neprisijungus" -#: ../midori/midori-websettings.c:898 +#: ../midori/midori-websettings.c:811 msgid "Whether to enable offline web application cache" -msgstr "" +msgstr "Ar įjungti žiniatinklio programų podėlį darbui neprisijungus" + +#: ../midori/midori-websettings.c:827 +msgid "Flash window on background tabs" +msgstr "Blykstelti langą atvėrus kortelę fone" -#: ../midori/midori-websettings.c:923 +#: ../midori/midori-websettings.c:828 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "Jei nauja kortelė buvo atidaryta fone, blykstelti naršyklės langą" + +#: ../midori/midori-websettings.c:836 +msgid "Enable WebGL support" +msgstr "Įgalinti WebGL palaikymą" + +#: ../midori/midori-websettings.c:837 +msgid "Allow websites to use OpenGL rendering" +msgstr "Leisti tinklalapiams naudoti OpenGL atvaizdavimą" + +#: ../midori/midori-websettings.c:863 msgid "Zoom Text and Images" -msgstr "" +msgstr "Keisti teksto ir paveikslų mastelį" -#: ../midori/midori-websettings.c:924 +#: ../midori/midori-websettings.c:864 msgid "Whether to zoom text and images" -msgstr "" +msgstr "Ar keisti teksto ir paveikslų mastelį" -#: ../midori/midori-websettings.c:939 +#: ../midori/midori-websettings.c:879 msgid "Find inline while typing" -msgstr "" +msgstr "Ieškoti rašant" -#: ../midori/midori-websettings.c:940 +#: ../midori/midori-websettings.c:880 msgid "Whether to automatically find inline while typing" -msgstr "" +msgstr "Ar automatiškai ieškoti rašant" -#: ../midori/midori-websettings.c:955 +#: ../midori/midori-websettings.c:895 msgid "Kinetic scrolling" -msgstr "" +msgstr "Kinetinis slinkimas" -#: ../midori/midori-websettings.c:956 +#: ../midori/midori-websettings.c:896 msgid "Whether scrolling should kinetically move according to speed" msgstr "" +"Ar slinkimo greitis turėtų būti atitinkamas kinetiniam slinkimo greičiui" -#: ../midori/midori-websettings.c:964 -msgid "Accept cookies" -msgstr "" - -#: ../midori/midori-websettings.c:965 -msgid "What type of cookies to accept" -msgstr "" - -#: ../midori/midori-websettings.c:974 -msgid "Maximum cookie age" -msgstr "" +#: ../midori/midori-websettings.c:904 +msgid "Delete old Cookies after:" +msgstr "Šalinti slapukus senesnius nei:" -#: ../midori/midori-websettings.c:975 +#: ../midori/midori-websettings.c:905 msgid "The maximum number of days to save cookies for" -msgstr "" +msgstr "Didžiausias dienų skaičius slapukams saugoti " -#: ../midori/midori-websettings.c:984 -msgid "Maximum history age" -msgstr "" +#: ../midori/midori-websettings.c:921 +msgid "Only accept Cookies from sites you visit" +msgstr "Slapukus priimti tik iš aplankytų puslapių" -#: ../midori/midori-websettings.c:985 -msgid "The maximum number of days to save the history for" -msgstr "" +#: ../midori/midori-websettings.c:922 +msgid "Block cookies sent by third-party websites" +msgstr "Blokuoti slapukus siunčiamus trečiųjų šalių" -#: ../midori/midori-websettings.c:993 -msgid "Remember last downloaded files" -msgstr "" +#: ../midori/midori-websettings.c:936 +msgid "Delete pages from history after:" +msgstr "Iš žurnalo šalinti tinklapius senesnius nei:" -#: ../midori/midori-websettings.c:994 -msgid "Whether the last downloaded files are saved" -msgstr "" +#: ../midori/midori-websettings.c:937 +msgid "The maximum number of days to save the history for" +msgstr "Didžiausias dienų skaičius tinklapiams žurnale saugoti" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:952 msgid "Proxy server" -msgstr "" +msgstr "Įgaliotasis serveris" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:953 msgid "The type of proxy server to use" -msgstr "" +msgstr "Naudojamo įgaliotojo serverio tipas" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:962 msgid "HTTP Proxy Server" -msgstr "" +msgstr "HTTP tarpinis serveris" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:963 msgid "The proxy server used for HTTP connections" -msgstr "" +msgstr "Tarpinis serveris naudojamas HTTP prisijungimams" + +#: ../midori/midori-websettings.c:978 +msgid "Port" +msgstr "Prievadas" + +#: ../midori/midori-websettings.c:979 +msgid "The proxy server port used for HTTP connections" +msgstr "Tarpinio serverio prievadas naudojamas HTPP susijungimams" + +#: ../midori/midori-websettings.c:997 +msgid "The maximum size of cached pages on disk" +msgstr "Didžiausias galimas podėlio dydis diske" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1038 +#: ../midori/midori-websettings.c:1014 msgid "Identify as" -msgstr "" +msgstr "Prisistatyti kaip" -#: ../midori/midori-websettings.c:1039 +#: ../midori/midori-websettings.c:1015 msgid "What to identify as to web pages" -msgstr "" +msgstr "Kaip prisistatyti tinklalapiams" -#: ../midori/midori-websettings.c:1055 +#: ../midori/midori-websettings.c:1031 msgid "Identification string" -msgstr "" +msgstr "Atpažinimo eilutė" -#: ../midori/midori-websettings.c:1056 +#: ../midori/midori-websettings.c:1032 msgid "The application identification string" -msgstr "" +msgstr "Programos atpažinimo eilutė" -#: ../midori/midori-websettings.c:1071 +#: ../midori/midori-websettings.c:1048 msgid "Preferred languages" -msgstr "" +msgstr "Pageidaujamos kalbos" -#: ../midori/midori-websettings.c:1072 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +#: ../midori/midori-websettings.c:1049 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "" +"Kableliais atskirtas sąrašas kalbų, pageidaujamų daugiakalbių tinklapių " +"atvaizdavimui, pavyzdžiui „de“, „ru,nl“ ar „en-us;q=1.0, fr-fr;q=0.667“" -#: ../midori/midori-websettings.c:1087 +#: ../midori/midori-websettings.c:1064 msgid "Clear private data" -msgstr "" +msgstr "Šalinti asmeninius duomenis" -#: ../midori/midori-websettings.c:1088 +#: ../midori/midori-websettings.c:1065 msgid "The private data selected for deletion" -msgstr "" +msgstr "Asmeniniai duomenys pažymėti šalinimui" + +#: ../midori/midori-websettings.c:1080 +msgid "Clear data" +msgstr "Išvalyti duomenis" + +#: ../midori/midori-websettings.c:1081 +msgid "The data selected for deletion" +msgstr "Duomenys pasirinkti šalinimui" -#. 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:1227 -#: ../midori/midori-view.c:4440 -#: ../midori/midori-view.c:4444 +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1130 +msgid "Strip referrer details sent to websites" +msgstr "Apkarpyti „referrer“ detales siunčiamas tinklapiams" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1132 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Ar apkarpyti „Referer“ antraštę iki serverio adreso" + +#: ../midori/midori-websettings.c:1146 +msgid "Always use my font choices" +msgstr "Visada naudoti mano pasirinktus šriftus" + +#: ../midori/midori-websettings.c:1147 +msgid "Override fonts picked by websites with user preferences" +msgstr "Perrašyti tinklalapių parinktus šriftus naudotojo pasirinktais" + +#: ../midori/midori-view.c:1360 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s nori išsaugoti HTML5 duomenų bazę." + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Deny" +msgstr "_Neleisti" + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Allow" +msgstr "_Leisti" + +#: ../midori/midori-view.c:1392 +#, c-format +msgid "%s wants to know your location." +msgstr "%s nori žinoti jūsų vietą." + +#: ../midori/midori-view.c:1485 #, c-format msgid "Error - %s" -msgstr "" +msgstr "Klaida - %s" -#: ../midori/midori-view.c:1228 +#: ../midori/midori-view.c:1486 #, c-format msgid "The page '%s' couldn't be loaded." -msgstr "" +msgstr "Puslapio „%s“ įkelti nepavyko." -#: ../midori/midori-view.c:1230 +#: ../midori/midori-view.c:1488 msgid "Try again" -msgstr "" +msgstr "Bandyti dar kartą" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1249 -#, c-format -msgid "Not found - %s" -msgstr "" - -#: ../midori/midori-view.c:1433 -#: ../midori/midori-view.c:2279 +#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598 #, c-format msgid "Send a message to %s" -msgstr "" +msgstr "Siųsti laišką į %s" -#: ../midori/midori-view.c:2061 -#: ../midori/midori-view.c:2446 +#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747 msgid "Inspect _Element" -msgstr "" +msgstr "Apžiūrėti _elementą" -#: ../midori/midori-view.c:2113 -#: ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2480 msgid "Open Link in New _Tab" -msgstr "" +msgstr "Atverti nuorodą naujoje _kortelėje" -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2484 msgid "Open Link in _Foreground Tab" -msgstr "" +msgstr "Atverti nuorodą priekinėje _kortelėje" -#: ../midori/midori-view.c:2118 +#: ../midori/midori-view.c:2485 msgid "Open Link in _Background Tab" -msgstr "" +msgstr "Atverti nuorodą fono _kortelėje" -#: ../midori/midori-view.c:2121 -#: ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2488 msgid "Open Link in New _Window" -msgstr "" +msgstr "Atverti nuorodą _naujame lange" -#: ../midori/midori-view.c:2124 +#: ../midori/midori-view.c:2491 msgid "Open Link as Web A_pplication" -msgstr "" +msgstr "Atverti nuorodą kaip _interneto programą" -#: ../midori/midori-view.c:2127 +#: ../midori/midori-view.c:2496 msgid "Copy Link de_stination" -msgstr "" - -#: ../midori/midori-view.c:2130 -#: ../midori/midori-view.c:2202 -msgid "_Save Link destination" -msgstr "" - -#: ../midori/midori-view.c:2131 -#: ../midori/midori-view.c:2196 -msgid "_Download Link destination" -msgstr "" - -#: ../midori/midori-view.c:2135 -#: ../midori/midori-view.c:2165 -#: ../midori/midori-view.c:2207 -msgid "Download with Download _Manager" -msgstr "" +msgstr "Kopijuoti nuorodos pa_skirtį" -#: ../midori/midori-view.c:2144 +#: ../midori/midori-view.c:2512 msgid "Open _Image in New Tab" -msgstr "" +msgstr "Paveikslėlį atverti naujoje k_ortelėje" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2515 msgid "Copy Image _Address" -msgstr "" +msgstr "_Kopijuoti paveikslėlio adresą" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2518 msgid "Save I_mage" -msgstr "" +msgstr " Išsaugoti p_aveikslėlį" -#: ../midori/midori-view.c:2151 -msgid "Download I_mage" -msgstr "" +#: ../midori/midori-view.c:2521 +msgid "Open in Image _Viewer" +msgstr "Atverti _paveikslėlių žiūryklėje" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2528 msgid "Copy Video _Address" -msgstr "" +msgstr "Kopijuoti video _adresą" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2531 msgid "Save _Video" -msgstr "" +msgstr "Išsaugoti _video" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2531 msgid "Download _Video" -msgstr "" +msgstr "Parsiųsti _video" -#: ../midori/midori-view.c:2224 +#: ../midori/midori-view.c:2557 msgid "Search _with" -msgstr "" +msgstr "Ieškoti _su" -#: ../midori/midori-view.c:2259 -#: ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2589 msgid "_Search the Web" -msgstr "" +msgstr "_Ieškoti žiniatinklyje" -#: ../midori/midori-view.c:2287 +#: ../midori/midori-view.c:2606 msgid "Open Address in New _Tab" -msgstr "" +msgstr "Atverti adresą naujoje _kortelėje" -#: ../midori/midori-view.c:2591 +#: ../midori/midori-view.c:2909 msgid "Open or download file" -msgstr "" +msgstr "Atverti arba parsiųsti failą" -#: ../midori/midori-view.c:2610 +#: ../midori/midori-view.c:2929 #, c-format msgid "File Type: '%s'" -msgstr "" +msgstr "Failo tipas: „%s“" -#: ../midori/midori-view.c:2613 +#: ../midori/midori-view.c:2931 #, c-format msgid "File Type: %s ('%s')" -msgstr "" +msgstr "Failo tipas: %s („%s“)" -#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2617 +#: ../midori/midori-view.c:2935 +#, c-format +msgid "File Name: %s" +msgstr "Failo vardas: „%s“" + +#: ../midori/midori-view.c:2955 #, c-format msgid "Open %s" -msgstr "" +msgstr "Atverti %s" -#: ../midori/midori-view.c:3158 +#: ../midori/midori-view.c:3576 #, c-format msgid "Inspect page - %s" -msgstr "" +msgstr "Apžiūrėti puslapį - %s" -#: ../midori/midori-view.c:3439 -msgid "Speed dial" -msgstr "" +#: ../midori/midori-view.c:3923 +msgid "Speed Dial" +msgstr "Sparčioji rinktis" -#: ../midori/midori-view.c:3440 +#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020 msgid "Click to add a shortcut" -msgstr "" +msgstr "Bakstelkit nuorodai pridėti" -#: ../midori/midori-view.c:3441 +#: ../midori/midori-view.c:3925 msgid "Enter shortcut address" -msgstr "" +msgstr "Įveskit nuorodos adresą" -#: ../midori/midori-view.c:3442 +#: ../midori/midori-view.c:3926 msgid "Enter shortcut title" -msgstr "" +msgstr "Įveskit nuorodos pavadinimą" -#: ../midori/midori-view.c:3443 +#: ../midori/midori-view.c:3927 msgid "Are you sure you want to delete this shortcut?" -msgstr "" +msgstr "Ar tikrai norite pašalinti šią nuorodą?" -#: ../midori/midori-view.c:3444 -msgid "Set number of columns and rows" -msgstr "" +#: ../midori/midori-view.c:4089 +#, c-format +msgid "No documentation installed" +msgstr "Dokumentacija neįdiegta" -#: ../midori/midori-view.c:3445 -msgid "Enter number of columns and rows:" -msgstr "" +#: ../midori/midori-view.c:4165 +msgid "Midori doesn't store any personal data:" +msgstr "Midori nesaugo asmeninių duomenų:" -#: ../midori/midori-view.c:3446 -msgid "Invalid input for the size of the speed dial" -msgstr "" +#: ../midori/midori-view.c:4166 +msgid "No history or web cookies are being saved." +msgstr "Nėra išsaugotų slapukų ar istorijos įrašų." -#: ../midori/midori-view.c:3447 -msgid "Thumb size:" -msgstr "" +#: ../midori/midori-view.c:4167 +msgid "Extensions are disabled." +msgstr "Plėtiniai išjungti." -#: ../midori/midori-view.c:3448 -msgid "Small" +#: ../midori/midori-view.c:4168 +msgid "HTML5 storage, local database and application caches are disabled." msgstr "" +"HTML5 saugykla, vietinė duomenų bazė ir programos podėlis yra išjungti." -#: ../midori/midori-view.c:3449 -msgid "Medium" -msgstr "" +#: ../midori/midori-view.c:4169 +msgid "Midori prevents websites from tracking the user:" +msgstr "Midori neleidžia tinklalapiams sekti naudotojo:" -#: ../midori/midori-view.c:3450 -msgid "Big" -msgstr "" +#: ../midori/midori-view.c:4170 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "Pasirinkimo URL apkarpyti iki serverio vardo." -#: ../midori/midori-view.c:3476 -#, c-format -msgid "Document cannot be displayed" -msgstr "" +#: ../midori/midori-view.c:4171 +msgid "DNS prefetching is disabled." +msgstr "DNS išankstinis gavimas išjungtas." -#: ../midori/midori-view.c:3499 -#, c-format -msgid "No documentation installed" -msgstr "" +#: ../midori/midori-view.c:4172 +msgid "The language and timezone are not revealed to websites." +msgstr "Tinklalapiams kalba ir laiko zona neatskleidžiama." -#: ../midori/midori-view.c:3617 +#: ../midori/midori-view.c:4173 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "Tinklalapiai negali matyti Flash ir kitų Netscape įskiepių sąrašo." + +#: ../midori/midori-view.c:4222 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "Versijų numeriai skliaustuose rodo naudojamas versijas." + +#: ../midori/midori-view.c:4278 msgid "Page loading delayed" -msgstr "" +msgstr "Puslapio įkrovimas uždelstas" -#: ../midori/midori-view.c:3618 +#: ../midori/midori-view.c:4279 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "" +msgstr "Įkrovimas uždelstas, dėl neseno lūžio arba dėl paleidimo nustatymų." -#: ../midori/midori-view.c:3619 +#: ../midori/midori-view.c:4280 msgid "Load Page" -msgstr "" +msgstr "Įkrauti puslapį" -#: ../midori/midori-view.c:3762 +#: ../midori/midori-view.c:4446 msgid "Blank page" -msgstr "" +msgstr "Išvalyti puslapį" -#: ../midori/midori-view.c:4016 +#: ../midori/midori-view.c:4708 msgid "_Duplicate Tab" -msgstr "" +msgstr "_Dubliuoti kortelę" -#: ../midori/midori-view.c:4021 +#: ../midori/midori-view.c:4713 msgid "Show Tab _Label" -msgstr "" +msgstr "Rodyti kortelės _antraštę" -#: ../midori/midori-view.c:4021 +#: ../midori/midori-view.c:4713 msgid "Show Tab _Icon Only" -msgstr "" +msgstr "Rodyti tik kortelės _piktogramą" -#: ../midori/midori-view.c:4027 +#: ../midori/midori-view.c:4719 msgid "Close ot_her Tabs" -msgstr "" +msgstr "Užverti _kitas korteles" + +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5532 +msgid "previous" +msgstr "ankstesnis" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5551 +msgid "next" +msgstr "sekantis" -#: ../midori/midori-view.c:4678 +#: ../midori/midori-view.c:5564 msgid "Print background images" -msgstr "" +msgstr "Spausdinti fono paveikslėlius" -#: ../midori/midori-view.c:4679 +#: ../midori/midori-view.c:5565 msgid "Whether background images should be printed" -msgstr "" +msgstr "Ar spausdinti fono piešinius" -#: ../midori/midori-view.c:4731 -#: ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:5597 msgid "Features" -msgstr "" - -#. Page "General" -#: ../midori/midori-preferences.c:301 -msgid "General" -msgstr "" +msgstr "Galimybės" -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:297 msgid "Startup" -msgstr "" +msgstr "Paleistis" -#: ../midori/midori-preferences.c:317 -#: ../midori/midori-preferences.c:324 -msgid "Use current page as homepage" -msgstr "" +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Naudoti _dabartinį puslapį" -#: ../midori/midori-preferences.c:334 -#: ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "" +#: ../midori/midori-preferences.c:314 +msgid "Use current page as homepage" +msgstr "Naudoti dabartinį tinklapį kaip pradžios" #. Page "Appearance" -#: ../midori/midori-preferences.c:352 -msgid "Appearance" -msgstr "" - -#: ../midori/midori-preferences.c:353 -msgid "Font settings" -msgstr "" - -#: ../midori/midori-preferences.c:355 -msgid "Default Font Family" -msgstr "" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Šriftai" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Įvairiaplotė garnitūra" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" -msgstr "" +msgstr "Numatytoji tekstui atvaizduoti naudojama šriftų šeima" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" -msgstr "" +msgstr "Numatytasis tekstui atvaizduoti naudojamas šriftas" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" -msgstr "" +msgstr "Lygiaplotė garnitūra" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" -msgstr "" +msgstr "Numatytoji tekstui atvaizduoti naudojama lygiapločių šriftų šeima" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" msgstr "" +"Mažiausias leistinas tekstui atvaizduoti naudojamo šrifto lygiapločio šrifto " +"dydis" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" -msgstr "" +msgstr "Mažiausias galimas šrifto dydis" -#: ../midori/midori-preferences.c:374 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" -msgstr "" +msgstr "Mažiausias leistinas tekstui atvaizduoti naudojamo šrifto dydis" #. Page "Behavior" -#: ../midori/midori-preferences.c:383 +#: ../midori/midori-preferences.c:359 msgid "Behavior" -msgstr "" +msgstr "Elgsena" -#: ../midori/midori-preferences.c:396 -msgid "Enforce 96 dots per inch" -msgstr "" - -#: ../midori/midori-preferences.c:397 -msgid "Enforce a video dot density of 96 DPI" -msgstr "" - -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" -msgstr "" +msgstr "Leisti iškylančius langus" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "" - -#: ../midori/midori-preferences.c:422 -msgid "Spell Checking" -msgstr "" - -#: ../midori/midori-preferences.c:425 -msgid "Enable Spell Checking" -msgstr "" - -#: ../midori/midori-preferences.c:426 -msgid "Enable spell checking while typing" -msgstr "" - -#: ../midori/midori-preferences.c:428 -msgid "Spelling dictionaries:" -msgstr "" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:432 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "" +msgstr "Ar leisti scenarijams atverti iškylančius langus automatiškai" #. Page "Interface" -#: ../midori/midori-preferences.c:438 -msgid "Interface" -msgstr "" - -#: ../midori/midori-preferences.c:439 -msgid "Navigationbar" -msgstr "" - -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:416 msgid "Browsing" -msgstr "" - -#. Page "Applications" -#: ../midori/midori-preferences.c:471 -msgid "Applications" -msgstr "" - -#: ../midori/midori-preferences.c:472 -msgid "External applications" -msgstr "" +msgstr "Naršymas" #. Page "Network" -#: ../midori/midori-preferences.c:488 -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:456 msgid "Network" -msgstr "" +msgstr "Tinklas" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:463 msgid "Hostname" -msgstr "" +msgstr "Pagrindinio kompiuterio vardas" -#. Page "Privacy" -#: ../midori/midori-preferences.c:514 -msgid "Privacy" -msgstr "" - -#: ../midori/midori-preferences.c:515 -msgid "Web Cookies" -msgstr "" - -#: ../midori/midori-preferences.c:524 -#: ../midori/midori-preferences.c:538 -msgid "days" -msgstr "" - -#: ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "MB" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" -msgstr "" +msgstr "Pridėti paieškos variklį" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" -msgstr "" +msgstr "Taisyti paieškos variklį" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" -msgstr "" +msgstr "_Pavadinimas:" + +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "Ap_rašas:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" -msgstr "" +msgstr "Pikto_grama:" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" -msgstr "" +msgstr "Ž_ymė:" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" -msgstr "" +msgstr "Tvarkyti ieškykles" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" -msgstr "" - -#: ../midori/sokoke.c:1303 -msgid "_Bookmark" -msgstr "" - -#: ../midori/sokoke.c:1304 -msgid "_Bookmarks" -msgstr "" - -#: ../midori/sokoke.c:1305 -msgid "Add Boo_kmark" -msgstr "" - -#: ../midori/sokoke.c:1306 -msgid "_Console" -msgstr "" +msgstr "Naudoti kaip _numatytą" -#: ../midori/sokoke.c:1307 -msgid "_Extensions" -msgstr "" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "Atverti su" -#: ../midori/sokoke.c:1308 -msgid "_History" -msgstr "" +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Pasirinkite programą ar komandą „%s“ atvėrimui:" -#: ../midori/sokoke.c:1309 -msgid "_Homepage" -msgstr "" +#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "Nepavyksta paleisti išorinės programos." -#: ../midori/sokoke.c:1310 -msgid "_Userscripts" -msgstr "" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d valanda" +msgstr[1] "%d valandos" +msgstr[2] "%d valandų" + +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minutė" +msgstr[1] "%d minutės" +msgstr[2] "%d minučių" + +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d sekundė" +msgstr[1] "%d sekundės" +msgstr[2] "%d sekundžių" -#: ../midori/sokoke.c:1311 -msgid "New _Tab" -msgstr "Nauja _kortelė" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s iš %s" -#: ../midori/sokoke.c:1312 -msgid "_Transfers" -msgstr "" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "?B" -#: ../midori/sokoke.c:1313 -msgid "Netscape p_lugins" -msgstr "" +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/sokoke.c:1316 -msgid "New _Folder" -msgstr "" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr " - %s liko" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:201 +#: ../toolbars/midori-findbar.c:291 msgid "_Inline Find:" -msgstr "" +msgstr "_Paieška tinklapyje:" -#: ../toolbars/midori-findbar.c:233 +#: ../toolbars/midori-findbar.c:317 msgid "Previous" -msgstr "" +msgstr "Ankstesnis" -#: ../toolbars/midori-findbar.c:239 +#: ../toolbars/midori-findbar.c:323 msgid "Next" -msgstr "" +msgstr "Kitas" -#: ../toolbars/midori-findbar.c:243 +#: ../toolbars/midori-findbar.c:327 msgid "Match Case" -msgstr "" +msgstr "Skirti dydį" -#: ../toolbars/midori-findbar.c:252 +#: ../toolbars/midori-findbar.c:336 msgid "Highlight Matches" -msgstr "" +msgstr "Paryškinti surastus" -#: ../toolbars/midori-findbar.c:263 +#: ../toolbars/midori-findbar.c:347 msgid "Close Findbar" -msgstr "" - -#: ../toolbars/midori-transferbar.c:88 -#: ../panels/midori-transfers.c:273 -#, c-format -msgid "%s of %s" -msgstr "" +msgstr "Užverti paieškos juostą" -#: ../toolbars/midori-transferbar.c:123 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." -msgstr "" +msgstr "Failas „%s“ parsiųstas." -#: ../toolbars/midori-transferbar.c:126 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" +msgstr "Siuntimas baigtas" + +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "Parsiųstas failas yra klaidingas." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." msgstr "" +"Kontrolinė suma kurią suteikė nuoroda nesutampa. Tai reiškia jog failas " +"nepilnas arba buvo pakeistas po to." -#: ../toolbars/midori-transferbar.c:257 -#: ../panels/midori-transfers.c:144 +#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 msgid "Clear All" -msgstr "" +msgstr "Išvalyti visus" -#: ../toolbars/midori-transferbar.c:300 -#: ../toolbars/midori-transferbar.c:302 +#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 msgid "Some files are being downloaded" -msgstr "" +msgstr "Kai kurie failai parsiunčiami" -#: ../toolbars/midori-transferbar.c:306 +#: ../toolbars/midori-transferbar.c:377 msgid "_Quit Midori" -msgstr "" +msgstr "_Baigti darbą su Midori" -#: ../toolbars/midori-transferbar.c:308 +#: ../toolbars/midori-transferbar.c:379 msgid "The transfers will be cancelled if Midori quits." -msgstr "" +msgstr "Visi siuntimai nutrūks jei baigsit darbą su Midori." -#: ../panels/midori-bookmarks.c:116 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" -msgstr "" +msgstr "Adresynas" -#: ../panels/midori-bookmarks.c:275 +#: ../panels/midori-bookmarks.c:257 #, c-format msgid "Failed to add bookmark item: %s\n" -msgstr "" +msgstr "Nepavyko pridėti adresynan: %s\n" -#: ../panels/midori-bookmarks.c:414 +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" -msgstr "" +msgstr "Taisyti pažymėtą adresyno įrašą" -#: ../panels/midori-bookmarks.c:422 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" -msgstr "" +msgstr "Pašalinti pažymėta adresyno įrašą" -#: ../panels/midori-bookmarks.c:436 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" -msgstr "" +msgstr "Pridėti naują aplanką" -#: ../panels/midori-bookmarks.c:568 -#: ../panels/midori-history.c:569 +#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 msgid "Separator" -msgstr "" - -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "" - -#: ../panels/midori-console.c:361 -msgid "Copy _All" -msgstr "" +msgstr "Skirtukas" -#: ../panels/midori-console.c:362 -msgid "Copy All" -msgstr "" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "Žurnalas" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "" +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "Šiandien" -#: ../panels/midori-history.c:146 -msgid "A week ago" -msgstr "" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "Vakar" -#: ../panels/midori-history.c:148 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 #, c-format msgid "%d day ago" msgid_plural "%d days ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Prieš %d dieną" +msgstr[1] "Prieš %d dienas" +msgstr[2] "Prieš %d dienų" -#: ../panels/midori-history.c:151 -msgid "Today" -msgstr "" - -#: ../panels/midori-history.c:153 -msgid "Yesterday" -msgstr "" +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "Prieš savaitę" -#: ../panels/midori-history.c:324 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" -msgstr "" +msgstr "Ar tikrai norite pašalinti visus žurnalo įrašus?" -#: ../panels/midori-history.c:369 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" -msgstr "" +msgstr "Įtraukti į adresyną pažymėtą žurnalo įrašą" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" -msgstr "" +msgstr "Ištrinti pažymėtą žurnalo įrašą" -#: ../panels/midori-history.c:386 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" -msgstr "" +msgstr "Pašalinti žurnalo įrašus" + +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Siuntimai" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" -msgstr "" +msgstr "Atverti paskirties _aplanką" -#: ../panels/midori-transfers.c:484 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" -msgstr "" +msgstr "Kopijuoti saito _adresą" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" -msgstr "" +msgstr "Reikia nustatyti tapatybę" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" msgstr "" +"Šiai vietai atverti reikia naudotojo vardo\n" +"ir slaptažodžio:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" -msgstr "" +msgstr "Naudotojo vardas" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" -msgstr "" +msgstr "Slaptažodis" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" -msgstr "" +msgstr "P_risiminti slaptažodį" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "" +msgstr "Pavadintos piktogramos „%s“ įkelti nepavyko" -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "" +msgstr "Piktogramos „%s“ įkelti nepavyko" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" -msgstr "" +msgstr "Animuoti kadrai sugadinti" -#: ../katze/katze-utils.c:503 -#: ../katze/katze-utils.c:898 +#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" -msgstr "" +msgstr "Savybė „%s“ netinka %s" -#: ../katze/katze-utils.c:549 -#: ../katze/katze-utils.c:578 +#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" -msgstr "" +msgstr "Pasirinkite failą" -#: ../katze/katze-utils.c:564 +#: ../katze/katze-utils.c:506 msgid "Choose folder" -msgstr "" +msgstr "Pasirinkite aplanką" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "Joks" + +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "1 valanda" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "1 diena" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "1 savaitė" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "1 mėnuo" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "1 metai" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" -msgstr "" +msgstr "%s nustatymai" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:473 msgid "Configure Advertisement filters" -msgstr "" +msgstr "Konfigūruoti reklamų filtrus" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:504 #, 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:587 -msgid "Configure _Advertisement filters..." +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 "" +"Įveskite sukonfigūruoto filtrų sąrašo adresą ir spauskite „Pridėti“ norėdami " +"pridėti į sąrašą. Daugiau sąrašų galite rasti %s." -#: ../extensions/adblock.c:841 +#: ../extensions/adblock.c:882 msgid "Edit rule" -msgstr "" +msgstr "Keisti taisyklę" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:896 msgid "_Rule:" -msgstr "" +msgstr "_Taisyklė:" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:950 msgid "Bl_ock image" -msgstr "" +msgstr "B_lokuoti paveikslėlį" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:955 msgid "Bl_ock link" -msgstr "" +msgstr "_Blokuoti nuorodą" -#: ../extensions/adblock.c:1494 +#: ../extensions/adblock.c:1670 msgid "Advertisement blocker" -msgstr "" +msgstr "Reklamų blokavimas" -#: ../extensions/adblock.c:1495 +#: ../extensions/adblock.c:1671 msgid "Block advertisements according to a filter list" -msgstr "" +msgstr "Blokuoti reklamas remiantis filtrų sąrašu" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "" +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "Šis puslapis turėtų turėti naudotojo scenarijų. Ar norite įdiegti jį?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "Įdiegti naudotojo _scenarijų" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "Šis puslapis turėtų turėti naudotojo stilių. Ar norite įdiegti jį?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_Įdiegti naudotojo stilių" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Nediegti" -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" -msgstr "" +msgstr "Naudotojo scenarijai" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" -msgstr "" +msgstr "Naudotojo stiliai" + +#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Klaida" -#: ../extensions/addons.c:1082 +#: ../extensions/addons.c:421 #, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "" +msgid "Do you want to delete '%s'?" +msgstr "Ar norite ištrinti „%s“?" + +#: ../extensions/addons.c:427 +msgid "Delete user script" +msgstr "Ištrinti naudotojo scenarijų" + +#: ../extensions/addons.c:428 +msgid "Delete user style" +msgstr "Ištrinti naudotojo stilių" + +#: ../extensions/addons.c:431 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "Failas %s bus ištrintas visam laikui." + +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "Atverti teksto redaktoriuje" -#: ../extensions/addons.c:1083 -#: ../extensions/addons.c:1248 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "Atverti paskirties aplankką" + +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "Pridėti naują papildinį" + +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "Pašalinti pasirinktą papildinį" + +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" -msgstr "" +msgstr "Naudotojo papildiniai" -#: ../extensions/addons.c:1205 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" -msgstr "" +msgstr "Negaliu stebėti aplanko „%s“: %s" -#: ../extensions/addons.c:1249 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" -msgstr "" +msgstr "Naudotojo stilių ir naudotojo scenarijų palaikymas" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" -msgstr "" +msgstr "Spalvotos kortelės" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" -msgstr "" +msgstr "Kiekvienos kortelės atspalvį keisti aiškiai" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" -msgstr "" +msgstr "Slapukų tvarkytuvė" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" -msgstr "" +msgstr "Ištrinti viską" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +#: ../extensions/cookie-manager/cookie-manager-page.c:105 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." msgstr "" +"Šalina visus matomus slapukus. Jei nustatytas filtras, tik atfiltruoti " +"slapukai bus pašalinti." -#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" -msgstr "" +msgstr "Išskleisti viską" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" -msgstr "" +msgstr "Suskleisti viską" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" -msgstr "" +msgstr "Ar tikrai norite ištrinti visus slapukus?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" -msgstr "" +msgstr "Klausimas" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." -msgstr "" +msgstr "Bus ištrinti tik tie slapukai kurie atitiks filtrą." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" -msgstr "" +msgstr "Seanso pabaigoje" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2465,322 +2466,402 @@ "Secure: %s\n" "Expires: %s" msgstr "" +"Mazgas: %s\n" +"Pavadinimas: %s\n" +"Vertė: %s\n" +"Kelias: %s\n" +"Saugus: %s\n" +"Galioja iki: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" -msgstr "" +msgstr "Taip" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" -msgstr "" +msgstr "Ne" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" "Cookies: %d" msgstr "" +"Domenas: %s\n" +"Slapukai: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" -msgstr "" +msgstr "Pavadinimas" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" -msgstr "" +msgstr "_Išskleisti visus" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" -msgstr "" +msgstr "_Suskleisti visus" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 msgid "Filter:" -msgstr "" - -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "" +msgstr "Filtras:" -#: ../extensions/cookie-manager/main.c:40 -msgid "_Cookie Manager" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" msgstr "" +"Įveskite filtravimo frazę, pagal kurią bus rodomi tik laukeliai kurie " +"atitiks įvestą filtrą" -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" -msgstr "" +msgstr "Parodyti ir ištrinti slapukus" -#: ../extensions/copy-tabs.c:39 +#: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" -msgstr "" +msgstr "Kopijuoti kortelių _adresus" -#: ../extensions/copy-tabs.c:98 +#: ../extensions/copy-tabs.c:95 msgid "Copy Addresses of Tabs" -msgstr "" +msgstr "Kopijuoti kortelių adresus" -#: ../extensions/copy-tabs.c:99 +#: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" -msgstr "" - -#: ../extensions/external-applications.vala:93 -msgid "External Applications" -msgstr "" - -#: ../extensions/external-applications.vala:94 -msgid "Associate URL schemes with external commands" -msgstr "" +msgstr "Kopijuoti visų kortelių adresus į iškarpinę" #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "" +msgstr "XML duomenyse nepavyko rasti Atom „entry“ elementų." #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "" +msgstr "XML duomenyse nepavyko rasti Atom „feed“ elementų." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." -msgstr "" +msgstr "Paskutinis atnaujinimas: %s." -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" -msgstr "" +msgstr "Kanalai" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" -msgstr "" +msgstr "Pridėti naują kanalą" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" -msgstr "" +msgstr "Ištrinti kanalą" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" -msgstr "" +msgstr "_Kanalai" #: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." -msgstr "" +msgstr "Kanalo XML duomenyse nepavyko rasti šakninio elemento." #: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." -msgstr "" +msgstr "Kanalo formatas nepalaikomas." #: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" -msgstr "" +msgstr "Nepavyko apdoroti XML kanalo: %s" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "" +msgstr "RSS XML duomenų „channel“ elementas nerastas." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." -msgstr "" +msgstr "Rasta nepalaikoma RSS versija." #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "" +msgstr "Nepavyko rasti reikiamo RSS „item“ XML duomenų elemento." #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "" - -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "" +msgstr "Nepavyko rasti reikiamo RSS „channel“ XML duomenų elemento." #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" -msgstr "" +msgstr "Kanalas „%s“ jau yra" #: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" -msgstr "" +msgstr "Klaida įkraunant kanalą „%s“" -#: ../extensions/feed-panel/main.c:520 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" -msgstr "" +msgstr "Kanalų skydelis" -#: ../extensions/feed-panel/main.c:521 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" -msgstr "" +msgstr "Skaityti Atom/RSS kanalus" -#: ../extensions/formhistory.c:142 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" +msgstr "Nepavyko pridėti formos reikšmės: %s\n" + +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "Formų istorija" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" msgstr "" +"Šiai vietai atverti reikia naudotojo vardo\n" +"ir slaptažodžio:" -#: ../extensions/formhistory.c:455 -#: ../extensions/formhistory.c:459 +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "Šiame puslapyje prisiminti slaptažodį?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Prisiminti" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "Ne dabar" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Šiame puslapyje niekada" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "Perjungti formų istorijos būseną" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "Aktyvuoti ar deaktyvuoti formų istoriją dabartinei kortelei." + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format msgid "Failed to execute database statement: %s\n" +msgstr "Nepavyko įvykdyti duomenų bazės sakinio: %s\n" + +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" msgstr "" +"Kiekvienai kortelei formų istoriją aktyvuoti tik su greituoju klavišu (Ctrl" +"+Shift+F)" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "Formų istorijos pildytojas" -#: ../extensions/formhistory.c:503 +#: ../extensions/formhistory/formhistory.c:669 msgid "Stores history of entered form data" -msgstr "" +msgstr "Saugo įvestų duomenų istoriją" -#: ../extensions/formhistory.c:507 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 #, c-format -msgid "Not available: %s" -msgstr "" +msgid "Failed to select suggestions\n" +msgstr "Nepavyko pasirinkti pasiūlymų\n" -#: ../extensions/formhistory.c:508 -msgid "Resource files not installed" -msgstr "" +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Nėra neaplankytų kortelių" -#: ../extensions/formhistory.c:514 -msgid "Form history filler" -msgstr "" +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "Istorijos sąrašas" -#: ../extensions/history-list.vala:174 -msgid "Next Tab (History List)" -msgstr "" +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Kortelės užvėrimo elgsena" -#: ../extensions/history-list.vala:175 -msgid "Next tab from history" -msgstr "" +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Nieko nedaryti" -#: ../extensions/history-list.vala:184 -msgid "Previous Tab (History List)" -msgstr "" +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Persijungti į paskutinę žiūrėtą kortelę" -#: ../extensions/history-list.vala:185 -msgid "Previous tab from history" -msgstr "" +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Persijungti į naujausią kortelę" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Sekanti nauja kortelė iš istorijos (Istorijos sąrašas)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Sekanti nauja kortelė iš istorijos" -#: ../extensions/history-list.vala:245 +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Ankstesnė nauja kortelė iš istorijos (Istorijos sąrašas)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Ankstesnė nauja kortelė iš istorijos" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Kortelę rodyti fone (Istorijos sąrašas)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Rodyti dabartinę pasirinktą kortelę fone" + +#: ../extensions/history-list.vala:569 msgid "History List" -msgstr "" +msgstr "Istorijos sąrašas" -#: ../extensions/history-list.vala:246 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" msgstr "" +"Perjungiant ar užveriant korteles, perkelti į paskutinę naudotą kortelę" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" -msgstr "" +msgstr "Pelės gestai" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" -msgstr "" - -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 -#: ../extensions/page-holder.c:177 -msgid "Pageholder" -msgstr "" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "" +msgstr "Valdykite Midori stumdami pelę" -#: ../extensions/page-holder.c:178 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "Perkrauti puslapį arba sustabdyti krovimą" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" -msgstr "" +msgstr "Derinti klaviatūros susiejimus" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." -msgstr "" +msgstr "Derinti _susiejimus..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" -msgstr "" +msgstr "Susiejimai" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" -msgstr "" +msgstr "Rodyti ir keisti klaviatūros susiejimus" -#: ../extensions/status-clock.c:176 +#: ../extensions/status-clock.c:174 msgid "Statusbar Clock" -msgstr "" +msgstr "Būsenos juostos laikrodis" -#: ../extensions/status-clock.c:177 +#: ../extensions/status-clock.c:175 msgid "Display date and time in the statusbar" -msgstr "" +msgstr "Būsenos juostoje rodyti datą ir laiką" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/statusbar-features.c:131 msgid "Images" -msgstr "" +msgstr "Paveikslėliai" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" -msgstr "" +msgstr "Scenarijai" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Netscape papildiniai" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" -msgstr "" +msgstr "Būsenos juostos galimybės" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" -msgstr "" +msgstr "Interneto puslapiuose lengvai įjunkite ar išjunkite galimybes" -#: ../extensions/tab-panel.c:569 -#: ../extensions/tab-panel.c:628 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" -msgstr "" +msgstr "Kortelių skydelis" -#: ../extensions/tab-panel.c:612 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" -msgstr "" +msgstr "_Kortelių skydelis" -#: ../extensions/tab-panel.c:629 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" -msgstr "" +msgstr "Korteles rodo vertikaliame skydelyje" -#: ../extensions/tabs-minimized.c:79 +#: ../extensions/tabs-minimized.c:76 msgid "Only Icons on Tabs by default" -msgstr "" +msgstr "Pagal nutylėjimą ant kortelių tik piktogramos" -#: ../extensions/tabs-minimized.c:80 +#: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" -msgstr "" +msgstr "Pagal nutylėjimą kortelės neturi etikečių" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" -msgstr "" +msgstr "Įrankių juostos derinimas" -#: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." msgstr "" +"Pasirinkite kurie elementai bus rodomi įrankių juostoje. Elementai gali būti " +"sukeisti vietomis tiesiog juos velkant." -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" -msgstr "" +msgstr "Prieinami elementai" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" -msgstr "" +msgstr "Rodomi elementai" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." -msgstr "" +msgstr "Įrankių juostos _derinimas" -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Derinti..." + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" -msgstr "" +msgstr "Įrankinės redaktorius" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" -msgstr "" +msgstr "Lengvai pakeiskite įrankinės išdėstymą" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" -msgstr "" +msgstr "Podėlio HTTP bendravimas su disku" + +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "Nurodytos konfigūracijos aplankas yra netinkamas." + +#~ msgid "Cookies" +#~ msgstr "Slapukai" + +#~ msgid "'Flash' Cookies" +#~ msgstr "„Flash” Slapukai" + +#~ msgid "HTML5 _Databases" +#~ msgstr "HTML5 _duomenų bazės" +#~ msgid "Offline Application Cache" +#~ msgstr "Atsijungusių programų podėlis" diff -Nru midori-0.2.8/po/nl.po midori-0.4.6/po/nl.po --- midori-0.2.8/po/nl.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/nl.po 2012-05-14 22:13:42.000000000 +0000 @@ -1,2406 +1,2478 @@ -# Dutch translations for midori package. -# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# Dutch translation of the midori package. +# Copyright (C) The Xfce development team. # This file is distributed under the same license as the midori package. # Vincent Tunru 2008 +# Emmo, 2011 (assisted by Pjotr). # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.0\n" +"Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-06 10:08+0000\n" -"PO-Revision-Date: 2008-11-10 02:02+0100\n" -"Last-Translator: Vincent Tunru \n" -"Language-Team: Dutch\n" +"POT-Creation-Date: 2012-05-14 07:30+0000\n" +"PO-Revision-Date: 2011-09-08 12:02+0200\n" +"Last-Translator: Emmo (assisted by Pjotr)\n" +"Language-Team: Dutch (Flemish)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: nl (Dutch)\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Lichtgewicht webbrowser" +msgid "Browse the Web" +msgstr "Blader door het Web" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1353 ../midori/main.c:1683 -#: ../midori/main.c:1691 ../midori/main.c:1707 -#: ../midori/midori-websettings.c:314 +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "Internet;WWW;Verkenner" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:1972 ../midori/main.c:1996 +#: ../midori/main.c:2010 ../midori/midori-websettings.c:313 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Webbrowser" -#: ../midori/main.c:102 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Midori Privé-surfen" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Open een nieuw privé-surfvenster" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4288 +msgid "Private Browsing" +msgstr "Privé-surfen" + +#: ../midori/main.c:97 ../midori/main.c:103 #, c-format msgid "The configuration couldn't be loaded: %s\n" -msgstr "Configuratie kan niet geladen worden: %s\n" +msgstr "Configuratie kon niet geladen worden: %s\n" #: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Waarde '%s' is ongeldig voor %s" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:156 ../midori/main.c:260 #, c-format msgid "Invalid configuration value '%s'" -msgstr "Ongeldige waarde '%s'" +msgstr "Ongeldige configuratiewaarde '%s'" + +#: ../midori/main.c:381 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "De zoekmachines konden niet worden geladen. %s\n" + +#: ../midori/main.c:435 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Niet gelukt om geschiedenis te verwijderen: %s\n" -#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#: ../midori/main.c:455 ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" -msgstr "Kan database niet openen: %s\n" +msgstr "Kon gegevensbank niet openen: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:525 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "Kan oude items in geschiedenis niet verwijderen: %s\n" +msgstr "Kon oude elementen in geschiedenis niet verwijderen: %s\n" -#: ../midori/main.c:457 +#: ../midori/main.c:547 #, c-format msgid "The configuration couldn't be saved. %s" -msgstr "De instellingen kunnen niet worden opgeslagen. %s" +msgstr "De instellingen konden niet worden opgeslagen. %s" -#: ../midori/main.c:495 +#: ../midori/main.c:582 #, c-format msgid "The search engines couldn't be saved. %s" -msgstr "De zoekmachines kunnen niet opgeslagen worden. %s" - -#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "De bladwijzers kunnen niet opgeslagen worden. %s" +msgstr "De zoekmachines konden niet opgeslagen worden. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:614 ../midori/main.c:637 +#: ../midori/main.c:619 #, c-format msgid "The trash couldn't be saved. %s" -msgstr "De prullenbak kan niet worden opgeslagen. %s" +msgstr "De prullenbak kon niet worden opgeslagen. %s" + +#: ../midori/main.c:660 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Extensies" + +#: ../midori/main.c:674 +msgid "Privacy" +msgstr "Privacy" -#: ../midori/main.c:696 ../midori/main.c:936 +#: ../midori/main.c:686 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"Koekjes slaan aanmeldgegevens, opgeslagen spelletjes of gebruikerprofielen " +"op voor adverteerdoeleinden." + +#: ../midori/main.c:742 #, c-format msgid "The session couldn't be saved. %s" -msgstr "De sessie kan niet worden opgeslagen. %s" +msgstr "De sessie kon niet worden opgeslagen. %s" -#: ../midori/main.c:880 -msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "Geen root certificaatbestand aanwezig. SSL certificaten kunnen niet worden geverifieerd." +#: ../midori/main.c:960 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" +"Geen root-certificaatbestand aanwezig. SSL-certificaten kunnen niet worden " +"geverifieerd." -#: ../midori/main.c:970 -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 schijnt te zijn gecrasht de laatste keer dat het werd geopend. Als dit herhaaldelijk gebeurt, probeer dan een van de volgende opties om het probleem op te lossen." +#: ../midori/main.c:1036 +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 schijnt te zijn vastgelopen, de laatste keer dat hij werd geopend. " +"Als dit herhaaldelijk gebeurt, probeer dan een van de volgende opties om het " +"probleem op te lossen." -#: ../midori/main.c:985 +#: ../midori/main.c:1055 msgid "Modify _preferences" msgstr "_Voorkeuren wijzigen" -#: ../midori/main.c:989 -msgid "Reset the last _session" -msgstr "Reset de laatste _SESSION" - -#: ../midori/main.c:994 +#: ../midori/main.c:1059 msgid "Disable all _extensions" msgstr "Schakel alle _extensies uit" -#: ../midori/main.c:1229 ../midori/main.c:1956 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "De sessie kan niet geladen worden: %s\n" +#: ../midori/main.c:1072 +msgid "Discard old tabs" +msgstr "Verwijder oude tabbladen" + +#: ../midori/main.c:1073 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "Toon laatste tabbladen zonder te laden" -#: ../midori/main.c:1353 -msgid "No filename specified" -msgstr "Geen bestandsnaam ingegeven" +#: ../midori/main.c:1074 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "Toon laatst geopende tabbladen" -#: ../midori/main.c:1372 -msgid "An unknown error occured." -msgstr "Onbekende fout." +#: ../midori/main.c:1321 ../midori/main.c:2399 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "De sessie kon niet geladen worden: %s\n" -#: ../midori/main.c:1403 +#: ../midori/main.c:1459 #, c-format msgid "Snapshot saved to: %s\n" -msgstr "Snapshot opgeslagen in:%s\n" +msgstr "Momentopname opgeslagen in: %s\n" -#: ../midori/main.c:1575 +#: ../midori/main.c:1875 msgid "Run ADDRESS as a web application" msgstr "ADRES uitvoeren als een webtoepassing" -#: ../midori/main.c:1575 +#: ../midori/main.c:1875 msgid "ADDRESS" msgstr "ADRES" -#: ../midori/main.c:1578 +#: ../midori/main.c:1878 msgid "Use FOLDER as configuration folder" msgstr "Gebruik MAP als configuratiemap" -#: ../midori/main.c:1578 +#: ../midori/main.c:1878 msgid "FOLDER" msgstr "MAP" -#: ../midori/main.c:1581 +#: ../midori/main.c:1881 +msgid "Private browsing, no changes are saved" +msgstr "Privé-surfen, veranderingen worden niet opgeslagen." + +#: ../midori/main.c:1883 msgid "Show a diagnostic dialog" msgstr "Toon een diagnostisch venster" -#: ../midori/main.c:1583 +#: ../midori/main.c:1885 msgid "Run the specified filename as javascript" -msgstr "Voer de gegeven bestandsnaam uit als Javascript" +msgstr "Voer de opgegeven bestandnaam uit als javascript" -#: ../midori/main.c:1586 +#: ../midori/main.c:1887 msgid "Take a snapshot of the specified URI" -msgstr "Neem een snapshot van de opgegeven URI" +msgstr "Maak een momentopname van de opgegeven URI" -#: ../midori/main.c:1589 +#: ../midori/main.c:1889 msgid "Execute the specified command" msgstr "Voer de opgegeven opdracht uit" -#: ../midori/main.c:1591 +#: ../midori/main.c:1891 +msgid "List available commands to execute with -e/ --execute" +msgstr "Lijst beschikbare opdrachten uit te voeren met -e/ --execute" + +#: ../midori/main.c:1893 msgid "Display program version" msgstr "Versie-informatie weergeven" -#: ../midori/main.c:1593 +#: ../midori/main.c:1895 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1595 +#: ../midori/main.c:1897 msgid "Block URIs according to regular expression PATTERN" msgstr "Blokkeer URIs die overeenstemmen met reguliere expressie PATROON" -#: ../midori/main.c:1595 +#: ../midori/main.c:1897 msgid "PATTERN" msgstr "PATROON" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1599 +#: ../midori/main.c:1901 msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "Reset Midori na SECONDEN seconden van inactiviteit" +msgstr "" +"Zet Midori na SECONDEN seconden van inactiviteit, terug op de " +"standaardwaarden" -#: ../midori/main.c:1599 +#: ../midori/main.c:1901 msgid "SECONDS" msgstr "SECONDEN" -#: ../midori/main.c:1680 +#: ../midori/main.c:1904 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Verwijst terminalwaarschuwingen naar de opgegeven BESTANDNAAM" + +#: ../midori/main.c:1904 +msgid "FILENAME" +msgstr "BESTANDNAAM" + +#: ../midori/main.c:1969 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/main.c:1708 +#: ../midori/main.c:2011 msgid "Please report comments, suggestions and bugs to:" -msgstr "Gelieve commentaar, suggesties en fouten in het Engels te melden bij:" +msgstr "Gelieve commentaar, suggesties en fouten te melden bij:" -#: ../midori/main.c:1710 +#: ../midori/main.c:2013 msgid "Check for new versions at:" msgstr "Controleer op nieuwe versies op:" -#: ../midori/main.c:1807 -msgid "The specified configuration folder is invalid." -msgstr "De gespecifieerde configuratiemap is ongeldig." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2108 +msgid "Saved logins and _passwords" +msgstr "Opgeslagen aanmeldingen en _wachtwoorden" + +#: ../midori/main.c:2110 +msgid "Cookies and Website data" +msgstr "Koekjes en websitegegevens" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2114 ../midori/midori-websettings.c:997 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Webopslag" + +#: ../midori/main.c:2117 +msgid "Website icons" +msgstr "Website-pictogrammen" + +#: ../midori/main.c:2223 +msgid "An unknown error occured" +msgstr "Er is een onbekende fout opgetreden" -#: ../midori/main.c:1855 +#: ../midori/main.c:2330 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori is al actief maar reageert niet.\n" -#: ../midori/main.c:1910 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "De zoekmachines kunnen niet worden geladen. %s\n" - -#: ../midori/main.c:1939 +#: ../midori/main.c:2366 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "De bladwijzers kunnen niet geladen worden: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" +msgstr "De bladwijzers konden niet worden geladen: %s\n" -#: ../midori/main.c:1971 +#: ../midori/main.c:2414 #, c-format msgid "The trash couldn't be loaded: %s\n" -msgstr "De prullenbak kan niet geladen worden: %s\n" +msgstr "De prullenbak kon niet geladen worden: %s\n" -#: ../midori/main.c:1985 +#: ../midori/main.c:2427 #, c-format msgid "The history couldn't be loaded: %s\n" -msgstr "De geschiedenis kan niet geladen worden: %s\n" +msgstr "De geschiedenis kon niet geladen worden: %s\n" -#: ../midori/main.c:1999 +#: ../midori/main.c:2443 msgid "The following errors occured:" msgstr "De volgende fouten hebben plaatsgevonden:" -#: ../midori/main.c:2015 +#: ../midori/main.c:2459 msgid "_Ignore" msgstr "_Negeren" -#: ../midori/midori-array.c:428 +#: ../midori/midori-app.c:1339 +msgid "_Bookmark" +msgstr "_Bladwijzer" + +#: ../midori/midori-app.c:1340 ../midori/midori-browser.c:6066 +msgid "_Bookmarks" +msgstr "_Bladwijzers" + +#: ../midori/midori-app.c:1341 +msgid "Add Boo_kmark" +msgstr "Bladwijzer _toevoegen" + +#: ../midori/midori-app.c:1342 +msgid "_Console" +msgstr "Terminalvenster" + +#: ../midori/midori-app.c:1343 +msgid "_Extensions" +msgstr "_Extensies" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1344 ../midori/midori-browser.c:4591 +msgid "_History" +msgstr "_Geschiedenis" + +#: ../midori/midori-app.c:1345 +msgid "_Homepage" +msgstr "_Thuispagina" + +#: ../midori/midori-app.c:1346 +msgid "_Userscripts" +msgstr "Gebruikers_scripts" + +#: ../midori/midori-app.c:1347 +msgid "New _Tab" +msgstr "Nieuw _tabblad" + +#: ../midori/midori-app.c:1348 +msgid "_Transfers" +msgstr "Bestand_overdrachten" + +#: ../midori/midori-app.c:1349 +msgid "Netscape p_lugins" +msgstr "Netscape p_lugins" + +#: ../midori/midori-app.c:1350 +msgid "_Closed Tabs" +msgstr "Ge_sloten tabbladen" + +#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5218 +msgid "New _Window" +msgstr "Nieuw _venster" + +#: ../midori/midori-app.c:1352 +msgid "New _Folder" +msgstr "Nieuwe _map" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "Bestand niet gevonden." -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." -msgstr "Ongeldig document." +msgstr "Misvormd document." -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." -msgstr "Onbekend bladwijzerformaat." +msgstr "Onbekende bladwijzeropmaak." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 -#, c-format +#: ../midori/midori-array.c:915 msgid "Writing failed." -msgstr "Fout bij schrijven." +msgstr "Schrijven is mislukt." -#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5300 +#: ../midori/midori-browser.c:5309 msgid "Reload the current page" msgstr "De huidige pagina opnieuw laden" -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5306 msgid "Stop loading the current page" msgstr "Stop met het laden van de huidige pagina" -#: ../midori/midori-browser.c:458 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% geladen" - -#: ../midori/midori-browser.c:496 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" -msgstr "Kan titel niet aanpassen: %s\n" +msgstr "Kon titel niet aanpassen: %s\n" -#: ../midori/midori-browser.c:510 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." msgstr "Onverwachte actie '%s'." -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:569 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Privé-surfen)" + +#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716 +msgid "Toplevel folder" +msgstr "Hoofdmap" + +#: ../midori/midori-browser.c:774 msgid "New folder" msgstr "Nieuwe map" -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:774 msgid "Edit folder" -msgstr "Map wijzigen" +msgstr "Map bewerken" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:776 msgid "New bookmark" msgstr "Nieuwe bladwijzer" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:776 msgid "Edit bookmark" msgstr "Bladwijzer bewerken" -#: ../midori/midori-browser.c:759 +#: ../midori/midori-browser.c:818 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "_Beschrijving:" - -#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" -msgstr "_Address:" +msgstr "_Adres:" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 +#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4328 msgid "_Folder:" msgstr "_Map:" -#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 -#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 -msgid "Toplevel folder" -msgstr "Hoofdmap" - -#: ../midori/midori-browser.c:862 +#: ../midori/midori-browser.c:877 msgid "Add to _Speed Dial" msgstr "Toevoegen aan _snelkiezen" -#: ../midori/midori-browser.c:875 +#: ../midori/midori-browser.c:890 msgid "Show in the tool_bar" msgstr "Laat in de werk_balk zien" -#: ../midori/midori-browser.c:890 +#: ../midori/midori-browser.c:905 msgid "Run as _web application" msgstr "Uitvoeren als _webtoepassing" -#: ../midori/midori-browser.c:984 +#: ../midori/midori-browser.c:976 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr " Het bestand \"%s\" kan niet worden opgeslagen in deze map." + +#: ../midori/midori-browser.c:978 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "U heeft geen rechten om op deze plaats te schrijven." + +#: ../midori/midori-browser.c:985 #, c-format msgid "There is not enough free space to download \"%s\"." -msgstr "Er is niet voldoende schijfruimte om \"%s\" te downloaden." +msgstr "Er is niet voldoende schijfruimte om \"%s\" binnen te halen." #: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." -msgstr "Het bestand heeft %s nodig maar slechts %s is beschikbaar." +msgstr "Het bestand heeft %s nodig maar slechts %s is over." -#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4397 msgid "Save file as" msgstr "Bestand opslaan als" -#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s van %s" +#: ../midori/midori-browser.c:1320 +msgid "New Window" +msgstr "Nieuw venster" -#: ../midori/midori-browser.c:1454 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "Het bestand '%s' is gedownload." +#: ../midori/midori-browser.c:1320 +msgid "A new window has been opened" +msgstr "Er is een nieuw venster geopend" -#: ../midori/midori-browser.c:1458 -msgid "Transfer completed" -msgstr "Overdracht compleet" +#: ../midori/midori-browser.c:1323 +msgid "New Tab" +msgstr "Nieuw tabblad" -#: ../midori/midori-browser.c:1598 +#: ../midori/midori-browser.c:1323 +msgid "A new tab has been opened" +msgstr "Er is een nieuw tabblad geopend" + +#: ../midori/midori-browser.c:1358 +msgid "Error opening the image!" +msgstr "Fout bij het openen van de afbeelding." + +#: ../midori/midori-browser.c:1359 +msgid "Can not open selected image in a default viewer." +msgstr "Kan de gekozen afbeelding niet openen in een standaardkijker." + +#: ../midori/midori-browser.c:1365 +msgid "Error downloading the image!" +msgstr "Fout bij het binnenhalen van de afbeelding." + +#: ../midori/midori-browser.c:1366 +msgid "Can not download selected image." +msgstr "Kan de gekozen afbeelding niet binnenhalen." + +#: ../midori/midori-browser.c:1492 msgid "Save file" msgstr "Bestand opslaan" -#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 -msgid "Some files are being downloaded" -msgstr "Sommige bestanden worden gedownload" - -#: ../midori/midori-browser.c:1921 -msgid "_Quit Midori" -msgstr "Midori _afsluiten" - -#: ../midori/midori-browser.c:1923 -msgid "The transfers will be cancelled if Midori quits." -msgstr "De bestandsoverdrachten zullen worden geannuleerd als Midori wordt afgesloten." - -#: ../midori/midori-browser.c:2384 +#: ../midori/midori-browser.c:2367 msgid "Open file" msgstr "Bestand openen" -#: ../midori/midori-browser.c:2462 +#: ../midori/midori-browser.c:2499 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." msgstr "" -"Om de bovenstaande URI te openen heeft u een nieuwsaggregator nodig. Daar is meestal een menu of knop \"Nieuw abonnement\", \"Nieuwe nieuwsfeed\" of vergelijkbaar.\n" -"Alternatief kan u gaan naar Voorkeuren, Toepassingen in Midori en een Nieuwsaggregator kiezen. De volgende keer dat u de nieuwsfeed aanklikt zal deze automatisch worden toegevoegd." +"Om de bovenstaande URI te openen heeft u een nieuwsaggregator nodig. Daar is " +"meestal een menu of knop \"Nieuw abonnement\", \"Nieuwe nieuwsvoeding\" of " +"vergelijkbaar.\n" +"Anders kunt u gaan naar Voorkeuren, Toepassingen in Midori en een " +"Nieuwsaggregator kiezen. De volgende keer dat u het pictogram van " +"nieuwsvoeding aanklikt, zal dit automatisch worden toegevoegd." -#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365 msgid "New feed" -msgstr "Nieuwe feed" +msgstr "Nieuwe voeding" -#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 -#: ../panels/midori-bookmarks.c:233 +#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5369 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "Nieuwe bladwijzer toevoegen" -#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Kan database statement niet uitvoeren: %s\n" - -#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 msgid "Empty" msgstr "Leeg" -#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "Kan extern programma niet uitvoeren." +#: ../midori/midori-browser.c:3469 +msgid "Toggle text cursor navigation" +msgstr "Schakel tekstaanwijzer-navigatie" -#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 +#: ../midori/midori-browser.c:3784 ../midori/midori-browser.c:5759 #, c-format msgid "Failed to insert new history item: %s\n" -msgstr "Kan nieuw item in geschiedenis niet toevoegen: %s\n" +msgstr "Kon nieuw element in geschiedenis niet toevoegen: %s\n" -#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:4116 ../panels/midori-bookmarks.c:745 +#: ../panels/midori-history.c:803 msgid "Open all in _Tabs" msgstr "Alles openen in _tabbladen" -#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4123 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "In nieuw _tabblad openen" -#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4126 ../midori/midori-view.c:2688 +#: ../midori/midori-view.c:4848 ../panels/midori-bookmarks.c:753 +#: ../panels/midori-history.c:811 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "In nieuw _venster openen" -#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:4215 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4666 +#: ../midori/midori-browser.c:4216 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:4217 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4668 +#: ../midori/midori-browser.c:4218 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:4219 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4690 +#: ../midori/midori-browser.c:4220 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4241 msgid "Import bookmarks..." -msgstr "Bladwijzers importeren..." +msgstr "Bladwijzers invoeren..." -#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:4244 ../midori/midori-browser.c:5374 msgid "_Import bookmarks" -msgstr "Bladwijzers _importeren" +msgstr "Bladwijzers _invoeren" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:4255 msgid "_Application:" msgstr "_Toepassing:" -#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 -#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 -#: ../katze/katze-utils.c:691 -msgid "Custom..." -msgstr "Aangepast..." +#: ../midori/midori-browser.c:4320 +msgid "Import from XBEL or HTML file" +msgstr "Invoeren vanuit een XBEL- of HTML-bestand" + +#: ../midori/midori-browser.c:4355 +msgid "Import from a file" +msgstr "Invoeren vanuit een bestand" -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4367 msgid "Failed to import bookmarks" -msgstr "Bladwijzers importeren mislukt" +msgstr "Bladwijzers invoeren mislukt" -#: ../midori/midori-browser.c:4841 -msgid "Failed to export bookmarks" -msgstr "Bladwijzers exporteren mislukt" +#: ../midori/midori-browser.c:4402 +msgid "XBEL Bookmarks" +msgstr "XBEL-bladwijzers" -#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Kan item in geschiedenis niet verwijderen: %s\n" +#: ../midori/midori-browser.c:4407 +msgid "Netscape Bookmarks" +msgstr "Netscape-bladwijzers" + +#: ../midori/midori-browser.c:4421 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "Midori kan alleen uitvoeren naar XBEL (*.xbel) en Netscape (*.html)" + +#: ../midori/midori-browser.c:4436 +msgid "Failed to export bookmarks" +msgstr "Bladwijzers uitvoeren mislukt" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4558 msgid "Clear Private Data" msgstr "Wis privégegevens" -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:4562 msgid "_Clear private data" msgstr "Privégegevens _wissen" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:4575 msgid "Clear the following data:" -msgstr "Wis de volgende data:" - -#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 -msgid "History" -msgstr "Geschiedenis" - -#: ../midori/midori-browser.c:5037 -msgid "Cookies" -msgstr "Cookies" - -#: ../midori/midori-browser.c:5042 -msgid "'Flash' Cookies" -msgstr "'Flash' cookies" - -#: ../midori/midori-browser.c:5047 -msgid "Website icons" -msgstr "Website pictogrammen" +msgstr "Wis de volgende gegevens:" -#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 -msgid "_Closed Tabs" -msgstr "Ge_sloten tabbladen" - -#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "Web tijdelijke opslag" +#: ../midori/midori-browser.c:4585 +msgid "Last open _tabs" +msgstr "Laatst openstaande _tabbladen" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:4611 msgid "Clear private data when _quitting Midori" msgstr "Privégegevens wissen bij het _afsluiten van Midori" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:4806 msgid "A lightweight web browser." msgstr "Een lichtgewicht webbrowser." -#: ../midori/midori-browser.c:5168 -msgid "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." -msgstr "Deze bibliotheek is vrije software; u kan deze opnieuw verdelen en/of wijzigen onder de voorwaarden van de GNU Lesser General Public License zoals gepubliceerd door de Free Software Foundation; ofwel versie 2.1 van de licentie of een latere versie (naar keuze)." +#: ../midori/midori-browser.c:4807 +msgid "See about:version for version info." +msgstr "Ga naar about:version voor informatie over de versie." -#: ../midori/midori-browser.c:5187 +#: ../midori/midori-browser.c:4809 +msgid "" +"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." +msgstr "" +"Deze bibliotheek is vrije programmatuur; u kan deze opnieuw verdelen en/of " +"wijzigen onder de voorwaarden van de GNU Lesser General Public License, " +"zoals gepubliceerd door de Free Software Foundation; hetzij versie 2.1 van " +"de licentie hetzij een latere versie (naar keuze)." + +#: ../midori/midori-browser.c:4830 msgid "translator-credits" msgstr "" "Timo Verbeek \n" -"Pascal De Vuyst " +"Pascal De Vuyst \n" +"Emmo" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5216 msgid "_File" msgstr "_Bestand" -#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 -msgid "New _Window" -msgstr "Nieuw _venster" - -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5219 msgid "Open a new window" msgstr "Nieuw venster openen" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:5222 msgid "Open a new tab" msgstr "Nieuw tabblad openen" -#: ../midori/midori-browser.c:5504 -msgid "P_rivate Browsing" -msgstr "P_rivé surfen" - -#: ../midori/midori-browser.c:5505 -msgid "Don't save any private data while browsing" -msgstr "Geen privégegevens opslaan tijdens het surfen" +#: ../midori/midori-browser.c:5224 +msgid "New P_rivate Browsing Window" +msgstr "Nieuw p_rivé-surfvenster" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5228 msgid "Open a file" msgstr "Bestand openen" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5230 +msgid "_Save Page As..." +msgstr "_Sla pagina op als..." + +#: ../midori/midori-browser.c:5231 msgid "Save to a file" msgstr "Opslaan naar bestand" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5233 msgid "Add to Speed _dial" msgstr "Toevoegen aan _snelkiezen" -#: ../midori/midori-browser.c:5515 -msgid "Add shortcut to speed dial" -msgstr "Voeg snelkoppeling toe aan snelkiezen" - -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:5237 msgid "Add Shortcut to the _desktop" msgstr "Voeg snelkoppeling toe op _bureaublad" -#: ../midori/midori-browser.c:5518 -msgid "Add shortcut to the desktop" -msgstr "Voeg snelkoppeling toe op bureaublad" +#: ../midori/midori-browser.c:5239 +msgid "Create _Launcher" +msgstr "Maak _starter" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5243 msgid "Subscribe to News _feed" -msgstr "Abonneren op nieuws_feed" +msgstr "Abonneren op nieuws_voeding" -#: ../midori/midori-browser.c:5521 -msgid "Subscribe to this news feed" -msgstr "Abonneren op deze nieuwsfeed" - -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5249 msgid "_Close Tab" msgstr "Tabblad _sluiten" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5250 msgid "Close the current tab" msgstr "Huidig tabblad sluiten" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5252 msgid "C_lose Window" msgstr "Venster _sluiten" -#: ../midori/midori-browser.c:5530 -msgid "Close this window" -msgstr "Dit venster sluiten" - -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5256 msgid "Print the current page" -msgstr "Huidige pagina uitprinten" +msgstr "Huidige pagina afdrukken" -#: ../midori/midori-browser.c:5536 -msgid "Quit the application" -msgstr "Programma afsluiten" +#: ../midori/midori-browser.c:5258 +msgid "Close a_ll Windows" +msgstr "A_lle Vensters Sluiten" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5261 msgid "_Edit" msgstr "_Bewerken" -#: ../midori/midori-browser.c:5542 -msgid "Undo the last modification" -msgstr "Maak de laatste wijziging ongedaan" - -#: ../midori/midori-browser.c:5545 -msgid "Redo the last modification" -msgstr "De laatste wijziging opnieuw maken" - -#: ../midori/midori-browser.c:5549 -msgid "Cut the selected text" -msgstr "Geselecteerde tekst knippen" - -#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 -msgid "Copy the selected text" -msgstr "Geselecteerde tekst kopiëren" - -#: ../midori/midori-browser.c:5558 -msgid "Paste text from the clipboard" -msgstr "Tekst van het klembord plakken" - -#: ../midori/midori-browser.c:5561 -msgid "Delete the selected text" -msgstr "Geselecteerde tekst verwijderen" - -#: ../midori/midori-browser.c:5564 -msgid "Select all text" -msgstr "Alle tekst selecteren" +#: ../midori/midori-browser.c:5284 +msgid "_Find..." +msgstr "_Zoek..." -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5285 msgid "Find a word or phrase in the page" msgstr "Zoek naar een woord of zin in deze pagina" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5287 msgid "Find _Next" msgstr "Vo_lgende zoeken" -#: ../midori/midori-browser.c:5570 -msgid "Find the next occurrence of a word or phrase" -msgstr "Volgende voorkomen van een woord of zin opzoeken" - -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5290 msgid "Find _Previous" msgstr "Vo_rige zoeken" -#: ../midori/midori-browser.c:5573 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Vorige voorkomen van een woord of zin opzoeken" - -#: ../midori/midori-browser.c:5577 +#: ../midori/midori-browser.c:5294 msgid "Configure the application preferences" -msgstr "Voorkeuren instellen" +msgstr "Toepassingsvoorkeuren instellen" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5296 msgid "_View" msgstr "_Beeld" -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:5297 msgid "_Toolbars" msgstr "_Werkbalken" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5302 +msgid "Reload page without caching" +msgstr "Vernieuw de pagina zonder gegevensopslag" + +#: ../midori/midori-browser.c:5312 msgid "Increase the zoom level" msgstr "Zoomniveau verhogen" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5315 msgid "Decrease the zoom level" msgstr "Zoomniveau verlagen" -#: ../midori/midori-browser.c:5598 -msgid "Reset the zoom level" -msgstr "Zoomniveau op beginwaarde" - -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5319 msgid "_Encoding" msgstr "_Codering" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5321 msgid "View So_urce" msgstr "_Bron bekijken" -#: ../midori/midori-browser.c:5602 -msgid "View the source code of the page" -msgstr "Broncode van deze pagina bekijken" +#: ../midori/midori-browser.c:5324 +msgid "Ca_ret Browsing" +msgstr "Be_schermd surfen" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5328 msgid "Toggle fullscreen view" -msgstr "Volledig scherm" +msgstr "Schakel volledig-scherm-weergave" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5330 msgid "Scroll _Left" -msgstr "Naar _links schuiven" +msgstr "Naar _links bladeren" -#: ../midori/midori-browser.c:5609 -msgid "Scroll to the left" -msgstr "Naar links schuiven" - -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5333 msgid "Scroll _Down" -msgstr "Naar _beneden schuiven" - -#: ../midori/midori-browser.c:5612 -msgid "Scroll down" -msgstr "Naar beneden schuiven" +msgstr "Naar _beneden bladeren" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5336 msgid "Scroll _Up" -msgstr "Naar _omhoog schuiven" +msgstr "Naar _omhoog bladeren" -#: ../midori/midori-browser.c:5615 -msgid "Scroll up" -msgstr "Naar omhoog schuiven" - -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5339 msgid "Scroll _Right" -msgstr "Naar _rechts schuiven" - -#: ../midori/midori-browser.c:5618 -msgid "Scroll to the right" -msgstr "Naar rechts schuiven" +msgstr "Naar _rechts bladeren" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:5342 msgid "_Go" -msgstr "_Ga naar" +msgstr "_Ga" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5345 msgid "Go back to the previous page" -msgstr "Terug naar de vorige pagina" +msgstr "Ga terug naar de vorige pagina" -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5348 msgid "Go forward to the next page" -msgstr "Naar de volgende pagina" +msgstr "Ga naar de volgende pagina" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5352 msgid "Go to the previous sub-page" -msgstr "Naar de vorige subpagina" +msgstr "Ga naar de vorige subpagina" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5356 msgid "Go to the next sub-page" -msgstr "Naar de volgende subpagina" +msgstr "Ga naar de volgende subpagina" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5359 msgid "Go to your homepage" -msgstr "Naar de homepage" +msgstr "Ga naar de thuispagina" -#: ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:5361 msgid "Empty Trash" msgstr "Prullenbak leegmaken" -#: ../midori/midori-browser.c:5641 -msgid "Delete the contents of the trash" -msgstr "Verwijder de inhoud van de prullenbak" - -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5364 msgid "Undo _Close Tab" msgstr "Tabblad _sluiten ongedaan maken" -#: ../midori/midori-browser.c:5644 -msgid "Open the last closed tab" -msgstr "Open het laatst gesloten tabblad" - -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5371 msgid "Add a new _folder" msgstr "Nieuwe _map toevoegen" -#: ../midori/midori-browser.c:5651 -msgid "Add a new bookmark folder" -msgstr "Nieuwe bladwijzermap toevoegen" - -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5377 msgid "_Export bookmarks" msgstr "Bladwijzers _exporteren" -#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Zoekmachines beheren" -#: ../midori/midori-browser.c:5660 -msgid "Add, edit and remove search engines..." -msgstr "Zoekmachines toevoegen, bewerken en verwijderen..." - -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5383 msgid "_Clear Private Data" -msgstr "Privégegevens _wissen" - -#: ../midori/midori-browser.c:5664 -msgid "Clear private data..." -msgstr "Privé data wissen..." +msgstr "Privé-gegevens _Wissen" -#: ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:5386 msgid "_Inspect Page" -msgstr "Pagina _inspecteren - %s" +msgstr "Pagina _inspecteren" -#: ../midori/midori-browser.c:5669 -msgid "Inspect page details and access developer tools..." -msgstr "Inspecteer paginadetails en toegang tot ontwikkelaarsgereedschappen..." - -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5390 msgid "_Previous Tab" msgstr "Vo_rig tabblad" -#: ../midori/midori-browser.c:5675 -msgid "Switch to the previous tab" -msgstr "Overschakelen naar het vorige tabblad" - -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5393 msgid "_Next Tab" msgstr "Vo_lgend tabblad" -#: ../midori/midori-browser.c:5678 -msgid "Switch to the next tab" -msgstr "Overschakelen naar het volgende tabblad" +#: ../midori/midori-browser.c:5395 +msgid "Move Tab _Backward" +msgstr "Verplaats tabblad naar _achteren" + +#: ../midori/midori-browser.c:5397 +msgid "_Move Tab Forward" +msgstr "_Verplaats tabblad naar voren" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5400 msgid "Focus _Current Tab" msgstr "Focus _huidig tabblad" -#: ../midori/midori-browser.c:5681 -msgid "Focus the current tab" -msgstr "Focus op huidig tabblad" +#: ../midori/midori-browser.c:5403 +msgid "Focus _Next view" +msgstr "Focus _volgende weergave" + +#: ../midori/midori-browser.c:5406 +msgid "Only show the Icon of the _Current Tab" +msgstr "Toon alleen het Pictogram van het _Huidige Tabblad" + +#: ../midori/midori-browser.c:5409 +msgid "_Duplicate Current Tab" +msgstr "Huidig tabblad _dupliceren" + +#: ../midori/midori-browser.c:5412 +msgid "Close Ot_her Tabs" +msgstr "An_dere tabbladen sluiten" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5415 msgid "Open last _session" msgstr "Open laatste _sessie" -#: ../midori/midori-browser.c:5684 -msgid "Open the tabs saved in the last session" -msgstr "Open tabbladen die werden bewaard in de laatste sessie" - -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5418 msgid "_Help" msgstr "_Hulp" -#: ../midori/midori-browser.c:5688 -msgid "_Contents" -msgstr "_Inhoud" - -#: ../midori/midori-browser.c:5689 -msgid "Show the documentation" -msgstr "Documentatie weergeven" - -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5420 msgid "_Frequent Questions" msgstr "_Veelgestelde vragen" -#: ../midori/midori-browser.c:5692 -msgid "Show the Frequently Asked Questions" -msgstr "Veelgestelde vragen weergeven" - -#: ../midori/midori-browser.c:5694 -msgid "_Report a Bug" -msgstr "Probleem _melden" - -#: ../midori/midori-browser.c:5695 -msgid "Open Midori's bug tracker" -msgstr "Open Midori's foutmelder" - -#: ../midori/midori-browser.c:5698 -msgid "Show information about the program" -msgstr "Informatie over dit programma weergeven" +#: ../midori/midori-browser.c:5423 +msgid "_Report a Problem..." +msgstr "_Meld een probleem..." -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5435 msgid "_Menubar" msgstr "_Menubalk" -#: ../midori/midori-browser.c:5707 -msgid "Show menubar" -msgstr "Menubalk weergeven" - -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5439 msgid "_Navigationbar" msgstr "_Navigatiebalk" -#: ../midori/midori-browser.c:5711 -msgid "Show navigationbar" -msgstr "Navigatiebalk weergeven" - -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5443 msgid "Side_panel" -msgstr "_Paneel" +msgstr "_Zijbalk" -#: ../midori/midori-browser.c:5715 -msgid "Show sidepanel" -msgstr "_Paneel weergeven" +#: ../midori/midori-browser.c:5444 +msgid "Sidepanel" +msgstr "Zijbalk" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5447 msgid "_Bookmarkbar" msgstr "_Bladwijzerbalk" -#: ../midori/midori-browser.c:5719 -msgid "Show bookmarkbar" -msgstr "Bladwijzerbalk weergeven" - -#: ../midori/midori-browser.c:5722 -msgid "_Transferbar" -msgstr "Bestands_overdrachten-balk" - -#: ../midori/midori-browser.c:5723 -msgid "Show transferbar" -msgstr "Bestandsoverdrachten-balk weergeven" - -#: ../midori/midori-browser.c:5726 +#: ../midori/midori-browser.c:5451 msgid "_Statusbar" msgstr "_Statusbalk" -#: ../midori/midori-browser.c:5727 -msgid "Show statusbar" -msgstr "Statusbalk weergeven" - -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5460 ../midori/midori-websettings.c:312 msgid "_Automatic" msgstr "_Automatisch" -#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:222 -msgid "Chinese (BIG5)" -msgstr "Chinees (BIG5)" +#: ../midori/midori-browser.c:5463 ../midori/midori-websettings.c:236 +msgid "Chinese Traditional (BIG5)" +msgstr "Chinees traditioneel (BIG5)" + +#: ../midori/midori-browser.c:5466 ../midori/midori-websettings.c:237 +msgid "Chinese Simplified (GB18030)" +msgstr "Chinees vereenvoudigd (GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5470 msgid "Japanese (SHIFT__JIS)" msgstr "Japans (SHIFT__JIS)" -#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5473 ../midori/midori-websettings.c:239 msgid "Korean (EUC-KR)" msgstr "Koreaans (EUC-KR)" -#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5476 ../midori/midori-websettings.c:240 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5479 ../midori/midori-websettings.c:241 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5482 ../midori/midori-websettings.c:242 msgid "Western (ISO-8859-1)" msgstr "Westers (ISO-8859-1)" -#: ../midori/midori-browser.c:6300 +#: ../midori/midori-browser.c:5485 ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:318 ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "Aangepast..." + +#: ../midori/midori-browser.c:5991 msgid "_Separator" msgstr "_Scheidingsteken" -#: ../midori/midori-browser.c:6307 +#: ../midori/midori-browser.c:5998 msgid "_Location..." msgstr "_Locatie..." -#: ../midori/midori-browser.c:6309 +#: ../midori/midori-browser.c:6000 msgid "Open a particular location" -msgstr "Open een locatie" +msgstr "Open een specifieke locatie" -#: ../midori/midori-browser.c:6333 +#: ../midori/midori-browser.c:6022 msgid "_Web Search..." msgstr "Zoeken op het _web..." -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:6024 msgid "Run a web search" msgstr "Doorzoek het web" -#: ../midori/midori-browser.c:6356 +#: ../midori/midori-browser.c:6051 msgid "Reopen a previously closed tab or window" msgstr "Heropen een eerder gesloten tabblad of venster" -#: ../midori/midori-browser.c:6371 -msgid "_Recently visited pages" -msgstr "_Recent bezochte pagina's" - -#: ../midori/midori-browser.c:6373 -msgid "Reopen pages that you visited earlier" -msgstr "Eerder bezochte pagina's heropenen" - -#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 -msgid "_Bookmarks" -msgstr "_Bladwijzers" - -#: ../midori/midori-browser.c:6390 +#: ../midori/midori-browser.c:6068 msgid "Show the saved bookmarks" msgstr "Opgeslagen bladwijzers weergeven" -#: ../midori/midori-browser.c:6405 +#: ../midori/midori-browser.c:6085 msgid "_Tools" msgstr "_Hulpmiddelen" -#: ../midori/midori-browser.c:6418 +#: ../midori/midori-browser.c:6101 msgid "_Window" msgstr "_Venster" -#: ../midori/midori-browser.c:6420 +#: ../midori/midori-browser.c:6103 msgid "Show a list of all open tabs" -msgstr "Geef een lijst met open tabbladen weer" +msgstr "Geef een lijst van alle open tabbladen weer" -#: ../midori/midori-browser.c:6434 +#: ../midori/midori-browser.c:6117 msgid "_Menu" -msgstr "_Menubalk" +msgstr "_Menu" -#: ../midori/midori-browser.c:6436 +#: ../midori/midori-browser.c:6119 msgid "Menu" -msgstr "Menubalk" - -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6640 -msgid "_Inline Find:" -msgstr "_Zoeken:" - -#: ../midori/midori-browser.c:6671 -msgid "Previous" -msgstr "Vorig" - -#: ../midori/midori-browser.c:6676 -msgid "Next" -msgstr "Volgend" - -#: ../midori/midori-browser.c:6681 -msgid "Match Case" -msgstr "Hoofdlettergevoelig" - -#: ../midori/midori-browser.c:6690 -msgid "Highlight Matches" -msgstr "Gevonden items markeren" - -#: ../midori/midori-browser.c:6702 -msgid "Close Findbar" -msgstr "Zoekbalk sluiten" +msgstr "Menu" -#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 -msgid "Clear All" -msgstr "Alles wissen" - -#: ../midori/midori-browser.c:7104 +#: ../midori/midori-browser.c:6933 #, c-format msgid "Unexpected setting '%s'" msgstr "Onverwachte configuratie-optie '%s'" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-extension.c:329 #, c-format -msgid "Failed to select from history\n" -msgstr "Kon niet kiezen uit geschiedenis\n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "De configuratie van de extensie '%s' kon niet worden geladen: %s\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "Zoek naar %s" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "De configuratie van de extensie '%s' kon niet worden opgeslagen: %s\n" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "Zoek met %s" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Doorzoeken met..." + +#: ../midori/midori-locationaction.c:537 +#, c-format +msgid "Failed to select from history\n" +msgstr "Kon niet kiezen uit geschiedenis\n" + +#: ../midori/midori-locationaction.c:624 #, c-format -msgid "Failed to execute database statement\n" -msgstr "Kon database statement niet uitvoeren:\n" +msgid "Search for %s" +msgstr "Zoek naar %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1398 msgid "Paste and p_roceed" msgstr "Plakken en _doorgaan" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 -msgid "Detach chosen panel from the window" -msgstr "Gekozen paneel losmaken van venster" +#: ../midori/midori-locationaction.c:1739 +msgid "Not verified" +msgstr "Niet geverifieerd" + +#: ../midori/midori-locationaction.c:1759 +msgid "Verified and encrypted connection" +msgstr "Geverifieerde en versleutelde verbinding" + +#: ../midori/midori-locationaction.c:1771 +msgid "Open, unencrypted connection" +msgstr "Open, niet-versleutelde verbinding" -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" -msgstr "Zijpaneel rechts plaatsen" +msgstr "Zijbalk rechts plaatsen" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" -msgstr "Paneel sluiten" +msgstr "Balk sluiten" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" -msgstr "Zijpaneel links plaatsen" - -#: ../midori/midori-panel.c:797 -msgid "Hide operating controls" -msgstr "Bedieningselementen verbergen" +msgstr "Zijbalk links plaatsen" -#: ../midori/midori-websettings.c:204 -msgid "Show Blank page" -msgstr "Toon blanco pagina" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "Toon snelkeuzemenu" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" msgstr "Toon startpagina" -#: ../midori/midori-websettings.c:206 -msgid "Show last open tabs" -msgstr "Toon laatst geopende tabbladen" - -#: ../midori/midori-websettings.c:207 -msgid "Show last tabs without loading" -msgstr "Toon laatste tabbladen zonder te laden" - -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:238 msgid "Japanese (SHIFT_JIS)" msgstr "Japans (SHIFT_JIS)" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:258 msgid "New tab" msgstr "Nieuw tabblad" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:259 msgid "New window" msgstr "Nieuw venster" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:260 msgid "Current tab" msgstr "Huidig tabblad" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:275 msgid "Default" msgstr "Standaard" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:276 msgid "Icons" msgstr "Pictogrammen" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:277 msgid "Small icons" msgstr "Kleine pictogrammen" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:278 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:279 msgid "Icons and text" msgstr "Pictogrammen en tekst" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:280 msgid "Text beside icons" msgstr "Tekst naast pictogrammen" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:295 msgid "Automatic (GNOME or environment)" msgstr "Automatisch (GNOME of omgeving)" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:296 msgid "HTTP proxy server" -msgstr "HTTP proxy server" - -#: ../midori/midori-websettings.c:282 -msgid "No proxy server" -msgstr "Geen proxy server" +msgstr "HTTP proxy-server" #: ../midori/midori-websettings.c:297 -msgid "All cookies" -msgstr "Alle koekies" - -#: ../midori/midori-websettings.c:298 -msgid "Session cookies" -msgstr "Sessie-koekies" - -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 -msgid "None" -msgstr "Geen" +msgid "No proxy server" +msgstr "Geen proxy-server" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:314 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:315 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:316 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:317 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:401 msgid "Remember last window size" msgstr "Laatst gebruikte venstergrootte onthouden" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:402 msgid "Whether to save the last window size" -msgstr "Laatst gebruiken venstergrootte onthouden" +msgstr "Al dan niet de laatst gebruikte venstergrootte opslaan" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:410 msgid "Last window width" msgstr "Laatst gebruikte vensterbreedte" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:411 msgid "The last saved window width" -msgstr "Laatst gebruikte vensterbreedte" +msgstr "De laatst opgeslagen vensterbreedte" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:419 msgid "Last window height" msgstr "Laatst gebruikte vensterhoogte" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:420 msgid "The last saved window height" -msgstr "Laatst gebruikte vensterhoogte" +msgstr "De laatste opgeslagen vensterhoogte" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:445 msgid "Last panel position" msgstr "Laatst gebruikte positie van paneel" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:446 msgid "The last saved panel position" -msgstr "Laatst gebruikte positie van paneel" +msgstr "De laatste opgeslagen positie van het paneel" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:455 msgid "Last panel page" -msgstr "Laatst geopende paneel" +msgstr "Laatst geopende werkbalkpagina" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:456 msgid "The last saved panel page" -msgstr "Laatst geopende paneel" +msgstr "De laatst opgeslagen werkbalkpagina" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:464 msgid "Last Web search" -msgstr "Laatst uitgevoerde zoekopdracht" +msgstr "Laatste webzoekactie" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:465 msgid "The last saved Web search" -msgstr "Laatst uitgevoerde zoekopdracht" +msgstr "De laatst bewaarde webzoekactie" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:474 msgid "Show Menubar" msgstr "Menubalk weergeven" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:475 msgid "Whether to show the menubar" msgstr "Menubalk weergeven" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:483 msgid "Show Navigationbar" msgstr "Navigatiebalk weergeven" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:484 msgid "Whether to show the navigationbar" -msgstr "Navigatiebalk weergeven" +msgstr "Al dan niet de navigatiebalk weergeven" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:492 msgid "Show Bookmarkbar" msgstr "Bladwijzerbalk weergeven" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:493 msgid "Whether to show the bookmarkbar" -msgstr "Bladwijzerbalk weergeven" +msgstr "Al dan niet bladwijzerbalk weergeven" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:501 msgid "Show Panel" -msgstr "Paneel weergeven" +msgstr "Werkbalk weergeven" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:502 msgid "Whether to show the panel" -msgstr "Paneel weergeven" - -#: ../midori/midori-websettings.c:487 -msgid "Show Transferbar" -msgstr "Bestandsoverdrachten-balk weergeven" +msgstr "Al dan niet de werkbalk weergeven" -#: ../midori/midori-websettings.c:488 -msgid "Whether to show the transferbar" -msgstr "Of de statusbalk dient te worden weergeven" - -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:510 msgid "Show Statusbar" msgstr "Statusbalk weergeven" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:511 msgid "Whether to show the statusbar" -msgstr "Statusbalk weergeven" +msgstr "Al dan niet de statusbalk weergeven" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:520 msgid "Toolbar Style:" msgstr "Stijl van de werkbalk:" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:521 msgid "The style of the toolbar" -msgstr "Stijl van de werkbalk" - -#: ../midori/midori-websettings.c:523 -msgid "Show progress in location entry" -msgstr "Toon voortgang in locatieveld" - -#: ../midori/midori-websettings.c:524 -msgid "Whether to show loading progress in the location entry" -msgstr "Of voortgang van laden pagina getoond dient te worden in locatieveld" - -#: ../midori/midori-websettings.c:539 -msgid "Search engines in location completion" -msgstr "Zoekmachines tonen bij ingave in locatieveld" - -#: ../midori/midori-websettings.c:540 -msgid "Whether to show search engines in the location completion" -msgstr "Of zoekmachines bij ingaves in het locatieveld dienen te worden getoond" +msgstr "De stijl van de werkbalk" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:530 msgid "Toolbar Items" -msgstr "Items in de werkbalk" +msgstr "Elementen in de werkbalk" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:531 msgid "The items to show on the toolbar" -msgstr "Items om weer te geven in de werkbalk" +msgstr "De elementen om weer te geven in de werkbalk" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:539 msgid "Compact Sidepanel" -msgstr "Compact paneel" +msgstr "Compacte zijbalk" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:540 msgid "Whether to make the sidepanel compact" -msgstr "Het paneel compact weergeven" - -#: ../midori/midori-websettings.c:573 -msgid "Show operating controls of the panel" -msgstr "Toon bedieningselementen van het paneel" - -#: ../midori/midori-websettings.c:574 -msgid "Whether to show the operating controls of the panel" -msgstr "Of bedieningselementen van het paneel moeten worden weergegeven" +msgstr "Al dan niet de zijbalk compact weergeven" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:555 msgid "Align sidepanel on the right" -msgstr "Plaats zijpaneel rechts" +msgstr "Plaats zijbalk rechts" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:556 msgid "Whether to align the sidepanel on the right" -msgstr "Of het zijpaneel aan de rechterkant dient te worden geplaatst" +msgstr "Of de zijbalk aan de rechterkant dient te worden geplaatst" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:571 msgid "Open panels in separate windows" -msgstr "Open panelen in aparte vensters" +msgstr "Open werkbalken in aparte vensters" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:572 msgid "Whether to always open panels in separate windows" msgstr "Of tabbladen altijd dienen te worden geopend in aparte vensters" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:581 msgid "When Midori starts:" msgstr "Bij starten van Midori:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:582 msgid "What to do when Midori starts" msgstr "Wat er dient te gebeuren bij starten van Midori" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:591 msgid "Homepage:" -msgstr "Startpagina" +msgstr "Startpagina:" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:592 msgid "The homepage" -msgstr "Homepage" +msgstr "De startpagina" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:607 msgid "Show crash dialog" -msgstr "Toon crashdialoog" +msgstr "Toon vastloopdialoogvenster" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:608 msgid "Show a dialog after Midori crashed" -msgstr "Toon een dialoog nadat Midori crasht" +msgstr "Toon een dialoogvenster nadat Midori is vastgelopen" -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:658 -msgid "Show speed dial in new tabs" -msgstr "Toon snelkiezen in nieuwe tabbladen" - -#: ../midori/midori-websettings.c:659 -msgid "Show speed dial in newly opened tabs" -msgstr "Toon snelkiezen in nieuw geopende tabbladen" - -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:616 msgid "Save downloaded files to:" -msgstr "Bewaar gedownloade bestanden in:" +msgstr "Bewaar binnengehaalde bestanden in:" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:617 msgid "The folder downloaded files are saved to" -msgstr "De map waar gedownloade bestanden worden opgeslagen" - -#: ../midori/midori-websettings.c:689 -msgid "Ask for the destination folder" -msgstr "Vraag naar de doelmap" - -#: ../midori/midori-websettings.c:690 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "Of naar de doelmap moet worden gevraagd bij het downloaden van een bestand" - -#: ../midori/midori-websettings.c:709 -msgid "Notify when a transfer has been completed" -msgstr "Melding wanneer de overdracht is voltooid" +msgstr "De map waarin binnengehaalde bestanden worden opgeslagen" -#: ../midori/midori-websettings.c:710 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "Of een melding dient te worden getoond als een overdracht is voltooid" - -#: ../midori/midori-websettings.c:722 -msgid "Download Manager" -msgstr "Downloadbeheer" - -#: ../midori/midori-websettings.c:723 -msgid "An external download manager" -msgstr "Extern downloadbeheer" - -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:625 msgid "Text Editor" -msgstr "Tekstbewerker" +msgstr "Tekstverwerker" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:626 msgid "An external text editor" -msgstr "Een externe tekstbewerker" +msgstr "Een externe tekstverwerker" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:641 msgid "News Aggregator" msgstr "Nieuwsaggregator" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:642 msgid "An external news aggregator" msgstr "Een externe nieuwaggregator" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:650 msgid "Location entry Search" msgstr "Zoeken vanuit locatieveld" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:651 msgid "The search to perform inside the location entry" msgstr "Met welke website gezocht wordt vanuit het locatie-invoerveld" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:659 msgid "Preferred Encoding" -msgstr "Voorkeurs-codering" +msgstr "Voorkeurcodering" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:660 msgid "The preferred character encoding" -msgstr "Voorkeurs-codering" +msgstr "De voorkeurcodering van tekens" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:670 msgid "Always Show Tabbar" -msgstr "Tabbladen altijd weergeven" +msgstr "Balk met tabbladen altijd weergeven" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:671 msgid "Always show the tabbar" -msgstr "Balk met tabbladen altijd weergeven" +msgstr "De balk met tabbladen altijd weergeven" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:684 msgid "Close Buttons on Tabs" msgstr "Sluitknoppen op tabbladen" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:685 msgid "Whether tabs have close buttons" -msgstr "Sluitknoppen op tabbladen" +msgstr "Of tabbladen sluitknoppen hebben" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:710 msgid "Open new pages in:" msgstr "Nieuwe pagina's openen in:" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:711 msgid "Where to open new pages" msgstr "Waar nieuwe pagina's geopend moeten worden" -#: ../midori/midori-websettings.c:804 -msgid "Open external pages in:" -msgstr "Externe pagina's openen in:" - -#: ../midori/midori-websettings.c:805 -msgid "Where to open externally opened pages" -msgstr "Waar externe pagina's geopend moeten worden" - -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:720 msgid "Middle click opens Selection" -msgstr "Middel-klikken opent selectie" +msgstr "Klikken met middelste muisknop opent selectie" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:721 msgid "Load an address from the selection via middle click" msgstr "Een adres vanuit de selectie laden met middelste muisknop" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:729 msgid "Open tabs in the background" msgstr "Tabbladen op de achtergrond openen" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:730 msgid "Whether to open new tabs in the background" -msgstr "Tabbladen op de achtergrond openen" +msgstr "Of tabbladen op de achtergrond geopend dienen te worden" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:738 msgid "Open Tabs next to Current" msgstr "Tabbladen naast het huidige tabblad openen" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:739 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Tabbladen naast het huidige tabblad openen" +msgstr "" +"Of nieuwe tabbladen naast het huidige tabblad geopend dienen te worden of na " +"het laatste tabblad" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:747 msgid "Open popups in tabs" -msgstr "Pop-ups in tabbladen openen" +msgstr "Opduikvensters in tabbladen openen" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:748 msgid "Whether to open popup windows in tabs" -msgstr "Pop-ups in tabbladen openen" +msgstr "Of opduikvensters in tabbladen geopend dienen te worden" -#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:758 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Afbeeldingen automatisch laden" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:759 msgid "Load and display images automatically" msgstr "Afbeeldingen automatisch laden en weergeven" -#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:766 ../extensions/statusbar-features.c:143 msgid "Enable scripts" msgstr "Scripts aanzetten" -#: ../midori/midori-websettings.c:861 +#: ../midori/midori-websettings.c:767 msgid "Enable embedded scripting languages" msgstr "Ingebedde scripttalen uitvoeren" -#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:774 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" -msgstr "Netscape plugins uitvoeren" +msgstr "Netscape-plugins uitvoeren" -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:775 msgid "Enable embedded Netscape plugin objects" -msgstr "Ingebedde Netscape pluginobjecten uitvoeren" +msgstr "Ingebedde Netscape-pluginobjecten uitvoeren" + +#: ../midori/midori-websettings.c:790 +msgid "Enable Spell Checking" +msgstr "Spellingscontrole aanzetten" + +#: ../midori/midori-websettings.c:791 +msgid "Enable spell checking while typing" +msgstr "Spellingscontrole tijdens het typen activeren" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:797 msgid "Enable HTML5 database support" -msgstr "HTML5 database ondersteuning activeren" +msgstr "Ondersteuning van HTML5-gegevensbank activeren" -#: ../midori/midori-websettings.c:886 +#: ../midori/midori-websettings.c:798 msgid "Whether to enable HTML5 database support" -msgstr "OF HTML5 database ondersteuning dient te worden geactiveerd" +msgstr "Of ondersteuning van de HTML5-gegevensbank dient te worden geactiveerd" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:804 msgid "Enable HTML5 local storage support" msgstr "HTML5 lokale opslagondersteuning activeren" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:805 msgid "Whether to enable HTML5 local storage support" msgstr "Of HTML5 locale opslagondersteuning dient te worden geactiveerd" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:811 msgid "Enable offline web application cache" -msgstr "Offline webtoepassingscache gebruiken" +msgstr "Offline webtoepassingsopslag gebruiken" -#: ../midori/midori-websettings.c:902 +#: ../midori/midori-websettings.c:812 msgid "Whether to enable offline web application cache" -msgstr "Of offline webtoepassingscache dient te worden gebruikt" +msgstr "Of offline webtoepassingsopslag dient te worden gebruikt" + +#: ../midori/midori-websettings.c:828 +msgid "Flash window on background tabs" +msgstr "Laat venster op achtergrond-tabbladen opflitsen" + +#: ../midori/midori-websettings.c:829 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "" +"Laat het browser-venster opflitsen indien er een nieuw tabblad werd geopend " +"in de achtergrond" + +#: ../midori/midori-websettings.c:837 +msgid "Enable WebGL support" +msgstr "WebGL-ondersteuning inschakelen" + +#: ../midori/midori-websettings.c:838 +msgid "Allow websites to use OpenGL rendering" +msgstr "Sta websites toe om OpenGL-weergave te gebruiken" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:864 msgid "Zoom Text and Images" msgstr "Tekst en afbeeldingen zoomen" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:865 msgid "Whether to zoom text and images" msgstr "Of tekst en afbeeldingen gezoomd dienen te worden" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:880 msgid "Find inline while typing" -msgstr "Zoeken tijdens typen" +msgstr "Zoeken tijdens typen can regel" -#: ../midori/midori-websettings.c:944 +#: ../midori/midori-websettings.c:881 msgid "Whether to automatically find inline while typing" -msgstr "Of automatisch dient gezocht te worden tijdens het typen" +msgstr "Of automatisch gezocht moet worden tijdens typen van regel" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:896 msgid "Kinetic scrolling" -msgstr "Kinetisch schuiven" +msgstr "Kinetisch bladeren" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:897 msgid "Whether scrolling should kinetically move according to speed" -msgstr "Of schuiven kinetisch dient te gebeuren volgens de snelheid" +msgstr "Of bladeren kinetisch dient te gebeuren volgens de snelheid" -#: ../midori/midori-websettings.c:968 -msgid "Accept cookies" -msgstr "Koekies accepteren" +#: ../midori/midori-websettings.c:905 +msgid "Delete old Cookies after:" +msgstr "Verwijder oude koekjes na:" -#: ../midori/midori-websettings.c:969 -msgid "What type of cookies to accept" -msgstr "Welke soorten koekies geaccepteerd moeten worden" - -#: ../midori/midori-websettings.c:985 -msgid "Original cookies only" -msgstr "Alleen originele koekies" - -#: ../midori/midori-websettings.c:986 -msgid "Accept cookies from the original website only" -msgstr "Alleen koekies accepteren van de originele website" - -#: ../midori/midori-websettings.c:994 -msgid "Maximum cookie age" -msgstr "Maximale leeftijd van koekies" - -#: ../midori/midori-websettings.c:995 +#: ../midori/midori-websettings.c:906 msgid "The maximum number of days to save cookies for" -msgstr "Hoeveel dagen een koekie maximaal bewaard mag worden" +msgstr "Hoeveel dagen een koekje maximaal bewaard mag worden" -#: ../midori/midori-websettings.c:1012 -msgid "Remember last visited pages" -msgstr "Laatst bezochte pagina's onthouden" +#: ../midori/midori-websettings.c:922 +msgid "Only accept Cookies from sites you visit" +msgstr "Alleen koekjes aanvaarden van websites die u bezoekt" -#: ../midori/midori-websettings.c:1013 -msgid "Whether the last visited pages are saved" -msgstr "Laatst bezochte pagina's onthouden" +#: ../midori/midori-websettings.c:923 +msgid "Block cookies sent by third-party websites" +msgstr "Blokkeer koekjes verzonden door derden" -#: ../midori/midori-websettings.c:1021 -msgid "Maximum history age" -msgstr "Dagen in geschiedenis" +#: ../midori/midori-websettings.c:937 +msgid "Delete pages from history after:" +msgstr "Verwijder pagina's uit de geschiedenis na:" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:938 msgid "The maximum number of days to save the history for" -msgstr "Hoeveel dagen items in de geschiedenis bewaard moeten blijven" +msgstr "Hoeveel dagen de geschiedenis bewaard moeten blijven" -#: ../midori/midori-websettings.c:1030 -msgid "Remember last downloaded files" -msgstr "Laatst gedownloade bestanden onthouden" - -#: ../midori/midori-websettings.c:1031 -msgid "Whether the last downloaded files are saved" -msgstr "Of de laatst gedownloade bestanden onthouden dienen te worden" - -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:953 msgid "Proxy server" msgstr "Proxyserver" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:954 msgid "The type of proxy server to use" msgstr "De te gebruiken proxyserver" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:963 msgid "HTTP Proxy Server" -msgstr "HTTP proxyserver" +msgstr "HTTP Proxyserver" -#: ../midori/midori-websettings.c:1059 +#: ../midori/midori-websettings.c:964 msgid "The proxy server used for HTTP connections" -msgstr "De proxyserver voor HTTP-verbindingen gebruiken" +msgstr "De proxyserver die gebruikt wordt voor HTTP-verbindingen" -#: ../midori/midori-websettings.c:1074 -msgid "Detect proxy server automatically" -msgstr "De proxyserver automatisch detecteren" - -#: ../midori/midori-websettings.c:1075 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Of de proxyserver automatisch dient gedetecteerd te worden uit de omgeving" +#: ../midori/midori-websettings.c:979 +msgid "Port" +msgstr "Poort" + +#: ../midori/midori-websettings.c:980 +msgid "The proxy server port used for HTTP connections" +msgstr "De proxyserver die gebruikt wordt voor HTTP-verbindingen" + +#: ../midori/midori-websettings.c:998 +msgid "The maximum size of cached pages on disk" +msgstr "De maximale grootte van opgeslagen pagina's op de harde schijf" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1015 msgid "Identify as" msgstr "Identificeren als" -#: ../midori/midori-websettings.c:1092 +#: ../midori/midori-websettings.c:1016 msgid "What to identify as to web pages" -msgstr "Hoe zich te identificeren naar webpagina's" +msgstr "Hoe zich te identificeren op webpagina's" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1032 msgid "Identification string" -msgstr "Identificatiestring" +msgstr "Identificatie-tekstsnoer" -#: ../midori/midori-websettings.c:1109 +#: ../midori/midori-websettings.c:1033 msgid "The application identification string" -msgstr "De indentificatiestring van de toepassing" +msgstr "Het identificatie-tekstsnoer van de toepassing" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1049 msgid "Preferred languages" msgstr "Voorkeurstalen" -#: ../midori/midori-websettings.c:1125 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "Een door komma's gescheiden lijst van voorkeurstalen om meertalige webpagina's in weer te geven, bijvoorbeeld \"de\", \"ru,nl\" of \"en-us;q=1.0, fr-fr;q=0.667\"" +#: ../midori/midori-websettings.c:1050 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"Een door komma's gescheiden lijst van voorkeurstalen om meertalige " +"webpagina's in weer te geven, bijvoorbeeld \"de\", \"ru,nl\" of \"en-us;" +"q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1065 msgid "Clear private data" -msgstr "Privégegevens wissen" +msgstr "Privé-gegevens wissen" -#: ../midori/midori-websettings.c:1141 +#: ../midori/midori-websettings.c:1066 msgid "The private data selected for deletion" -msgstr "De te verwijderen privégegevens" +msgstr "De te verwijderen privé-gegevens" + +#: ../midori/midori-websettings.c:1081 +msgid "Clear data" +msgstr "Gegevens wissen" + +#: ../midori/midori-websettings.c:1082 +msgid "The data selected for deletion" +msgstr "De te verwijderen gegevens" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1131 +msgid "Strip referrer details sent to websites" +msgstr "Verwijder naar websites gestuurde verwijzingdetails" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1133 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Of de \"Referer\" koptekst moet worden verkort tot de hostnaam" -#. 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:1261 ../midori/midori-view.c:4560 -#: ../midori/midori-view.c:4564 +#: ../midori/midori-websettings.c:1147 +msgid "Always use my font choices" +msgstr "Altijd mijn lettertypekeuzes gebruiken" + +#: ../midori/midori-websettings.c:1148 +msgid "Override fonts picked by websites with user preferences" +msgstr "Lettertypes van websites vervangen door gebruikersvoorkeuren" + +#: ../midori/midori-view.c:1375 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s wil een HTML5-gegevensbank opslaan." + +#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1411 +msgid "_Deny" +msgstr "_Weigeren" + +#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1411 +msgid "_Allow" +msgstr "_Toestaan" + +#: ../midori/midori-view.c:1407 +#, c-format +msgid "%s wants to know your location." +msgstr "%s wil uw locatie weten." + +#: ../midori/midori-view.c:1500 #, c-format msgid "Error - %s" msgstr "Fout - %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1501 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "De pagina '%s' kan niet worden geladen" -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1503 msgid "Try again" msgstr "Probeer opnieuw" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 -#, c-format -msgid "Not found - %s" -msgstr "Niet gevonden - %s" - -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1701 ../midori/midori-view.c:2623 #, c-format msgid "Send a message to %s" msgstr "Stuur een bericht naar %s" -#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2453 ../midori/midori-view.c:2779 msgid "Inspect _Element" msgstr "_Element inspecteren" -#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2505 msgid "Open Link in New _Tab" -msgstr "Link in nieuw _tabblad openen" +msgstr "Koppeling in nieuw _tabblad openen" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2509 msgid "Open Link in _Foreground Tab" -msgstr "Link in nieuw tabblad op _voorgrond openen" +msgstr "Koppeling in nieuw tabblad op _voorgrond openen" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2510 msgid "Open Link in _Background Tab" -msgstr "Link in nieuw tabblad op _achtergrond openen" +msgstr "Koppeling in nieuw tabblad op _achtergrond openen" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2513 msgid "Open Link in New _Window" -msgstr "Link in nieuw _venster openen" +msgstr "Koppeling in nieuw _venster Openen" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2516 msgid "Open Link as Web A_pplication" -msgstr "Link als webt_oepassing openen" +msgstr "Koppeling als webt_oepassing openen" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2521 msgid "Copy Link de_stination" -msgstr "Linkve_rwijzing kopiëren" +msgstr "Koppelingbe_stemming kopiëren" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 -msgid "_Save Link destination" -msgstr "Locatie _opslaan" - -#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 -msgid "_Download Link destination" -msgstr "Locatie _downloaden" - -#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 -msgid "Download with Download _Manager" -msgstr "Downloaden met Download_beheer" - -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2537 msgid "Open _Image in New Tab" msgstr "Open _afbeelding in nieuw tabblad" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2540 msgid "Copy Image _Address" msgstr "_Adres van afbeelding kopiëren" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2543 msgid "Save I_mage" msgstr "A_fbeelding opslaan" -#: ../midori/midori-view.c:2229 -msgid "Download I_mage" -msgstr "A_fbeelding downloaden" +#: ../midori/midori-view.c:2546 +msgid "Open in Image _Viewer" +msgstr "Openen in afbeeldingkijker." -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2553 msgid "Copy Video _Address" msgstr "_Adres van video kopiëren" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2556 msgid "Save _Video" -msgstr "_Video opslaan als" +msgstr "_Video opslaan" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2556 msgid "Download _Video" -msgstr "_Video downloaden" +msgstr "_Video binnenhalen" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2582 msgid "Search _with" msgstr "Zoeken _met" -#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2614 msgid "_Search the Web" msgstr "_Zoek op internet" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2631 msgid "Open Address in New _Tab" msgstr "Adres in nieuw _tabblad openen" -#: ../midori/midori-view.c:2661 +#: ../midori/midori-view.c:2684 +msgid "Open _Frame in New Tab" +msgstr "Open omlijsting in nieuw tabblad" + +#: ../midori/midori-view.c:2988 msgid "Open or download file" msgstr "Bestand openen of downloaden" -#: ../midori/midori-view.c:2680 +#: ../midori/midori-view.c:3008 #, c-format msgid "File Type: '%s'" -msgstr "Bestandstype: '%s'" +msgstr "Bestandtype: '%s'" -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:3010 #, c-format msgid "File Type: %s ('%s')" -msgstr "Bestandstype: %s ('%s')" +msgstr "Bestandtype: %s ('%s')" + +#: ../midori/midori-view.c:3014 +#, c-format +msgid "File Name: %s" +msgstr "Bestandnaam: %s" -#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2687 +#: ../midori/midori-view.c:3041 #, c-format msgid "Open %s" msgstr "Openen %s" -#: ../midori/midori-view.c:3231 +#: ../midori/midori-view.c:3700 #, c-format msgid "Inspect page - %s" msgstr "Pagina analyseren - %s" -#: ../midori/midori-view.c:3513 -msgid "Speed dial" +#: ../midori/midori-view.c:4047 +msgid "Speed Dial" msgstr "Snelkeuze" -#: ../midori/midori-view.c:3514 +#: ../midori/midori-view.c:4048 ../midori/midori-view.c:4144 msgid "Click to add a shortcut" -msgstr "Klik om een snelkeuze toe te voegen" +msgstr "Klik om een sneltoets toe te voegen" -#: ../midori/midori-view.c:3515 +#: ../midori/midori-view.c:4049 msgid "Enter shortcut address" -msgstr "Geef adres voor snelkeuze" +msgstr "Voer adres voor sneltoets in" -#: ../midori/midori-view.c:3516 +#: ../midori/midori-view.c:4050 msgid "Enter shortcut title" -msgstr "Geef titel voor snelkeuze" +msgstr "Voer titel voor sneltoets in" -#: ../midori/midori-view.c:3517 +#: ../midori/midori-view.c:4051 msgid "Are you sure you want to delete this shortcut?" -msgstr "Weet u zeker dat u deze snelkeuze wil wissen?" - -#: ../midori/midori-view.c:3518 -msgid "Set number of columns and rows" -msgstr "Stel aantal kolommen en rijen in" - -#: ../midori/midori-view.c:3519 -msgid "Enter number of columns and rows:" -msgstr "Geef aantal kolommen en rijen:" - -#: ../midori/midori-view.c:3520 -msgid "Invalid input for the size of the speed dial" -msgstr "Ongeldige invoer voor grootte van snelkeuze" +msgstr "Weet u zeker dat u deze sneltoets wilt wissen?" -#: ../midori/midori-view.c:3521 -msgid "Thumb size:" -msgstr "Grootte miniatuurafbeelding:" +#: ../midori/midori-view.c:4213 +#, c-format +msgid "No documentation installed" +msgstr "Geen documentatie geïnstalleerd" -#: ../midori/midori-view.c:3522 -msgid "Small" -msgstr "Klein" +#: ../midori/midori-view.c:4289 +msgid "Midori doesn't store any personal data:" +msgstr "Midori slaat geen persoonlijke gegevens op:" + +#: ../midori/midori-view.c:4290 +msgid "No history or web cookies are being saved." +msgstr "Webgeschiedenis en webkoekjes worden niet opgeslagen." + +#: ../midori/midori-view.c:4291 +msgid "Extensions are disabled." +msgstr "Extensies zijn uitgeschakeld." -#: ../midori/midori-view.c:3523 -msgid "Medium" -msgstr "Middelmatig" +#: ../midori/midori-view.c:4292 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "" +"HTML5-opslag, plaatselijke gegevensbank en toepassingopslag zijn " +"uitgeschakeld." -#: ../midori/midori-view.c:3524 -msgid "Big" -msgstr "Groot" +#: ../midori/midori-view.c:4293 +msgid "Midori prevents websites from tracking the user:" +msgstr "Midori verhindert websites om de gebruiker te volgen:" + +#: ../midori/midori-view.c:4294 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "Verwijzingskoppelingen worden teruggebracht tot de hostnaam." + +#: ../midori/midori-view.c:4295 +msgid "DNS prefetching is disabled." +msgstr "Vooraf DNS binnenhalen is uitgeschakeld." + +#: ../midori/midori-view.c:4296 +msgid "The language and timezone are not revealed to websites." +msgstr "De taal en de tijdzone worden niet bekendgemaakt aan websites." -#: ../midori/midori-view.c:3550 -#, c-format -msgid "Document cannot be displayed" -msgstr "Het document kan niet worden weergegeven" +#: ../midori/midori-view.c:4297 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "" +"Flash en andere Netscape (Firefox)-plugins, kunnen niet worden geregistreerd " +"door websites." -#: ../midori/midori-view.c:3573 -#, c-format -msgid "No documentation installed" -msgstr "Geen documentatie geïnstalleerd" +#: ../midori/midori-view.c:4370 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "" +"Versienummers tussen haakjes tonen de versie die tijdens de runtime wordt " +"gebruikt" -#: ../midori/midori-view.c:3694 +#: ../midori/midori-view.c:4422 msgid "Page loading delayed" msgstr "Het laden van de pagina is vertraagd" -#: ../midori/midori-view.c:3695 +#: ../midori/midori-view.c:4423 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "Het laden is vertraagd door een recente crash of opstartvoorkeuren." +msgstr "" +"Het laden is vertraagd ofwel door een recente crash ofwel door " +"opstartvoorkeuren." -#: ../midori/midori-view.c:3696 +#: ../midori/midori-view.c:4424 msgid "Load Page" msgstr "Pagina laden" -#: ../midori/midori-view.c:3840 +#: ../midori/midori-view.c:4590 msgid "Blank page" msgstr "Blanco pagina" -#: ../midori/midori-view.c:4100 +#: ../midori/midori-view.c:4852 msgid "_Duplicate Tab" msgstr "Tabblad _dupliceren" -#: ../midori/midori-view.c:4105 -msgid "_Restore Tab" -msgstr "Tabblad _herstellen" - -#: ../midori/midori-view.c:4105 -msgid "_Minimize Tab" -msgstr "Tabblad _minimaliseren" +#: ../midori/midori-view.c:4857 +msgid "Show Tab _Label" +msgstr "Toon tabblad_etiket" + +#: ../midori/midori-view.c:4857 +msgid "Show Tab _Icon Only" +msgstr "Toon alleen tabblad_pictogram" -#: ../midori/midori-view.c:4111 +#: ../midori/midori-view.c:4863 msgid "Close ot_her Tabs" msgstr "An_dere tabbladen sluiten" -#: ../midori/midori-view.c:4783 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5676 +msgid "previous" +msgstr "vorige" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5695 +msgid "next" +msgstr "volgende" + +#: ../midori/midori-view.c:5708 msgid "Print background images" msgstr "Achtergrondafbeeldingen meenemen in afdrukken" -#: ../midori/midori-view.c:4784 +#: ../midori/midori-view.c:5709 msgid "Whether background images should be printed" -msgstr "Of achtergrondafbeeldingen dienen te worden geprint" +msgstr "Of achtergrondafbeeldingen dienen te worden afgedrukt" -#: ../midori/midori-view.c:4836 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:5741 msgid "Features" msgstr "Opties" -#. Page "General" -#: ../midori/midori-preferences.c:298 -msgid "General" -msgstr "Algemeen" - -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Opstarten" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Gebruik _huidige pagina" + +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Gebruik de huidige pagina als startpagina" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Bestandsoverdrachten" - #. Page "Appearance" -#: ../midori/midori-preferences.c:349 -msgid "Appearance" -msgstr "Weergave" - -#: ../midori/midori-preferences.c:350 -msgid "Font settings" -msgstr "Lettertype" - -#: ../midori/midori-preferences.c:352 -msgid "Default Font Family" -msgstr "Standaard lettertype" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Lettertypes" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Proportionele lettertypen-familie" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" -msgstr "Het standaardlettertype om tekst weer te geven" +msgstr "De standaardlettertype-familie om tekst weer te geven" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "De standaard lettergrootte om tekst weer te geven" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" -msgstr "Lettertype met vaste breedte" +msgstr "Lettertype-familie met vaste breedte" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" -msgstr "Het lettertype om tekst met vaste breedte weer te geven" +msgstr "De lettertype-familie om tekst met vaste breedte weer te geven" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" -msgstr "De lettergrootte om tekst met vaste breedte weer te geven" +msgstr "De lettertypegrootte om tekst met vaste breedte weer te geven" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" -msgstr "Minimale lettergrootte" +msgstr "Minimale lettertypegrootte" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" -msgstr "De minimale lettergrootte om tekst weer te geven" +msgstr "De minimale lettertypegrootte om tekst weer te geven" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Gedrag" -#: ../midori/midori-preferences.c:393 -msgid "Enforce 96 dots per inch" -msgstr "Handhaven van 96 dpi" - -#: ../midori/midori-preferences.c:394 -msgid "Enforce a video dot density of 96 DPI" -msgstr "Een videoresolutie van 96 dpi handhaven" - -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" -msgstr "Scripts toelaten om popups te openen" +msgstr "Scripts toelaten om opduikvensters te openen" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "Of het toegelaten is voor scripts om popups automatisch te openen" - -#: ../midori/midori-preferences.c:419 -msgid "Spell Checking" -msgstr "Spellingscontrole" - -#: ../midori/midori-preferences.c:422 -msgid "Enable Spell Checking" -msgstr "Spellingscontrole activeren" - -#: ../midori/midori-preferences.c:423 -msgid "Enable spell checking while typing" -msgstr "Spellingscontrole tijden typen activeren" - -#: ../midori/midori-preferences.c:425 -msgid "Spelling dictionaries:" -msgstr "Spellingswoordenboeken:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "Een door komma's gescheiden lijst van talen voor spellingscontrole, bijvoorbeeld \"en_GB,de_DE\"" +msgstr "" +"Of het toegelaten is voor scripts om opduikvensters automatisch te openen" #. Page "Interface" -#: ../midori/midori-preferences.c:435 -msgid "Interface" -msgstr "Gebruik" - -#: ../midori/midori-preferences.c:436 -msgid "Navigationbar" -msgstr "Navigatiebalk" - -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:416 msgid "Browsing" -msgstr "Browsen" - -#. Page "Applications" -#: ../midori/midori-preferences.c:468 -msgid "Applications" -msgstr "Toepassingen" - -#: ../midori/midori-preferences.c:469 -msgid "External applications" -msgstr "Externe toepassingen" +msgstr "Surfen" #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "Netwerk" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:463 msgid "Hostname" msgstr "Hostnaam" -#. Page "Privacy" -#: ../midori/midori-preferences.c:511 -msgid "Privacy" -msgstr "Privacy" - -#: ../midori/midori-preferences.c:512 -msgid "Web Cookies" -msgstr "Koekies" - -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 -msgid "days" -msgstr "dagen" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "MB" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Zoekmachine toevoegen" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Zoekmachine bewerken" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Naam:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Beschrijving:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "_Pictogram:" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "_Trefwoord:" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "Zoekmachines beheren" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "Als _standaard gebruiken" -#: ../midori/sokoke.c:1294 -msgid "_Bookmark" -msgstr "_Bladwijzer" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "Openen met" -#: ../midori/sokoke.c:1296 -msgid "Add Boo_kmark" -msgstr "Bladwijzer _toevoegen" +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Kies een toepassing of opdracht om \"%s\" te openen:" -#: ../midori/sokoke.c:1297 -msgid "_Console" -msgstr "_Console" +#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "Kon extern programma niet uitvoeren." -#: ../midori/sokoke.c:1298 -msgid "_Extensions" -msgstr "_Extensies" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d uur" +msgstr[1] "%d uur" -#: ../midori/sokoke.c:1299 -msgid "_History" -msgstr "_Geschiedenis" +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minuut" +msgstr[1] "%d minuten" -#: ../midori/sokoke.c:1300 -msgid "_Homepage" -msgstr "_Homepage" +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d seconde" +msgstr[1] "%d seconden" -#: ../midori/sokoke.c:1301 -msgid "_Userscripts" -msgstr "Gebruikers_scripts" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s van %s" -#: ../midori/sokoke.c:1302 -msgid "New _Tab" -msgstr "Nieuw _tabblad" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/sokoke.c:1303 -msgid "_Transfers" -msgstr "Bestands_overdrachten" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr " - %s over" -#: ../midori/sokoke.c:1304 -msgid "Netscape p_lugins" -msgstr "Netscape p_lugins" +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:291 +msgid "_Inline Find:" +msgstr "_Zoeken in regel:" -#: ../midori/sokoke.c:1307 -msgid "New _Folder" -msgstr "Nieuwe _map" +#: ../toolbars/midori-findbar.c:317 +msgid "Previous" +msgstr "Vorig" + +#: ../toolbars/midori-findbar.c:323 +msgid "Next" +msgstr "Volgend" + +#: ../toolbars/midori-findbar.c:327 +msgid "Match Case" +msgstr "Hoofdlettergevoelig" + +#: ../toolbars/midori-findbar.c:336 +msgid "Highlight Matches" +msgstr "Overeenkomsten markeren" + +#: ../toolbars/midori-findbar.c:347 +msgid "Close Findbar" +msgstr "Zoekbalk sluiten" + +#: ../toolbars/midori-transferbar.c:122 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "Het bestand '%s' is binnengehaald." + +#: ../toolbars/midori-transferbar.c:125 +msgid "Transfer completed" +msgstr "Overdracht compleet" + +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "Het binnengehaalde bestand is foutief." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"De controlesom die aangeboden werd bij de koppeling kwam niet overeen. Dit " +"betekent dat het bestand waarschijnlijk incompleet is of achteraf gewijzigd " +"werd." + +#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "Alles wissen" + +#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 +msgid "Some files are being downloaded" +msgstr "Sommige bestanden worden binnengehaald" -#: ../panels/midori-bookmarks.c:111 +#: ../toolbars/midori-transferbar.c:377 +msgid "_Quit Midori" +msgstr "Midori _afsluiten" + +#: ../toolbars/midori-transferbar.c:379 +msgid "The transfers will be cancelled if Midori quits." +msgstr "" +"De bestandoverdrachten zullen worden geannuleerd als Midori wordt afgesloten." + +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Bladwijzers" -#: ../panels/midori-bookmarks.c:241 +#: ../panels/midori-bookmarks.c:257 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Niet gelukt om bladwijzerelement toe te voegen: %s\n" + +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "Geselecteerde bladwijzer bewerken" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "Geselecteerde bladwijzer verwijderen" -#: ../panels/midori-bookmarks.c:262 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" msgstr "Een nieuwe map toevoegen" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:594 ../panels/midori-history.c:635 msgid "Separator" msgstr "Scheidingsteken" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "Console" - -#: ../panels/midori-console.c:361 -msgid "Copy _All" -msgstr "Kopieer _alle" - -#: ../panels/midori-console.c:362 -msgid "Copy All" -msgstr "Kopieer alle" - -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Extensies" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "Geschiedenis" -#: ../panels/midori-history.c:273 -msgid "Erroneous clock time" -msgstr "Foutieve kloktijd" - -#: ../panels/midori-history.c:274 -msgid "The clock time lies in the past. Please check the current date and time." -msgstr "De kloktijd ligt in het verleden. Controleer a.u.b. de huidige datum en tijd." +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "Vandaag" -#: ../panels/midori-history.c:286 -msgid "A week ago" -msgstr "Eén week geleden" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "Gisteren" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d dag geleden" msgstr[1] "%d dagen geleden" -#: ../panels/midori-history.c:291 -msgid "Today" -msgstr "Vandaag" +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "Eén week geleden" -#: ../panels/midori-history.c:293 -msgid "Yesterday" -msgstr "Gisteren" +#: ../panels/midori-history.c:232 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Kon element in geschiedenis niet verwijderen: %s\n" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" msgstr "Weet u zeker dat u de hele geschiedenis wilt wissen?" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" -msgstr "Geselecteerde item uit geschiedenis toevoegen als bladwijzer" +msgstr "Geselecteerde element uit geschiedenis toevoegen als bladwijzer" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" -msgstr "Geselecteerde item uit geschiedenis verwijderen" +msgstr "Geselecteerde element uit geschiedenis verwijderen" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "Volledige geschiedenis wissen" -#: ../panels/midori-history.c:952 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Filter:" +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Overdrachten" -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" msgstr "Open bestemmings_map" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" -msgstr "Kopieer Linkverwijzing" +msgstr "Kopieer _koppelingsverwijzing" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Authenticatie vereist" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" msgstr "" -"Een gebruikersnaam en wachtwoord zijn\n" +"Een gebruikernaam en wachtwoord zijn\n" "vereist om deze locatie te openen:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "Gebruikersnaam" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "Wachtwoord" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "Wachtwoord _onthouden" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "Pictogram '%s' kan niet geladen worden" +msgstr "Pictogram '%s' kon niet geladen worden" -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "Standaardpictogram '%s' kan niet geladen worden" +msgstr "Standaardpictogram '%s' kon niet geladen worden" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" -msgstr "Film-frames werken niet " +msgstr "Animatiebeelden zijn gebroken" -#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschap '%s' is ongeldig voor %s" -#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Bestand kiezen" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:506 msgid "Choose folder" msgstr "Map kiezen" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "Geen" + +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "1 uur" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "1 dag" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "1 week" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "1 maand" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "1 jaar" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Voorkeuren voor %s" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:473 msgid "Configure Advertisement filters" msgstr "Configureer advertentiefilters" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:504 #, 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 "Geef het adres van een voorgeconfigureerde filterlijst in het tekstvak en klik \"\\Toevoegen\" om het aan de lijst toe te voegen. Meer lijsten zijn beschikbaar op %s." - -#: ../extensions/adblock.c:587 -msgid "Configure _Advertisement filters..." -msgstr "Configureer _advertentiefilters" +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 "" +"Tik het adres van een voorgeconfigureerde filterlijst in het tekstvak en " +"klik \"\\Toevoegen\" om het aan de lijst toe te voegen. Meer lijsten zijn " +"beschikbaar op %s." -#: ../extensions/adblock.c:841 +#: ../extensions/adblock.c:882 msgid "Edit rule" msgstr "Regel bewerken" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:896 msgid "_Rule:" msgstr "_Regel:" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:950 msgid "Bl_ock image" msgstr "Afbeelding bl_okkeren" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:955 msgid "Bl_ock link" -msgstr "Link bl_okkeren" +msgstr "Koppeling bl_okkeren" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1670 msgid "Advertisement blocker" msgstr "Advertentieblokkeerder" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1671 msgid "Block advertisements according to a filter list" msgstr "Blokkeer advertenties volgens filterlijst" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "Kopieer %s naar de map %s." +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "" +"Deze pagina lijkt een gebruikersscript te bevatten. Wilt u het installeren?" -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "Gebruikerscript _installeren" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "" +"Deze pagina lijkt een gebruikersstijl te bevatten. Wilt u het installeren?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "Gebruikersstijl _installeren" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Niet installeren" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Gebruikersscripts" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Gebruikersopmaakprofielen" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Fout" + +#: ../extensions/addons.c:421 #, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "De configuratie van de extensie '%s' kan niet worden opgeslagen: %s\n" +msgid "Do you want to delete '%s'?" +msgstr "Wilt u '%s' verwijderen?" + +#: ../extensions/addons.c:427 +msgid "Delete user script" +msgstr "Gebruikersscript verwijderen" + +#: ../extensions/addons.c:428 +msgid "Delete user style" +msgstr "Gebruikersstijl verwijderen" + +#: ../extensions/addons.c:431 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "Het bestand '%s' zal blijvend worden verwijderd." + +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "In tekstbewerker openen" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "Bestemmingsmap openen" + +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "Nieuwe extensie toevoegen" + +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "Geselecteerde extensie verwijderen" + +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" -msgstr "Gebruiker addons" +msgstr "Gebruikersextensies" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" -msgstr "Kan folder '%s': %s niet controleren" +msgstr "Kan map '%s': %s niet bewaken" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" msgstr "Ondersteuning voor gebruikersscripts en -stijlen" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "Gekleurde tabbladen" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Ieder tabblad verschillend tinten" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" -msgstr "Cookiebeheerder" +msgstr "Koekjesbeheerder" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "Alles wissen" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "Alle weergegeven cookies wissen. Als een filter is ingesteld zullen enkel de cookies die overeenkomen met de filter worden gewist." +#: ../extensions/cookie-manager/cookie-manager-page.c:105 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"Alle weergegeven koekjes wissen. Als een filter is ingesteld zullen enkel de " +"koekjes die overeenkomen met het filter worden gewist." -#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "Alles uitvouwen" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "Alles invouwen" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" -msgstr "Weet u zeker dat u alle cookies wil wissen?" +msgstr "Weet u zeker dat u alle koekjes wil wissen?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Vraag" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." -msgstr "Enkel cookies die overeenkomen met de filter zullen worden gewist." +msgstr "Enkel koekjes die overeenkomen met de filter zullen worden gewist." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "Bij het beëindigen van de sessie" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2414,49 +2486,65 @@ "Naam: %s\n" "Waarde: %s\n" "Pad: %s\n" -"Veilig: %s\n" +"Beveiligd: %s\n" "Vervalt: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Ja" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "Nee" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" "Cookies: %d" msgstr "" "Domein: %s\n" -"Cookies: %d" +"Koekjes: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Naam" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "Alles _uitvouwen" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "Alles _invouwen" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "Geef een filterwaarde om enkel de cookies te tonen wiens naam of domein overeenkomen met het ingegeven filter." - -#: ../extensions/cookie-manager/main.c:40 -msgid "_Cookie Manager" -msgstr "_Cookiebeheerder" +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +msgid "Filter:" +msgstr "Filter:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Geef een filterwaarde op om enkel de koekjes te tonen welker naam of domein " +"overeenkomen met het ingegeven filter." -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" -msgstr "Cookies tonen en verwijderen" +msgstr "Koekjes tonen en verwijderen" + +#: ../extensions/copy-tabs.c:38 +msgid "Copy Tab _Addresses" +msgstr "Tabblad_adressen kopiëren" + +#: ../extensions/copy-tabs.c:95 +msgid "Copy Addresses of Tabs" +msgstr "Kopieer adressen van tabbladen" + +#: ../extensions/copy-tabs.c:96 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Kopieer de adressen van alle tabbladen naar het klembord" #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." @@ -2467,232 +2555,768 @@ msgstr "Kan vereiste Atom \"feed\" elementen niet vinden in XML data." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Laatst aangepast: %s." -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" -msgstr "Feeds" +msgstr "Voedingen" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" -msgstr "Nieuwe feed toevoegen" +msgstr "Nieuwe voeding toevoegen" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" -msgstr "Feed verwijderen" +msgstr "Voeding verwijderen" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" -msgstr "_Feeds" +msgstr "_Voedingen" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." -msgstr "Kan hoofdelement in XML data van feed niet vinden." +msgstr "Kan hoofdelement in XML-gegevens van voeding niet vinden." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." -msgstr "Niet ondersteund feedformaat." +msgstr "Niet-ondersteunde voedingsopmaak." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" -msgstr "Kan XML feed niet openen: %s" +msgstr "Kan XML-voeding niet openen: %s" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "Kan \"channel\" element in RSS XML data niet vinden." +msgstr "Kan \"kanaal\" element in RSS XML-gegevens niet vinden." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." -msgstr "Niet ondersteunde RSS versie gevonden." +msgstr "Niet-ondersteunde RSS-versie gevonden." #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "Kan vereiste RSS \"\\item\" elementen niet vinden in XML data." +msgstr "Kan vereiste RSS \"onderdeel\" elementen niet vinden in XML-gegevens." #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "Kan vereiste RSS \"\\channel\" elementen niet vinden in XML data." - -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "Fout" +msgstr "Kan vereiste RSS \"kanaal\" elementen niet vinden in XML-gegevens." #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" -msgstr "Feed '%s' bestaat reeds" +msgstr "Voeding '%s' bestaat reeds" #: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" -msgstr "Fout bij het laden van feed '%s'" +msgstr "Fout bij het laden van voeding '%s'" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" -msgstr "Feedpaneel" +msgstr "Werkbalk voor voedingen" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" -msgstr "Lees Atom/RSS feeds" +msgstr "Lees Atom/RSS-voedingen" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" msgstr "Fout bij toevoegen van formulierwaarde: %s\n" -#: ../extensions/formhistory.c:510 +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "Formuliergeschiedenis" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Een gebruikernaam en wachtwoord zijn\n" +"vereist om deze locatie te openen:" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "Wachtwoord onthouden op deze pagina?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Onthouden" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "Niet nu" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Nooit voor deze pagina" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "Schakel geschiedenis-status van formulier in of uit" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "Activeer of deactiveer formuliergeschiedenis voor het huidige tabblad." + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Kan bewering van gegevensbank niet uitvoeren: %s\n" + +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" +"activeer formuliergeschiedenis alleen via sneltoets (Ctrl+Shift+F) per " +"tabblad" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "Formuliergeschiedenis-invuller" + +#: ../extensions/formhistory/formhistory.c:669 msgid "Stores history of entered form data" msgstr "Bewaart geschiedenis van ingegeven formuliergegevens" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 #, c-format -msgid "Not available: %s" -msgstr "Niet beschikbaar: %s" +msgid "Failed to select suggestions\n" +msgstr "Kon geen suggesties kiezen\n" -#: ../extensions/formhistory.c:515 -msgid "Resource files not installed" -msgstr "Bronbestanden niet geïnstalleerd" +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Er zijn geen onbezochte tabbladen" -#: ../extensions/formhistory.c:521 -msgid "Form history filler" -msgstr "Formuliergeschiedenis" +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "Geschiedenislijst" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Gedrag bij sluiten tabblad" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Doe niets" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Overschakelen naar laatst bekeken tabblad" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Overschakelen naar nieuwste tabblad" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Volgende nieuwe tabblad (Geschiedenislijst)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Volgende nieuwe tabblad vanuit geschiedenis" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Vorige nieuwe tabblad (Geschiedenislijst)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Vorige nieuwe tabblad vanuit geschiedenis" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Toon tabblad in achtergrond (Geschiedenislijst)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Toon het thans gekozen tabblad in achtergrond" + +#: ../extensions/history-list.vala:569 +msgid "History List" +msgstr "Geschiedenislijst" + +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "" +"Ga naar het laatst gebruikte tabblad bij tabbladwissel of tabbladsluiting" + +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Muisgebaren" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Midori besturen door de muis te bewegen" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 -msgid "Pageholder" -msgstr "Paginavak" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "_Paginavak" - -#: ../extensions/page-holder.c:178 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "Een of meerdere pagina's open houden parallel met uw tabbladen" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "Pagina vernieuwen of stoppen met laden" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" -msgstr "Toetsenbord sneltoetsen aanpassen" +msgstr "Sneltoetsen aanpassen" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "Snelt_oetsen aanpassen..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Sneltoetsen" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" -msgstr "Toetsenbord sneltoetsen tonen en bewerken" +msgstr "Sneltoetsen tonen en bewerken" + +#: ../extensions/status-clock.c:174 +msgid "Statusbar Clock" +msgstr "_Statusbalk-klok" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/status-clock.c:175 +msgid "Display date and time in the statusbar" +msgstr "Datum en tijd in de statusbalk tonen" + +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Afbeeldingen" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Scripts" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Netscape plugins" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" -msgstr "Statusbalk gedrag" +msgstr "Statusbalkfuncties" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" -msgstr "Eenvoudig omschakelen van gedrag van webpagina's" +msgstr "Eenvoudig schakelen van gedrag van webpagina's" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" -msgstr "Tabbladpaneel" +msgstr "Tabbladwerkbalk" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" -msgstr "T_abbladpaneel" +msgstr "T_abbladwerkbalk" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" -msgstr "Tabbladen in een verticaal paneel tonen" +msgstr "Tabbladen in een verticale werkbalk tonen" -#: ../extensions/tab-switcher.c:402 -msgid "Tab History List" -msgstr "Lijst van tabbladengeschiedenis " +#: ../extensions/tabs-minimized.c:76 +msgid "Only Icons on Tabs by default" +msgstr "Standaard alleen pictogrammen op tabbladen" -#: ../extensions/tab-switcher.c:403 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Laat toe om tussen tabbladen te wisselen door te kiezen uit een lijst gesorteerd volgens laatst gebruik" +#: ../extensions/tabs-minimized.c:77 +msgid "New tabs have no label by default" +msgstr "Nieuwe tabbladen hebben geen standaardetiket" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Werkbalk aanpassen" -#: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "Selecteer items die op de werkbalk dienen te worden weergegeven. Items kunnen via slepen en neerzetten van plaats worden verandert." +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"Selecteer elementen die op de werkbalk dienen te worden weergegeven. " +"Elementen kunnen via slepen en neerzetten van plaats worden veranderd." -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" -msgstr "Beschikbare items" +msgstr "Beschikbare elementen" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" -msgstr "Weergegeven items" +msgstr "Weergegeven elementen" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "_Werkbalk aanpassen..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Aanpassen..." + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" -msgstr "Werkbalkeditor" +msgstr "Werkbalkbewerker" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" -msgstr "De werkbalk eenvoudig aanpassen" +msgstr "De werkbalkvormgeving eenvoudig aanpassen" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" -msgstr "HTTP-communicatie op schijf cachen" +msgstr "HTTP-communicatie op schijf opslaan" + +#~ msgid "The bookmarks couldn't be saved. %s" +#~ msgstr "De bladwijzers konden niet opgeslagen worden. %s" + +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "De gespecifieerde configuratiemap is ongeldig." + +#~ msgid "Cookies" +#~ msgstr "Koekjes" + +#~ msgid "'Flash' Cookies" +#~ msgstr "'Flits'-koekjes" + +#~ msgid "HTML5 _Databases" +#~ msgstr "HTML5 _gegevensbanken" + +#~ msgid "Offline Application Cache" +#~ msgstr "Offline toepassingopslag" + +#~ msgid "Lightweight web browser" +#~ msgstr "Lichtgewicht webbrowser" + +#~ msgid "Not available: %s" +#~ msgstr "Niet beschikbaar: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "Bronbestanden niet geïnstalleerd" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "Geen privégegevens opslaan tijdens het surfen" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Voeg snelkoppeling toe aan snelkiezen" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Voeg snelkoppeling toe op bureaublad" + +#~ msgid "Create a launcher" +#~ msgstr "Maak een starter" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "Abonneren op deze nieuwsvoeding" + +#~ msgid "Close this window" +#~ msgstr "Dit venster sluiten" + +#~ msgid "Close all open windows" +#~ msgstr "Sluit alle openstaande vensters" + +#~ msgid "Undo the last modification" +#~ msgstr "Maak de laatste wijziging ongedaan" + +#~ msgid "Redo the last modification" +#~ msgstr "De laatste wijziging opnieuw uitvoeren" + +#~ msgid "Cut the selected text" +#~ msgstr "Geselecteerde tekst knippen" + +#~ msgid "Copy the selected text" +#~ msgstr "Geselecteerde tekst kopiëren" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "Tekst van het klembord plakken" + +#~ msgid "Delete the selected text" +#~ msgstr "Geselecteerde tekst verwijderen" + +#~ msgid "Select all text" +#~ msgstr "Alle tekst selecteren" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Volgende vóórkomen van een woord of zin opzoeken" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Vorige vóórkomen van een woord of zin opzoeken" + +#~ msgid "Reset the zoom level" +#~ msgstr "Zoomniveau op beginwaarde" + +#~ msgid "View the source code of the page" +#~ msgstr "Broncode van deze pagina bekijken" + +#~ msgid "Scroll to the left" +#~ msgstr "Naar links bladeren" + +#~ msgid "Scroll down" +#~ msgstr "Naar beneden bladeren" + +#~ msgid "Scroll up" +#~ msgstr "Naar omhoog bladeren" + +#~ msgid "Scroll to the right" +#~ msgstr "Naar rechts bladeren" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "Verwijder de inhoud van de prullenbak" + +#~ msgid "Open the last closed tab" +#~ msgstr "Open het laatst gesloten tabblad" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Nieuwe bladwijzermap toevoegen" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Zoekmachines toevoegen, bewerken en verwijderen..." + +#~ msgid "Clear private data..." +#~ msgstr "Privé-gegevens wissen..." + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "Inspecteer paginadetails en gebruik ontwikkelaarsgereedschappen..." + +#~ msgid "Switch to the previous tab" +#~ msgstr "Overschakelen naar het vorige tabblad" + +#~ msgid "Switch to the next tab" +#~ msgstr "Overschakelen naar het volgende tabblad" + +#~ msgid "Move tab behind the previous tab" +#~ msgstr "Verplaats tabblad achter het vorige tabblad" + +#~ msgid "Move tab in front of the next tab" +#~ msgstr "Verplaats tabblad voor het volgende tabblad" + +#~ msgid "Focus the current tab" +#~ msgstr "Focus op huidig tabblad" + +#~ msgid "Cycle focus between views" +#~ msgstr "Wissel voortdurend focus tussen weergaven" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Toon alleen het pictogram van het huidige tabblad" + +#~ msgid "Duplicate the current tab" +#~ msgstr "Het huidige tabblad dupliceren" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Sluit alle tabbladen behalve het huidige tabblad" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Open tabbladen die werden bewaard in de laatste sessie" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Veelgestelde vragen weergeven" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Open Midori's foutmelder" + +#~ msgid "Show information about the program" +#~ msgstr "Informatie over dit programma weergeven" + +#~ msgid "Show menubar" +#~ msgstr "Menubalk weergeven" + +#~ msgid "Show navigationbar" +#~ msgstr "Navigatiebalk weergeven" + +#~ msgid "Show sidepanel" +#~ msgstr "_Zijbalk weergeven" + +#~ msgid "Show bookmarkbar" +#~ msgstr "Bladwijzerbalk weergeven" + +#~ msgid "Show statusbar" +#~ msgstr "Statusbalk weergeven" + +#~ msgid "MD5-Checksum:" +#~ msgstr "MD5-Controlesom:" + +#~ msgid "SHA1-Checksum:" +#~ msgstr "SHA1-Controlesom:" + +#~ msgid "No filename specified" +#~ msgstr "Geen bestandnaam opgegeven" + +#~ msgid "Set number of columns and rows" +#~ msgstr "Stel aantal kolommen en rijen in" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Voer aantal kolommen en rijen in:" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "Ongeldige invoer voor de grootte van de snelkeuze" + +#~ msgid "Thumb size:" +#~ msgstr "Grootte miniatuurafbeelding:" + +#~ msgid "Small" +#~ msgstr "Klein" + +#~ msgid "Medium" +#~ msgstr "Middelmatig" + +#~ msgid "Big" +#~ msgstr "Groot" + +#~ msgid "Reset the last _session" +#~ msgstr "Zet de laatste _sessie terug op de standaardwaarden" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Configureer _advertentiefilters..." + +#~ msgid "Not found - %s" +#~ msgstr "Niet gevonden - %s" + +#~ msgid "Document cannot be displayed" +#~ msgstr "Het document kan niet worden weergegeven" + +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "Handhaven van 96 dpi" + +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "Een videoresolutie van 96 dpi handhaven" + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "Wissel tussen tabbladen met Ctrl+Tab gesorteerd op laatste gebruik" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% geladen" + +#~ msgid "Quit the application" +#~ msgstr "Toepassing afsluiten" + +#~ msgid "_Contents" +#~ msgstr "_Inhoud" + +#~ msgid "Show the documentation" +#~ msgstr "Documentatie weergeven" + +#~ msgid "_Transferbar" +#~ msgstr "Bestands_overdrachten-balk" + +#~ msgid "Show transferbar" +#~ msgstr "Bestandsoverdrachten-balk weergeven" + +#~ msgid "_Recently visited pages" +#~ msgstr "_Recent bezochte pagina's" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Eerder bezochte pagina's heropenen" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "Kon bewering van gegevensbank niet uitvoeren:\n" + +#~ msgid "Detach chosen panel from the window" +#~ msgstr "Gekozen werkbalk losmaken van venster" + +#~ msgid "Hide operating controls" +#~ msgstr "Bedieningselementen verbergen" + +#~ msgid "Show Blank page" +#~ msgstr "Toon lege pagina" + +#~ msgid "All cookies" +#~ msgstr "Alle koekjes" + +#~ msgid "Session cookies" +#~ msgstr "Sessiekoekjes" + +#~ msgid "Show Transferbar" +#~ msgstr "Bestandsoverdrachten-balk weergeven" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "Of de statusbalk dient te worden weergeven" + +#~ msgid "Show progress in location entry" +#~ msgstr "Toon voortgang in locatieveld" + +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "Of laadvoortgang getoond dient te worden in het locatieveld" + +#~ msgid "Search engines in location completion" +#~ msgstr "Zoekmachines tonen bij ingave in locatieveld" + +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "" +#~ "Of zoekmachines bij de locatieveld-aanvulling dienen te worden getoond" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "Toon bedieningselementen van de werkbalk" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "Of bedieningselementen van de werkbalk moeten worden weergegeven" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Toon snelkiezen in nieuwe tabbladen" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Toon snelkiezen in nieuw geopende tabbladen" + +#~ msgid "Ask for the destination folder" +#~ msgstr "Vraag naar de doelmap" + +#~ msgid "Whether to ask for the destination folder when downloading a file" +#~ msgstr "" +#~ "Of naar de doelmap moet worden gevraagd bij het binnenhalen van een " +#~ "bestand" + +#~ msgid "Whether to show a notification when a transfer has been completed" +#~ msgstr "" +#~ "Of een melding dient te worden getoond als een overdracht is voltooid" + +#~ msgid "Download Manager" +#~ msgstr "Downloadbeheerder" + +#~ msgid "An external download manager" +#~ msgstr "Externe downloadbeheerder" + +#~ msgid "Open external pages in:" +#~ msgstr "Externe pagina's openen in:" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "Waar externe pagina's geopend moeten worden" + +#~ msgid "Accept cookies" +#~ msgstr "Koekjes aanvaarden" + +#~ msgid "What type of cookies to accept" +#~ msgstr "Welke soorten koekies aanvaard moeten worden" + +#~ msgid "Original cookies only" +#~ msgstr "Alleen oorspronkelijke koekjes" + +#~ msgid "Maximum cookie age" +#~ msgstr "Maximale leeftijd van koekjes" + +#~ msgid "Remember last visited pages" +#~ msgstr "Laatst bezochte pagina's onthouden" + +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "Laatst bezochte pagina's onthouden" + +#~ msgid "Maximum history age" +#~ msgstr "Dagen in geschiedenis" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Laatst binnengehaalde bestanden onthouden" + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "Of de laatst binnengehaalde bestanden opgeslagen zijn" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "De proxyserver automatisch detecteren" + +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" +#~ msgstr "" +#~ "Of de proxyserver automatisch gedetecteerd moet worden vanuit de omgeving" + +#~ msgid "_Save Link destination" +#~ msgstr "_Koppelingslocatie opslaan" + +#~ msgid "_Download Link destination" +#~ msgstr "Koppelingsbestemming _binnenhalen" + +#~ msgid "Download with Download _Manager" +#~ msgstr "Binnenhalen met downloadbeheerder" + +#~ msgid "Download I_mage" +#~ msgstr "A_fbeelding binnenhalen" + +#~ msgid "_Restore Tab" +#~ msgstr "Tabblad _herstellen" + +#~ msgid "_Minimize Tab" +#~ msgstr "Tabblad _minimaliseren" + +#~ msgid "General" +#~ msgstr "Algemeen" + +#~ msgid "Appearance" +#~ msgstr "Weergave" + +#~ msgid "Font settings" +#~ msgstr "Lettertype instellingen" + +#~ msgid "Spell Checking" +#~ msgstr "Spellingcontrole" + +#~ msgid "Spelling dictionaries:" +#~ msgstr "Spellingswoordenboeken:" + +#~ msgid "" +#~ "A comma separated list of languages to be used for spell checking, for " +#~ "example \"en_GB,de_DE\"" +#~ msgstr "" +#~ "Een door komma's gescheiden lijst van talen voor spellingscontrole, " +#~ "bijvoorbeeld \"en_GB,de_DE\"" + +#~ msgid "Interface" +#~ msgstr "Gebruikersomgeving" + +#~ msgid "Navigationbar" +#~ msgstr "Navigatiebalk" + +#~ msgid "Applications" +#~ msgstr "Toepassingen" + +#~ msgid "External applications" +#~ msgstr "Externe toepassingen" + +#~ msgid "Web Cookies" +#~ msgstr "Koekjes" + +#~ msgid "Console" +#~ msgstr "Terminalvenster" + +#~ msgid "Copy _All" +#~ msgstr "Kopieer _alle" + +#~ msgid "Copy All" +#~ msgstr "Kopieer alle" + +#~ msgid "Erroneous clock time" +#~ msgstr "Foutieve kloktijd" + +#~ msgid "" +#~ "The clock time lies in the past. Please check the current date and time." +#~ msgstr "" +#~ "De kloktijd ligt in het verleden. Controleer a.u.b. de huidige datum en " +#~ "tijd." + +#~ msgid "Copy %s to the folder %s." +#~ msgstr "Kopieer %s naar de map %s." + +#~ msgid "_Cookie Manager" +#~ msgstr "_Koekjesbeheerder" + +#~ msgid "Pageholder" +#~ msgstr "Paginavak" + +#~ msgid "_Pageholder" +#~ msgstr "_Paginavak" + +#~ msgid "Keep one or multiple pages open in parallel to your tabs" +#~ msgstr "Een of meerdere pagina's open houden parallel met uw tabbladen" #~ msgid "Failed to get current time: %s\n" #~ msgstr "Kan de tijd niet verkrijgen: %s\n" -#~ msgid "Failed to add history item: %s\n" -#~ msgstr "Kan item niet toevoegen aan geschiedenis: %s\n" - #~ msgid "Open _Link" -#~ msgstr "Bestand openen" +#~ msgstr "_Koppeling openen" #~ msgid "Open Image in New Wi_ndow" -#~ msgstr "In nieuw _venster openen" +#~ msgstr "Afbeelding in nieuw _venster openen" #~ msgid "User_styles" -#~ msgstr "Gebruikers_opmaakprofielen" - -#~ msgid "_Closed Tabs and Windows" -#~ msgstr "Ge_sloten tabbladen en vensters" +#~ msgstr "Gebruikers_stijlen" #~ msgid "_Quick Find" -#~ msgstr "_Snel zoeken" +#~ msgstr "_Snelzoeken" #~ msgid "Quickly jump to a word or phrase" #~ msgstr "Snel naar een woord of zin springen" @@ -2700,9 +3324,6 @@ #~ msgid "View Selection Source" #~ msgstr "Bron van selectie bekijken" -#~ msgid "Last open pages" -#~ msgstr "Laatst geopende pagina's" - #~ msgid "Both" #~ msgstr "Beide" @@ -2713,22 +3334,22 @@ #~ msgstr "Laden bij opstarten" #~ msgid "Remember last form inputs" -#~ msgstr "Laatst ingevoerde data in formulieren onthouden" +#~ msgstr "Laatst ingevoerde gegevens in formulieren onthouden" #~ msgid "Whether the last form inputs are saved" -#~ msgstr "Laatst ingevoerde data in formulieren onthouden" +#~ msgstr "Of de laatst ingevoerde gegevens in formulieren worden onthouden" #~ msgid "Cache size" -#~ msgstr "Cachegrootte" +#~ msgstr "Opslaggrootte" #~ msgid "The allowed size of the cache" -#~ msgstr "Toegestane grootte voor de cache" +#~ msgstr "Toegestane grootte voor de opslag" #~ msgid "Source" #~ msgstr "Bron" #~ msgid "The character encoding to use by default" -#~ msgstr "Voorkeurs-codering" +#~ msgstr "De tekencodering om standaard te gebruiken" #~ msgid "Shrink images automatically" #~ msgstr "Afbeeldingen automatisch verkleinen" @@ -2740,10 +3361,7 @@ #~ msgstr "Laatst bezochte pagina's onthouden" #~ msgid "Enable developer tools" -#~ msgstr "Ontwikkelaars-opties aanzetten" - -#~ msgid "MB" -#~ msgstr "MB" +#~ msgstr "Ontwikkelaargereedschappen aanzetten" #~ msgid "_Icon (name or file):" #~ msgstr "_Pictogram (naam of bestand):" @@ -2752,7 +3370,7 @@ #~ msgstr "Zoekmachines beheren" #~ msgid "Warning: You are using a superuser account!" -#~ msgstr "Waarschuwing: u bent ingelogd als root!" +#~ msgstr "Waarschuwing: u bent ingelogd als beheerder (root)!" #~ msgid "%s has no property '%s'" #~ msgstr "%s heeft geen eigenschap '%s'" diff -Nru midori-0.2.8/po/no.po midori-0.4.6/po/no.po --- midori-0.2.8/po/no.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/no.po 2012-05-14 22:13:42.000000000 +0000 @@ -1480,7 +1480,7 @@ msgstr "Undersøk side - %s" #: ../midori/midori-view.c:2147 -msgid "Speed dial" +msgid "Speed Dial" msgstr "Snarveier (Speed dial)" #: ../midori/midori-view.c:2148 @@ -2225,7 +2225,7 @@ 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." +msgid "Select items to be displayed on the toolbar. Items can be reordered 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 diff -Nru midori-0.2.8/po/pa.po midori-0.4.6/po/pa.po --- midori-0.2.8/po/pa.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/pa.po 2012-05-14 22:13:42.000000000 +0000 @@ -1788,7 +1788,7 @@ msgstr "" #: ../midori/midori-view.c:3368 -msgid "Speed dial" +msgid "Speed Dial" msgstr "" #: ../midori/midori-view.c:3369 @@ -2547,7 +2547,7 @@ #: ../extensions/toolbar-editor.c:405 msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " +"Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" diff -Nru midori-0.2.8/po/pl.po midori-0.4.6/po/pl.po --- midori-0.2.8/po/pl.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/pl.po 2012-05-14 22:13:42.000000000 +0000 @@ -1,2458 +1,2488 @@ # Polish translations for midori package. -# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) 2011 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. # Przemysław Sitek , 2008. -# Lukasz Romanowicz , 2008. -# Piotr Sokół , 2010. -# +# Łukasz Romanowicz , 2008. +# Piotr Sokół , 2010, 2011. +# msgid "" msgstr "" -"Project-Id-Version: midori 0.2.4\n" +"Project-Id-Version: midori 0.4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 16:07+0000\n" -"PO-Revision-Date: 2010-05-25 23:13+0100\n" +"POT-Creation-Date: 2012-03-25 11:18+0000\n" +"PO-Revision-Date: 2011-11-24 17:37+0100\n" "Last-Translator: Piotr Sokół \n" -"Language-Team: pl <>\n" +"Language-Team: polski <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Content-Transfer-Encoding: 8bits\n" +"Language: pl\n" +"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20)) ? 1 : 2));\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Lekka przeglądarka internetowa" +msgid "Browse the Web" +msgstr "Wyszukaj w sieci" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1336 -#: ../midori/main.c:1664 -#: ../midori/main.c:1672 -#: ../midori/main.c:1688 -#: ../midori/midori-websettings.c:313 +msgid "Internet;WWW;Explorer" +msgstr "Internet;WWW;Explorer" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:1989 ../midori/main.c:2009 +#: ../midori/main.c:2023 ../midori/midori-websettings.c:308 msgid "Midori" -msgstr "Midori" +msgstr "Przeglądarka internetowa Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Przeglądarka internetowa" -#: ../midori/main.c:102 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Tryb prywatny przeglądarki Midori" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Otwiera nowe, prywatne okno przeglądarki" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4117 +msgid "Private Browsing" +msgstr "Prywatne przeglądanie" + +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Nie można wczytać ustawień: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wartość „%s” nie jest poprawna dla %s" -#: ../midori/main.c:158 -#: ../midori/main.c:244 -#, fuzzy, c-format +#: ../midori/main.c:155 ../midori/main.c:259 +#, c-format msgid "Invalid configuration value '%s'" msgstr "Błędna wartość konfiguracyjna „%s”" -#: ../midori/main.c:370 -#: ../extensions/formhistory.c:446 +#: ../midori/main.c:364 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Nie można wczytać wyszukiwarek internetowych. %s\n" + +#: ../midori/main.c:418 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Nie udało się wyczyścić historii: %s\n" + +#: ../midori/main.c:438 ../midori/main.c:562 +#: ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" msgstr "Nie udało się uzyskać dostępu do bazy danych: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:505 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Nie udało się usunąć przestarzałych elementów historii: %s\n" -#: ../midori/main.c:445 +#: ../midori/main.c:545 ../panels/midori-history.c:232 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Nie udało się usunąć elementu historii: %s\n" + +#: ../midori/main.c:592 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Nie można zapisać zakładek. %s" + +#: ../midori/main.c:614 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Nie można zapisać ustawień. %s" -#: ../midori/main.c:483 +#: ../midori/main.c:649 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Nie można zapisać wyszukiwarek internetowych. %s" -#: ../midori/main.c:502 -#: ../midori/main.c:552 -#: ../midori/main.c:572 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Nie można zapisać zakładek. %s" - #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 -#: ../midori/main.c:625 +#: ../midori/main.c:686 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Nie można zapisać listy ostatnio zamkniętych kart i okien. %s" -#: ../midori/main.c:684 -#: ../midori/main.c:924 +#: ../midori/main.c:727 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Wtyczki" + +#: ../midori/main.c:741 +msgid "Privacy" +msgstr "Prywatność" + +#: ../midori/main.c:753 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"Ciasteczka przechowują dane logowania, zapisane stany gier lub profile " +"użytkownika używane w celach reklamowych." + +#: ../midori/main.c:809 #, c-format msgid "The session couldn't be saved. %s" msgstr "Nie można zapisać sesji. %s" -#: ../midori/main.c:868 -msgid "No root certificate file is available. SSL certificates cannot be verified." +#: ../midori/main.c:1027 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." msgstr "" +"Brak pliku głównego certyfikatu. Nie można zweryfikować certyfikatu SSL." -#: ../midori/main.c:958 -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 "Program uległ awarii odkąd został uruchomiony ostatni raz. Jeżeli problem się powtarza, należy spróbować poniższych opcji w celu rozwiązania problemu." +#: ../midori/main.c:1096 +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 "" +"Program uległ awarii odkąd został uruchomiony ostatni raz. Jeżeli problem " +"się powtarza, należy spróbować poniższych opcji w celu rozwiązania problemu." -#: ../midori/main.c:973 +#: ../midori/main.c:1115 msgid "Modify _preferences" msgstr "Zmodyfikuj p_referencje" -#: ../midori/main.c:977 -msgid "Reset the last _session" -msgstr "Przywróć ostatnią _sesję" - -#: ../midori/main.c:982 +#: ../midori/main.c:1119 msgid "Disable all _extensions" msgstr "Wyłącz wszystkie _wtyczki" -#: ../midori/main.c:1217 -#: ../midori/main.c:1937 +#: ../midori/main.c:1132 +msgid "Discard old tabs" +msgstr "Porzucenie ostatnich kart" + +#: ../midori/main.c:1133 ../midori/midori-websettings.c:217 +msgid "Show last tabs without loading" +msgstr "Wyświetlenie ostatnich kart bez wczytywania" + +#: ../midori/main.c:1134 ../midori/midori-websettings.c:216 +msgid "Show last open tabs" +msgstr "Wyświetlenie ostatnich\t kart" + +#: ../midori/main.c:1342 ../midori/main.c:2400 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Nie można wczytać sesji: %s\n" -#: ../midori/main.c:1336 -msgid "No filename specified" -msgstr "Nie podano pliku" - -#: ../midori/main.c:1355 -msgid "An unknown error occured." -msgstr "Wystąpił nieznany błąd." - -#: ../midori/main.c:1386 +#: ../midori/main.c:1480 #, c-format msgid "Snapshot saved to: %s\n" -msgstr "Kopia strony zapisana jako: %s\n" +msgstr "Obraz strony internetowej zapisano do pliku %s\n" -#: ../midori/main.c:1557 +#: ../midori/main.c:1892 msgid "Run ADDRESS as a web application" -msgstr "Uruchamia ADRES jako aplikację internetową" +msgstr "Otwiera ADRES jako stronę usługi internetowej" -#: ../midori/main.c:1557 +#: ../midori/main.c:1892 msgid "ADDRESS" msgstr "ADRES" -#: ../midori/main.c:1560 +#: ../midori/main.c:1895 msgid "Use FOLDER as configuration folder" msgstr "Używa KATALOGU do przechowywania konfiguracji programu" -#: ../midori/main.c:1560 +#: ../midori/main.c:1895 msgid "FOLDER" msgstr "KATALOG" -#: ../midori/main.c:1563 +#: ../midori/main.c:1898 +msgid "Private browsing, no changes are saved" +msgstr "" +"Otwiera wystąpienie programu, które nie zapisuje żadnych prywatnych danych" + +#: ../midori/main.c:1900 msgid "Show a diagnostic dialog" -msgstr "Wyświetlanie okna diagnostycznego po wystąpieniu awarii" +msgstr "Wyświetla okno diagnostyczne po wystąpieniu awarii" -#: ../midori/main.c:1565 +#: ../midori/main.c:1902 msgid "Run the specified filename as javascript" msgstr "Uruchamia określony plik jako skrypt javascript" -#: ../midori/main.c:1568 +#: ../midori/main.c:1904 msgid "Take a snapshot of the specified URI" -msgstr "Wykonuje migawkę podanego adresu URI" +msgstr "Przechwytuje obraz strony określonej jako ADRES" -#: ../midori/main.c:1571 +#: ../midori/main.c:1906 msgid "Execute the specified command" msgstr "Wykonuje wprowadzone polecenie" -#: ../midori/main.c:1573 +#: ../midori/main.c:1908 +msgid "List available commands to execute with -e/ --execute" +msgstr "Wypisuje polecenia dostępne z opcją -e/ --execute" + +#: ../midori/main.c:1910 msgid "Display program version" msgstr "Wypisuje wersję programu" -#: ../midori/main.c:1575 +#: ../midori/main.c:1912 msgid "Addresses" msgstr "Adresy" -#: ../midori/main.c:1577 +#: ../midori/main.c:1914 msgid "Block URIs according to regular expression PATTERN" -msgstr "Blokuje adresy URI określone przez WZORZEC" +msgstr "Blokuje adresy URI określone przez WZÓR" -#: ../midori/main.c:1577 +#: ../midori/main.c:1914 msgid "PATTERN" -msgstr "WZORZEC" +msgstr "WZÓR" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1581 +#: ../midori/main.c:1918 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Resetuje działanie programu po czasie wyrażonym ilością SEKUND" -#: ../midori/main.c:1581 +#: ../midori/main.c:1918 msgid "SECONDS" msgstr "SEKUNDY" -#: ../midori/main.c:1661 +#: ../midori/main.c:1921 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Przekierowuje ostrzeżenia terminala do określonego PLIKU" + +#: ../midori/main.c:1921 +msgid "FILENAME" +msgstr "PLIK" + +#: ../midori/main.c:1986 msgid "[Addresses]" msgstr "[ADRES...]" -#: ../midori/main.c:1689 +#: ../midori/main.c:1996 +msgid "The specified configuration folder is invalid." +msgstr "Podany katalog konfiguracyjny jest niepoprawny" + +#: ../midori/main.c:2024 msgid "Please report comments, suggestions and bugs to:" msgstr "Prosimy o zgłaszanie uwag, sugestii i błędów na adres:" -#: ../midori/main.c:1691 +#: ../midori/main.c:2026 msgid "Check for new versions at:" msgstr "Sprawdź nową wersję na:" -#: ../midori/main.c:1788 -msgid "The specified configuration folder is invalid." -msgstr "Podany katalog konfiguracyjny jest niepoprawny" +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2110 +msgid "Saved logins and _passwords" +msgstr "Zapisane nazwy użytkowników i _hasła" + +#: ../midori/main.c:2112 +msgid "Cookies and Website data" +msgstr "Ciasteczka i dane witryn" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2116 ../midori/midori-websettings.c:984 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Pamięć podręczna:" + +#: ../midori/main.c:2119 +msgid "Website icons" +msgstr "Ikony stron internetowych" + +#: ../midori/main.c:2225 +msgid "An unknown error occured" +msgstr "Wystąpił nieznany błąd." -#: ../midori/main.c:1836 +#: ../midori/main.c:2331 msgid "An instance of Midori is already running but not responding.\n" msgstr "Pogram Midori jest już uruchomiony lecz nie odpowiada.\n" -#: ../midori/main.c:1891 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "Nie można wczytać wyszukiwarek internetowych. %s\n" - -#: ../midori/main.c:1920 +#: ../midori/main.c:2367 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Nie można wczytać zakładek: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:2415 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Nie można wczytać listy ostatnio zamkniętych kart i okien: %s\n" -#: ../midori/main.c:1966 +#: ../midori/main.c:2428 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Nie można wczytać historii: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:2444 msgid "The following errors occured:" msgstr "Napotkano błędy:" -#: ../midori/main.c:1996 +#: ../midori/main.c:2460 msgid "_Ignore" msgstr "_Ignoruj" -#: ../midori/midori-array.c:428 +#: ../midori/midori-app.c:1334 +msgid "_Bookmark" +msgstr "_Zakładka" + +#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6039 +msgid "_Bookmarks" +msgstr "_Zakładki" + +#: ../midori/midori-app.c:1336 +msgid "Add Boo_kmark" +msgstr "_Dodaj zakładkę" + +#: ../midori/midori-app.c:1337 +msgid "_Console" +msgstr "_Konsola" + +#: ../midori/midori-app.c:1338 +msgid "_Extensions" +msgstr "_Wtyczki" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4566 +msgid "_History" +msgstr "_Historia" + +#: ../midori/midori-app.c:1340 +msgid "_Homepage" +msgstr "_Strona główna" + +#: ../midori/midori-app.c:1341 +msgid "_Userscripts" +msgstr "Skrypty _użytkownika" + +#: ../midori/midori-app.c:1342 +msgid "New _Tab" +msgstr "Nowa kar_ta" + +#: ../midori/midori-app.c:1343 +msgid "_Transfers" +msgstr "_Pobieranie plików" + +#: ../midori/midori-app.c:1344 +msgid "Netscape p_lugins" +msgstr "Wtyczki _Netscape" + +#: ../midori/midori-app.c:1345 +msgid "_Closed Tabs" +msgstr "_Zamknięte karty" + +#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5195 +msgid "New _Window" +msgstr "_Nowe okno" + +#: ../midori/midori-app.c:1347 +msgid "New _Folder" +msgstr "Nowy _katalog" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "Nie odnaleziono pliku." -#: ../midori/midori-array.c:462 -#: ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Niepoprawny dokument." -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "Nierozpoznany format zakładek." -#: ../midori/midori-array.c:718 -#: ../midori/sokoke.c:1115 -#, c-format +#: ../midori/midori-array.c:915 msgid "Writing failed." msgstr "Zapisywanie nie udało się." -#: ../midori/midori-browser.c:336 -#: ../midori/midori-browser.c:5575 -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5277 +#: ../midori/midori-browser.c:5286 msgid "Reload the current page" msgstr "Wczytuje ponownie bieżącą stronę" -#: ../midori/midori-browser.c:346 -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:5283 msgid "Stop loading the current page" msgstr "Zatrzymuje wczytywanie bieżącej strony" -#: ../midori/midori-browser.c:460 -#, c-format -msgid "%d%% loaded" -msgstr "wczytano %d%%" - -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" msgstr "Nie udało się zaktualizować tytułu: %s\n" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." msgstr "Niespodziewana czynność „%s”." -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:579 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Tryb prywatny)" + +#: ../midori/midori-browser.c:693 ../midori/midori-browser.c:726 +msgid "Toplevel folder" +msgstr "Katalog główny" + +#: ../midori/midori-browser.c:784 msgid "New folder" msgstr "Nowy katalog" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:784 msgid "Edit folder" msgstr "Edytuj katalog" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:786 msgid "New bookmark" msgstr "Nowa zakładka" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:786 msgid "Edit bookmark" msgstr "Edytuj zakładkę" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:828 msgid "_Title:" msgstr "_Tytuł:" -#: ../midori/midori-browser.c:774 -#: ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "_Opis:" - -#: ../midori/midori-browser.c:793 -#: ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:848 ../midori/midori-searchaction.c:961 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Adres:" -#: ../midori/midori-browser.c:823 -#: ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:871 ../midori/midori-browser.c:4303 msgid "_Folder:" msgstr "_Katalog:" -#: ../midori/midori-browser.c:833 -#: ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4736 -#: ../midori/midori-browser.c:4768 -msgid "Toplevel folder" -msgstr "Katalog główny" - -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:887 msgid "Add to _Speed Dial" -msgstr "Dodaj do strony _szybkiego wybierania" +msgstr "Dodaj odnośnik _szybkiego wybierania" -#: ../midori/midori-browser.c:877 +#: ../midori/midori-browser.c:900 msgid "Show in the tool_bar" -msgstr "Wyświetlanie na pasku _narzędziowym" +msgstr "Wyświetlanie na pasku _zakładek" -#: ../midori/midori-browser.c:892 +#: ../midori/midori-browser.c:915 msgid "Run as _web application" -msgstr "Uruchamianie jako _aplikacja internetowa" +msgstr "Otwieranie jako stronę usługi _internetowej" #: ../midori/midori-browser.c:986 #, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Nie można zapisać pliku „%s” we wskazanym katalogu." + +#: ../midori/midori-browser.c:988 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Brak uprawnień do zapisywania we wskazanym położeniu." + +#: ../midori/midori-browser.c:995 +#, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Nie ma wystarczająco dużo wolnej przestrzeni aby pobrać „%s”." -#: ../midori/midori-browser.c:990 +#: ../midori/midori-browser.c:998 #, c-format msgid "The file needs %s but only %s are left." -msgstr "Pobranie pliku wymaga %s wolnej przestrzeni ale dostępne jest tylko %s." +msgstr "" +"Pobranie pliku wymaga %s wolnej przestrzeni ale dostępne jest tylko %s." -#: ../midori/midori-browser.c:1047 -#: ../midori/midori-browser.c:4786 -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4372 msgid "Save file as" msgstr "Wybór pliku" -#: ../midori/midori-browser.c:1420 -#: ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s z %s" - -#: ../midori/midori-browser.c:1456 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "Plik „%s” został pobrany." - -#: ../midori/midori-browser.c:1460 -msgid "Transfer completed" -msgstr "Pobieranie zakończone" +#: ../midori/midori-browser.c:1330 +msgid "New Window" +msgstr "Nowe okno" + +#: ../midori/midori-browser.c:1330 +msgid "A new window has been opened" +msgstr "Otwarto nowe okno" + +#: ../midori/midori-browser.c:1333 +msgid "New Tab" +msgstr "Nowa karta" + +#: ../midori/midori-browser.c:1333 +msgid "A new tab has been opened" +msgstr "Otwarto nową kartę" + +#: ../midori/midori-browser.c:1368 +msgid "Error opening the image!" +msgstr "Błąd przy otwieraniu obrazka!" + +#: ../midori/midori-browser.c:1369 +msgid "Can not open selected image in a default viewer." +msgstr "Nie można otworzyć obrazka w domyślnej przeglądarce" + +#: ../midori/midori-browser.c:1375 +msgid "Error downloading the image!" +msgstr "Wystąpił błąd podczas ściągania obrazu!" + +#: ../midori/midori-browser.c:1376 +msgid "Can not download selected image." +msgstr "Nie można ściągnąć wybranego obrazu." -#: ../midori/midori-browser.c:1600 +#: ../midori/midori-browser.c:1479 msgid "Save file" msgstr "Wybór pliku" -#: ../midori/midori-browser.c:1917 -#: ../midori/midori-browser.c:1919 -msgid "Some files are being downloaded" -msgstr "Pliki są pobierane." - -#: ../midori/midori-browser.c:1923 -msgid "_Quit Midori" -msgstr "Za_kończ program" - -#: ../midori/midori-browser.c:1925 -msgid "The transfers will be cancelled if Midori quits." -msgstr "Pobieranie plików zostanie anulowane po zakończeniu programu." - -#: ../midori/midori-browser.c:2386 +#: ../midori/midori-browser.c:2346 msgid "Open file" msgstr "Wybór pliku" -#: ../midori/midori-browser.c:2462 -#: ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2478 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr "" +"Wyświetlony adres URI należy otworzyć za pomocą czytnika wiadomości. " +"Zazwyczaj do podanego adresu prowadzi odnośnik znajdujący się na stronie, " +"zatytułowany jako „Zasubskrybuj”, „Dodaj nowe źródło wiadomości” lub " +"podobnie.\n" +"Można też wskazać zewnętrzny czytnik wiadomości w oknie preferencji na " +"karcie „Programy”, co umożliwi dodawanie źródeł wiadomości do czytnika w " +"sposób automatyczny po kliknięciu w odnośnik." + +#: ../midori/midori-browser.c:2484 ../extensions/feed-panel/main.c:365 msgid "New feed" -msgstr "Nowy kanał wiadomości" +msgstr "Nowe źródło wiadomości" -#: ../midori/midori-browser.c:2503 -#: ../midori/midori-browser.c:5640 -#: ../panels/midori-bookmarks.c:233 +#: ../midori/midori-browser.c:2527 ../midori/midori-browser.c:5346 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "Dodaje nową zakładkę" -#: ../midori/midori-browser.c:3076 -#: ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 -#: ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Nie udało się wykonać zapytania: %s\n" - -#: ../midori/midori-browser.c:3156 -#: ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3026 ../midori/midori-searchaction.c:488 msgid "Empty" msgstr "Puste" -#: ../midori/midori-browser.c:3777 -#: ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 -#: ../midori/sokoke.c:436 -#: ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "Nie można uruchomić zewnętrznego programu." +#: ../midori/midori-browser.c:3446 +msgid "Toggle text cursor navigation" +msgstr "Przełącza przeglądanie kursorem klawiatury" -#: ../midori/midori-browser.c:4091 -#: ../midori/midori-browser.c:6034 +#: ../midori/midori-browser.c:3762 ../midori/midori-browser.c:5732 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nie udało się dodać nowego elementu historii: %s\n" -#: ../midori/midori-browser.c:4424 -#: ../panels/midori-bookmarks.c:779 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:4091 ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 msgid "Open all in _Tabs" msgstr "Otwórz wszystkie w nowych _kartach" -#: ../midori/midori-browser.c:4431 -#: ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 -#: ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4098 ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Otwórz w nowej _karcie" -#: ../midori/midori-browser.c:4434 -#: ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 -#: ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4101 ../midori/midori-view.c:2648 +#: ../midori/midori-view.c:4646 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Otwórz w nowym _oknie" -#: ../midori/midori-browser.c:4657 +#: ../midori/midori-browser.c:4190 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4658 +#: ../midori/midori-browser.c:4191 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4192 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4660 +#: ../midori/midori-browser.c:4193 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4661 +#: ../midori/midori-browser.c:4194 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4682 +#: ../midori/midori-browser.c:4195 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4216 msgid "Import bookmarks..." msgstr "Importowanie zakładek" -#: ../midori/midori-browser.c:4685 -#: ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:4219 ../midori/midori-browser.c:5351 msgid "_Import bookmarks" -msgstr "_Zaimportuj zakładki" +msgstr "_Importuj zakładki..." -#: ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4230 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:4723 -#: ../midori/midori-browser.c:5749 -#: ../midori/midori-websettings.c:227 -#: ../midori/midori-websettings.c:318 -#: ../katze/katze-utils.c:691 -msgid "Custom..." -msgstr "Dostosuj..." +#: ../midori/midori-browser.c:4295 +msgid "Import from XBEL or HTML file" +msgstr "Plik XBEL lub HTML" + +#: ../midori/midori-browser.c:4330 +msgid "Import from a file" +msgstr "Z pliku" -#: ../midori/midori-browser.c:4797 +#: ../midori/midori-browser.c:4342 msgid "Failed to import bookmarks" msgstr "Nie udało się zaimportować zakładek" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4377 +msgid "XBEL Bookmarks" +msgstr "Zakładki XBEL" + +#: ../midori/midori-browser.c:4382 +msgid "Netscape Bookmarks" +msgstr "Zakładki Netscape" + +#: ../midori/midori-browser.c:4396 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "" +"Program Midori umożliwia tylko eksportowanie zakładek w formatach XBEL (*." +"xbel) i Netscape (*.html)" + +#: ../midori/midori-browser.c:4411 msgid "Failed to export bookmarks" msgstr "Nie udało się wyeksportować zakładek" -#: ../midori/midori-browser.c:4887 -#: ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Nie udało się usunąć elementu historii: %s\n" - #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4994 +#: ../midori/midori-browser.c:4533 msgid "Clear Private Data" msgstr "Usuwanie danych" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:4537 msgid "_Clear private data" msgstr "_Usuń prywatne dane" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:4550 msgid "Clear the following data:" msgstr "Prywatne dane:" -#: ../midori/midori-browser.c:5023 -#: ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 -msgid "History" -msgstr "Historia" - -#: ../midori/midori-browser.c:5029 -msgid "Cookies" -msgstr "Ciasteczka" - -#: ../midori/midori-browser.c:5034 -msgid "'Flash' Cookies" -msgstr "Ciasteczka „Flash”" - -#: ../midori/midori-browser.c:5039 -msgid "Website icons" -msgstr "Ikony stron internetowych" - -#: ../midori/midori-browser.c:5044 -#: ../midori/sokoke.c:1305 -msgid "_Closed Tabs" -msgstr "_Zamknięte karty" - -#: ../midori/midori-browser.c:5049 -#: ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "Pamięć podręczna" +#: ../midori/midori-browser.c:4560 +msgid "Last open _tabs" +msgstr "Ostatnio otwarte _karty" -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:4586 msgid "Clear private data when _quitting Midori" msgstr "Usunięcie danych podczas _kończenia programu" -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:4781 msgid "A lightweight web browser." -msgstr "Lekka przeglądarka internetowa" +msgstr "Lekka przeglądarka internetowa." + +#: ../midori/midori-browser.c:4782 +msgid "See about:version for version info." +msgstr "" +"Proszę wprowadzić w pasku adresu about:version, aby uzyskać szczegółowe " +"informacje o wersji." -#: ../midori/midori-browser.c:5160 -msgid "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." -msgstr "Ta biblioteka jest wolnym oprogramowaniem; można ją rozprowadzać dalej i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundację Wolnego Oprogramowania - według wersji drugiej tej Licencji lub którejś z późniejszych wersji." +#: ../midori/midori-browser.c:4784 +msgid "" +"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." +msgstr "" +"Ta biblioteka jest wolnym oprogramowaniem; można ją rozprowadzać dalej i/lub " +"modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez " +"Fundację Wolnego Oprogramowania - według wersji drugiej tej Licencji lub " +"którejś z późniejszych wersji." -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:4805 msgid "translator-credits" msgstr "" -"Przemysław Sitek \n" -"Piotr Sokół , 2010" +"Przemysław Sitek , 2008.\n" +"Łukasz Romanowicz , 2008.\n" +"Piotr Sokół , 2010, 2011." -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5193 msgid "_File" msgstr "_Plik" -#: ../midori/midori-browser.c:5490 -#: ../midori/sokoke.c:1306 -msgid "New _Window" -msgstr "_Nowe okno" - -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5196 msgid "Open a new window" msgstr "Otwiera nowe okno programu" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5199 msgid "Open a new tab" msgstr "Otwiera nową kartę" -#: ../midori/midori-browser.c:5496 -msgid "P_rivate Browsing" -msgstr "Tryb p_rywatny" - -#: ../midori/midori-browser.c:5497 -msgid "Don't save any private data while browsing" -msgstr "Nie zapisuje żadnych prywatnych danych podczas przeglądania stron" +#: ../midori/midori-browser.c:5201 +msgid "New P_rivate Browsing Window" +msgstr "Nowe okno p_rywatne" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5205 msgid "Open a file" msgstr "Otwiera plik strony" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5207 +msgid "_Save Page As..." +msgstr "Zapisz j_ako..." + +#: ../midori/midori-browser.c:5208 msgid "Save to a file" msgstr "Zapisuje stronę do pliku" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:5210 msgid "Add to Speed _dial" -msgstr "Dodaj do strony _szybkiego wybierania" - -#: ../midori/midori-browser.c:5507 -msgid "Add shortcut to speed dial" -msgstr "Dodaje odnośnik do strony szybiego wybierania" +msgstr "Utwórz odnośnik _szybkiego wybierania" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5214 msgid "Add Shortcut to the _desktop" -msgstr "Dodaj do strony _szybiego wybierania" +msgstr "Utwórz odnośnik na _pulpicie" -#: ../midori/midori-browser.c:5510 -msgid "Add shortcut to the desktop" -msgstr "Dodaj do strony szybkiego wybierania" +#: ../midori/midori-browser.c:5216 +msgid "Create _Launcher" +msgstr "Utwórz _aktywator" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5220 msgid "Subscribe to News _feed" -msgstr "" - -#: ../midori/midori-browser.c:5513 -msgid "Subscribe to this news feed" -msgstr "" +msgstr "Zasubskrybuj _kanał wiadomości" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5226 msgid "_Close Tab" msgstr "_Zamknij kartę" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5227 msgid "Close the current tab" msgstr "Zamyka bieżącą kartę" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5229 msgid "C_lose Window" msgstr "Za_mknij okno" -#: ../midori/midori-browser.c:5522 -msgid "Close this window" -msgstr "Zamyka bieżące okno" - -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5233 msgid "Print the current page" msgstr "Drukuje bieżącą stronę" -#: ../midori/midori-browser.c:5528 -msgid "Quit the application" -msgstr "Kończy działanie programu" +#: ../midori/midori-browser.c:5235 +msgid "Close a_ll Windows" +msgstr "Za_mknij wszystkie okna" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5238 msgid "_Edit" msgstr "_Edycja" -#: ../midori/midori-browser.c:5534 -msgid "Undo the last modification" -msgstr "Cofa ostatnie działanie" - -#: ../midori/midori-browser.c:5537 -msgid "Redo the last modification" -msgstr "Powtarza ostatnie działanie" - -#: ../midori/midori-browser.c:5541 -msgid "Cut the selected text" -msgstr "Wycina zaznaczony tekst" - -#: ../midori/midori-browser.c:5544 -#: ../midori/midori-browser.c:5547 -msgid "Copy the selected text" -msgstr "Kopiuje zaznaczony tekst" - -#: ../midori/midori-browser.c:5550 -msgid "Paste text from the clipboard" -msgstr "Wkleja tekst ze schowka" - -#: ../midori/midori-browser.c:5553 -msgid "Delete the selected text" -msgstr "Usuwa zaznaczony tekst" - -#: ../midori/midori-browser.c:5556 -msgid "Select all text" -msgstr "Zaznacz w_szystko" +#: ../midori/midori-browser.c:5261 +msgid "_Find..." +msgstr "_Wyszukaj..." -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5262 msgid "Find a word or phrase in the page" msgstr "Wyszukuje słowa lub wyrażenia na stronie" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5264 msgid "Find _Next" msgstr "Znajdź _następne" -#: ../midori/midori-browser.c:5562 -msgid "Find the next occurrence of a word or phrase" -msgstr "Wyszukuje następne wystąpienie słowa lub wyrażenia" - -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5267 msgid "Find _Previous" msgstr "Znajdź _poprzednie" -#: ../midori/midori-browser.c:5565 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Wyszukuje poprzednie wystąpienie słowa lub wyrażenia" - -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5271 msgid "Configure the application preferences" -msgstr "Konfiguruje preferencje programu" +msgstr "Otwiera okno preferencji programu" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5273 msgid "_View" msgstr "_Widok" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5274 msgid "_Toolbars" msgstr "Paski _narzędziowe" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5279 +msgid "Reload page without caching" +msgstr "Odśwież bez wczytywania pamięci podręcznej" + +#: ../midori/midori-browser.c:5289 msgid "Increase the zoom level" msgstr "Powiększa rozmiar strony" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5292 msgid "Decrease the zoom level" msgstr "Zmniejsza rozmiar strony" -#: ../midori/midori-browser.c:5590 -msgid "Reset the zoom level" -msgstr "Przywraca pierwotny rozmiar strony" - -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5296 msgid "_Encoding" msgstr "_Kodowanie znaków" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5298 msgid "View So_urce" msgstr "Wyświetl ź_ródło" -#: ../midori/midori-browser.c:5594 -msgid "View the source code of the page" -msgstr "Wyświetla kod źródłowy strony" +#: ../midori/midori-browser.c:5301 +msgid "Ca_ret Browsing" +msgstr "Przeglądanie _kursorem klawiatury" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5305 msgid "Toggle fullscreen view" msgstr "Przełącza widok trybu pełnoekranowego" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5307 msgid "Scroll _Left" -msgstr "" - -#: ../midori/midori-browser.c:5601 -#, fuzzy -msgid "Scroll to the left" -msgstr "Przełącz na następną kartę" +msgstr "Przewiń w _lewo" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5310 msgid "Scroll _Down" -msgstr "" - -#: ../midori/midori-browser.c:5604 -msgid "Scroll down" -msgstr "" +msgstr "Przewiń w _dół" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5313 msgid "Scroll _Up" -msgstr "" - -#: ../midori/midori-browser.c:5607 -msgid "Scroll up" -msgstr "" +msgstr "Przewiń w _górę" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5316 msgid "Scroll _Right" -msgstr "" +msgstr "Przewiń w _prawo" -#: ../midori/midori-browser.c:5610 -msgid "Scroll to the right" -msgstr "" - -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5319 msgid "_Go" msgstr "P_rzejdź" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5322 msgid "Go back to the previous page" msgstr "Przechodzi do poprzedniej odwiedzonej strony" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5325 msgid "Go forward to the next page" msgstr "Przechodzi do następnej odwiedzonej strony" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5329 msgid "Go to the previous sub-page" -msgstr "Przechodzi do poprzedniej strony podrzędnej" +msgstr "Przechodzi do poprzedniej podstrony" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5333 msgid "Go to the next sub-page" -msgstr "Przechodzi do następnej strony podrzędnej" +msgstr "Przechodzi do następnej podstrony" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5336 msgid "Go to your homepage" -msgstr "Przechodzi do strony głównej przeglądarki" +msgstr "Przechodzi do strony głównej" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5338 msgid "Empty Trash" msgstr "Wyczyść listę" -#: ../midori/midori-browser.c:5633 -msgid "Delete the contents of the trash" -msgstr "Czyści listę ostatnio zamkniętych kart i okien" - -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5341 msgid "Undo _Close Tab" -msgstr "Cofnij _zamknięcie karty" - -#: ../midori/midori-browser.c:5636 -msgid "Open the last closed tab" -msgstr "Otwórz ostatnio zamkniętą kartę" +msgstr "Przywróć _zamkniętą kartę" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5348 msgid "Add a new _folder" msgstr "Utwórz _katalog" -#: ../midori/midori-browser.c:5643 -msgid "Add a new bookmark folder" -msgstr "Dodaj nowy katalog zakładek" - -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5354 msgid "_Export bookmarks" -msgstr "_Eksportuj..." +msgstr "_Eksportuj zakładki..." -#: ../midori/midori-browser.c:5651 -#: ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5357 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Zarządzaj wyszukiwarkami..." -#: ../midori/midori-browser.c:5652 -msgid "Add, edit and remove search engines..." -msgstr "Zarządza wyszukiwarkami internetowymi" - -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5360 msgid "_Clear Private Data" -msgstr "_Usuń dane prywatne..." +msgstr "_Usuń prywatne dane..." -#: ../midori/midori-browser.c:5656 -msgid "Clear private data..." -msgstr "Usuwa prywatne dane zapisane przez program..." - -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5363 msgid "_Inspect Page" -msgstr "_Analizuj stronę..." - -#: ../midori/midori-browser.c:5661 -msgid "Inspect page details and access developer tools..." -msgstr "Umożliwia analizowanie szczegółów strony i udostępnia narzędzia programistyczne" +msgstr "_Zbadaj stronę..." -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5367 msgid "_Previous Tab" msgstr "_Poprzednia karta" -#: ../midori/midori-browser.c:5667 -msgid "Switch to the previous tab" -msgstr "Przełącz na poprzednią kartę" - -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5370 msgid "_Next Tab" msgstr "_Następna karta" -#: ../midori/midori-browser.c:5670 -msgid "Switch to the next tab" -msgstr "Przełącz na następną kartę" +#: ../midori/midori-browser.c:5372 +msgid "Move Tab _Backward" +msgstr "Przemieść kartę w _lewo" + +#: ../midori/midori-browser.c:5374 +msgid "_Move Tab Forward" +msgstr "Przemieść kartę w p_rawo" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5377 msgid "Focus _Current Tab" -msgstr "Zaznacz _bieżącą kartę" +msgstr "Uaktywnij _zawartość" + +#: ../midori/midori-browser.c:5380 +msgid "Focus _Next view" +msgstr "Uaktywnij n_astępny element" + +#: ../midori/midori-browser.c:5383 +msgid "Only show the Icon of the _Current Tab" +msgstr "Ukryj etykietę _bieżącej karty" + +#: ../midori/midori-browser.c:5386 +msgid "_Duplicate Current Tab" +msgstr "_Powiel bieżącą kartę" -#: ../midori/midori-browser.c:5673 -msgid "Focus the current tab" -msgstr "Uaktywnia bieżącą kartę przeglądarki" +#: ../midori/midori-browser.c:5389 +msgid "Close Ot_her Tabs" +msgstr "Zamknij pozo_stałe karty" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5392 msgid "Open last _session" msgstr "Przywróć ostatnią _sesję" -#: ../midori/midori-browser.c:5676 -msgid "Open the tabs saved in the last session" -msgstr "Otwiera karty zapisane podczas ostatniej sesji" - -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5395 msgid "_Help" msgstr "Pomo_c" -#: ../midori/midori-browser.c:5680 -msgid "_Contents" -msgstr "_Spis treści" - -#: ../midori/midori-browser.c:5681 -msgid "Show the documentation" -msgstr "Wyświetla pomoc dotyczącą programu" - -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5397 msgid "_Frequent Questions" msgstr "_Często zadawane pytania" -#: ../midori/midori-browser.c:5684 -msgid "Show the Frequently Asked Questions" -msgstr "Wyświetla najczęściej zadawane pytania" - -#: ../midori/midori-browser.c:5686 -msgid "_Report a Bug" -msgstr "_Zgłoś problem" - -#: ../midori/midori-browser.c:5687 -msgid "Open Midori's bug tracker" -msgstr "Otwiera stronę systemu zgłaszania i monitorowania błędów" - -#: ../midori/midori-browser.c:5690 -msgid "Show information about the program" -msgstr "Wyświetla informacje na temat programu" +#: ../midori/midori-browser.c:5400 +msgid "_Report a Problem..." +msgstr "_Zgłoś błąd w programie" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5412 msgid "_Menubar" msgstr "Pasek _menu" -#: ../midori/midori-browser.c:5699 -msgid "Show menubar" -msgstr "Przełącza widoczność paska menu" - -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:5416 msgid "_Navigationbar" msgstr "Pasek _narzędzi nawigacyjnych" -#: ../midori/midori-browser.c:5703 -msgid "Show navigationbar" -msgstr "Przełącza widoczność paska narzędzi nawigacyjnych" - -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5420 msgid "Side_panel" msgstr "Panel _boczny" -#: ../midori/midori-browser.c:5707 -msgid "Show sidepanel" -msgstr "Przełącza widoczność panelu bocznego" +#: ../midori/midori-browser.c:5421 +msgid "Sidepanel" +msgstr "Panel boczny" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5424 msgid "_Bookmarkbar" msgstr "Pasek _zakładek" -#: ../midori/midori-browser.c:5711 -msgid "Show bookmarkbar" -msgstr "Przełącza widoczność paska zakładek" - -#: ../midori/midori-browser.c:5714 -msgid "_Transferbar" -msgstr "_Pasek pobierania plików" - -#: ../midori/midori-browser.c:5715 -msgid "Show transferbar" -msgstr "Przełącza widoczność paska pobierania plików" - -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5428 msgid "_Statusbar" msgstr "Pasek stanu" -#: ../midori/midori-browser.c:5719 -msgid "Show statusbar" -msgstr "Przełącza widoczność paska stanu" - -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5437 ../midori/midori-websettings.c:307 msgid "_Automatic" msgstr "Wybór _automatyczny" -#: ../midori/midori-browser.c:5730 -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5440 ../midori/midori-websettings.c:232 msgid "Chinese (BIG5)" msgstr "Chiński tradycyjny (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5734 +#: ../midori/midori-browser.c:5444 msgid "Japanese (SHIFT__JIS)" msgstr "Japoński (SHIFT_JIS)" -#: ../midori/midori-browser.c:5737 -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5447 ../midori/midori-websettings.c:234 msgid "Korean (EUC-KR)" msgstr "Koreański (EUC-KR)" -#: ../midori/midori-browser.c:5740 -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5450 ../midori/midori-websettings.c:235 msgid "Russian (KOI8-R)" msgstr "Rosyjski (KOI8-R)" -#: ../midori/midori-browser.c:5743 -#: ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5453 ../midori/midori-websettings.c:236 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5746 -#: ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5456 ../midori/midori-websettings.c:237 msgid "Western (ISO-8859-1)" msgstr "Zachodni (ISO-8859-1)" -#: ../midori/midori-browser.c:6294 +#: ../midori/midori-browser.c:5459 ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:313 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "Dostosuj..." + +#: ../midori/midori-browser.c:5964 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:5971 msgid "_Location..." -msgstr "_Położenie" +msgstr "_Pasek położenia" -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:5973 msgid "Open a particular location" -msgstr "Otwiera wprowadzone położenie" +msgstr "Wprowadza określone położenie" -#: ../midori/midori-browser.c:6327 +#: ../midori/midori-browser.c:5995 msgid "_Web Search..." msgstr "_Wyszukiwarka" -#: ../midori/midori-browser.c:6329 +#: ../midori/midori-browser.c:5997 msgid "Run a web search" msgstr "Wyszukuje wyrażenia przy pomocy wyszukiwarki internetowej" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6024 msgid "Reopen a previously closed tab or window" msgstr "Wyświetla listę ostatnio zamkniętych kart i okien" -#: ../midori/midori-browser.c:6365 -msgid "_Recently visited pages" -msgstr "_Ostatnio odwiedzone strony" - -#: ../midori/midori-browser.c:6367 -msgid "Reopen pages that you visited earlier" -msgstr "Wyświetla listę ostatnio odwiedzonych stron" - -#: ../midori/midori-browser.c:6382 -#: ../midori/sokoke.c:1295 -msgid "_Bookmarks" -msgstr "_Zakładki" - -#: ../midori/midori-browser.c:6384 +#: ../midori/midori-browser.c:6041 msgid "Show the saved bookmarks" msgstr "Wyświetla zapisane zakładki" -#: ../midori/midori-browser.c:6399 +#: ../midori/midori-browser.c:6058 msgid "_Tools" msgstr "_Narzędzia" -#: ../midori/midori-browser.c:6412 +#: ../midori/midori-browser.c:6074 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:6414 +#: ../midori/midori-browser.c:6076 msgid "Show a list of all open tabs" msgstr "Wyświetla listę otwartych kart" -#: ../midori/midori-browser.c:6428 +#: ../midori/midori-browser.c:6090 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6430 +#: ../midori/midori-browser.c:6092 msgid "Menu" msgstr "Wyświetla listę poleceń paska menu" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6634 -msgid "_Inline Find:" -msgstr "_Wyszukiwanie:" - -#: ../midori/midori-browser.c:6665 -msgid "Previous" -msgstr "Poprzednie" - -#: ../midori/midori-browser.c:6670 -msgid "Next" -msgstr "Następne" - -#: ../midori/midori-browser.c:6675 -msgid "Match Case" -msgstr "Uwzględnianie wielkości liter" - -#: ../midori/midori-browser.c:6684 -msgid "Highlight Matches" -msgstr "Wyróżnianie" - -#: ../midori/midori-browser.c:6696 -msgid "Close Findbar" -msgstr "Zamyka pasek wyszukiwania" - -#: ../midori/midori-browser.c:6742 -#: ../panels/midori-transfers.c:141 -msgid "Clear All" -msgstr "Wyczyść wszystko" - -#: ../midori/midori-browser.c:7100 +#: ../midori/midori-browser.c:6904 #, c-format msgid "Unexpected setting '%s'" msgstr "Niespodziewane ustawienie „%s”" -#: ../midori/midori-locationaction.c:377 -#, fuzzy, c-format -msgid "Failed to select from history\n" -msgstr "Nie udało się wyczyścić historii: %s\n" +#: ../midori/midori-extension.c:310 +#, c-format +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "Nie można wczytać ustawień wtyczki „%s”: %s\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "Wyszukaj wyrażenie „%s”" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Nie można zapisać ustawień wtyczki „%s”: %s\n" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "Wyszukaj za pomocą %s" -#: ../midori/midori-locationaction.c:1197 -#, fuzzy, c-format -msgid "Failed to execute database statement\n" -msgstr "Nie udało się wykonać zapytania: %s\n" +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Wyszukaj za pomocą..." -#. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 -msgid "Paste and p_roceed" -msgstr "Wklej i p_rzejdź" +#: ../midori/midori-locationaction.c:537 +#, c-format +msgid "Failed to select from history\n" +msgstr "Nie udało się wybrać z historii\n" -#: ../midori/midori-panel.c:432 -#: ../midori/midori-panel.c:434 -msgid "Detach chosen panel from the window" -msgstr "Odłącza panel od okna" - -#: ../midori/midori-panel.c:444 -#: ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 -#: ../midori/midori-panel.c:642 -msgid "Align sidepanel to the right" -msgstr "Umieszcza panel boczy po prawej stronie okna" +#: ../midori/midori-locationaction.c:624 +#, c-format +msgid "Search for %s" +msgstr "Wyszukaj wyrażenie „%s”" + +#. i18n: Right-click on Location, Open an URL from the clipboard +#: ../midori/midori-locationaction.c:1400 +msgid "Paste and p_roceed" +msgstr "Wklej i p_rzejdź" + +#: ../midori/midori-locationaction.c:1768 +msgid "Not verified" +msgstr "Nie zweryfikowany" + +#: ../midori/midori-locationaction.c:1788 +msgid "Verified and encrypted connection" +msgstr "Zweryfikowane i szyfrowane połączenie" -#: ../midori/midori-panel.c:456 -#: ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 +msgid "Align sidepanel to the right" +msgstr "Przemieszcza panel boczny na prawą stronę okna" + +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Zamyka panel" -#: ../midori/midori-panel.c:640 -#: ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" -msgstr "Umieszcza panel boczy po lewej stronie okna" +msgstr "Przemieszcza panel boczny na lewą stronę okna" -#: ../midori/midori-panel.c:797 -msgid "Hide operating controls" -msgstr "Przełącza widoczność przycisków konfiguracyjnych panelu" +#: ../midori/midori-websettings.c:214 +msgid "Show Speed Dial" +msgstr "Wyświetlenie strony szybkiego wybierania" -#: ../midori/midori-websettings.c:204 -msgid "Show Blank page" -msgstr "Wyświetlanie pustej strony" - -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:215 msgid "Show Homepage" -msgstr "Wyświetlanie strony głównej" - -#: ../midori/midori-websettings.c:206 -msgid "Show last open tabs" -msgstr "Wyświetlanie ostatnio otwartych kart" +msgstr "Wyświetlenie strony głównej" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:233 msgid "Japanese (SHIFT_JIS)" msgstr "Japoński (SHIFT_JIS)" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:253 msgid "New tab" msgstr "W nowej karcie" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:254 msgid "New window" msgstr "W nowym oknie" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:255 msgid "Current tab" msgstr "W bieżącej karcie" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:270 msgid "Default" msgstr "Domyślny" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:271 msgid "Icons" msgstr "Tylko ikony" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:272 msgid "Small icons" msgstr "Małe ikony" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:273 msgid "Text" -msgstr "Tylko tekst" +msgstr "Tylko etykiety" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:274 msgid "Icons and text" msgstr "Etykiety poniżej ikon" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:275 msgid "Text beside icons" msgstr "Etykiety obok ikon" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:290 msgid "Automatic (GNOME or environment)" msgstr "Ustawienia środowiska" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:291 msgid "HTTP proxy server" -msgstr "Serwer pośredniczący HTTP" +msgstr "HTTP" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:292 msgid "No proxy server" msgstr "Brak" -#: ../midori/midori-websettings.c:296 -msgid "All cookies" -msgstr "Wszystkie" - -#: ../midori/midori-websettings.c:297 -msgid "Session cookies" -msgstr "Bieżącej sesji" - -#: ../midori/midori-websettings.c:298 -#: ../katze/katze-utils.c:667 -msgid "None" -msgstr "Żadne" - -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:309 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:310 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:311 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:312 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:388 msgid "Remember last window size" msgstr "Pamiętaj ostatni rozmiar okna" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:389 msgid "Whether to save the last window size" msgstr "Zapamiętuje ostatni rozmiar okna programu" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:397 msgid "Last window width" msgstr "Ostatnia szerokość okna" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:398 msgid "The last saved window width" msgstr "Ostatnia zapisana szerokość okna" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:406 msgid "Last window height" msgstr "Ostatnia wysokość okna" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:407 msgid "The last saved window height" msgstr "Ostatnia zapisana wysokość okna" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:432 msgid "Last panel position" msgstr "Ostatnia pozycja panelu" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:433 msgid "The last saved panel position" msgstr "Ostatnio zapisana pozycja panelu" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:442 msgid "Last panel page" -msgstr "" +msgstr "Ostatni panel strony" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:443 msgid "The last saved panel page" -msgstr "" +msgstr "Ostatnio zapamiętany panel strony" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:451 msgid "Last Web search" -msgstr "" +msgstr "Ostatnie wyszukiwanie" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:452 msgid "The last saved Web search" -msgstr "" +msgstr "Ostatnio zapisane wyszukiwanie" -#: ../midori/midori-websettings.c:443 -#, fuzzy +#: ../midori/midori-websettings.c:461 msgid "Show Menubar" -msgstr "Wyświetlanie paska menu" +msgstr "Przełącza widoczność paska poleceń" -#: ../midori/midori-websettings.c:444 -#, fuzzy +#: ../midori/midori-websettings.c:462 msgid "Whether to show the menubar" -msgstr "Otwieranie nowych kart w tle" +msgstr "Przełącza wyświetlanie paska poleceń" -#: ../midori/midori-websettings.c:452 -#, fuzzy +#: ../midori/midori-websettings.c:470 msgid "Show Navigationbar" -msgstr "Wyświetlanie paska nawigacji" +msgstr "Pokaż pasek nawigacji" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:471 msgid "Whether to show the navigationbar" -msgstr "" +msgstr "Przełącza wyświetlanie paska nawigacyjnego" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:479 msgid "Show Bookmarkbar" -msgstr "" +msgstr "Wyświetlanie paska zakładek" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:480 msgid "Whether to show the bookmarkbar" -msgstr "" +msgstr "Przełącza wyświetlanie paska zakładek" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:488 msgid "Show Panel" msgstr "Pokaż panel" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:489 msgid "Whether to show the panel" -msgstr "" - -#: ../midori/midori-websettings.c:486 -msgid "Show Transferbar" -msgstr "Pasek pobierania plików" - -#: ../midori/midori-websettings.c:487 -#, fuzzy -msgid "Whether to show the transferbar" -msgstr "Otwieraj nowe karty w tle" +msgstr "Przełącza wyświetlanie panelu bocznego" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:497 msgid "Show Statusbar" msgstr "Pasek _stanu" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:498 msgid "Whether to show the statusbar" -msgstr "" +msgstr "Przełącza wyświetlanie paska stanu" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:507 msgid "Toolbar Style:" msgstr "Wygląd:" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:508 msgid "The style of the toolbar" msgstr "Określa styl paska narzędzi" -#: ../midori/midori-websettings.c:522 -msgid "Show progress in location entry" -msgstr "Pasek postępu wczytywania strony" - -#: ../midori/midori-websettings.c:523 -msgid "Whether to show loading progress in the location entry" -msgstr "Wyświetla pasek postępu wczytywania strony w pasku adresu" - -#: ../midori/midori-websettings.c:538 -msgid "Search engines in location completion" -msgstr "Wyszukiwarki na liście paska adresu" - -#: ../midori/midori-websettings.c:539 -msgid "Whether to show search engines in the location completion" -msgstr "Wyświetla wyszukiwarki na liście automatycznego uzupełniania paska adresu" - -#: ../midori/midori-websettings.c:547 -#, fuzzy +#: ../midori/midori-websettings.c:517 msgid "Toolbar Items" -msgstr "Paski _narzędziowe" +msgstr "Elementy paska narzędziowego" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:518 msgid "The items to show on the toolbar" msgstr "Określa wygląd paska narzędziowego" -#: ../midori/midori-websettings.c:556 -#, fuzzy +#: ../midori/midori-websettings.c:526 msgid "Compact Sidepanel" -msgstr "Panel _boczny" +msgstr "Zwarty panel boczny" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:527 msgid "Whether to make the sidepanel compact" -msgstr "" - -#: ../midori/midori-websettings.c:572 -msgid "Show operating controls of the panel" -msgstr "Wyświetlanie przycisków konfiguracyjnych panelu" - -#: ../midori/midori-websettings.c:573 -msgid "Whether to show the operating controls of the panel" -msgstr "Wyświetla przyciski konfiguracyjne panelu" +msgstr "Przełącza wyświetlanie panelu bocznego w trybie zwartym" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:542 msgid "Align sidepanel on the right" -msgstr "" +msgstr "Przypnij panel boczny do prawej strony" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:543 msgid "Whether to align the sidepanel on the right" msgstr "" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:558 msgid "Open panels in separate windows" msgstr "Otwieranie paneli w oddzielnych oknach" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:559 msgid "Whether to always open panels in separate windows" msgstr "Otwiera wszystkie panale w oddzielnych oknach" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:568 msgid "When Midori starts:" msgstr "Domyślna czynność:" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:569 msgid "What to do when Midori starts" msgstr "Określa domyślną czynność wykonywaną po uruchomieniu programu" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:578 msgid "Homepage:" msgstr "Strona główna:" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:579 msgid "The homepage" -msgstr "Wprowadza adres strony głównej przeglądarki" +msgstr "Wprowadza adres strony głównej" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:594 msgid "Show crash dialog" msgstr "Wyświetlanie okna diagnostycznego po wystąpieniu awarii" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:595 msgid "Show a dialog after Midori crashed" msgstr "Wyświetla okno diagnostyczne po wystąpieniu awarii programu" -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:657 -msgid "Show speed dial in new tabs" -msgstr "Strona szybkiego wybierania" - -#: ../midori/midori-websettings.c:658 -msgid "Show speed dial in newly opened tabs" -msgstr "Wyświetla stronę szybkiego wybierania w pustych kartach" - -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:603 msgid "Save downloaded files to:" -msgstr "Położenie:" +msgstr "Położenie pobierania:" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:604 msgid "The folder downloaded files are saved to" -msgstr "Katalog w którym są zapisywane pobierane pliki" - -#: ../midori/midori-websettings.c:688 -msgid "Ask for the destination folder" -msgstr "Wybór katalogu pobierania" - -#: ../midori/midori-websettings.c:689 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "Pyta o wskazanie katalogu docelowego każdorazowo przed rozpoczęciem pobierania pliku" +msgstr "Określa katalog, w którym są zapisywane pobierane pliki" -#: ../midori/midori-websettings.c:708 -msgid "Notify when a transfer has been completed" -msgstr "Powiadamianie o zakończeniu" - -#: ../midori/midori-websettings.c:709 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "Wyświetla powiadomienie gdy pobieranie zostanie zakończone" - -#: ../midori/midori-websettings.c:721 -msgid "Download Manager" -msgstr "Menedżer pobierania:" - -#: ../midori/midori-websettings.c:722 -msgid "An external download manager" -msgstr "Zewnętrzny menedżer pobierania" - -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:612 msgid "Text Editor" msgstr "Edytor tekstu:" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:613 msgid "An external text editor" -msgstr "Zewnętrzny edytor tekstu" +msgstr "Określa zewnętrzny edytor tekstu" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:628 msgid "News Aggregator" msgstr "Czytnik wiadomości:" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:629 msgid "An external news aggregator" -msgstr "Zewnętrzny czytnik wiadomości" +msgstr "Określa zewnętrzny czytnik wiadomości" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:637 msgid "Location entry Search" msgstr "Adres domyślnej wyszukiwarki internetowej" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:638 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:646 msgid "Preferred Encoding" msgstr "Kodowanie znaków:" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:647 msgid "The preferred character encoding" msgstr "Określa preferowane kodowanie znaków" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:657 msgid "Always Show Tabbar" msgstr "Zawsze widoczny pasek kart" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:658 msgid "Always show the tabbar" msgstr "Wyświetla pasek kart nawet gdy otwarto tylko jedną kartę" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:671 msgid "Close Buttons on Tabs" msgstr "Przyciski zamykania kart" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:672 msgid "Whether tabs have close buttons" msgstr "Wyświetla przyciski zamykania na kartach" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:697 msgid "Open new pages in:" msgstr "Otwieranie nowych stron:" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:698 msgid "Where to open new pages" msgstr "Określa sposób otwierania nowych stron" -#: ../midori/midori-websettings.c:803 -msgid "Open external pages in:" -msgstr "Otwieranie stron przez inne programy:" - -#: ../midori/midori-websettings.c:804 -msgid "Where to open externally opened pages" -msgstr "Określa sposób otwierania stron przez inne programy" - -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:707 msgid "Middle click opens Selection" -msgstr "Środkowy przycisk myszy otwiera zaznaczoną stronę" +msgstr "" +"Otwieranie odnośników zaznaczonych adresów URL\n" +"kliknięciem środkowego przycisku myszy" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:708 msgid "Load an address from the selection via middle click" -msgstr "" +msgstr "Otwiera zaznaczony adres kliknięciem środkowego przycisku myszy" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:716 msgid "Open tabs in the background" msgstr "Otwieranie kart w tle" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:717 msgid "Whether to open new tabs in the background" msgstr "Otwiera karty w tle" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:725 msgid "Open Tabs next to Current" msgstr "Otwieranie kart za bieżącą kartą" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:726 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Określa czy nowe karty będą umieszczane zaraz za bieżącą kartą czy za ostatnią" +msgstr "" +"Określa czy nowe karty będą umieszczane zaraz za bieżącą kartą czy za " +"ostatnią" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:734 msgid "Open popups in tabs" msgstr "Otwieranie wyskakującyh okienek jako karty" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:735 msgid "Whether to open popup windows in tabs" msgstr "Czy otwierać wyskakujące okienka jako karty" -#: ../midori/midori-websettings.c:851 -#: ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:745 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Wczytywanie obrazów" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:746 msgid "Load and display images automatically" msgstr "Wczytuje i wyświetla obrazy automatycznie" -#: ../midori/midori-websettings.c:859 -#: ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:753 ../extensions/statusbar-features.c:143 msgid "Enable scripts" msgstr "Wykonywanie skryptów" -#: ../midori/midori-websettings.c:860 +#: ../midori/midori-websettings.c:754 msgid "Enable embedded scripting languages" msgstr "Wykonuje osadzone skrypty" -#: ../midori/midori-websettings.c:867 -#: ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:761 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" -msgstr "Wtyczki Netscape" +msgstr "Obsługa wtyczek Netscape" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:762 msgid "Enable embedded Netscape plugin objects" -msgstr "Używa wtyczek Netscape" +msgstr "Używa wbudowanych wtyczek Netscape" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:777 +msgid "Enable Spell Checking" +msgstr "Sprawdzanie pisowni" + +#: ../midori/midori-websettings.c:778 +msgid "Enable spell checking while typing" +msgstr "Sprawdza pisownię podczas wprowadzania tekstu" + +#: ../midori/midori-websettings.c:784 msgid "Enable HTML5 database support" msgstr "Obsługa baz danych HTML5" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:785 msgid "Whether to enable HTML5 database support" -msgstr "Obsługuje bazy danych HTML5" +msgstr "Przełącza obsługę baz danych HTML5" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:791 msgid "Enable HTML5 local storage support" -msgstr "" +msgstr "Obsługa lokalnego magazynu HTML5" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:792 msgid "Whether to enable HTML5 local storage support" -msgstr "" +msgstr "Przełącza obsługę lokalnych magazynów HTML5" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:798 msgid "Enable offline web application cache" -msgstr "Pamięć podręczna programów internetowych w trybie offline" +msgstr "Pamięć podręczna rozłączonych usług internetowych" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:799 msgid "Whether to enable offline web application cache" -msgstr "Włącza pamięć podręczną programów internetowych w trybie offline" +msgstr "Włącza pamięć podręczną rozłączonych usług internetowych" + +#: ../midori/midori-websettings.c:815 +msgid "Flash window on background tabs" +msgstr "Miganie okna po otwarciu karty w tle" + +#: ../midori/midori-websettings.c:816 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "Powiadamianie miganiem okna o otwarciu karty w tle" + +#: ../midori/midori-websettings.c:824 +msgid "Enable WebGL support" +msgstr "Włącz obsługę WebGL" + +#: ../midori/midori-websettings.c:825 +msgid "Allow websites to use OpenGL rendering" +msgstr "Pozwól na używanie OpenGL do renderowania stron internetowych" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:851 msgid "Zoom Text and Images" msgstr "Skalowanie tekstu i obrazów" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:852 msgid "Whether to zoom text and images" msgstr "Umożliwia skalowanie tekstu i obrazów" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:867 msgid "Find inline while typing" msgstr "Wyszukiwanie inkrementalne podczas wpisywania tekstu" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:868 msgid "Whether to automatically find inline while typing" -msgstr "Wyszukuje tekst automatycznie podczas jego wpisywania w polu wyszukiwania" +msgstr "" +"Wyszukuje tekst automatycznie podczas jego wpisywania w polu wyszukiwania" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:883 msgid "Kinetic scrolling" -msgstr "" +msgstr "Kinetyczne przewijanie" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:884 msgid "Whether scrolling should kinetically move according to speed" msgstr "" +"Dopasowuje prędkość przewijania, do prędkości ruchu urządzenia wskazującego" -#: ../midori/midori-websettings.c:967 -msgid "Accept cookies" -msgstr "Akceptowane typy:" - -#: ../midori/midori-websettings.c:968 -msgid "What type of cookies to accept" -msgstr "Określa typy akceptowanych ciasteczek" +#: ../midori/midori-websettings.c:892 +msgid "Delete old Cookies after:" +msgstr "Czas przechowywania ciasteczek:" -#: ../midori/midori-websettings.c:984 -msgid "Original cookies only" +#: ../midori/midori-websettings.c:893 +msgid "The maximum number of days to save cookies for" msgstr "" +"Określa maksymalny czas przechowywania ciasteczek dla stron internetowych" -#: ../midori/midori-websettings.c:985 -msgid "Accept cookies from the original website only" -msgstr "Zezwalaj wyłącznie na ciasteczka z bieżącej strony" - -#: ../midori/midori-websettings.c:993 -msgid "Maximum cookie age" -msgstr "Maksymalny okres przechowywania:" - -#: ../midori/midori-websettings.c:994 -msgid "The maximum number of days to save cookies for" -msgstr "Określa maksymalny czas przechowywania ciasteczek dla witryn internetowych" +#: ../midori/midori-websettings.c:909 +msgid "Only accept Cookies from sites you visit" +msgstr "Akceptowanie ciasteczek pochodzących tylko z odwiedzonych stron" -#: ../midori/midori-websettings.c:1011 -msgid "Remember last visited pages" -msgstr "Przechowywanie adresów ostatnio odwiedzonych stron" - -#: ../midori/midori-websettings.c:1012 -msgid "Whether the last visited pages are saved" -msgstr "Przechowuje listę ostatnio odwiedzonych stron" +#: ../midori/midori-websettings.c:910 +msgid "Block cookies sent by third-party websites" +msgstr "Blokuje ciasteczka wysyłane przez nieodwiedzone strony" -#: ../midori/midori-websettings.c:1020 -msgid "Maximum history age" -msgstr "Maksymalny okres przechowywania:" +#: ../midori/midori-websettings.c:924 +msgid "Delete pages from history after:" +msgstr "Czas przechowywania historii:" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:925 msgid "The maximum number of days to save the history for" msgstr "Określa maksymalny czas przechowywania historii odwiedzonych stron" -#: ../midori/midori-websettings.c:1029 -msgid "Remember last downloaded files" -msgstr "Przechowywanie informacji o ostatnio pobranych plikach" - -#: ../midori/midori-websettings.c:1030 -msgid "Whether the last downloaded files are saved" -msgstr "Określa czy będzie przechowywana lista ostatnio pobranych plików" - -#: ../midori/midori-websettings.c:1047 +#: ../midori/midori-websettings.c:940 msgid "Proxy server" msgstr "Serwer pośredniczący:" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:941 msgid "The type of proxy server to use" msgstr "Określa typ używanego serwera pośredniczącego" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:950 msgid "HTTP Proxy Server" msgstr "Serwer pośredniczący HTTP:" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:951 msgid "The proxy server used for HTTP connections" msgstr "Określa serwer pośredniczący w połączeniach HTTP" -#: ../midori/midori-websettings.c:1073 -msgid "Detect proxy server automatically" -msgstr "Automatyczne wykrywanie serwera pośredniczącego" - -#: ../midori/midori-websettings.c:1074 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Przełącza automatyczne wykrywanie serwera pośredniczącego" +#: ../midori/midori-websettings.c:966 +msgid "Port" +msgstr "Port:" + +#: ../midori/midori-websettings.c:967 +msgid "The proxy server port used for HTTP connections" +msgstr "Określa port serwera pośredniczącego w połączeniach HTTP" + +#: ../midori/midori-websettings.c:985 +msgid "The maximum size of cached pages on disk" +msgstr "Określa maksymalny rozmiar pamięci podręcznej stron" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1002 msgid "Identify as" msgstr "Identyfikator:" -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1003 msgid "What to identify as to web pages" -msgstr "Określa jak przeglądarka ma się identyfikować przed stronami internetowymi" +msgstr "" +"Określa jak przeglądarka ma się identyfikować przed stronami internetowymi" -#: ../midori/midori-websettings.c:1107 +#: ../midori/midori-websettings.c:1019 msgid "Identification string" msgstr "Identyfikacja" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1020 msgid "The application identification string" msgstr "Ciąg indentyfikujący przeglądarkę" -#: ../midori/midori-websettings.c:1123 +#: ../midori/midori-websettings.c:1036 msgid "Preferred languages" msgstr "Preferowane języki:" -#: ../midori/midori-websettings.c:1124 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "Wprowadza listę języków preferowanych podczas renderowania witryn wielojęzycznych, rozdzielonych znakiem przecinka. Np.: „pl”, „ru,nl” or „en-us;q=1.0, fr-fr;q=0.667”." +#: ../midori/midori-websettings.c:1037 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"Wprowadza listę języków preferowanych podczas renderowania stron " +"wielojęzycznych, rozdzielonych znakiem przecinka. Np.: „pl”, „ru,nl” or „en-" +"us;q=1.0, fr-fr;q=0.667”." -#: ../midori/midori-websettings.c:1139 +#: ../midori/midori-websettings.c:1052 msgid "Clear private data" -msgstr "" +msgstr "Usuń prywatne dane" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1053 msgid "The private data selected for deletion" +msgstr "Prywatne dane zaznaczone do usunięcia" + +#: ../midori/midori-websettings.c:1068 +msgid "Clear data" +msgstr "Usuń dane" + +#: ../midori/midori-websettings.c:1069 +msgid "The data selected for deletion" +msgstr "Dane zaznaczone do usunięcia" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1118 +msgid "Strip referrer details sent to websites" +msgstr "" +"Skracanie adresów przekierowanych stron internetowych\n" +"w nagłówkach HTTP" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1120 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "" +"Skraca adresy przekierowywanych stron internetowych, wysyłane do serwerów w " +"nagłówkach HTTP, jedynie do nazw komputerów" + +#: ../midori/midori-websettings.c:1134 +msgid "Always use my font choices" +msgstr "Wymuszenie używania wybranej czcionki" + +#: ../midori/midori-websettings.c:1135 +msgid "Override fonts picked by websites with user preferences" msgstr "" +"Używa czcionek wybranych przez użytkownika, bez względu na preferencje stron" + +#: ../midori/midori-view.c:1353 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "Strona „%s” chce zapisać bazę danych HTML5." + +#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1389 +msgid "_Deny" +msgstr "_Odmów" + +#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1389 +msgid "_Allow" +msgstr "_Zezwól" + +#: ../midori/midori-view.c:1385 +#, c-format +msgid "%s wants to know your location." +msgstr "Strona „%s” chce poznać położenie użytkownika." -#. 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:1261 -#: ../midori/midori-view.c:4528 -#: ../midori/midori-view.c:4532 +#: ../midori/midori-view.c:1476 #, c-format msgid "Error - %s" msgstr "Błąd - %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1477 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Nie można wczytać strony „%s”." -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1479 msgid "Try again" msgstr "Wczytaj ponownie" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 -#, c-format -msgid "Not found - %s" -msgstr "Nie znaleziono - %s" - -#: ../midori/midori-view.c:1520 -#: ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1676 ../midori/midori-view.c:2589 #, c-format msgid "Send a message to %s" msgstr "Wyślij wiadomość na adres %s" -#: ../midori/midori-view.c:2139 -#: ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2419 ../midori/midori-view.c:2738 msgid "Inspect _Element" -msgstr "Analizuj _element..." +msgstr "Zbadaj _element..." -#: ../midori/midori-view.c:2191 -#: ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2471 msgid "Open Link in New _Tab" msgstr "Otwórz w nowej _karcie" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2475 msgid "Open Link in _Foreground Tab" msgstr "Otwórz odnośnik w nowej karcie" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2476 msgid "Open Link in _Background Tab" msgstr "Otwórz w nowej karcie w _tle" -#: ../midori/midori-view.c:2199 -#: ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2479 msgid "Open Link in New _Window" msgstr "Otwórz w nowym _oknie" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2482 msgid "Open Link as Web A_pplication" -msgstr "Uruchom jako a_plikację internetową" +msgstr "Otwórz jako stronę _usługi internetowej" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2487 msgid "Copy Link de_stination" msgstr "_Skopiuj adres odnośnika" -#: ../midori/midori-view.c:2208 -#: ../midori/midori-view.c:2280 -msgid "_Save Link destination" -msgstr "_Zapisz obiekt odnośnika" - -#: ../midori/midori-view.c:2209 -#: ../midori/midori-view.c:2274 -msgid "_Download Link destination" -msgstr "_Pobierz obiekt odnośnika" - -#: ../midori/midori-view.c:2213 -#: ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 -msgid "Download with Download _Manager" -msgstr "Pobierz za pomocą _menedżera pobierania" - -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2503 msgid "Open _Image in New Tab" msgstr "Otwórz obraz w nowej _karcie" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2506 msgid "Copy Image _Address" msgstr "Skopiuj _adres obrazu" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2509 msgid "Save I_mage" msgstr "Zapisz _obraz" -#: ../midori/midori-view.c:2229 -msgid "Download I_mage" -msgstr "_Pobierz obraz" +#: ../midori/midori-view.c:2512 +msgid "Open in Image _Viewer" +msgstr "Otwórz w przeglądarce obrazów" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2519 msgid "Copy Video _Address" -msgstr "_Skopiuj adres wideo" +msgstr "_Skopiuj adres nagrania wideo" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2522 msgid "Save _Video" -msgstr "Zapisz _wideo" +msgstr "Zapisz nagranie _wideo" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2522 msgid "Download _Video" -msgstr "Pobierz _wideo" +msgstr "Pobierz nagranie _wideo" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2548 msgid "Search _with" msgstr "Wyszukaj _za pomocą" -#: ../midori/midori-view.c:2337 -#: ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2580 msgid "_Search the Web" msgstr "_Wyszukaj w internecie" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2597 msgid "Open Address in New _Tab" msgstr "Otwórz adres w nowej _karcie" -#: ../midori/midori-view.c:2662 +#: ../midori/midori-view.c:2886 msgid "Open or download file" msgstr "Pobieranie pliku" -#: ../midori/midori-view.c:2681 +#: ../midori/midori-view.c:2905 #, c-format msgid "File Type: '%s'" msgstr "Typ pliku: „%s”" -#: ../midori/midori-view.c:2684 +#: ../midori/midori-view.c:2907 #, c-format msgid "File Type: %s ('%s')" msgstr "Typ pliku: %s („%s”)" +#: ../midori/midori-view.c:2911 +#, c-format +msgid "File Name: %s" +msgstr "Typ pliku: %s" + #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2688 +#: ../midori/midori-view.c:2930 #, c-format msgid "Open %s" msgstr "Otwieranie %s" -#: ../midori/midori-view.c:3236 +#: ../midori/midori-view.c:3575 #, c-format msgid "Inspect page - %s" -msgstr "Analizowanie - %s" +msgstr "Badanie - %s" -#: ../midori/midori-view.c:3501 -msgid "Speed dial" +#: ../midori/midori-view.c:3876 +msgid "Speed Dial" msgstr "Szybkie wybieranie" -#: ../midori/midori-view.c:3502 +#: ../midori/midori-view.c:3877 ../midori/midori-view.c:3973 msgid "Click to add a shortcut" -msgstr "Proszę kliknąć aby dodać odnośnik" +msgstr "Proszę kliknąć, aby dodać odnośnik" -#: ../midori/midori-view.c:3503 +#: ../midori/midori-view.c:3878 msgid "Enter shortcut address" msgstr "Proszę wprowadzić adres URL odnośnika:" -#: ../midori/midori-view.c:3504 +#: ../midori/midori-view.c:3879 msgid "Enter shortcut title" msgstr "Proszę wprowadzić nazwę odnośnika:" -#: ../midori/midori-view.c:3505 +#: ../midori/midori-view.c:3880 msgid "Are you sure you want to delete this shortcut?" msgstr "Usunąć odnośnik?" -#: ../midori/midori-view.c:3506 -msgid "Set number of columns" -msgstr "Ustaw ilość kolumn" +#: ../midori/midori-view.c:4042 +#, c-format +msgid "No documentation installed" +msgstr "Brak zainstalowanej dokumentacji" + +#: ../midori/midori-view.c:4118 +msgid "Midori doesn't store any personal data:" +msgstr "Midori nie przechowuje żadnych danych osobistych:" -#: ../midori/midori-view.c:3507 -msgid "Enter number of columns:" -msgstr "Proszę wprowadzić ilość kolumn:" +#: ../midori/midori-view.c:4119 +msgid "No history or web cookies are being saved." +msgstr "Historia i ciasteczka nie są zapisywane " -#: ../midori/midori-view.c:3508 -msgid "Set number of shortcuts" -msgstr "Ustaw ilość odnośników" +#: ../midori/midori-view.c:4120 +msgid "Extensions are disabled." +msgstr "Rozszerzenia są wyłączone. " -#: ../midori/midori-view.c:3509 -msgid "Enter number of shortcuts:" -msgstr "Proszę wprowadzić ilość odnośników:" +#: ../midori/midori-view.c:4121 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "" -#: ../midori/midori-view.c:3535 -#, c-format -msgid "Document cannot be displayed" -msgstr "Nie można wyświetlić dokumentu" +#: ../midori/midori-view.c:4122 +msgid "Midori prevents websites from tracking the user:" +msgstr "Midori zapobiega śledzeniu użytkownika przez witryny " -#: ../midori/midori-view.c:3558 -#, c-format -msgid "No documentation installed" -msgstr "Brak zainstalowanej dokumentacji" +#: ../midori/midori-view.c:4123 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "" + +#: ../midori/midori-view.c:4124 +msgid "DNS prefetching is disabled." +msgstr "Wczesne pobieranie wpisów DNS jest wyłączone." + +#: ../midori/midori-view.c:4125 +msgid "The language and timezone are not revealed to websites." +msgstr "Domyślny język oraz strefa czasowa nie ujawniany witrynom." + +#: ../midori/midori-view.c:4126 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "" + +#: ../midori/midori-view.c:4164 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "" +"Numery wersji w nawiasach oznaczają wersje komponentów użytych do " +"uruchomienia programu." + +#: ../midori/midori-view.c:4220 +msgid "Page loading delayed" +msgstr "Wstrzymano wczytywanie strony" -#: ../midori/midori-view.c:3808 +#: ../midori/midori-view.c:4221 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "" +"Wczytywanie zostało wstrzymane z powodu ostatniej awarii lub niewłaściwych " +"preferencji programu." + +#: ../midori/midori-view.c:4222 +msgid "Load Page" +msgstr "Wczytaj stronę" + +#: ../midori/midori-view.c:4388 msgid "Blank page" msgstr "Pusta strona" -#: ../midori/midori-view.c:4068 +#: ../midori/midori-view.c:4650 msgid "_Duplicate Tab" msgstr "_Powiel kartę" -#: ../midori/midori-view.c:4073 -msgid "_Restore Tab" -msgstr "_Przywróć kartę" - -#: ../midori/midori-view.c:4073 -msgid "_Minimize Tab" -msgstr "_Zminimalizuj kartę" +#: ../midori/midori-view.c:4655 +msgid "Show Tab _Label" +msgstr "Wyświetl _etykietę karty" + +#: ../midori/midori-view.c:4655 +msgid "Show Tab _Icon Only" +msgstr "Ukryj _etykietę karty" -#: ../midori/midori-view.c:4079 +#: ../midori/midori-view.c:4661 msgid "Close ot_her Tabs" msgstr "Zamknij pozo_stałe karty" -#: ../midori/midori-view.c:4700 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5474 +msgid "previous" +msgstr "Poprzednie" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5493 +msgid "next" +msgstr "Następne" + +#: ../midori/midori-view.c:5506 msgid "Print background images" msgstr "Drukowanie obrazów tła" -#: ../midori/midori-view.c:4701 +#: ../midori/midori-view.c:5507 msgid "Whether background images should be printed" msgstr "Drukuje obrazy tła stron" -#: ../midori/midori-view.c:4753 -#: ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:5539 msgid "Features" msgstr "Treść" -#. Page "General" -#: ../midori/midori-preferences.c:298 -msgid "General" -msgstr "Ogólne" - -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Uruchamianie" +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Wprowadza adres bieżącej strony jako adres strony głównej" + #: ../midori/midori-preferences.c:314 -#: ../midori/midori-preferences.c:321 msgid "Use current page as homepage" -msgstr "Ustawia bieżącą stronę jako stronę główną" - -#: ../midori/midori-preferences.c:331 -#: ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Pobieranie plików" +msgstr "Ustaw bieżącą stronę" #. Page "Appearance" -#: ../midori/midori-preferences.c:349 -msgid "Appearance" -msgstr "Wygląd" - -#: ../midori/midori-preferences.c:350 -msgid "Font settings" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" msgstr "Czcionki" -#: ../midori/midori-preferences.c:352 -msgid "Default Font Family" -msgstr "Domyślna:" +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Czcionka o zmiennej szerokości:" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "Określa domyślny krój czcionki używany do wyświetlania tekstu" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "Określa domyślny rozmiar czcionki używany do wyświetlania tekstu" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" -msgstr "Stałej szerokości:" +msgstr "Czcionka stałej szerokości:" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" -msgstr "Określa krój czcionki używany do wyświetlania testu o stałej szerokości znaków" +msgstr "" +"Określa krój czcionki używany do wyświetlania testu o stałej szerokości " +"znaków" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" -msgstr "Określa rozmiar czcionki używany do wyświetlania testu o stałej szerokości znaków" +msgstr "" +"Określa rozmiar czcionki używany do wyświetlania tekstu o stałej szerokości " +"znaków" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" -msgstr "Minimalny rozmiar:" +msgstr "Minimalny rozmiar czcionki:" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "Określa minimalny rozmiar czcionki używany do wyświetlania tekstu" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Zachowanie" -#: ../midori/midori-preferences.c:393 -msgid "Enforce 96 dots per inch" -msgstr "Wymuszenie 96 DPI" - -#: ../midori/midori-preferences.c:394 -msgid "Enforce a video dot density of 96 DPI" -msgstr "Ustawia rozdzielczość renderowania strony na 96 DPI" - -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Otwieranie nowych okien przez skrypty" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Umożliwia skryptom automatyczne otwieranie nowych okien" -#: ../midori/midori-preferences.c:419 -msgid "Spell Checking" -msgstr "Sprawdzanie pisowni" - -#: ../midori/midori-preferences.c:422 -msgid "Enable Spell Checking" -msgstr "Włączenie" - -#: ../midori/midori-preferences.c:423 -msgid "Enable spell checking while typing" -msgstr "Sprawdza pisownię podczas wprowadzania tekstu" - -#: ../midori/midori-preferences.c:425 -msgid "Spelling dictionaries:" -msgstr "Słowniki:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "Wprowadza listę języków sprawdzania pisowni, rozdzieloną znakami przecinka, np.: „en_GB,pl”" - #. Page "Interface" -#: ../midori/midori-preferences.c:435 -msgid "Interface" -msgstr "Interfejs" - -#: ../midori/midori-preferences.c:436 -msgid "Navigationbar" -msgstr "Pasek narzędzi nawigacyjnych" - -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Przeglądanie" -#. Page "Applications" -#: ../midori/midori-preferences.c:468 -msgid "Applications" -msgstr "Programy" - -#: ../midori/midori-preferences.c:469 -msgid "External applications" -msgstr "Zewnętrzne" - #. Page "Network" -#: ../midori/midori-preferences.c:485 -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "Sieć" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:463 msgid "Hostname" -msgstr "Nazwa komputera:" - -#. Page "Privacy" -#: ../midori/midori-preferences.c:511 -msgid "Privacy" -msgstr "Prywatność" +msgstr "Nazwa serwera:" -#: ../midori/midori-preferences.c:512 -msgid "Web Cookies" -msgstr "Ciasteczka" - -#: ../midori/midori-preferences.c:521 -#: ../midori/midori-preferences.c:535 -msgid "days" -msgstr "dni" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "MB" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Nowa wyszukiwarka" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Edycja wyszukiwarki" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Nazwa:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Opis:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "_Ikona:" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "Słowo _kluczowe:" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "Wyszukiwarki" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "Ustaw _domyślną" -#: ../midori/sokoke.c:1294 -msgid "_Bookmark" -msgstr "_Zakładka" - -#: ../midori/sokoke.c:1296 -msgid "Add Boo_kmark" -msgstr "_Dodaj zakładkę" +#: ../midori/sokoke.c:412 +msgid "Open with" +msgstr "Otwórz za pomocą" -#: ../midori/sokoke.c:1297 -msgid "_Console" -msgstr "_Konsola" +#: ../midori/sokoke.c:420 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Proszę wprowadzić polecenie służące do otworzenia „%s”:" -#: ../midori/sokoke.c:1298 -msgid "_Extensions" -msgstr "_Wtyczki" +#: ../midori/sokoke.c:461 ../midori/sokoke.c:471 ../midori/sokoke.c:499 +#: ../midori/sokoke.c:528 ../midori/sokoke.c:542 +msgid "Could not run external program." +msgstr "Nie można uruchomić zewnętrznego programu." -#: ../midori/sokoke.c:1299 -msgid "_History" -msgstr "_Historia" +#: ../midori/sokoke.c:1653 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d godzina" +msgstr[1] "%d godziny" +msgstr[2] "%d godzin" + +#: ../midori/sokoke.c:1654 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minuta" +msgstr[1] "%d minuty" +msgstr[2] "%d minut" + +#: ../midori/sokoke.c:1655 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d sekunda" +msgstr[1] "%d sekundy" +msgstr[2] "%d sekund" -#: ../midori/sokoke.c:1300 -msgid "_Homepage" -msgstr "_Strona główna" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1663 ../panels/midori-transfers.c:267 +#, c-format +msgid "%s of %s" +msgstr "Pobrano %s z %s" -#: ../midori/sokoke.c:1301 -msgid "_Userscripts" -msgstr "Skrypty _użytkownika" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1672 +msgid "?B" +msgstr "?B" -#: ../midori/sokoke.c:1302 -msgid "New _Tab" -msgstr "Nowa kar_ta" +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1675 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/sokoke.c:1303 -msgid "_Transfers" -msgstr "_Pobieranie plików" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1692 +#, c-format +msgid " - %s remaining" +msgstr " - pozostało %s" -#: ../midori/sokoke.c:1304 -msgid "Netscape p_lugins" -msgstr "Wtyczki _Netscape" +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:264 +msgid "_Inline Find:" +msgstr "_Wyszukiwanie:" -#: ../midori/sokoke.c:1307 -msgid "New _Folder" -msgstr "Nowy _katalog" +#: ../toolbars/midori-findbar.c:290 +msgid "Previous" +msgstr "Poprzednie" -#: ../panels/midori-bookmarks.c:111 -msgid "Bookmarks" -msgstr "Zakładki" +#: ../toolbars/midori-findbar.c:296 +msgid "Next" +msgstr "Następne" -#: ../panels/midori-bookmarks.c:241 -msgid "Edit the selected bookmark" -msgstr "Edytuj wybraną zakładkę" +#: ../toolbars/midori-findbar.c:300 +msgid "Match Case" +msgstr "Uwzględnianie wielkości liter" -#: ../panels/midori-bookmarks.c:249 -msgid "Delete the selected bookmark" -msgstr "Usuń wybraną zakładkę" +#: ../toolbars/midori-findbar.c:309 +msgid "Highlight Matches" +msgstr "Wyróżnianie" -#: ../panels/midori-bookmarks.c:262 -msgid "Add a new folder" -msgstr "Dodaje nowy katalog" +#: ../toolbars/midori-findbar.c:320 +msgid "Close Findbar" +msgstr "Zamyka pasek wyszukiwania" -#: ../panels/midori-bookmarks.c:592 -msgid "Separator" -msgstr "Separator" +#: ../toolbars/midori-transferbar.c:122 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "Pobrano plik „%s”." -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "Konsola" - -#: ../panels/midori-console.c:361 -msgid "Copy _All" -msgstr "Skopiuj _wszystko" - -#: ../panels/midori-console.c:362 -msgid "Copy All" -msgstr "Skopiuj wszystko" +#: ../toolbars/midori-transferbar.c:125 +msgid "Transfer completed" +msgstr "Zakończono pobieranie" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Wtyczki" +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "Pobrany plik jest uszkodzony." -#: ../panels/midori-history.c:273 -msgid "Erroneous clock time" +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." msgstr "" +"Suma kontrolna dostarczona w odnośniku pobierania nie jest taka sama jak " +"obliczona. Oznacza to, że prawdopodobnie plik jest niekompletny lub został " +"zmodyfikowany." -#: ../panels/midori-history.c:274 -msgid "The clock time lies in the past. Please check the current date and time." -msgstr "" +#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "Wyczyść wszystko" -#: ../panels/midori-history.c:286 -msgid "A week ago" -msgstr "Tydzień temu" +#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 +msgid "Some files are being downloaded" +msgstr "Trwa pobieranie plików" + +#: ../toolbars/midori-transferbar.c:374 +msgid "_Quit Midori" +msgstr "Za_kończ program" + +#: ../toolbars/midori-transferbar.c:376 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Pobieranie plików zostanie anulowane wraz z zakończeniem programu." -#: ../panels/midori-history.c:288 +#: ../panels/midori-bookmarks.c:114 +msgid "Bookmarks" +msgstr "Zakładki" + +#: ../panels/midori-bookmarks.c:257 #, c-format -msgid "%d day ago" -msgid_plural "%d days ago" -msgstr[0] "%d dzień temu" -msgstr[1] "%d dni temu" -msgstr[2] "%d dni temu" +msgid "Failed to add bookmark item: %s\n" +msgstr "Nie udało się dodać zakładki: %s\n" + +#: ../panels/midori-bookmarks.c:435 +msgid "Edit the selected bookmark" +msgstr "Edytuj wybraną zakładkę" + +#: ../panels/midori-bookmarks.c:443 +msgid "Delete the selected bookmark" +msgstr "Usuń wybraną zakładkę" + +#: ../panels/midori-bookmarks.c:458 +msgid "Add a new folder" +msgstr "Tworzy nowy katalog zakładek" -#: ../panels/midori-history.c:291 +#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 +msgid "Separator" +msgstr "Separator" + +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "Historia" + +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 msgid "Today" msgstr "Dzisiaj" -#: ../panels/midori-history.c:293 +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 msgid "Yesterday" msgstr "Wczoraj" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "%d dzień temu" +msgstr[1] "%d dni temu" +msgstr[2] "%d dni temu" + +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "Tydzień temu" + +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" msgstr "Czy na pewno usunąć wszystkie elementy historii?" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" msgstr "Dodaje zakładkę do zaznaczonego elementu historii" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" msgstr "Usuwa zaznaczony element historii" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "Czyści całą historię" -#: ../panels/midori-history.c:952 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Filtr:" +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Pobieranie plików" -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "Otwórz _katalog pobierania" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" -msgstr "Skopiuj położ_enie odnośnika" +msgstr "Skopiuj położ_enie pliku" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Wymagane uwierzytelnienie" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" msgstr "Uzyskanie dostępu do położenia, wymaga uwierzytelnienia:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" -msgstr "Nazwa użytkownika" +msgstr "Nazwa użytkownika:" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" -msgstr "Hasło" +msgstr "Hasło:" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" -msgstr "_Zapamiętaj hasło" +msgstr "_Pamiętanie hasła" -#: ../katze/katze-throbber.c:882 -#, fuzzy, c-format +#: ../katze/katze-throbber.c:949 +#, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "Sesja nie może być załadowana. %s\n" +msgstr "Nie udało się wczytać nazwanej ikony „%s”" -#: ../katze/katze-throbber.c:895 -#, fuzzy, c-format +#: ../katze/katze-throbber.c:962 +#, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "Sesja nie może być załadowana. %s\n" +msgstr "Nie udało się wczytać standardowej ikony „%s”" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" -msgstr "" +msgstr "Klatki animacji są uszkodzone" -#: ../katze/katze-utils.c:498 -#: ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 #, c-format msgid "Property '%s' is invalid for %s" -msgstr "" +msgstr "Właściwość „%s” jest niepoprawna dla %s" -#: ../katze/katze-utils.c:544 -#: ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Wybierz plik" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "Wybór katalogu" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:604 +msgid "None" +msgstr "Brak" + +#: ../katze/katze-utils.c:719 +msgid "1 hour" +msgstr "Godzina" + +#: ../katze/katze-utils.c:720 +msgid "1 day" +msgstr "Dzień" + +#: ../katze/katze-utils.c:721 +msgid "1 week" +msgstr "Tydzień" + +#: ../katze/katze-utils.c:722 +msgid "1 month" +msgstr "Miesiąc" + +#: ../katze/katze-utils.c:723 +msgid "1 year" +msgstr "Rok" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Preferencje %s" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:467 msgid "Configure Advertisement filters" msgstr "Filtr reklam" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:498 #, 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 "Proszę wpisać w polu adres skonfigurowanej listy filtrów i kliknąć przycisk „Dodaj”, aby umieścić ją na poniższej liście. Więcej list można znaleźć pod adresem %s." - -#: ../extensions/adblock.c:587 -msgid "Configure _Advertisement filters..." -msgstr "Skonfiguruj filtr _reklam..." +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 "" +"Proszę wpisać w polu adres skonfigurowanej listy filtrów i kliknąć przycisk " +"„Dodaj”, aby umieścić ją na poniższej liście. Więcej list można znaleźć pod " +"adresem %s." -#: ../extensions/adblock.c:841 +#: ../extensions/adblock.c:846 msgid "Edit rule" msgstr "Edycja reguły" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:860 msgid "_Rule:" msgstr "_Reguła:" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:914 msgid "Bl_ock image" msgstr "Za_blokuj obraz" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:919 msgid "Bl_ock link" msgstr "Za_blokuj odnośnik" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1620 msgid "Advertisement blocker" msgstr "Filtr reklam" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1621 msgid "Block advertisements according to a filter list" msgstr "Blokuje wyświetlanie treści według określonych filtrów" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "Proszę skopiować %s do katalogu „%s”." +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "Ta strona zawiera skrypt użytkownika. Zainstalować go?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "_Zainstaluj skrypt" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "Ta strona zawiera styl użytkownika. Zainstalować go?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_Zainstaluj styl" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Nie instaluj" -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Skrypty użytkownika" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Style użytkownika" -#: ../extensions/addons.c:1085 -#, fuzzy, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "Ustawienia nie mogą zostać zapisane. %s" +#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Błąd" -#: ../extensions/addons.c:1086 -#: ../extensions/addons.c:1253 +#: ../extensions/addons.c:421 +#, c-format +msgid "Do you want to delete '%s'?" +msgstr "Usunąć „%s”?" + +#: ../extensions/addons.c:427 +msgid "Delete user script" +msgstr "Usuwa skrypt użytkownika" + +#: ../extensions/addons.c:428 +msgid "Delete user style" +msgstr "Usuwa styl użytkownika" + +#: ../extensions/addons.c:431 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "Plik „%s” zostanie usunięty." + +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "Otwiera w edytorze tekstu" + +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "Otwiera katalog docelowy" + +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "Dodaje nowy dodatek" + +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "Usuwa zaznaczony dodatek" + +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" msgstr "Dodatki użytkownika" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" -msgstr "" +msgstr "Nie można obserwować katalogu „%s”: %s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" msgstr "Obsługuje własne skrypty i style" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "Kolorowe karty" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Wyświetla kolorowe nagłówki kart" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Menedżer ciasteczek" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "Usuń wszystko" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +#: ../extensions/cookie-manager/cookie-manager-page.c:105 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." msgstr "Usuwa wszystkie wyświetlone ciasteczka uwzględniając filtr" -#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" -msgstr "Rozwiń wszystko" +msgstr "Rozwija wszystkie gałęzie" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" -msgstr "Zwiń wszystko" +msgstr "Zwija wszystkie gałęzie" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" msgstr "Usunąć wszystkie ciasteczka?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Pytanie" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." -msgstr "Usuniętę zostaną tylko ciasteczka o nazwie domeny pasującej do wyrażenia filtra." +msgstr "" +"Usunięte zostaną tylko ciasteczka o nazwie domeny pasującej do wyrażenia " +"filtra." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 -#, fuzzy +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "Pod koniec sesji" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2469,47 +2499,63 @@ "Bezpieczne: %s\n" "Data wygaśnięcia: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Tak" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "Nie" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" "Cookies: %d" msgstr "" "Domena: %s\n" -"Ilość ciasteczek:: %d" +"Ilość ciasteczek: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Nazwa:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "_Rozwiń wszystko" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "_Zwiń wszystko" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "Wprowadza wyrażenie filtra i wyświetla ciasteczka o nazwie domeny pasującej do niego" - -#: ../extensions/cookie-manager/main.c:40 -msgid "_Cookie Manager" -msgstr "Menedżer _ciasteczek" +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +msgid "Filter:" +msgstr "Filtr:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Wprowadza wyrażenie filtra i wyświetla ciasteczka o nazwie domeny pasującej " +"do niego" -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Umożliwia wyświetlanie i usuwanie ciasteczek" +#: ../extensions/copy-tabs.c:38 +msgid "Copy Tab _Addresses" +msgstr "Skopiuj _adresy kart" + +#: ../extensions/copy-tabs.c:95 +msgid "Copy Addresses of Tabs" +msgstr "Kopiowanie adresów" + +#: ../extensions/copy-tabs.c:96 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Kopiuje do schowka adresy wszystkich kart" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Nie udało się odnaleźć wymaganych elementów „entry” w danych XML." @@ -2519,39 +2565,39 @@ msgstr "Nie udało się odnaleźć wymaganych elementów „feed” w danych XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Ostatnio zaktualizowano: %s." -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" -msgstr "Kanały informacyjne" +msgstr "Kanały wiadomości" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "Dodaje kanał wiadomości" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "Usuwa kanał wiadomości" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "Kanały _wiadomości" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Nie udało się odnaleźć głównego elementu w danych XML." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Nieobsługiwany format kanału wiadomości." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Nie udało się uzyskać dostępu do bazy danych: %s" @@ -2570,299 +2616,903 @@ #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "Nie udało się odnaleźć wymaganych elementów „channel” w danych RSS XML." - -#: ../extensions/feed-panel/main.c:132 -msgid "Error" -msgstr "Błąd" +msgstr "" +"Nie udało się odnaleźć wymaganych elementów „channel” w danych RSS XML." -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "Kanał wiadomości „%s” już istnieje." -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Wystąpił błąd podczas wczytywania kanału wiadomości „%s”." -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "Kanały wiadomości" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Odczytuje wiadomości z kanałów Atom/RSS" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" msgstr "Nie udało się dodać wartości pola do historii: %s\n" -#: ../extensions/formhistory.c:510 +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "Historia formularzy" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Główne hasło wymagane\n" +"do otwarcia bazy haseł" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "Pamiętać hasła na w tej witrynie?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Zapamiętaj" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "Nie tym razem" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Nie zapamiętuj w tej witrynie" + +#: ../extensions/formhistory/formhistory.c:437 +#, fuzzy +msgid "Toggle form history state" +msgstr "Czas przechowywania historii:" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "Przełącza wyświetlanie historii pól formularzy na bieżącej karcie" + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Nie udało się wykonać zapytania bazy danych: %s\n" + +#: ../extensions/formhistory/formhistory.c:629 +#, fuzzy +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" +"Wyświetlanie historii pól formularzy tylko po wciśnięciu skrótu klawiszowego" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "Historia pól formularzy" + +#: ../extensions/formhistory/formhistory.c:669 msgid "Stores history of entered form data" msgstr "Przechowuje historię uzupełnionych pól formularzy" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 #, fuzzy, c-format -msgid "Not available: %s" -msgstr "Nie dostępne: %s" +msgid "Failed to select suggestions\n" +msgstr "Nie udało się wybrać z historii\n" -#: ../extensions/formhistory.c:515 -msgid "Resource files not installed" -msgstr "Nie zainstalowano pliku zasobów" +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Brak nieodwiedzonych kart" -#: ../extensions/formhistory.c:521 -msgid "Form history filler" -msgstr "Historia pól formularzy" +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "Historia kart" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Działanie po zamknięciu karty:" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Brak" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Przełączenie do ostatniej używanej karty" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Przełączenie do najnowszej karty" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Następna otwarta karta" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "" +"Przechodzi do następnej karty znajdującej się na liście ostatnio otwartych " +"kart" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Poprzednia otwarta karta" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "" +"Przechodzi do poprzedniej karty znajdującej się na liście ostatnio otwartych " +"kart" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Wyświetl kartę w tle (Lista historii)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Wyświetl aktualną kartę w tle" + +#: ../extensions/history-list.vala:569 +msgid "History List" +msgstr "Historia kart" + +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "" +"Przełącza do ostatniej używanej karty po przełączeniu lub zamknięciu bieżącej" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Gesty myszy" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Umożliwia kontrolowanie przeglądarki za pomocą gestów myszy" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 -#: ../extensions/page-holder.c:177 -msgid "Pageholder" -msgstr "Schowek stron" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "_Schowek stron" - -#: ../extensions/page-holder.c:178 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "Przechowuje otwarte strony niezależnie od zawartości głównego okna programu" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "Odśwież lub zatrzymaj wczytywanie" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "Skróty klawiszowe" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "Dostosuj skróty _klawiszowe..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Edytor skrótów klawiszowych" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "Umożliwia wyświetlanie i modyfikowanie skrótów klawiszowych" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/status-clock.c:174 +msgid "Statusbar Clock" +msgstr "Zegar paska stanu" + +#: ../extensions/status-clock.c:175 +msgid "Display date and time in the statusbar" +msgstr "Wyświetla datę i czas na pasku stanu" + +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Obrazy" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Skrypty użytkownika" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Wtyczki Netscape" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "Dodatki paska stanu" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" -msgstr "Umożliwia przełączanie wczytywania i wykonywania określonych treści stron" +msgstr "" +"Umożliwia przełączanie wczytywania i wykonywania określonych elementów stron" -#: ../extensions/tab-panel.c:568 -#: ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" -msgstr "Karty panelu bocznego" +msgstr "Panel kart" -#: ../extensions/tab-panel.c:609 -#, fuzzy +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" -msgstr "Pokaż panel" +msgstr "Panel _kart" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Wyświetla karty w panelu bocznym" -#: ../extensions/tab-switcher.c:395 -msgid "Tab History List" -msgstr "Historia kart" - -#: ../extensions/tab-switcher.c:396 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Sortuje listę kart według czasu ostatniego użycia" +#: ../extensions/tabs-minimized.c:76 +msgid "Only Icons on Tabs by default" +msgstr "Ikony kart" + +#: ../extensions/tabs-minimized.c:77 +msgid "New tabs have no label by default" +msgstr "Ukrywa etykiety nowo otwieranych kart" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" -msgstr "Pasek narzędziowy" +msgstr "Modyfikowanie paska narzędziowego" -#: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." msgstr "" "Proszę wybrać elementy, które mają być wyświetlane na pasku narzędziowym.\n" -"Kolejność elementów można zmieniać przeciągając je na odpowiednie pozycje listy." +"Kolejność elementów można zmieniać przeciągając je na odpowiednie pozycje " +"listy." -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Dostępne elementy" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Wyświetlane elementy" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "Dostosuj pasek _narzędziowy..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Dostosuj..." + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" msgstr "Edytor paska narzędziowego" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" msgstr "Umożliwia modyfikację układu paska narzędziowego" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "Przechowuje dane komunikacji HTTP na dysku" -#, fuzzy +#~ msgid "Lightweight web browser" +#~ msgstr "Umożliwia przeglądanie zawartości sieci internetowej" + +#~ msgid "Cookies" +#~ msgstr "Ciasteczka" + +#~ msgid "'Flash' Cookies" +#~ msgstr "Ciasteczka „Flash”" + +#~ msgid "HTML5 _Databases" +#~ msgstr "_Bazy danych HTML5" + +#~ msgid "Offline Application Cache" +#~ msgstr "Pamięć podręczna rozłączonych usług internetowych" + +#~ msgid "Not available: %s" +#~ msgstr "Nie dostępne: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "Nie zainstalowano pliku zasobów" + +#~ msgid "No filename specified" +#~ msgstr "Nie podano pliku" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "" +#~ "Otwiera wystąpienie programu, które nie zapisuje żadnych prywatnych danych" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Tworzy odnośnik do strony na ekranie szybkiego wybierania" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Tworzy odnośnik do strony na pulpicie" + +#~ msgid "Create a launcher" +#~ msgstr "Tworzy na pulpicie aktywator z odnośnikiem do bieżącej strony" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "Subskrybuje kanał wiadomości" + +#~ msgid "Close this window" +#~ msgstr "Zamyka bieżące okno" + +#~ msgid "Close all open windows" +#~ msgstr "Zamyka wszystkie otwarte okna programu" + +#~ msgid "Undo the last modification" +#~ msgstr "Cofa ostatnią czynność" + +#~ msgid "Redo the last modification" +#~ msgstr "Powtarza ostatnią czynność" + +#~ msgid "Cut the selected text" +#~ msgstr "Wycina zaznaczony tekst" + +#~ msgid "Copy the selected text" +#~ msgstr "Kopiuje zaznaczony tekst" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "Wkleja tekst ze schowka" + +#~ msgid "Delete the selected text" +#~ msgstr "Usuwa zaznaczony tekst" + +#~ msgid "Select all text" +#~ msgstr "Zaznacz w_szystko" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Wyszukuje następne wystąpienie słowa lub wyrażenia" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Wyszukuje poprzednie wystąpienie słowa lub wyrażenia" + +#~ msgid "Reset the zoom level" +#~ msgstr "Przywraca zwykły rozmiar strony" + +#~ msgid "View the source code of the page" +#~ msgstr "Wyświetla kod źródłowy strony" + +#~ msgid "Scroll to the left" +#~ msgstr "Przewija zawartość strony w lewo" + +#~ msgid "Scroll down" +#~ msgstr "Przewija zawartość strony w dół" + +#~ msgid "Scroll up" +#~ msgstr "Przewija zawartość strony w górę" + +#~ msgid "Scroll to the right" +#~ msgstr "Przewija zawartość strony w prawo" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "Czyści listę ostatnio zamkniętych kart i okien" + +#~ msgid "Open the last closed tab" +#~ msgstr "Otwiera ostatnio zamkniętą kartę" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Tworzy nowy katalog zakładek" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Zarządza wyszukiwarkami internetowymi" + +#~ msgid "Clear private data..." +#~ msgstr "Usuwa prywatne dane zapisane przez program..." + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "" +#~ "Umożliwia analizowanie szczegółów strony i udostępnia narzędzia " +#~ "programistyczne" + +#~ msgid "Switch to the previous tab" +#~ msgstr "Przechodzi do poprzedniej karty" + +#~ msgid "Switch to the next tab" +#~ msgstr "Przechodzi do następnej karty" + +#~ msgid "Move tab behind the previous tab" +#~ msgstr "Przemieszcza bieżącą kartę przed poprzednią kartę" + +#~ msgid "Move tab in front of the next tab" +#~ msgstr "Przemieszcza bieżącą kartę za następną kartę" + +#~ msgid "Focus the current tab" +#~ msgstr "Uaktywnia bieżącą kartę przeglądarki" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Wyświetla tylko ikonę bieżącej karty" + +#~ msgid "Duplicate the current tab" +#~ msgstr "Powiela bieżącą kartę" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Zamyka wszystkie karty z wyjątkiem bieżącej" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Otwiera karty zapisane podczas ostatniej sesji" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Wyświetla najczęściej zadawane pytania" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Otwiera stronę systemu zgłaszania i monitorowania błędów" + +#~ msgid "Show information about the program" +#~ msgstr "Wyświetla informacje na temat programu" + +#~ msgid "Show menubar" +#~ msgstr "Przełącza widoczność paska menu" + +#~ msgid "Show navigationbar" +#~ msgstr "Przełącza widoczność paska narzędzi nawigacyjnych" + +#~ msgid "Show sidepanel" +#~ msgstr "Przełącza widoczność panelu bocznego" + +#~ msgid "Show bookmarkbar" +#~ msgstr "Przełącza widoczność paska zakładek" + +#~ msgid "Show statusbar" +#~ msgstr "Przełącza widoczność paska stanu" + +#~ msgid "MD5-Checksum:" +#~ msgstr "Suma kontrolna MD5:" + +#~ msgid "SHA1-Checksum:" +#~ msgstr "Suma kontrolna SHA-1:" + +#~ msgid "Set number of columns and rows" +#~ msgstr "Ustaw ilość kolumn i wierszy" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Proszę wprowadzić ilość kolumn i wierszy:" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "Wprowadzono nieprawidłowy rozmiar strony szybkiego wybierania." + +#~ msgid "Thumb size:" +#~ msgstr "Rozmiar miniatur:" + +#~ msgid "Small" +#~ msgstr "Mały" + +#~ msgid "Medium" +#~ msgstr "Średni" + +#~ msgid "Big" +#~ msgstr "Duży" + +#~ msgid "Reset the last _session" +#~ msgstr "Nie przywracaj ostatniej _sesji" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Skonfiguruj filtr _reklam..." + +#~ msgid "Not found - %s" +#~ msgstr "Nie znaleziono - %s" + +#~ msgid "Document cannot be displayed" +#~ msgstr "Nie można wyświetlić dokumentu" + +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "Wymuszenie 96 DPI" + +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "Ustawia rozdzielczość renderowania strony na 96 DPI" + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "" +#~ "Przełącza za pomocą klawiszy Ctrl+Tab pomiędzy kartami\n" +#~ "posortowanymi według czasu ostatniego użycia." + +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "Godzina" + +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "Tydzień" + +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "Miesiąc" + +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "Rok" + +#~ msgid "All cookies" +#~ msgstr "Wszystkie" + +#~ msgid "Session cookies" +#~ msgstr "Bieżącej sesji" + +#~ msgid "Show Transferbar" +#~ msgstr "Pasek pobierania plików" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "Przełącza wyświetlanie paska pobierania plików" + +#~ msgid "Search engines in location completion" +#~ msgstr "Wyszukiwarki na liście paska adresu" + +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "" +#~ "Wyświetla wyszukiwarki na liście automatycznego uzupełniania paska adresu" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "Wyświetlanie przycisków konfiguracyjnych panelu" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "Wyświetla przyciski konfiguracyjne panelu" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Strona szybkiego wybierania" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Wyświetla stronę szybkiego wybierania w pustych kartach" + +#~ msgid "Download Manager" +#~ msgstr "Menedżer pobierania:" + +#~ msgid "An external download manager" +#~ msgstr "Określa zewnętrzny menedżer pobierania" + +#~ msgid "Open external pages in:" +#~ msgstr "Otwieranie stron przez inne programy:" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "Określa sposób otwierania stron przez inne programy" + +#~ msgid "Accept cookies" +#~ msgstr "Akceptowane typy:" + +#~ msgid "What type of cookies to accept" +#~ msgstr "Określa typy akceptowanych ciasteczek" + +#~ msgid "Maximum cookie age" +#~ msgstr "Maksymalny okres przechowywania ciasteczek:" + +#~ msgid "Maximum history age" +#~ msgstr "Maksymalny okres przechowywania historii:" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Przechowywanie informacji o ostatnio pobranych plikach" + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "Określa czy będzie przechowywana lista ostatnio pobranych plików" + +#~ msgid "Appearance" +#~ msgstr "Wygląd" + +#~ msgid "Applications" +#~ msgstr "Programy" + +#~ msgid "Quit the application" +#~ msgstr "Kończy działanie programu" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "Nie udało się wykonać zapytania bazy danych\n" + +#~ msgid "Download with Download _Manager" +#~ msgstr "Pobierz za pomocą _menedżera pobierania" + +#~ msgid "General" +#~ msgstr "Ogólne" + +#~ msgid "Font settings" +#~ msgstr "Czcionki" + +#~ msgid "Interface" +#~ msgstr "Interfejs" + +#~ msgid "Navigationbar" +#~ msgstr "Pasek narzędzi nawigacyjnych" + +#~ msgid "External applications" +#~ msgstr "Zewnętrzne" + +#~ msgid "Web Cookies" +#~ msgstr "Ciasteczka" + +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "Usuwanie ciasteczek podczas _kończenia programu" + +#~ msgid "%s of %s, %s/s" +#~ msgstr "Pobrano %s z %s, %s/s" + +#~ msgid "Next Tab (History List)" +#~ msgstr "Poprzednia odwiedzona karta" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "Następna odwiedzona karta" + +#~ msgid "Previous tab from history" +#~ msgstr "" +#~ "Przechodzi do poprzedniej karty znajdującej się na liście ostatnio " +#~ "odwiedzonych kart" + +#~ msgid "Pageholder" +#~ msgstr "Schowek stron" + +#~ msgid "_Pageholder" +#~ msgstr "_Schowek stron" + +#~ msgid "Keep one or multiple pages open in parallel to your tabs" +#~ msgstr "" +#~ "Przechowuje otwarte strony niezależnie od zawartości głównego okna " +#~ "programu" + +#~ msgid "Show Blank page" +#~ msgstr "Wyświetlanie pustej strony" + +#~ msgid "_Contents" +#~ msgstr "_Spis treści" + +#~ msgid "Show the documentation" +#~ msgstr "Wyświetla pomoc dotyczącą programu" + +#~ msgid "_Save Link destination" +#~ msgstr "_Zapisz obiekt odnośnika" + +#~ msgid "_Download Link destination" +#~ msgstr "_Pobierz obiekt odnośnika" + +#~ msgid "%d%% loaded" +#~ msgstr "wczytano %d%%" + +#~ msgid "_Transferbar" +#~ msgstr "_Pasek pobierania plików" + +#~ msgid "Show transferbar" +#~ msgstr "Przełącza widoczność paska pobierania plików" + +#~ msgid "Show progress in location entry" +#~ msgstr "Pasek postępu wczytywania strony" + +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "Wyświetla pasek postępu wczytywania strony w pasku adresu" + +#~ msgid "Ask for the destination folder" +#~ msgstr "Wybór katalogu pobierania" + +#~ msgid "Whether to ask for the destination folder when downloading a file" +#~ msgstr "" +#~ "Pyta o wskazanie katalogu docelowego każdorazowo przed rozpoczęciem " +#~ "pobierania pliku" + +#~ msgid "Whether to show a notification when a transfer has been completed" +#~ msgstr "Wyświetla powiadomienie gdy pobieranie zostanie zakończone" + +#~ msgid "Download I_mage" +#~ msgstr "_Pobierz obraz" + +#~ msgid "Failed to clear search history: %s\n" +#~ msgstr "Nie udało się wyczyścić historii wyszukiwania: %s\n" + +#~ msgid "Detach chosen panel from the window" +#~ msgstr "Odłącza panel od okna" + +#~ msgid "Hide operating controls" +#~ msgstr "Przełącza widoczność przycisków konfiguracyjnych panelu" + +#~ msgid "Spell Checking" +#~ msgstr "Sprawdzanie pisowni" + +#~ msgid "" +#~ "A comma separated list of languages to be used for spell checking, for " +#~ "example \"en_GB,de_DE\"" +#~ msgstr "" +#~ "Wprowadza listę języków sprawdzania pisowni, rozdzieloną znakami " +#~ "przecinka, np.: „en_GB,pl”" + +#~ msgid "Minimize _Current Tab" +#~ msgstr "_Zminimalizuj kartę" + +#~ msgid "Minimize the current tab" +#~ msgstr "Minimalizuje bieżącą kartę" + +#~ msgid "External Applications" +#~ msgstr "Zewnętrzne programy" + +#~ msgid "Associate URL schemes with external commands" +#~ msgstr "Kojarzy schematy adresów URL z poleceniami" + +#~ msgid "_Recently visited pages" +#~ msgstr "_Ostatnio odwiedzone strony" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Wyświetla listę ostatnio odwiedzonych stron" + +#~ msgid "Remember last visited pages" +#~ msgstr "Przechowywanie adresów ostatnio odwiedzonych stron" + +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "Przechowuje listę ostatnio odwiedzonych stron" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "Automatyczne wykrywanie serwera pośredniczącego" + +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" +#~ msgstr "Przełącza automatyczne wykrywanie serwera pośredniczącego" + +#~ msgid "Set number of shortcuts" +#~ msgstr "Ustaw ilość odnośników" + +#~ msgid "Enter number of shortcuts:" +#~ msgstr "Proszę wprowadzić ilość odnośników:" + +#~ msgid "_Restore Tab" +#~ msgstr "_Przywróć kartę" + +#~ msgid "Spelling dictionaries:" +#~ msgstr "Słowniki:" + +#~ msgid "Console" +#~ msgstr "Konsola" + +#~ msgid "Copy _All" +#~ msgstr "Skopiuj _wszystko" + +#~ msgid "Copy All" +#~ msgstr "Skopiuj wszystko" + +#~ msgid "Copy %s to the folder %s." +#~ msgstr "Proszę skopiować %s do katalogu „%s”." + +#~ msgid "_Cookie Manager" +#~ msgstr "Menedżer _ciasteczek" + #~ msgid "REGEX" #~ msgstr "WYRAŻENIE REGULARNE" + #~ msgid "Open _Link" #~ msgstr "Otwórz _odnośnik" + #~ msgid "Open Image in New Wi_ndow" #~ msgstr "Otwórz obraz w nowym _oknie" -#~ msgid "_Closed Tabs and Windows" -#~ msgstr "_Zamknięte karty i okna" + #~ msgid "View Selection Source" #~ msgstr "Pokaż źródło zaznaczenia" + #~ msgid "View the source code of the selection" #~ msgstr "Pokaż źródło zaznaczenia" -#~ msgid "Last open pages" -#~ msgstr "Ostatnio otwarte strony" + #~ msgid "Both" #~ msgstr "Tekst pod ikonami" + #~ msgid "Both horizontal" #~ msgstr "Tekst obok ikon" + #~ msgid "Load on Startup" #~ msgstr "Pokaż przy uruchomieniu" + #~ msgid "Remember last form inputs" #~ msgstr "Przechowuj dane z formularzy" + #~ msgid "Cache size" #~ msgstr "Pamięć podręczna" + #~ msgid "The allowed size of the cache" #~ msgstr "Rozmiar pamięci podręcznej" -#, fuzzy #~ msgid "Encoding" -#~ msgstr "Preferowane kodowanie znaków" -#~ msgid "MB" -#~ msgstr "MB" +#~ msgstr "Kodowanie znaków" + #~ msgid "User_styles" #~ msgstr "_Style użytkownika" -#, fuzzy #~ msgid "Enable" #~ msgstr "Skrypty użytkownika" -#, fuzzy #~ msgid "_Disable" -#~ msgstr "_Plik" +#~ msgstr "_Wyłącz" -#, fuzzy #~ msgid "Disable" #~ msgstr "_Plik" + #~ msgid "URIs" #~ msgstr "Adresy URI" -#, fuzzy #~ msgid "[URIs]" -#~ msgstr "[URI]" +#~ msgstr "[ADRES URI...]" + #~ msgid "_URL:" #~ msgstr "_URL:" + #~ msgid "Root" #~ msgstr "Korzeń" + #~ msgid "_Quick Find" #~ msgstr "Szybkie wyszukiwanie" + #~ msgid "HTTP Proxy" #~ msgstr "Serwer proxy HTTP" + #~ msgid "Open URL in New _Tab" #~ msgstr "Otwórz URL w nowej karcie" -#, fuzzy #~ msgid "Source" #~ msgstr "Ź_ródło strony" + #~ msgid "_Icon (name or file):" #~ msgstr "_Ikona (nazwa albo plik):" + #~ msgid "Manage search engines" #~ msgstr "_Zarządzaj wyszukiwarkami" + #~ msgid "Warning: You are using a superuser account!" #~ msgstr "Uwaga: Używasz konta administratora!" + #~ msgid "Bookmark" #~ msgstr "Zakładka" + #~ msgid "_Form Fill" #~ msgstr "Wypełnij _formularz" + #~ msgid "_Fullscreen" #~ msgstr "Tryb _pełnoekranowy" + #~ msgid "_Leave Fullscreen" #~ msgstr "_Opuść tryb pełnoekranowy" + #~ msgid "midori" #~ msgstr "midori" + #~ msgid "Unknown argument." #~ msgstr "Nieznany argument" + #~ msgid "Settings" #~ msgstr "Ustawienia" + #~ msgid "Trash" #~ msgstr "Kosz" + #~ msgid "Browser" #~ msgstr "Przeglądarka" + #~ msgid "The current browser" #~ msgstr "Obecna przeglądarka" + #~ msgid "The list of search engines" #~ msgstr "Lista wyszukiwarek" + #~ msgid "The navigationbar" #~ msgstr "Pasek narzędzi nawigacyjnych" + #~ msgid "Tab" #~ msgstr "Karta" + #~ msgid "The current tab" #~ msgstr "Bieżącą karta" -#~ msgid "Statusbar" -#~ msgstr "Pasek stanu" + #~ msgid "The statusbar" #~ msgstr "Pasek stanu" -#~ msgid "The text that is displayed in the statusbar" -#~ msgstr "Tekst wyświetlany na pasku stanu" + #~ msgid "Pa_ge Setup" #~ msgstr "_Ustawienia strony" + #~ msgid "Show a preview of the printed page" #~ msgstr "Pokaż podgląd drukowanej strony" -#~ msgid "_Manage Bookmarks" -#~ msgstr "_Modyfikuj zakładki" + #~ msgid "Open the selected bookmark in a new tab" #~ msgstr "Otwórz wybraną zakładkę w nowej karcie" + #~ msgid "Open the selected bookmark in a new window" #~ msgstr "Otwórz wybraną zakładkę w nowym oknie" + #~ msgid "Tab _Overview" #~ msgstr "P_odgląd kart" + #~ msgid "_Work Offline" #~ msgstr "Pracuj bez podłączenia" + #~ msgid "Untitled" #~ msgstr "Bez tytułu" + #~ msgid "Limit" #~ msgstr "Ograniczenie" + #~ msgid "Show New Tab" #~ msgstr "Pokazuj przycisk \"Nowa karta\"" + #~ msgid "Show the New Tab button in the toolbar" #~ msgstr "Pokaż przycisk nowej karty na pasku narzędzi" + #~ msgid "Show the Homepage button in the toolbar" #~ msgstr "Pokaż przycisk strony startowej na pasku narzędzi" + #~ msgid "Show Web search" #~ msgstr "Pokazuj wyszukiwarki internetowe" + #~ msgid "Show a notification window for finished downloads" #~ msgstr "Pokazuj powiadomienie dla zakończonych pobierań" - diff -Nru midori-0.2.8/po/pt.po midori-0.4.6/po/pt.po --- midori-0.2.8/po/pt.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/pt.po 2012-05-14 22:13:42.000000000 +0000 @@ -1,1128 +1,1163 @@ # Portuguese translations for midori package. # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. -# Sérgio Marques 2008-2009 +# Sérgio Marques 2008-2010 # msgid "" msgstr "" -"Project-Id-Version: Midori 0.2.2\n" +"Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 22:08+0000\n" +"POT-Creation-Date: 2012-04-22 08:33+0000\n" "PO-Revision-Date: \n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: PORTUGAL\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Navegador Web rápido" +msgid "Browse the Web" +msgstr "Navegar na web" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 -#: ../midori/main.c:1665 ../midori/main.c:1681 -#: ../midori/midori-websettings.c:312 +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "Internet;WWW;Explorador" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072 +#: ../midori/main.c:2086 ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Navegador Web" -#: ../midori/main.c:99 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Midori (Navegação privada)" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Abrir nova janela de navegação privada" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164 +msgid "Private Browsing" +msgstr "Navegação privada" + +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "A configuração não foi carregada: %s\n" -#: ../midori/main.c:148 +#: ../midori/main.c:150 #, 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:155 ../midori/main.c:241 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" -msgstr "Valor de configuração '%s' inválido " +msgstr "O valor de configuração \"%s\" é inválido " + +#: ../midori/main.c:380 +#, 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:368 ../midori/main.c:472 ../extensions/formhistory.c:440 +#: ../midori/main.c:434 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Falha ao apagar o histórico: %s\n" + +#: ../midori/main.c:454 ../midori/main.c:581 +#: ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" msgstr "Falha ao abrir a base de dados: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:424 +#: ../midori/main.c:524 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "Falha ao remover histórico antigo: %s\n" +msgstr "Falha ao remover histórico mais antigo: %s\n" -#: ../midori/main.c:455 ../panels/midori-history.c:169 -#: ../panels/midori-history.c:199 +#: ../midori/main.c:564 ../panels/midori-history.c:232 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Falha ao remover histórico: %s\n" -#: ../midori/main.c:500 +#: ../midori/main.c:611 #, c-format msgid "The bookmarks couldn't be saved. %s" -msgstr "Os marcadores não foram guardados. %s" +msgstr "Os marcadores não foram gravados. %s" -#: ../midori/main.c:528 +#: ../midori/main.c:633 #, c-format msgid "The configuration couldn't be saved. %s" -msgstr "A configuração não foi guardada. %s" +msgstr "A configuração não foi gravada. %s" -#: ../midori/main.c:566 +#: ../midori/main.c:668 #, c-format msgid "The search engines couldn't be saved. %s" -msgstr "Os motores de pesquisa não foram guardados. %s" +msgstr "Os motores de pesquisa não foram gravados. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:586 ../midori/main.c:609 +#: ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" -msgstr "O lixo não foi guardado. %s" +msgstr "O lixo não foi gravado. %s" -#: ../midori/main.c:668 ../midori/main.c:908 +#: ../midori/main.c:746 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Extensões" + +#: ../midori/main.c:760 +msgid "Privacy" +msgstr "Privacidade" + +#: ../midori/main.c:772 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"Os \"cookies\" guardam dados ou perfis de utilizador para publicitar " +"produtos." + +#: ../midori/main.c:828 #, c-format msgid "The session couldn't be saved. %s" -msgstr "A sessão não foi guardada. %s" +msgstr "A sessão não foi gravada. %s" -#: ../midori/main.c:852 -msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "Nenhum certificado root disponível. Os certificados SSL não podem ser verificados." +#: ../midori/main.c:1046 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" +"Nenhum certificado disponível. Os certificados SSL não podem ser verificados." -#: ../midori/main.c:942 -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:1115 +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 inesperadamente na última vez que foi aberto. Se isto " +"ocorrer novamente, tente uma das seguintes opções para resolver o problema." -#: ../midori/main.c:957 +#: ../midori/main.c:1134 msgid "Modify _preferences" msgstr "Modificar _preferências" -#: ../midori/main.c:961 -msgid "Reset the last _session" -msgstr "Restaurar última _sessão" - -#: ../midori/main.c:966 +#: ../midori/main.c:1138 msgid "Disable all _extensions" -msgstr "Desactivar todas as _extensões" +msgstr "Desativar todas as _extensões" + +#: ../midori/main.c:1151 +msgid "Discard old tabs" +msgstr "Rejeitar separadores antigos" + +#: ../midori/main.c:1152 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "Mostrar últimos separadores sem os carregar" + +#: ../midori/main.c:1153 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "Mostrar últimos separadores abertos" -#: ../midori/main.c:1206 ../midori/main.c:1952 +#: ../midori/main.c:1400 ../midori/main.c:2464 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "A sessão não foi carregada: %s\n" -#: ../midori/main.c:1328 -msgid "No filename specified" -msgstr "Nenhum nome especificado" - -#: ../midori/main.c:1347 -msgid "An unknown error occured." -msgstr "Ocorreu um erro desconhecido." - -#: ../midori/main.c:1378 +#: ../midori/main.c:1538 #, c-format msgid "Snapshot saved to: %s\n" -msgstr "Captura guardada em: %s\n" +msgstr "Captura gravada em: %s\n" -#: ../midori/main.c:1550 +#: ../midori/main.c:1951 msgid "Run ADDRESS as a web application" msgstr "Executar ENDEREÇO como aplicação web" -#: ../midori/main.c:1550 +#: ../midori/main.c:1951 msgid "ADDRESS" msgstr "ENDEREÇO" -#: ../midori/main.c:1553 +#: ../midori/main.c:1954 msgid "Use FOLDER as configuration folder" msgstr "Usar PASTA como pasta de configuração" -#: ../midori/main.c:1553 +#: ../midori/main.c:1954 msgid "FOLDER" msgstr "PASTA" -#: ../midori/main.c:1556 +#: ../midori/main.c:1957 +msgid "Private browsing, no changes are saved" +msgstr "Navegação privada, as alterações não são gravadas" + +#: ../midori/main.c:1959 msgid "Show a diagnostic dialog" -msgstr "Mostrar diálogo de diagnóstico" +msgstr "Mostrar janela de diagnóstico" -#: ../midori/main.c:1558 +#: ../midori/main.c:1961 msgid "Run the specified filename as javascript" -msgstr "Executar o ficheiro especificado como 'javascripts '" +msgstr "Executar o ficheiro como \"javascript\"" -#: ../midori/main.c:1561 +#: ../midori/main.c:1963 msgid "Take a snapshot of the specified URI" -msgstr "Tirar uma captura da URI especificada" +msgstr "Obter uma captura da URI especificada" -#: ../midori/main.c:1564 +#: ../midori/main.c:1965 msgid "Execute the specified command" -msgstr "Executar o comando especificado" +msgstr "Executar o comando especificado" -#: ../midori/main.c:1566 +#: ../midori/main.c:1967 +msgid "List available commands to execute with -e/ --execute" +msgstr "Lista dos comandos disponíveis para executar com -e/ --execute" + +#: ../midori/main.c:1969 msgid "Display program version" -msgstr "Apresentar versão do programa" +msgstr "Exibir versão do programa" -#: ../midori/main.c:1568 +#: ../midori/main.c:1971 msgid "Addresses" msgstr "Endereços " -#: ../midori/main.c:1570 +#: ../midori/main.c:1973 msgid "Block URIs according to regular expression PATTERN" -msgstr "Bloquear URIs conforme a expressão PATTERN" +msgstr "Bloquear URIs conforme a expressão PADRÃO" -#: ../midori/main.c:1570 +#: ../midori/main.c:1973 msgid "PATTERN" -msgstr "PATTERN" +msgstr "PADRÃO" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1574 +#: ../midori/main.c:1977 msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "Repor Midori após SEGUNDOS segundos de inactividade" +msgstr "Repor Midori após SEGUNDOS segundos de inatividade" -#: ../midori/main.c:1574 +#: ../midori/main.c:1977 msgid "SECONDS" msgstr "SEGUNDOS" -#: ../midori/main.c:1654 +#: ../midori/main.c:1980 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Avisos de reencaminhamento para o NOMEDEFICHEIRO especificado" + +#: ../midori/main.c:1980 +msgid "FILENAME" +msgstr "NOMEDEFICHEIRO" + +#: ../midori/main.c:2045 msgid "[Addresses]" msgstr "[Endereços]" -#: ../midori/main.c:1682 +#: ../midori/main.c:2087 msgid "Please report comments, suggestions and bugs to:" -msgstr "Por favor reporte comentários, sugestões e erros para:" +msgstr "Por favor reporte comentários, sugestões e erros em:" -#: ../midori/main.c:1684 +#: ../midori/main.c:2089 msgid "Check for new versions at:" msgstr "Verificar por novas versões a:" -#: ../midori/main.c:1801 -msgid "The specified configuration folder is invalid." -msgstr "A pasta de configuração especificada é inválida." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2173 +msgid "Saved logins and _passwords" +msgstr "Autenticações e sen_has gravadas" + +#: ../midori/main.c:2175 +msgid "Cookies and Website data" +msgstr "Cookies e dados da página web" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2179 ../midori/midori-websettings.c:996 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "\"Web cache\"" -#: ../midori/main.c:1849 -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:2182 +msgid "Website icons" +msgstr "Ícones de sítios web" -#: ../midori/main.c:1904 -#, 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:2288 +msgid "An unknown error occured" +msgstr "Ocorreu um erro desconhecido" + +#: ../midori/main.c:2395 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Já está ativa uma instância de Midori mas que não está a responder.\n" -#: ../midori/main.c:1925 +#: ../midori/main.c:2431 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Os marcadores não foram carregados: %s\n" -#: ../midori/main.c:1967 +#: ../midori/main.c:2479 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "O lixo não foi carregado: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:2492 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "O histórico não foi carregado: %s\n" -#: ../midori/main.c:1994 +#: ../midori/main.c:2508 msgid "The following errors occured:" msgstr "Ocorreram os seguintes erros:" -#: ../midori/main.c:2010 +#: ../midori/main.c:2524 msgid "_Ignore" msgstr "_Ignorar " -#: ../midori/midori-array.c:429 +#: ../midori/midori-app.c:1334 +msgid "_Bookmark" +msgstr "_Marcador" + +#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060 +msgid "_Bookmarks" +msgstr "_Marcadores" + +#: ../midori/midori-app.c:1336 +msgid "Add Boo_kmark" +msgstr "Adicionar mar_cador" + +#: ../midori/midori-app.c:1337 +msgid "_Console" +msgstr "_Consola" + +#: ../midori/midori-app.c:1338 +msgid "_Extensions" +msgstr "_Extensões" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589 +msgid "_History" +msgstr "_Histórico" + +#: ../midori/midori-app.c:1340 +msgid "_Homepage" +msgstr "_Página inicial" + +#: ../midori/midori-app.c:1341 +msgid "_Userscripts" +msgstr "\"Scripts\" de _utilizador" + +#: ../midori/midori-app.c:1342 +msgid "New _Tab" +msgstr "No_vo separador" + +#: ../midori/midori-app.c:1343 +msgid "_Transfers" +msgstr "_Transferências" + +#: ../midori/midori-app.c:1344 +msgid "Netscape p_lugins" +msgstr "\"P_lug-ins\" Netscape" + +#: ../midori/midori-app.c:1345 +msgid "_Closed Tabs" +msgstr "Separadores _fechados" + +#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216 +msgid "New _Window" +msgstr "_Nova janela" + +#: ../midori/midori-app.c:1347 +msgid "New _Folder" +msgstr "Nova _pasta" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "Ficheiro não encontrado." -#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 -#: ../midori/midori-array.c:496 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Documento inválido." -#: ../midori/midori-array.c:505 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "Formato de marcadores não reconhecido." -#: ../midori/midori-array.c:719 +#: ../midori/midori-array.c:915 msgid "Writing failed." -msgstr "Falhou escrita." +msgstr "Falha ao escrever." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 -#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298 +#: ../midori/midori-browser.c:5307 msgid "Reload the current page" -msgstr "Recarregar página actual" +msgstr "Recarregar página atual" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 +#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304 msgid "Stop loading the current page" -msgstr "Parar o carregamento da página actual" +msgstr "Parar de carregar da página atual" -#: ../midori/midori-browser.c:453 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% carregado" - -#: ../midori/midori-browser.c:491 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" -msgstr "Falha ao actualizar título: %s\n" +msgstr "Falha ao atualizar título: %s\n" -#: ../midori/midori-browser.c:504 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." -msgstr "Acção inesperada '%s'." +msgstr "Ação inesperada \"%s\"." + +#: ../midori/midori-browser.c:569 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Navegação privada)" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716 +msgid "Toplevel folder" +msgstr "Pasta superior" + +#: ../midori/midori-browser.c:774 msgid "New folder" msgstr "Nova pasta" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:774 msgid "Edit folder" msgstr "Editar pasta" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "New bookmark" msgstr "Novo marcador" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:818 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "_Descrição:" - -#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Endereço:" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326 msgid "_Folder:" msgstr "_Pasta:" -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 -#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 -msgid "Toplevel folder" -msgstr "Pasta Superior" - -#: ../midori/midori-browser.c:872 +#: ../midori/midori-browser.c:877 msgid "Add to _Speed Dial" -msgstr "Adicionar a _Ligação Rápida" +msgstr "Adicionar à _ligação rápida" -#: ../midori/midori-browser.c:885 +#: ../midori/midori-browser.c:890 msgid "Show in the tool_bar" msgstr "Mostrar na _barra de ferramentas" -#: ../midori/midori-browser.c:900 +#: ../midori/midori-browser.c:905 msgid "Run as _web application" msgstr "Executar como aplicação _web" -#: ../midori/midori-browser.c:979 +#: ../midori/midori-browser.c:976 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "O ficheiro \"%s\" não pode ser gravado nesta pasta." + +#: ../midori/midori-browser.c:978 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Não tem permissão para escrever nesta localização." + +#: ../midori/midori-browser.c:985 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Não possui espaço suficiente para transferir \"%s\"." -#: ../midori/midori-browser.c:983 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." -msgstr "O ficheiro precisa de %s e apenas está livre %s." +msgstr "Precisa de %s e apenas tem livre %s." -#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 -#: ../midori/midori-browser.c:4085 +#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395 msgid "Save file as" -msgstr "Guardar como" +msgstr "Gravar como" + +#: ../midori/midori-browser.c:1320 +msgid "New Window" +msgstr "Nova janela" + +#: ../midori/midori-browser.c:1320 +msgid "A new window has been opened" +msgstr "Foi aberta uma nova janela" -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1323 +msgid "New Tab" +msgstr "Novo separador" + +#: ../midori/midori-browser.c:1323 +msgid "A new tab has been opened" +msgstr "Foi aberto um novo separador" + +#: ../midori/midori-browser.c:1358 +msgid "Error opening the image!" +msgstr "Ocorreu um erro ao abrir a imagem!" + +#: ../midori/midori-browser.c:1359 +msgid "Can not open selected image in a default viewer." +msgstr "Não é possível abrir a imagem no visualizador de imagens." + +#: ../midori/midori-browser.c:1365 +msgid "Error downloading the image!" +msgstr "Ocorreu um erro ao transferir a imagem!" + +#: ../midori/midori-browser.c:1366 +msgid "Can not download selected image." +msgstr "não é possível transferir a imagem." + +#: ../midori/midori-browser.c:1492 msgid "Save file" -msgstr "Guardar ficheiro" +msgstr "Gravar ficheiro" -#: ../midori/midori-browser.c:2150 +#: ../midori/midori-browser.c:2367 msgid "Open file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:2228 +#: ../midori/midori-browser.c:2499 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." msgstr "" -"Para abrir a URI acima, abra um agregador de notícias. Normalmente, existe um menu ou botão para \"Nova Subscrição\", \"Nova Fonte de Notícias\" ou outro similar.\n" -"Alternativamente pode ir a Preferências->Aplicações e escolher o Agregador de Notícias. Da próxima vez que clicar no ícone de fontes, esta será automaticamente adicionada." +"Para abrir a URI, abra um agregador de notícias. Normalmente, existe um menu " +"ou botão para \"Nova subscrição\", \"Nova fonte de notícias\" ou similar.\n" +"Pode também ir a Preferências->Aplicações e escolher o agregador de " +"notícias. Da próxima vez que clicar no ícone de fontes, esta será " +"automaticamente adicionada." -#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nova fonte" -#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 -#: ../panels/midori-bookmarks.c:406 +#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "Adicionar novo marcador" -#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "Não é possível executar o programa externo." +#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "Vazio" -#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:3467 +msgid "Toggle text cursor navigation" +msgstr "Alternar navegação de cursor de texto" + +#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Falha ao inserir novo item no histórico: %s\n" -#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:734 +#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 msgid "Open all in _Tabs" -msgstr "Abrir todos em _Separadores" +msgstr "Abrir todos em _separadores" -#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 -#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" -msgstr "Abrir em Novo _Separador" +msgstr "Abrir em novo _separador" -#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 -#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657 +#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" -msgstr "Abrir em Nova _Janela" +msgstr "Abrir em nova _janela" -#: ../midori/midori-browser.c:3931 +#: ../midori/midori-browser.c:4213 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3932 +#: ../midori/midori-browser.c:4214 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:4215 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:4216 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3935 +#: ../midori/midori-browser.c:4217 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3959 +#: ../midori/midori-browser.c:4218 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4239 msgid "Import bookmarks..." msgstr "Importar marcadores..." -#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372 msgid "_Import bookmarks" msgstr "_Importar marcadores" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:4253 msgid "_Application:" msgstr "_Aplicação:" -#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 -#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 -#: ../katze/katze-utils.c:696 -msgid "Custom..." -msgstr "Personalizado..." +#: ../midori/midori-browser.c:4318 +msgid "Import from XBEL or HTML file" +msgstr "Importar de XBEL ou HTML" + +#: ../midori/midori-browser.c:4353 +msgid "Import from a file" +msgstr "Importar de um ficheiro" -#: ../midori/midori-browser.c:4061 +#: ../midori/midori-browser.c:4365 msgid "Failed to import bookmarks" msgstr "Falha ao importar marcadores" -#: ../midori/midori-browser.c:4102 +#: ../midori/midori-browser.c:4400 +msgid "XBEL Bookmarks" +msgstr "Marcadores XBEL" + +#: ../midori/midori-browser.c:4405 +msgid "Netscape Bookmarks" +msgstr "Marcadores Netscape" + +#: ../midori/midori-browser.c:4419 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "O Midori só consegue exportar para XBEL (*.xbel) e Netscape (*.html)" + +#: ../midori/midori-browser.c:4434 msgid "Failed to export bookmarks" msgstr "Falha ao exportar marcadores" -#: ../midori/midori-browser.c:4155 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "Falha ao apagar o histórico: %s\n" - -#: ../midori/midori-browser.c:4163 -#, c-format -msgid "Failed to clear search history: %s\n" -msgstr "Falha ao apagar o histórico de pesquisas: %s\n" - #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4270 +#: ../midori/midori-browser.c:4556 msgid "Clear Private Data" -msgstr "Limpar Dados Privados" +msgstr "Limpar dados privados" -#: ../midori/midori-browser.c:4274 +#: ../midori/midori-browser.c:4560 msgid "_Clear private data" msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:4288 +#: ../midori/midori-browser.c:4573 msgid "Clear the following data:" msgstr "Limpar os seguintes dados:" -#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:114 -msgid "History" -msgstr "Histórico" - -#: ../midori/midori-browser.c:4303 -msgid "Cookies" -msgstr "Cookies" - -#: ../midori/midori-browser.c:4308 -msgid "'Flash' Cookies" -msgstr "Cookies 'Flash'" - -#: ../midori/midori-browser.c:4313 -msgid "Website icons" -msgstr "Ícones de sítios Web" - -#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 -msgid "_Closed Tabs" -msgstr "Separadores _Fechados" - -#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "Cache Web" +#: ../midori/midori-browser.c:4583 +msgid "Last open _tabs" +msgstr "Úl_timos separadores abertos" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4609 msgid "Clear private data when _quitting Midori" msgstr "Limpar dados privados ao _sair do Midori" -#: ../midori/midori-browser.c:4472 +#: ../midori/midori-browser.c:4804 msgid "A lightweight web browser." msgstr "Um navegador web rápido." -#: ../midori/midori-browser.c:4474 -msgid "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." -msgstr "Esta biblioteca é software livre; pode redistribuí-lo e/ou modificá-lo nos termos da GNU Lesser General Public License conforme publicada pela Free Software Foundation; tanto na versão 2.1 ou qualquer versão mais recente (por opção)." +#: ../midori/midori-browser.c:4805 +msgid "See about:version for version info." +msgstr "Veja about:version para informações da versão." + +#: ../midori/midori-browser.c:4807 +msgid "" +"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." +msgstr "" +"Este biblioteca é um programa livre; pode redistribuí-lo e/ou modificá-la " +"nos termos da GNU Lesser General Public License conforme publicada pela Free " +"Software Foundation; tanto na versão 2.1 ou qualquer versão mais recente " +"(por opção)." -#: ../midori/midori-browser.c:4493 +#: ../midori/midori-browser.c:4828 msgid "translator-credits" msgstr "Sérgio Marques " -#: ../midori/midori-browser.c:4802 +#: ../midori/midori-browser.c:5214 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 -msgid "New _Window" -msgstr "Nova _Janela" - -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:5217 msgid "Open a new window" msgstr "Abrir nova janela" -#: ../midori/midori-browser.c:4808 +#: ../midori/midori-browser.c:5220 msgid "Open a new tab" msgstr "Abrir novo separador" -#: ../midori/midori-browser.c:4810 -msgid "P_rivate Browsing" -msgstr "Navegação P_rivada" - -#: ../midori/midori-browser.c:4811 -msgid "Don't save any private data while browsing" -msgstr "Não guardar quaisquer dados privados ao navegar" +#: ../midori/midori-browser.c:5222 +msgid "New P_rivate Browsing Window" +msgstr "Nova janela de navegação p_rivada" -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:5226 msgid "Open a file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:5228 +msgid "_Save Page As..." +msgstr "_Gravar página como" + +#: ../midori/midori-browser.c:5229 msgid "Save to a file" -msgstr "Guardar para ficheiro" +msgstr "Gravar para ficheiro" -#: ../midori/midori-browser.c:4820 +#: ../midori/midori-browser.c:5231 msgid "Add to Speed _dial" -msgstr "Adicionar a ligação rápi_da" - -#: ../midori/midori-browser.c:4821 -msgid "Add shortcut to speed dial" -msgstr "Adicionar atalho à ligação rápida" +msgstr "Adicionar à ligação rápi_da" -#: ../midori/midori-browser.c:4823 +#: ../midori/midori-browser.c:5235 msgid "Add Shortcut to the _desktop" -msgstr "A_dicionar Atalho ao ambiente de trabalho" +msgstr "A_dicionar atalho ao ambiente de trabalho" -#: ../midori/midori-browser.c:4824 -msgid "Add shortcut to the desktop" -msgstr "Adicionar atalho ao ambiente de trabalho" +#: ../midori/midori-browser.c:5237 +msgid "Create _Launcher" +msgstr "Criar lança_dor" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:5241 msgid "Subscribe to News _feed" -msgstr "Subscrever _fonte de Notícias" +msgstr "Subscrever _fonte de notícias" -#: ../midori/midori-browser.c:4827 -msgid "Subscribe to this news feed" -msgstr "Subscrever a esta fonte de notícias" - -#: ../midori/midori-browser.c:4832 +#: ../midori/midori-browser.c:5247 msgid "_Close Tab" -msgstr "_Fechar Separador" +msgstr "_Fechar separador" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:5248 msgid "Close the current tab" -msgstr "Fechar separador actual" +msgstr "Fechar o separador atual" -#: ../midori/midori-browser.c:4835 +#: ../midori/midori-browser.c:5250 msgid "C_lose Window" -msgstr "Fechar Jane_la" - -#: ../midori/midori-browser.c:4836 -msgid "Close this window" -msgstr "Fechar esta janela" +msgstr "Fec_har janela" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:5254 msgid "Print the current page" -msgstr "Imprimir página actual" +msgstr "Imprimir a página atual" -#: ../midori/midori-browser.c:4842 -msgid "Quit the application" -msgstr "Sair da aplicação" +#: ../midori/midori-browser.c:5256 +msgid "Close a_ll Windows" +msgstr "Fechar todas as jane_las" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:5259 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:4848 -msgid "Undo the last modification" -msgstr "Desfazer a última modificação" - -#: ../midori/midori-browser.c:4851 -msgid "Redo the last modification" -msgstr "Refazer a última modificação" - -#: ../midori/midori-browser.c:4855 -msgid "Cut the selected text" -msgstr "Cortar o texto seleccionado" - -#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 -msgid "Copy the selected text" -msgstr "Copiar o texto seleccionado" - -#: ../midori/midori-browser.c:4864 -msgid "Paste text from the clipboard" -msgstr "Colar texto da área de transferência" - -#: ../midori/midori-browser.c:4867 -msgid "Delete the selected text" -msgstr "Apagar o texto seleccionado" - -#: ../midori/midori-browser.c:4870 -msgid "Select all text" -msgstr "Seleccionar tudo" +#: ../midori/midori-browser.c:5282 +msgid "_Find..." +msgstr "_Localizar..." -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:5283 msgid "Find a word or phrase in the page" msgstr "Localizar palavra ou frase na página" -#: ../midori/midori-browser.c:4875 +#: ../midori/midori-browser.c:5285 msgid "Find _Next" -msgstr "_Localizar Seguinte" +msgstr "Localizar seg_uinte" -#: ../midori/midori-browser.c:4876 -msgid "Find the next occurrence of a word or phrase" -msgstr "Localizar ocorrência seguinte da palavra ou frase" - -#: ../midori/midori-browser.c:4878 +#: ../midori/midori-browser.c:5288 msgid "Find _Previous" -msgstr "Localizar _Anterior" - -#: ../midori/midori-browser.c:4879 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Localizar a ocorrência anterior da palavra ou frase" +msgstr "Localizar _anterior" -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:5292 msgid "Configure the application preferences" msgstr "Configurar preferências da aplicação" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:5294 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:4886 +#: ../midori/midori-browser.c:5295 msgid "_Toolbars" -msgstr "_Barra de Ferramentas" +msgstr "_Barra de ferramentas" + +#: ../midori/midori-browser.c:5300 +msgid "Reload page without caching" +msgstr "Recarregar página sem colocar em cache" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:5310 msgid "Increase the zoom level" -msgstr "Aumentar Zoom" +msgstr "Aumentar a ampliação" -#: ../midori/midori-browser.c:4901 +#: ../midori/midori-browser.c:5313 msgid "Decrease the zoom level" -msgstr "Diminuir Zoom" +msgstr "Diminuir a ampliação" -#: ../midori/midori-browser.c:4904 -msgid "Reset the zoom level" -msgstr "Repor Zoom" - -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:5317 msgid "_Encoding" msgstr "_Codificação" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:5319 msgid "View So_urce" -msgstr "Ver Fo_nte" +msgstr "Ver código f_onte" -#: ../midori/midori-browser.c:4908 -msgid "View the source code of the page" -msgstr "Ver código fonte da página" +#: ../midori/midori-browser.c:5322 +msgid "Ca_ret Browsing" +msgstr "Navegação ca_ret" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:5326 msgid "Toggle fullscreen view" msgstr "Alternar para ecrã completo" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:5328 msgid "Scroll _Left" -msgstr "Deslocar à _Esquerda" - -#: ../midori/midori-browser.c:4915 -msgid "Scroll to the left" -msgstr "Deslocar à esquerda" +msgstr "Deslocar à _esquerda" -#: ../midori/midori-browser.c:4917 +#: ../midori/midori-browser.c:5331 msgid "Scroll _Down" -msgstr "Deslocar para _Baixo" +msgstr "Deslocar para _baixo" -#: ../midori/midori-browser.c:4918 -msgid "Scroll down" -msgstr "Deslocar para baixo" - -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:5334 msgid "Scroll _Up" -msgstr "Deslocar para _Cima" - -#: ../midori/midori-browser.c:4921 -msgid "Scroll up" -msgstr "Deslocar para cima" +msgstr "Deslocar para _cima" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:5337 msgid "Scroll _Right" -msgstr "Deslocar à _Direita" +msgstr "Deslocar à _direita" -#: ../midori/midori-browser.c:4924 -msgid "Scroll to the right" -msgstr "Deslocar à direita" - -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:5340 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:5343 msgid "Go back to the previous page" -msgstr "Ir para página anterior" +msgstr "Ir para a página anterior" -#: ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:5346 msgid "Go forward to the next page" -msgstr "Ir para página seguinte" +msgstr "Ir para a página seguinte" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4937 +#: ../midori/midori-browser.c:5350 msgid "Go to the previous sub-page" -msgstr "Ir para sub-página anterior" +msgstr "Ir para a sub-página anterior" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:5354 msgid "Go to the next sub-page" -msgstr "Ir para sub-página seguinte" +msgstr "Ir para a sub-página seguinte" -#: ../midori/midori-browser.c:4944 +#: ../midori/midori-browser.c:5357 msgid "Go to your homepage" -msgstr "Ir para página inicial" +msgstr "Ir para a página inicial" -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:5359 msgid "Empty Trash" -msgstr "Esvaziar Lixo" - -#: ../midori/midori-browser.c:4947 -msgid "Delete the contents of the trash" -msgstr "Apagar conteúdos do lixo" +msgstr "Esvaziar lixo" -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:5362 msgid "Undo _Close Tab" -msgstr "Desfazer _Fecho de Separadores" - -#: ../midori/midori-browser.c:4950 -msgid "Open the last closed tab" -msgstr "Abrir último separador fechado" +msgstr "Anular _fecho de separadores" -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:5369 msgid "Add a new _folder" msgstr "Adicionar _nova pasta" -#: ../midori/midori-browser.c:4957 -msgid "Add a new bookmark folder" -msgstr "Adicionar nova pasta de marcadores" - -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:5375 msgid "_Export bookmarks" msgstr "_Exportar marcadores" -#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" -msgstr "Gerir Motores de _Pesquisa" - -#: ../midori/midori-browser.c:4966 -msgid "Add, edit and remove search engines..." -msgstr "Adicionar, editar e remover motores de pesquisa..." +msgstr "_Gerir motores de pesquisa" -#: ../midori/midori-browser.c:4969 +#: ../midori/midori-browser.c:5381 msgid "_Clear Private Data" -msgstr "_Limpar Dados Privados" - -#: ../midori/midori-browser.c:4970 -msgid "Clear private data..." -msgstr "Limpar dados privados..." +msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:5384 msgid "_Inspect Page" -msgstr "Inspeccionar Página" +msgstr "_Inspecionar página" -#: ../midori/midori-browser.c:4975 -msgid "Inspect page details and access developer tools..." -msgstr "Inspeccionar página e aceder às ferramentas de desenvolvimento..." - -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:5388 msgid "_Previous Tab" -msgstr "Separador _Anterior" - -#: ../midori/midori-browser.c:4981 -msgid "Switch to the previous tab" -msgstr "Mudar para separador anterior" +msgstr "Separador _anterior" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:5391 msgid "_Next Tab" -msgstr "Separador _Seguinte" +msgstr "Separador _seguinte" -#: ../midori/midori-browser.c:4984 -msgid "Switch to the next tab" -msgstr "Mudar para o separador seguinte" +#: ../midori/midori-browser.c:5393 +msgid "Move Tab _Backward" +msgstr "M_over separador para trás" -#: ../midori/midori-browser.c:4986 -msgid "Focus _Current Tab" -msgstr "Focar Separador _Actual" +#: ../midori/midori-browser.c:5395 +msgid "_Move Tab Forward" +msgstr "_Mover separador para a frente" -#: ../midori/midori-browser.c:4987 -msgid "Focus the current tab" -msgstr "Focar o separador actual" +#: ../midori/midori-browser.c:5398 +msgid "Focus _Current Tab" +msgstr "_Focar o separador atual" -#: ../midori/midori-browser.c:4989 -msgid "Minimize _Current Tab" -msgstr "Minimizar o Separador A_ctual" +#: ../midori/midori-browser.c:5401 +msgid "Focus _Next view" +msgstr "Focar visualização segui_nte" -#: ../midori/midori-browser.c:4990 -msgid "Minimize the current tab" -msgstr "Minimizar o separador actual" +#: ../midori/midori-browser.c:5404 +msgid "Only show the Icon of the _Current Tab" +msgstr "Apenas mostrar o ícone do separador _atual" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:5407 msgid "_Duplicate Current Tab" -msgstr "_Duplicar o Separador Actual" - -#: ../midori/midori-browser.c:4993 -msgid "Duplicate the current tab" -msgstr "Duplicar o separador actual" +msgstr "_Duplicar o separador atual" -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:5410 msgid "Close Ot_her Tabs" -msgstr "Fec_har os Outros Separadores" +msgstr "Fec_har os outros separadores" -#: ../midori/midori-browser.c:4996 -msgid "Close all tabs except the current tab" -msgstr "Fechar todos os separadores excepto o actual" - -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5413 msgid "Open last _session" -msgstr "Abrir última _sessão" - -#: ../midori/midori-browser.c:4999 -msgid "Open the tabs saved in the last session" -msgstr "Abrir separadores guardados na última sessão" +msgstr "Abrir últi_ma sessão" -#: ../midori/midori-browser.c:5001 +#: ../midori/midori-browser.c:5416 msgid "_Help" msgstr "_Ajuda" -#: ../midori/midori-browser.c:5003 -msgid "_Contents" -msgstr "_Conteúdos" - -#: ../midori/midori-browser.c:5004 -msgid "Show the documentation" -msgstr "Mostrar documentação" - -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:5418 msgid "_Frequent Questions" -msgstr "Questões _Frequentes" - -#: ../midori/midori-browser.c:5007 -msgid "Show the Frequently Asked Questions" -msgstr "Mostrar Questões Frequentes" - -#: ../midori/midori-browser.c:5009 -msgid "_Report a Bug" -msgstr "_Reportar Erro" +msgstr "_Questões frequentes" -#: ../midori/midori-browser.c:5010 -msgid "Open Midori's bug tracker" -msgstr "Abrir Midori's bug tracker" +#: ../midori/midori-browser.c:5421 +msgid "_Report a Problem..." +msgstr "_Reportar um problema..." -#: ../midori/midori-browser.c:5013 -msgid "Show information about the program" -msgstr "Mostrar informação sobre o programa" - -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:5433 msgid "_Menubar" -msgstr "Barra de _Menu" - -#: ../midori/midori-browser.c:5022 -msgid "Show menubar" -msgstr "Mostrar barra de menu" +msgstr "Barra de _menu" -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:5437 msgid "_Navigationbar" -msgstr "Barra de _Navegação" +msgstr "Barra de _navegação" -#: ../midori/midori-browser.c:5026 -msgid "Show navigationbar" -msgstr "Mostrar barra de navegação" - -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5441 msgid "Side_panel" -msgstr "Pai_nel lateral" +msgstr "Painel _lateral" -#: ../midori/midori-browser.c:5030 -msgid "Show sidepanel" -msgstr "Mostrar painel lateral" +#: ../midori/midori-browser.c:5442 +msgid "Sidepanel" +msgstr "Painel lateral" -#: ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:5445 msgid "_Bookmarkbar" -msgstr "_Barra de Marcadores" - -#: ../midori/midori-browser.c:5034 -msgid "Show bookmarkbar" -msgstr "Mostrar barra de marcadores" +msgstr "_Barra de marcadores" -#: ../midori/midori-browser.c:5037 -msgid "_Transferbar" -msgstr "Barra de _Transferências" - -#: ../midori/midori-browser.c:5038 -msgid "Show transferbar" -msgstr "Mostrar barra de transferências" - -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:5449 msgid "_Statusbar" -msgstr "Barra de _Estado" - -#: ../midori/midori-browser.c:5042 -msgid "Show statusbar" -msgstr "Mostrar barra de estado" +msgstr "Barra de _estado" -#: ../midori/midori-browser.c:5050 +#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236 msgid "Chinese (BIG5)" msgstr "Chinês (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5465 msgid "Japanese (SHIFT__JIS)" msgstr "Japonês (SHIFT__JIS)" -#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241 msgid "Western (ISO-8859-1)" msgstr "Ocidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "Personalizado..." + +#: ../midori/midori-browser.c:5985 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5992 msgid "_Location..." msgstr "_Localização..." -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5994 msgid "Open a particular location" msgstr "Abrir localização específica" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:6016 msgid "_Web Search..." -msgstr "Pesquisa _Web..." +msgstr "Pesquisa _web..." -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:6018 msgid "Run a web search" msgstr "Executar uma pesquisa web" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:6045 msgid "Reopen a previously closed tab or window" msgstr "Reabrir janela ou separador anteriormente fechado" -#: ../midori/midori-browser.c:5659 +#: ../midori/midori-browser.c:6062 +msgid "Show the saved bookmarks" +msgstr "Mostrar marcadores gravados" + +#: ../midori/midori-browser.c:6079 msgid "_Tools" msgstr "Ferramen_tas" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:6095 msgid "_Window" msgstr "_Janela" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:6097 msgid "Show a list of all open tabs" msgstr "Mostrar lista de separadores abertos" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:6111 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:6113 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:6262 +#: ../midori/midori-browser.c:6927 #, c-format msgid "Unexpected setting '%s'" -msgstr "Definição inesperada '%s'" +msgstr "Definição inesperada \"%s\"" -#: ../midori/midori-locationaction.c:390 +#: ../midori/midori-extension.c:329 #, c-format -msgid "Failed to select from history\n" -msgstr "Falha ao seleccionar do histórico\n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "A configuração da extensão \"%s\" não foi carregada: %s\n" -#: ../midori/midori-locationaction.c:474 +#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "Pesquisar por %s" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "A configuração da extensão \"%s\" não foi gravada: %s\n" -#: ../midori/midori-locationaction.c:497 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "Pesquisar com %s" -#: ../midori/midori-locationaction.c:1307 +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Pesquisar _com..." + +#: ../midori/midori-locationaction.c:537 #, c-format -msgid "Failed to execute database statement\n" -msgstr "Falha ao executar o relatório da base de dados:\n" +msgid "Failed to select from history\n" +msgstr "Falha ao selecionar do histórico\n" + +#: ../midori/midori-locationaction.c:624 +#, c-format +msgid "Search for %s" +msgstr "Pesquisar por %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1363 +#: ../midori/midori-locationaction.c:1398 msgid "Paste and p_roceed" msgstr "Cola_r e prosseguir" -#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 -msgid "Detach chosen panel from the window" -msgstr "Separar da janela o painel escolhido" +#: ../midori/midori-locationaction.c:1739 +msgid "Not verified" +msgstr "Não verificada" + +#: ../midori/midori-locationaction.c:1759 +msgid "Verified and encrypted connection" +msgstr "Ligação verificada e encriptada" + +#: ../midori/midori-locationaction.c:1771 +msgid "Open, unencrypted connection" +msgstr "Ligação aberta e não codificada" -#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 -#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" -msgstr "Alinhar painel à direita" +msgstr "Alinhar painel lateral à direita" -#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Fechar painel" -#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" -msgstr "Alinhar painel à esquerda" - -#: ../midori/midori-panel.c:771 -msgid "Hide operating controls" -msgstr "Ocultar controlos operacionais" +msgstr "Alinhar painel lateral à esquerda" -#: ../midori/midori-websettings.c:200 -msgid "Show Blank page" -msgstr "Mostrar Página em Branco" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "Mostrar ligação rápida" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" -msgstr "Mostrar Página Inicial" - -#: ../midori/midori-websettings.c:202 -msgid "Show last open tabs" -msgstr "Mostrar últimos separadores abertos" +msgstr "Mostrar página inicial" -#: ../midori/midori-websettings.c:204 -msgid "Show last tabs without loading" -msgstr "Mostrar últimos separadores sem os carregar" - -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:237 msgid "Japanese (SHIFT_JIS)" msgstr "Japonês (SHIFT_JIS)" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:257 msgid "New tab" msgstr "Novo separador" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:258 msgid "New window" msgstr "Nova janela" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:259 msgid "Current tab" -msgstr "Separador actual" +msgstr "Separador atual" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:274 msgid "Default" msgstr "Omissão" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:275 msgid "Icons" msgstr "Ícones" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:276 msgid "Small icons" msgstr "Ícones pequenos" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:277 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:278 msgid "Icons and text" msgstr "Ícones e texto" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:279 msgid "Text beside icons" msgstr "Texto ao lado dos ícones" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:294 msgid "Automatic (GNOME or environment)" msgstr "Automático (GNOME ou ambiente)" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:295 msgid "HTTP proxy server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:296 msgid "No proxy server" msgstr "Sem servidor proxy" -#: ../midori/midori-websettings.c:295 -msgid "All cookies" -msgstr "Todos os cookies" - -#: ../midori/midori-websettings.c:296 -msgid "Session cookies" -msgstr "Cookies da sessão" - -#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 -msgid "None" -msgstr "Nenhum" - #: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" @@ -1139,1291 +1174,1292 @@ msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:400 msgid "Remember last window size" msgstr "Lembrar último tamanho da janela" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:401 msgid "Whether to save the last window size" -msgstr "Marque se quiser guardar o último tamanho da janela" +msgstr "Marque se quiser gravar o último tamanho da janela" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:409 msgid "Last window width" msgstr "Largura da última janela" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:410 msgid "The last saved window width" -msgstr "Última largura de janela guardada" +msgstr "Última largura de janela gravada" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:418 msgid "Last window height" msgstr "Altura da última janela" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:419 msgid "The last saved window height" -msgstr "Última altura de janela guardada" +msgstr "Última altura de janela gravada" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:444 msgid "Last panel position" msgstr "Última posição do painel" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:445 msgid "The last saved panel position" -msgstr "Última posição de painel guardada" +msgstr "Última posição de painel gravada" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:454 msgid "Last panel page" msgstr "Última página do painel" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:455 msgid "The last saved panel page" -msgstr "Última página de painel guardada" +msgstr "Última página de painel gravada" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:463 msgid "Last Web search" -msgstr "Última pesquisa Web" +msgstr "Última pesquisa web" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:464 msgid "The last saved Web search" -msgstr "Última pesquisa Web guardada" +msgstr "Última pesquisa web gravada" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:473 msgid "Show Menubar" -msgstr "Mostrar Barra de Menu" +msgstr "Mostrar barra de menu" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:474 msgid "Whether to show the menubar" msgstr "Marque se quiser mostrar a barra de menu" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:482 msgid "Show Navigationbar" -msgstr "Mostrar Barra de Navegação" +msgstr "Mostrar barra de navegação" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:483 msgid "Whether to show the navigationbar" msgstr "Marque se quiser mostrar a barra de navegação" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:491 msgid "Show Bookmarkbar" -msgstr "Mostrar Barra de Marcadores" +msgstr "Mostrar barra de marcadores" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:492 msgid "Whether to show the bookmarkbar" msgstr "Marque se quiser mostrar a barra de marcadores" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:500 msgid "Show Panel" -msgstr "Mostrar Painel" +msgstr "Mostrar painel" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:501 msgid "Whether to show the panel" msgstr "Marque se quiser mostrar o painel" -#: ../midori/midori-websettings.c:485 -msgid "Show Transferbar" -msgstr "Mostrar Barra de Transferências" - -#: ../midori/midori-websettings.c:486 -msgid "Whether to show the transferbar" -msgstr "Marque se quiser mostrar a barra de transferências" - -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:509 msgid "Show Statusbar" -msgstr "Mostrar Barra de Estado" +msgstr "Mostrar barra de estado" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:510 msgid "Whether to show the statusbar" msgstr "Marque se quiser mostrar a barra de estado" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:519 msgid "Toolbar Style:" -msgstr "Estilo da Barra de Ferramentas:" +msgstr "Estilo da barra de ferramentas:" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:520 msgid "The style of the toolbar" msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:521 -msgid "Show progress in location entry" -msgstr "Mostrar evolução no endereço" - -#: ../midori/midori-websettings.c:522 -msgid "Whether to show loading progress in the location entry" -msgstr "Marque se quiser mostrar a evolução de carregamento do endereço" - -#: ../midori/midori-websettings.c:537 -msgid "Search engines in location completion" -msgstr "Motores de pesquisa na conclusão do endereço" - -#: ../midori/midori-websettings.c:538 -msgid "Whether to show search engines in the location completion" -msgstr "Marque se quiser mostrar motores de pesquisa na conclusão do endereço" - -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:529 msgid "Toolbar Items" -msgstr "Itens da Barra de Ferramentas" +msgstr "Itens da barra de ferramentas" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:530 msgid "The items to show on the toolbar" msgstr "Itens a mostrar na barra de ferramentas" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:538 msgid "Compact Sidepanel" -msgstr "Compactar Painel Lateral" +msgstr "Compactar painel lateral" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:539 msgid "Whether to make the sidepanel compact" msgstr "Marque se quiser compactar o painel lateral" -#: ../midori/midori-websettings.c:571 -msgid "Show operating controls of the panel" -msgstr "Mostrar os controlos operacionais do painel" - -#: ../midori/midori-websettings.c:572 -msgid "Whether to show the operating controls of the panel" -msgstr "Marque se quiser mostrar os controlos operacionais do painel" - -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:554 msgid "Align sidepanel on the right" msgstr "Alinhar painel lateral à direita" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:555 msgid "Whether to align the sidepanel on the right" msgstr "Marque se quiser alinhar o painel lateral à direita" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:570 msgid "Open panels in separate windows" -msgstr "Abrir painéis em janelas separadas" +msgstr "Abrir painéis em janelas distintas" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:571 msgid "Whether to always open panels in separate windows" -msgstr "Marque se quiser abrir, sempre, os painéis em janelas separadas" +msgstr "Marque se quiser abrir os painéis em janelas distintas" -#: ../midori/midori-websettings.c:613 +#: ../midori/midori-websettings.c:580 msgid "When Midori starts:" -msgstr "Ao iniciar Midori:" +msgstr "Ao iniciar o Midori:" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:581 msgid "What to do when Midori starts" -msgstr "O que fazer ao iniciar Midori" +msgstr "O que fazer ao iniciar o Midori" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:590 msgid "Homepage:" -msgstr "Página Inicial:" +msgstr "Página inicial:" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:591 msgid "The homepage" msgstr "A página inicial" -#: ../midori/midori-websettings.c:639 +#: ../midori/midori-websettings.c:606 msgid "Show crash dialog" -msgstr "Mostrar diálogo sobre encerramento" +msgstr "Mostrar janela de encerramento" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:607 msgid "Show a dialog after Midori crashed" -msgstr "Mostrar diálogo após o encerramento do Midori" +msgstr "Mostrar a janela após o encerramento do Midori" -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:656 -msgid "Show speed dial in new tabs" -msgstr "Mostrar ligação rápida em novos separadores" - -#: ../midori/midori-websettings.c:657 -msgid "Show speed dial in newly opened tabs" -msgstr "Mostrar ligação rápida em separadores recentemente abertos" - -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:615 msgid "Save downloaded files to:" -msgstr "Guardar ficheiros transferidos em:" +msgstr "Gravar ficheiros transferidos em:" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:616 msgid "The folder downloaded files are saved to" -msgstr "A pasta para guardar transferências" - -#: ../midori/midori-websettings.c:687 -msgid "Ask for the destination folder" -msgstr "Perguntar pasta de destino" - -#: ../midori/midori-websettings.c:688 -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:707 -msgid "Notify when a transfer has been completed" -msgstr "Notificar ao concluir a transferência" - -#: ../midori/midori-websettings.c:708 -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" +msgstr "A pasta para gravar as transferências" -#: ../midori/midori-websettings.c:720 -msgid "Download Manager" -msgstr "Gestor de Transferências" - -#: ../midori/midori-websettings.c:721 -msgid "An external download manager" -msgstr "Um gestor de transferências externo" - -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:624 msgid "Text Editor" -msgstr "Editor de Texto" +msgstr "Editor de texto" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:625 msgid "An external text editor" msgstr "Um editor de texto externo" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:640 msgid "News Aggregator" -msgstr "Agregador de Notícias" +msgstr "Agregador de notícias" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:641 msgid "An external news aggregator" msgstr "Um agregador de notícias externo" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:649 msgid "Location entry Search" -msgstr "Pesquisa de Endereço" +msgstr "Pesquisa no endereço" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:650 msgid "The search to perform inside the location entry" -msgstr "A pesquisa a executar no endereço" +msgstr "A pesquisa a executar na barra do endereço" -#: ../midori/midori-websettings.c:763 +#: ../midori/midori-websettings.c:658 msgid "Preferred Encoding" -msgstr "Codificação Preferida" +msgstr "Codificação preferida" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:659 msgid "The preferred character encoding" msgstr "A codificação de caracteres preferida" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:669 msgid "Always Show Tabbar" -msgstr "Mostrar sempre Barra de Separadores" +msgstr "Mostrar sempre barra de separadores" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:670 msgid "Always show the tabbar" msgstr "Mostrar sempre barra de separadores" -#: ../midori/midori-websettings.c:783 +#: ../midori/midori-websettings.c:683 msgid "Close Buttons on Tabs" -msgstr "Ícone Fechar nos Separadores" +msgstr "Botão Fechar nos separadores" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:684 msgid "Whether tabs have close buttons" -msgstr "Marque se quiser que os separadores tenham ícones para fechar" +msgstr "Marque se quiser que os separadores tenham os ícones para fechar" -#: ../midori/midori-websettings.c:792 +#: ../midori/midori-websettings.c:709 msgid "Open new pages in:" msgstr "Abrir novas páginas em:" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:710 msgid "Where to open new pages" msgstr "Onde abrir novas páginas" -#: ../midori/midori-websettings.c:802 -msgid "Open external pages in:" -msgstr "Abrir páginas externas em:" - -#: ../midori/midori-websettings.c:803 -msgid "Where to open externally opened pages" -msgstr "Onde abrir páginas abertas externamente" - -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:719 msgid "Middle click opens Selection" -msgstr "Clique na roda do rato abre Selecção" +msgstr "Clique na roda do rato abre seleção" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:720 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:821 +#: ../midori/midori-websettings.c:728 msgid "Open tabs in the background" msgstr "Abrir separadores em segundo plano" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:729 msgid "Whether to open new tabs in the background" msgstr "Marque se quiser abrir os novos separadores em segundo plano" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:737 msgid "Open Tabs next to Current" -msgstr "Abrir Separadores perto do Actual" +msgstr "Abrir separadores perto do atual" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:738 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 " +msgstr "" +"Marque se quiser abrir os novos separadores perto do atual ou após o último " -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:746 msgid "Open popups in tabs" -msgstr "Abrir popups em separadores" +msgstr "Abrir \"pop-ups\" em separadores" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:747 msgid "Whether to open popup windows in tabs" -msgstr "Marque se quiser abrir janelas popup em separadores" +msgstr "Marque se quiser abrir janelas \"pop-up\" em separadores" -#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Carregar imagens automaticamente" -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:758 msgid "Load and display images automatically" -msgstr "Carregar e apresentar automaticamente as imagens " +msgstr "Carregar e exibir automaticamente as imagens " -#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 msgid "Enable scripts" -msgstr "Activar 'scripts '" +msgstr "Ativar \"scripts\"" -#: ../midori/midori-websettings.c:859 +#: ../midori/midori-websettings.c:766 msgid "Enable embedded scripting languages" -msgstr "Activar 'scripts ' de linguagem incorporados" +msgstr "Ativar linguagem de \"scripts\" incorporados" -#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" -msgstr "Activar plugins Netscape" +msgstr "Ativar \"plug-ins\" Netscape" -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:774 msgid "Enable embedded Netscape plugin objects" -msgstr "Activar plugins Netscape incorporados" +msgstr "Ativar \"plug-ins\" Netscape incorporados" + +#: ../midori/midori-websettings.c:789 +msgid "Enable Spell Checking" +msgstr "Ativar verificação ortográfica" + +#: ../midori/midori-websettings.c:790 +msgid "Enable spell checking while typing" +msgstr "Ativar verificação ortográfica ao escrever" -#: ../midori/midori-websettings.c:883 +#: ../midori/midori-websettings.c:796 msgid "Enable HTML5 database support" -msgstr "Activar suporte a dados HTML5" +msgstr "Ativar suporte a dados HTML5" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:797 msgid "Whether to enable HTML5 database support" -msgstr "Marque se quiser activar suporte a dados HTML5" +msgstr "Marque se quiser ativar o suporte a dados HTML5" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:803 msgid "Enable HTML5 local storage support" -msgstr "Activar suporte a armazenagem local HTML5" +msgstr "Ativar suporte a armazenagem local HTML5" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:804 msgid "Whether to enable HTML5 local storage support" -msgstr "Marque se quiser activar suporte a armazenagem local HTML5" +msgstr "Marque se quiser ativar o suporte à armazenagem local HTML5" -#: ../midori/midori-websettings.c:899 +#: ../midori/midori-websettings.c:810 msgid "Enable offline web application cache" -msgstr "Activar cache de aplicação web offline" +msgstr "Ativar \"cache\" de aplicações web \"offline\"" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:811 msgid "Whether to enable offline web application cache" -msgstr "Marque se quiser activar cache de aplicação web offline" +msgstr "Marque se quiser ativar \"cache\" de aplicações web \"offline\"" + +#: ../midori/midori-websettings.c:827 +msgid "Flash window on background tabs" +msgstr "Janela intermitente nos separadores secundários" + +#: ../midori/midori-websettings.c:828 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "Janela intermitente se um novo separador for aberto em segundo plano" + +#: ../midori/midori-websettings.c:836 +msgid "Enable WebGL support" +msgstr "Ativar suporte a WebGL" -#: ../midori/midori-websettings.c:925 +#: ../midori/midori-websettings.c:837 +msgid "Allow websites to use OpenGL rendering" +msgstr "Permite que os sítios web utilizem o OpenGL" + +#: ../midori/midori-websettings.c:863 msgid "Zoom Text and Images" -msgstr "Zoom de Texto e Imagens" +msgstr "Ampliar texto e imagens" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:864 msgid "Whether to zoom text and images" -msgstr "Marque se quiser ajustar zoom de texto e imagens" +msgstr "Marque se quiser ajustar o texto e as imagens" -#: ../midori/midori-websettings.c:941 +#: ../midori/midori-websettings.c:879 msgid "Find inline while typing" msgstr "Encontrar ao escrever" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:880 msgid "Whether to automatically find inline while typing" msgstr "Marque se quiser encontrar automaticamente ao escrever" -#: ../midori/midori-websettings.c:957 +#: ../midori/midori-websettings.c:895 msgid "Kinetic scrolling" msgstr "Deslocamento cinético" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:896 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:966 -msgid "Accept cookies" -msgstr "Aceitar cookies" - -#: ../midori/midori-websettings.c:967 -msgid "What type of cookies to accept" -msgstr "Tipo de cookies a aceitar" +msgstr "" +"Marque se quiser que o deslocamento se mova cineticamente conforme a " +"velocidade" -#: ../midori/midori-websettings.c:976 -msgid "Maximum cookie age" -msgstr "Antiguidade máxima de cookies" +#: ../midori/midori-websettings.c:904 +msgid "Delete old Cookies after:" +msgstr "Apagar cookies após:" -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:905 msgid "The maximum number of days to save cookies for" -msgstr "O número máximo de dias para guardar cookies" +msgstr "O número máximo de dias para guardar os cookies" -#: ../midori/midori-websettings.c:986 -msgid "Maximum history age" -msgstr "Antiguidade máxima do histórico" +#: ../midori/midori-websettings.c:921 +msgid "Only accept Cookies from sites you visit" +msgstr "Aceitar cookies dos sítios que eu visitar" -#: ../midori/midori-websettings.c:987 -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:922 +msgid "Block cookies sent by third-party websites" +msgstr "Bloquear cookies de sítios de terceiros" -#: ../midori/midori-websettings.c:995 -msgid "Remember last downloaded files" -msgstr "Lembrar últimas transferências " +#: ../midori/midori-websettings.c:936 +msgid "Delete pages from history after:" +msgstr "Apagar páginas no histórico após:" -#: ../midori/midori-websettings.c:996 -msgid "Whether the last downloaded files are saved" -msgstr "Marque se quiser guardar as últimas transferências" +#: ../midori/midori-websettings.c:937 +msgid "The maximum number of days to save the history for" +msgstr "O número máximo de dias para guardar o histórico" -#: ../midori/midori-websettings.c:1013 +#: ../midori/midori-websettings.c:952 msgid "Proxy server" msgstr "Servidor proxy" -#: ../midori/midori-websettings.c:1014 +#: ../midori/midori-websettings.c:953 msgid "The type of proxy server to use" -msgstr "O tipo de servidor a utilizar" +msgstr "O tipo de servidor proxy a utilizar" -#: ../midori/midori-websettings.c:1023 +#: ../midori/midori-websettings.c:962 msgid "HTTP Proxy Server" -msgstr "Servidor Proxy HTTP" +msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:1024 +#: ../midori/midori-websettings.c:963 msgid "The proxy server used for HTTP connections" msgstr "Servidor proxy para ligações HTTP" +#: ../midori/midori-websettings.c:978 +msgid "Port" +msgstr "Porta" + +#: ../midori/midori-websettings.c:979 +msgid "The proxy server port used for HTTP connections" +msgstr "A porta do servidor proxy para ligações HTTP" + +#: ../midori/midori-websettings.c:997 +msgid "The maximum size of cached pages on disk" +msgstr "O tamanho máximo, no disco, das páginas em cache" + #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1040 +#: ../midori/midori-websettings.c:1014 msgid "Identify as" msgstr "Identificar como" -#: ../midori/midori-websettings.c:1041 +#: ../midori/midori-websettings.c:1015 msgid "What to identify as to web pages" msgstr "Identificar nas páginas web como" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1031 msgid "Identification string" -msgstr "Linha de Identificação" +msgstr "Texto da identificação" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1032 msgid "The application identification string" -msgstr "A linha de identificação da aplicação" +msgstr "O texto de identificação da aplicação" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1048 msgid "Preferred languages" msgstr "Idiomas preferidos" -#: ../midori/midori-websettings.c:1074 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "Uma lista de idiomas, separada por vírgulas, para o processamento de páginas web multi-idiomas, por exemplo \"de\", \"ru,nl\" ou \"en-us;q=1.0, fr-fr;q=0.667\"" +#: ../midori/midori-websettings.c:1049 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"Uma lista de idiomas, separada por vírgulas, para o processamento de páginas " +"web multi-idiomas, por exemplo \"de\", \"ru,nl\" ou \"en-us;q=1.0, fr-fr;" +"q=0.667\"" -#: ../midori/midori-websettings.c:1089 +#: ../midori/midori-websettings.c:1064 msgid "Clear private data" msgstr "Limpar dados privados" -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1065 msgid "The private data selected for deletion" -msgstr "Os dados privados seleccionados para apagar" +msgstr "Os dados privados selecionados para apagar" -#. 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:1227 ../midori/midori-view.c:4442 -#: ../midori/midori-view.c:4446 +#: ../midori/midori-websettings.c:1080 +msgid "Clear data" +msgstr "Limpar dados" + +#: ../midori/midori-websettings.c:1081 +msgid "The data selected for deletion" +msgstr "Os dados selecionados para apagar" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1130 +msgid "Strip referrer details sent to websites" +msgstr "Detalhes enviados para sítios externos" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1132 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Se o cabeçalho \"Referer\" deve ser abreviado no nome do servidor" + +#: ../midori/midori-websettings.c:1146 +msgid "Always use my font choices" +msgstr "Utilizar sempre as minhas escolhas de tipo de letras" + +#: ../midori/midori-websettings.c:1147 +msgid "Override fonts picked by websites with user preferences" +msgstr "" +"Substituir tipo de letra dos sítios web pelas que forem definidas pelo " +"utilizador" + +#: ../midori/midori-view.c:1360 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s pretende gravar uma base de dados HTML5." + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Deny" +msgstr "_Rejeitar" + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Allow" +msgstr "_Permitir" + +#: ../midori/midori-view.c:1392 +#, c-format +msgid "%s wants to know your location." +msgstr "%s pretende saber a sua localização." + +#: ../midori/midori-view.c:1485 #, c-format msgid "Error - %s" msgstr "Erro - %s" -#: ../midori/midori-view.c:1228 +#: ../midori/midori-view.c:1486 #, 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:1230 +#: ../midori/midori-view.c:1488 msgid "Try again" msgstr "Tente novamente" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1249 -#, c-format -msgid "Not found - %s" -msgstr "Não encontrada(o) - %s" - -#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 +#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598 #, c-format msgid "Send a message to %s" msgstr "Enviar mensagem a %s" -#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 +#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747 msgid "Inspect _Element" -msgstr "Inspeccionar _Elementos" +msgstr "Inspecionar _elementos" -#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2480 msgid "Open Link in New _Tab" -msgstr "Abrir Ligação em Novo _Separador" +msgstr "_Abrir ligação em novo separador" -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2484 msgid "Open Link in _Foreground Tab" -msgstr "Abrir Ligação no Separador _Principal" +msgstr "Abrir ligação no _separador principal" -#: ../midori/midori-view.c:2118 +#: ../midori/midori-view.c:2485 msgid "Open Link in _Background Tab" -msgstr "Abrir Ligação no Separador _Secundário" +msgstr "Abrir _ligação no separador secundário" -#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2488 msgid "Open Link in New _Window" -msgstr "Abrir Ligação em Nova _Janela" +msgstr "Abrir ligação em _nova janela" -#: ../midori/midori-view.c:2124 +#: ../midori/midori-view.c:2491 msgid "Open Link as Web A_pplication" -msgstr "Abrir Ligação como A_plicação Web" +msgstr "Abrir ligação como a_plicação web" -#: ../midori/midori-view.c:2127 +#: ../midori/midori-view.c:2496 msgid "Copy Link de_stination" -msgstr "Copiar de_stino da Ligação" +msgstr "_Copiar destino da ligação" -#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 -msgid "_Save Link destination" -msgstr "_Guardar destino da Ligação" - -#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 -msgid "_Download Link destination" -msgstr "_Transferir destino da Ligação" - -#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 -#: ../midori/midori-view.c:2207 -msgid "Download with Download _Manager" -msgstr "Transferir com _Gestor de Transferências" - -#: ../midori/midori-view.c:2144 +#: ../midori/midori-view.c:2512 msgid "Open _Image in New Tab" -msgstr "Abrir _Imagem em Novo Separador" +msgstr "Abrir _imagem em novo separador" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2515 msgid "Copy Image _Address" -msgstr "Copiar _Endereço da Imagem" +msgstr "Copiar _endereço da imagem" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2518 msgid "Save I_mage" -msgstr "Guardar I_magem" +msgstr "Gravar image_m" -#: ../midori/midori-view.c:2151 -msgid "Download I_mage" -msgstr "Transferir I_magem" +#: ../midori/midori-view.c:2521 +msgid "Open in Image _Viewer" +msgstr "Abrir no _visualizador de imagens" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2528 msgid "Copy Video _Address" -msgstr "Copiar _Endereço do Vídeo" +msgstr "Copiar _endereço do vídeo" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2531 msgid "Save _Video" -msgstr "Guardar _Vídeo" +msgstr "Gravar _vídeo" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2531 msgid "Download _Video" -msgstr "Transferir _Vídeo" +msgstr "Transferir _vídeo" -#: ../midori/midori-view.c:2224 +#: ../midori/midori-view.c:2557 msgid "Search _with" msgstr "Pesquisar _com" -#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2589 msgid "_Search the Web" -msgstr "_Pesquisar na Web" +msgstr "_Pesquisar na web" -#: ../midori/midori-view.c:2287 +#: ../midori/midori-view.c:2606 msgid "Open Address in New _Tab" -msgstr "Abrir Endereço em Novo _Separador" +msgstr "Abrir endereço em novo _separador" -#: ../midori/midori-view.c:2591 +#: ../midori/midori-view.c:2909 msgid "Open or download file" msgstr "Abrir ou transferir ficheiro" -#: ../midori/midori-view.c:2610 +#: ../midori/midori-view.c:2929 #, c-format msgid "File Type: '%s'" -msgstr "Tipo de Ficheiro: '%s' " +msgstr "Tipo de ficheiro: \"%s\"" -#: ../midori/midori-view.c:2613 +#: ../midori/midori-view.c:2931 #, c-format msgid "File Type: %s ('%s')" -msgstr "Tipo de Ficheiro: %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:2617 +#: ../midori/midori-view.c:2935 +#, c-format +msgid "File Name: %s" +msgstr "Nome do ficheiro: %s" + +#: ../midori/midori-view.c:2955 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:3158 +#: ../midori/midori-view.c:3576 #, c-format msgid "Inspect page - %s" -msgstr "Inspeccionar página - %s" +msgstr "Inspecionar página - %s" -#: ../midori/midori-view.c:3439 -msgid "Speed dial" +#: ../midori/midori-view.c:3923 +msgid "Speed Dial" msgstr "Ligação rápida" -#: ../midori/midori-view.c:3440 +#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020 msgid "Click to add a shortcut" msgstr "Clique para adicionar atalho" -#: ../midori/midori-view.c:3441 +#: ../midori/midori-view.c:3925 msgid "Enter shortcut address" -msgstr "Introduza endereço do atalho" +msgstr "Introduza o endereço do atalho" -#: ../midori/midori-view.c:3442 +#: ../midori/midori-view.c:3926 msgid "Enter shortcut title" -msgstr "Introduza título do atalho" +msgstr "Introduza o título do atalho" -#: ../midori/midori-view.c:3443 +#: ../midori/midori-view.c:3927 msgid "Are you sure you want to delete this shortcut?" msgstr "Tem a certeza que quer apagar este atalho?" -#: ../midori/midori-view.c:3444 -msgid "Set number of columns and rows" -msgstr "Definir número de colunas e linhas" - -#: ../midori/midori-view.c:3445 -msgid "Enter number of columns and rows:" -msgstr "Indique o número de colunas e linhas:" - -#: ../midori/midori-view.c:3446 -msgid "Invalid input for the size of the speed dial" -msgstr "Entrada inválida para o tamanho da ligação rápida" - -#: ../midori/midori-view.c:3447 -msgid "Thumb size:" -msgstr "Tamanho das miniaturas:" - -#: ../midori/midori-view.c:3448 -msgid "Small" -msgstr "Pequenas" - -#: ../midori/midori-view.c:3449 -msgid "Medium" -msgstr "Médias" - -#: ../midori/midori-view.c:3450 -msgid "Big" -msgstr "Grandes" - -#: ../midori/midori-view.c:3476 -#, c-format -msgid "Document cannot be displayed" -msgstr "O documento não pode ser apresentado" - -#: ../midori/midori-view.c:3499 +#: ../midori/midori-view.c:4089 #, c-format msgid "No documentation installed" msgstr "Nenhuma documentação instalada" -#: ../midori/midori-view.c:3618 +#: ../midori/midori-view.c:4165 +msgid "Midori doesn't store any personal data:" +msgstr "O Midori não guarda quaisquer dados privados." + +#: ../midori/midori-view.c:4166 +msgid "No history or web cookies are being saved." +msgstr "O histórico e os cookies não são guardados." + +#: ../midori/midori-view.c:4167 +msgid "Extensions are disabled." +msgstr "As extensões estão inativas." + +#: ../midori/midori-view.c:4168 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "" +"O armazenamento local de HTML5, base de dados e \"cache\" da aplicação estão " +"inativas." + +#: ../midori/midori-view.c:4169 +msgid "Midori prevents websites from tracking the user:" +msgstr "O Midori impede que os sítios web obtenham dados do utilizador." + +#: ../midori/midori-view.c:4170 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "Os URL são removidos do nome do servidor." + +#: ../midori/midori-view.c:4171 +msgid "DNS prefetching is disabled." +msgstr "A obtenção prévia de DNS está inativa." + +#: ../midori/midori-view.c:4172 +msgid "The language and timezone are not revealed to websites." +msgstr "O idioma e o fuso horário não são transmitidos aos sítios web." + +#: ../midori/midori-view.c:4173 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "Os \"plug-ins\" Flash e Netscape não são listados nos sítios web." + +#: ../midori/midori-view.c:4222 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "Os números em parênteses mostram a versão utilizada." + +#: ../midori/midori-view.c:4278 msgid "Page loading delayed" -msgstr "Actualização de página atrasada" +msgstr "Atualização de página atrasada" -#: ../midori/midori-view.c:3619 +#: ../midori/midori-view.c:4279 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "O atraso na actualização foi devido a um encerramento brusco ou ás preferências de arranque." +msgstr "" +"O atraso na atualização foi devido a um encerramento brusco ou às " +"preferências de arranque." -#: ../midori/midori-view.c:3620 +#: ../midori/midori-view.c:4280 msgid "Load Page" -msgstr "Carregar Página" +msgstr "Carregar página" -#: ../midori/midori-view.c:3764 +#: ../midori/midori-view.c:4446 msgid "Blank page" msgstr "Página em branco" -#: ../midori/midori-view.c:4018 +#: ../midori/midori-view.c:4708 msgid "_Duplicate Tab" -msgstr "_Duplicar Separador" +msgstr "_Duplicar separador" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4713 msgid "Show Tab _Label" -msgstr "Mostrar _Texto do Separador" +msgstr "Mostrar _texto do separador" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4713 msgid "Show Tab _Icon Only" -msgstr "Mostrar Apenas o Í_cone" +msgstr "Mostrar apenas o í_cone" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4719 msgid "Close ot_her Tabs" -msgstr "Fec_har outros Separadores" +msgstr "Fec_har outros separadores" + +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5532 +msgid "previous" +msgstr "anterior" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5551 +msgid "next" +msgstr "seguinte" -#: ../midori/midori-view.c:4680 +#: ../midori/midori-view.c:5564 msgid "Print background images" -msgstr "Imprimir imagens em segundo plano" +msgstr "Imprimir imagens de fundo" -#: ../midori/midori-view.c:4681 +#: ../midori/midori-view.c:5565 msgid "Whether background images should be printed" -msgstr "Marque se quiser imprimir as imagens em segundo plano" +msgstr "Marque se quiser imprimir as imagens de fundo" -#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:5597 msgid "Features" msgstr "Funcionalidades" -#. Page "General" -#: ../midori/midori-preferences.c:301 -msgid "General" -msgstr "Geral" - -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:297 msgid "Startup" -msgstr "Início" +msgstr "Arranque" -#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 -msgid "Use current page as homepage" -msgstr "Usar página actual como página inicial" +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Utili_zar página atual" -#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Transferências" +#: ../midori/midori-preferences.c:314 +msgid "Use current page as homepage" +msgstr "Usar página atual como página inicial" #. Page "Appearance" -#: ../midori/midori-preferences.c:352 -msgid "Appearance" -msgstr "Aparência" - -#: ../midori/midori-preferences.c:353 -msgid "Font settings" -msgstr "Definições de fonte" - -#: ../midori/midori-preferences.c:355 -msgid "Default Font Family" -msgstr "Família de Fontes por Omissão" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Tipo de letra" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Família de letras proporcionais" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" -msgstr "A família de fontes, usada por omissão, para apresentar texto" +msgstr "A família das letras a utilizar para exibir o texto" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" -msgstr "O tamanho da fonte, por omissão, para apresentar texto" +msgstr "O tamanho das letras utilizadas para exibir o texto" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" -msgstr "Família de Fontes de Largura Fixa" +msgstr "Letras com largura fixa" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:339 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 letras utilizada para exibir o texto com largura fixa" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" -msgstr "Tamanho da fonte para apresentar texto com largura fixa" +msgstr "O tamanho das letras utilizadas para exibir o texto com largura fixa" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" -msgstr "Tamanho Mínimo de Fonte" +msgstr "Tamanho mínimo da letra" -#: ../midori/midori-preferences.c:374 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" -msgstr "Tamanho mínimo de fonte para apresentar texto" +msgstr "Tamanho mínimo da letra para exibir o texto" #. Page "Behavior" -#: ../midori/midori-preferences.c:383 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:396 -msgid "Enforce 96 dots per inch" -msgstr "Forçar 96 pontos por polegada" - -#: ../midori/midori-preferences.c:397 -msgid "Enforce a video dot density of 96 DPI" -msgstr "Forçar densidade de vídeo de 96 PPP" - -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" -msgstr "Permitir que os scripts abram popups" +msgstr "Permitir que os \"scripts\" abram \"pop-ups\"" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "Marque se quiser que os scripts abram janelas popup automaticamente" - -#: ../midori/midori-preferences.c:422 -msgid "Spell Checking" -msgstr "Verificação Ortográfica" - -#: ../midori/midori-preferences.c:425 -msgid "Enable Spell Checking" -msgstr "Activar Verificação Ortográfica" - -#: ../midori/midori-preferences.c:426 -msgid "Enable spell checking while typing" -msgstr "Activar verificação ortográfica ao escrever" - -#: ../midori/midori-preferences.c:428 -msgid "Spelling dictionaries:" -msgstr "Dicionários:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:432 -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áfica, por exemplo \"en_GB,de_DE\"" +msgstr "" +"Marque para permitir que os \"scripts\" abram janelas \"pop-up\" " +"automaticamente" #. Page "Interface" -#: ../midori/midori-preferences.c:438 -msgid "Interface" -msgstr "Interface" - -#: ../midori/midori-preferences.c:439 -msgid "Navigationbar" -msgstr "Barra de Navegação" - -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Navegar" -#. Page "Applications" -#: ../midori/midori-preferences.c:471 -msgid "Applications" -msgstr "Aplicações" - -#: ../midori/midori-preferences.c:472 -msgid "External applications" -msgstr "Aplicações externas" - #. Page "Network" -#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "Rede" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:463 msgid "Hostname" msgstr "Nome de anfitrião" -#. Page "Privacy" -#: ../midori/midori-preferences.c:514 -msgid "Privacy" -msgstr "Privacidade" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "MB" -#: ../midori/midori-preferences.c:515 -msgid "Web Cookies" -msgstr "Web Cookies" - -#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 -msgid "days" -msgstr "dias" - -#: ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Vazio" - -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Adicionar motor de pesquisa" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Editar motor de pesquisa" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Nome:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Descrição:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "Í_cone:" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" -msgstr "_Token:" +msgstr "\"_Token\":" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" -msgstr "Gerir Motores de Pesquisa" +msgstr "Gerir motores de pesquisa" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "Usar por _omissão" -#: ../midori/sokoke.c:1303 -msgid "_Bookmark" -msgstr "_Marcador" - -#: ../midori/sokoke.c:1304 -msgid "_Bookmarks" -msgstr "_Marcadores" - -#: ../midori/sokoke.c:1305 -msgid "Add Boo_kmark" -msgstr "Adicionar _Marcador" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "Abrir com" -#: ../midori/sokoke.c:1306 -msgid "_Console" -msgstr "_Consola" - -#: ../midori/sokoke.c:1307 -msgid "_Extensions" -msgstr "_Extensões" +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Escolha a aplicação ou comando para abrir \"%s\":" -#: ../midori/sokoke.c:1308 -msgid "_History" -msgstr "_Histórico" +#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "Não é possível executar o programa externo." -#: ../midori/sokoke.c:1309 -msgid "_Homepage" -msgstr "_Página Inicial" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d hora" +msgstr[1] "%d horas" -#: ../midori/sokoke.c:1310 -msgid "_Userscripts" -msgstr "Argumentos de _Utilizador" +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minuto" +msgstr[1] "%d minutos" -#: ../midori/sokoke.c:1311 -msgid "New _Tab" -msgstr "_Novo Separador" +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d segundo" +msgstr[1] "%d segundos" -#: ../midori/sokoke.c:1312 -msgid "_Transfers" -msgstr "_Transferências" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s de %s" -#: ../midori/sokoke.c:1313 -msgid "Netscape p_lugins" -msgstr "P_lugins Netscape" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/sokoke.c:1316 -msgid "New _Folder" -msgstr "Nova _Pasta" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr " - %s restante(s)" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:201 +#: ../toolbars/midori-findbar.c:291 msgid "_Inline Find:" msgstr "Local_izar:" -#: ../toolbars/midori-findbar.c:233 +#: ../toolbars/midori-findbar.c:317 msgid "Previous" msgstr "Anterior" -#: ../toolbars/midori-findbar.c:239 +#: ../toolbars/midori-findbar.c:323 msgid "Next" msgstr "Seguinte" -#: ../toolbars/midori-findbar.c:243 +#: ../toolbars/midori-findbar.c:327 msgid "Match Case" -msgstr "Sensível à Capitalização" +msgstr "Sensível a maiúsculas" -#: ../toolbars/midori-findbar.c:252 +#: ../toolbars/midori-findbar.c:336 msgid "Highlight Matches" -msgstr "Realçar Correspondências" +msgstr "Realçar ocorrências" -#: ../toolbars/midori-findbar.c:263 +#: ../toolbars/midori-findbar.c:347 msgid "Close Findbar" msgstr "Fechar" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 -#, c-format -msgid "%s of %s" -msgstr "%s de %s" - -#: ../toolbars/midori-transferbar.c:123 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." -msgstr "O ficheiro '%s' foi transferido." +msgstr "O ficheiro \"%s\" foi transferido." -#: ../toolbars/midori-transferbar.c:126 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Transferência concluída" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "O ficheiro transferido contém erros." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"O código \"checksum\" não coincide com o do ficheiro. Provavelmente, o " +"ficheiro não foi transferido integralmente ou então foi modificado " +"posteriormente." + +#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 msgid "Clear All" -msgstr "Limpar Tudo" +msgstr "Limpar tudo" -#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 +#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 msgid "Some files are being downloaded" msgstr "Existem ficheiros a ser transferidos" -#: ../toolbars/midori-transferbar.c:306 +#: ../toolbars/midori-transferbar.c:377 msgid "_Quit Midori" msgstr "_Sair do Midori" -#: ../toolbars/midori-transferbar.c:308 +#: ../toolbars/midori-transferbar.c:379 msgid "The transfers will be cancelled if Midori quits." msgstr "As transferências serão canceladas se sair do Midori." -#: ../panels/midori-bookmarks.c:116 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Marcadores" -#: ../panels/midori-bookmarks.c:275 +#: ../panels/midori-bookmarks.c:257 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Falha ao adicionar marcador: %s\n" -#: ../panels/midori-bookmarks.c:414 +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" -msgstr "Editar marcador seleccionado" +msgstr "Editar o marcador selecionado" -#: ../panels/midori-bookmarks.c:422 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" -msgstr "Apagar marcador seleccionado" +msgstr "Apagar o marcador selecionado" -#: ../panels/midori-bookmarks.c:436 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" msgstr "Adicionar nova pasta" -#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 +#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 msgid "Separator" msgstr "Separador" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "Consola" - -#: ../panels/midori-console.c:361 -msgid "Copy _All" -msgstr "Copiar _Tudo" - -#: ../panels/midori-console.c:362 -msgid "Copy All" -msgstr "Copiar Tudo" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "Histórico" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Extensões" +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "Hoje" -#: ../panels/midori-history.c:146 -msgid "A week ago" -msgstr "Uma semana atrás" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "Ontem" -#: ../panels/midori-history.c:148 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 #, 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:151 -msgid "Today" -msgstr "Hoje" - -#: ../panels/midori-history.c:153 -msgid "Yesterday" -msgstr "Ontem" +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "Uma semana atrás" -#: ../panels/midori-history.c:324 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" -msgstr "Tem a certeza que quer remover todo o histórico?" +msgstr "Tem a certeza de que quer remover todo o histórico?" -#: ../panels/midori-history.c:369 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" -msgstr "Marcar o item de histórico seleccionado" +msgstr "Marcar o item de histórico selecionado" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" -msgstr "Apagar item de histórico seleccionado" +msgstr "Apagar o item de histórico selecionado" -#: ../panels/midori-history.c:386 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "Limpar todo o histórico" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Transferências" + +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" -msgstr "Abrir Pas_ta de Destino" +msgstr "Abrir pas_ta de destino" -#: ../panels/midori-transfers.c:484 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" -msgstr "Copiar Localização da Lig_ação" +msgstr "Copiar localização da lig_ação" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" -msgstr "Requer Autenticação" +msgstr "Requer autenticação" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" msgstr "" -"Precisa de um nome de utilizador e uma palavra-passe\n" +"Precisa de um nome de utilizador e uma senha\n" "para abrir esta localização:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" -msgstr "Nome de Utilizador" +msgstr "Nome de utilizador" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" -msgstr "Palavra-passe" +msgstr "Senha" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" -msgstr "_Lembrar palavra-passe" +msgstr "_Lembrar senha" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, 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:895 +#: ../katze/katze-throbber.c:962 #, 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:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" -msgstr "As frames de animação estão corrompidas" +msgstr "As \"frames\" de animação estão danificadas" -#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 +#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" -msgstr "Propriedade '%s' é inválida para %s" +msgstr "A propriedade \"%s\" é inválida para %s" -#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 -#: ../extensions/addons.c:119 +#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Escolha o ficheiro" -#: ../katze/katze-utils.c:564 +#: ../katze/katze-utils.c:506 msgid "Choose folder" msgstr "Escolha a pasta" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "Nenhum" + +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "1 hora" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "1 dia" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "1 semana" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "1 mês" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "1 ano" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Preferências para %s" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:473 msgid "Configure Advertisement filters" -msgstr "Configurar filtros de Publicidade" +msgstr "Configurar filtros de publicidade" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:504 #, 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:587 -msgid "Configure _Advertisement filters..." -msgstr "Configurar filtros de _Publicidade..." +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.\n" +"Pode encontrar mais listas em %s." -#: ../extensions/adblock.c:841 +#: ../extensions/adblock.c:882 msgid "Edit rule" msgstr "Editar regra" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:896 msgid "_Rule:" msgstr "_Regra:" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:950 msgid "Bl_ock image" msgstr "Bl_oquear imagem" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:955 msgid "Bl_ock link" msgstr "Bl_oquear ligação" -#: ../extensions/adblock.c:1494 +#: ../extensions/adblock.c:1670 msgid "Advertisement blocker" msgstr "Bloqueador de publicidade" -#: ../extensions/adblock.c:1495 +#: ../extensions/adblock.c:1671 msgid "Block advertisements according to a filter list" -msgstr "Bloquear publicidade de acordo com a lista " +msgstr "Bloquear publicidade de acordo com o filtro" + +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "" +"Parece que a página contém um \"script\" de utilizador. Pretende instalar?" -#: ../extensions/addons.c:130 ../extensions/addons.c:490 +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "_Instalar \"script\" de utilizador" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "Parece que a página contém um estilo de utilizador. Pretende instalar?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_Instalar estilo de utilizador" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Não instalar" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" -msgstr "Argumentos de Utilizador" +msgstr "\"Scripts\" de utilizador" -#: ../extensions/addons.c:135 ../extensions/addons.c:492 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Estilos de utilizador" -#: ../extensions/addons.c:191 ../extensions/addons.c:267 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Erro" -#: ../extensions/addons.c:231 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" -msgstr "Deseja realmente apagar '%s'?" +msgstr "Pretende apagar \"%s\"?" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:427 msgid "Delete user script" -msgstr "Apagar 'script ' de utilizador" +msgstr "Apagar \"script\" de utilizador" -#: ../extensions/addons.c:238 +#: ../extensions/addons.c:428 msgid "Delete user style" msgstr "Apagar estilo de utilizador" -#: ../extensions/addons.c:242 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." -msgstr "O ficheiro '%s' será apagado permanentemente." +msgstr "O ficheiro \"%s\" será apagado permanentemente." -#: ../extensions/addons.c:377 ../extensions/addons.c:454 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" -msgstr "Abrir no Editor de Texto" +msgstr "Abrir no editor de texto" -#: ../extensions/addons.c:379 ../extensions/addons.c:463 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" -msgstr "Abrir Pasta de Destino" +msgstr "Abrir pasta de destino" -#: ../extensions/addons.c:445 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "Adicionar novo extra" -#: ../extensions/addons.c:472 -msgid "Open target folder for selected addon" -msgstr "Abrir pasta de destino para o extra seleccionado" - -#: ../extensions/addons.c:473 +#: ../extensions/addons.c:664 msgid "Remove selected addon" -msgstr "Remover o extra seleccionado" +msgstr "Remover o extra selecionado" -#: ../extensions/addons.c:1420 -#, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "A configuração da extensão '%s' não foi gravada: %s\n" - -#: ../extensions/addons.c:1421 ../extensions/addons.c:1586 +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" msgstr "Extras de utilizador" -#: ../extensions/addons.c:1543 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" -msgstr "Não é possível vigiar a pasta '%s': %s " +msgstr "Não é possível vigiar a pasta \"%s\": %s " -#: ../extensions/addons.c:1587 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" -msgstr "Suporte a scripts e estilos de utilizador" +msgstr "Suporte a \"scripts\" e estilos de utilizador" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" -msgstr "Separadores Coloridos" +msgstr "Separadores coloridos" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Cor distinta para cada separador" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" -msgstr "Gestor de Cookies" +msgstr "Gestor de cookies" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" -msgstr "Apagar Todos" +msgstr "Apagar todos" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 -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 coincidam com o filtro." +#: ../extensions/cookie-manager/cookie-manager-page.c:105 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"Apagar todos os \"cookies\". Se definir um filtro, só serão eliminados os " +"\"cookies\" que coincidam com o filtro." -#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" -msgstr "Expandir Todos" +msgstr "Expandir tudo" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" -msgstr "Contrair Todos" +msgstr "Recolher tudo" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" msgstr "Deseja realmente apagar todos os cookies?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Pergunta" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." -msgstr "Apenas serão apagados os cookies que coincidam com o filtro." +msgstr "Só serão apagados os cookies que coincidam com o filtro." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "No fim da sessão" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2440,106 +2476,99 @@ "Seguro: %s\n" "Expira: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Sim" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "Não" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" "Cookies: %d" msgstr "" "Domínio: %s\n" -"Cookies: %d" +"\"Cookies\": %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Nome" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" -msgstr "_Expandir Todos" +msgstr "_Expandir tudo" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" -msgstr "_Contrair Todos" +msgstr "Re_colher tudo" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 msgid "Filter:" msgstr "Filtro:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "Introduza um filtro para apenas mostrar os cookies cujo nome ou domínio coincidam com o filtro" - -#: ../extensions/cookie-manager/main.c:40 -msgid "_Cookie Manager" -msgstr "Gestor de _Cookies" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Introduza um filtro para só mostrar os \"cookies\" cujo nome ou domínio " +"coincidam com o filtro" -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Listar, ver e apagar cookies" -#: ../extensions/copy-tabs.c:39 +#: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" -msgstr "Copiar _Endereço do Separador" +msgstr "Copiar _endereço do separador" -#: ../extensions/copy-tabs.c:98 +#: ../extensions/copy-tabs.c:95 msgid "Copy Addresses of Tabs" -msgstr "Copiar Endereço dos Separadores" +msgstr "Copiar endereço dos separadores" -#: ../extensions/copy-tabs.c:99 +#: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" -msgstr "Copiar endereço de todos os separadores para a área de transferência" - -#: ../extensions/external-applications.vala:93 -msgid "External Applications" -msgstr "Aplicações Externas" - -#: ../extensions/external-applications.vala:94 -msgid "Associate URL schemes with external commands" -msgstr "Associar o esquema das URL a comandos externos" +msgstr "" +"Copiar para a área de transferência o endereço de todos os separadores " #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "Falha ao encontrar os elementos Atom de \"entry\" nos dados XML." +msgstr "Falha ao encontrar os elementos Atom de \"entry\" nos dados XML." #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." 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:398 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." -msgstr "Última actualização: %s." +msgstr "Última atualização: %s." -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "Fontes" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "Adicionar nova fonte" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "Apagar fonte" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "_Fontes" #: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." -msgstr "Falha ao encontrar o elemento root nos dados XML da fonte." +msgstr "Falha ao encontrar o elemento nos dados XML da fonte." #: ../extensions/feed-panel/feed-parse.c:235 #, c-format @@ -2570,272 +2599,274 @@ #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" -msgstr "Já existe a fonte '%s'" +msgstr "Já existe a fonte \"%s\"" #: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" -msgstr "Erro ao carregar a fonte '%s'" +msgstr "Erro ao carregar a fonte \"%s\"" -#: ../extensions/feed-panel/main.c:520 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" -msgstr "Painel de Fontes" +msgstr "Painel de fontes" -#: ../extensions/feed-panel/main.c:521 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Ler fontes Atom/RSS" -#: ../extensions/formhistory.c:142 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" msgstr "Falha ao adicionar o valor de formulário: %s\n" -#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "Histórico de formulários" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Precisa de um nome de utilizador e uma senha\n" +"para abrir esta localização:" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "Memorizar senha para esta página?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Memorizar" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "Agora não" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Nunca para esta página" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "Alternar estado do histórico de formulários" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "Ativar ou desativar histórico de formulários para o separador atual." + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Falha ao executar o relatório da base de dados: %s\n" -#: ../extensions/formhistory.c:503 +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "Só ativar através das teclas de atalho e por separador (Ctrl+Shift+F)" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "Preenchimento do formulário" + +#: ../extensions/formhistory/formhistory.c:669 msgid "Stores history of entered form data" msgstr "Armazena o histórico do formulário" -#: ../extensions/formhistory.c:507 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 #, c-format -msgid "Not available: %s" -msgstr "Não disponível: %s" +msgid "Failed to select suggestions\n" +msgstr "Falha ao selecionar as sugestões\n" -#: ../extensions/formhistory.c:508 -msgid "Resource files not installed" -msgstr "O ficheiro de recursos não está instalado" +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Não existem separadores não visitados" -#: ../extensions/formhistory.c:514 -msgid "Form history filler" -msgstr "Preenchimento do formulário" +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "Histórico-Lista" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Ação ao fechar o separador" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Nenhuma" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Mudar para o último separador visualizado" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Mudar para o separador mais recente" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "O próximo Novo separador (lista de histórico)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "O próximo Novo separador no histórico" -#: ../extensions/history-list.vala:174 -msgid "Next Tab (History List)" -msgstr "Próximo Separador (Lista de Histórico)" - -#: ../extensions/history-list.vala:175 -msgid "Next tab from history" -msgstr "Próximo separador do histórico" - -#: ../extensions/history-list.vala:184 -msgid "Previous Tab (History List)" -msgstr "Separador Anterior (Lista de Histórico)" - -#: ../extensions/history-list.vala:185 -msgid "Previous tab from history" -msgstr "Separador anterior do histórico" +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "O anterior Novo separador (lista de histórico)" -#: ../extensions/history-list.vala:245 +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "O anterior Novo separador no histórico" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Exibir separador em segundo plano (histórico)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Exibir separador selecionado em segundo plano" + +#: ../extensions/history-list.vala:569 msgid "History List" -msgstr "Lista de Histórico" +msgstr "Lista de histórico" -#: ../extensions/history-list.vala:246 -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/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "" +"Mover para o último separador utilizado ao trocar ou fechar separadores" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" -msgstr "Gestos de Rato" +msgstr "Gestos de rato" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Controlar Midori movendo o rato" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 -msgid "Pageholder" -msgstr "Fixador de Página" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -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:109 +msgid "Reload page or stop loading" +msgstr "Atualizar página ou parar de carregar" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" -msgstr "Personalizar atalhos de Teclado" +msgstr "Personalizar atalhos de teclado" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." -msgstr "Personalizar Atalh_os..." +msgstr "Personalizar atalh_os..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Atalhos" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "Ver e editar os atalhos de teclado" -#: ../extensions/status-clock.c:176 +#: ../extensions/status-clock.c:174 msgid "Statusbar Clock" msgstr "Relógio de barra de estado" -#: ../extensions/status-clock.c:177 +#: ../extensions/status-clock.c:175 msgid "Display date and time in the statusbar" msgstr "Mostrar data e hora na barra de estado" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Imagens" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" -msgstr "Argumentos" +msgstr "\"Scripts\"" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" -msgstr "Plugins Netscape" +msgstr "\"Plug-ins\" Netscape" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" -msgstr "Funções na Barra de Estado" +msgstr "Funções na barra de estado" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" msgstr "Ligar/desligar facilmente as funções em páginas web" -#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" -msgstr "Painel de Separadores" +msgstr "Painel de separadores" -#: ../extensions/tab-panel.c:612 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" -msgstr "P_ainel de Separadores" +msgstr "P_ainel de separadores" -#: ../extensions/tab-panel.c:629 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" -msgstr "Mostrar separadores em painel vertical" +msgstr "Mostrar separadores num painel vertical" -#: ../extensions/tabs-minimized.c:79 +#: ../extensions/tabs-minimized.c:76 msgid "Only Icons on Tabs by default" -msgstr "Por omissão, mostrar apenas os Ícones" +msgstr "Por omissão, mostrar apenas os ícones" -#: ../extensions/tabs-minimized.c:80 +#: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" msgstr "Os novos separadores não mostram texto" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" -msgstr "Personalizar Barra de Ferramentas" +msgstr "Personalizar barra de ferramentas" -#: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "Seleccione os itens a mostar na barra de ferramentas. Os itens podem ser ordenados por arrastamento." +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"Selecione os itens a exibir na barra de ferramentas. Os itens podem ser " +"ordenados por arrastamento." -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" -msgstr "Itens Disponíveis" +msgstr "Itens disponíveis" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" -msgstr "Itens Apresentados" +msgstr "Itens exibidos" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." -msgstr "Personalizar Barra de _Ferramentas..." +msgstr "Personalizar barra de ferramen_tas..." + +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "Personali_zar..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" -msgstr "Editor da Barra de Ferramentas" +msgstr "Editor da barra de ferramentas" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" msgstr "Editar facilmente a barra de ferramentas" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "Pôr comunicações HTTP em cache" -#~ msgid "" -#~ "Do you really want to remove '%s'?\n" -#~ "\n" -#~ "The file '%s' will be permanently lost.\n" -#~ msgstr "" -#~ "Deseja realmente remover '%s'?\n" -#~ "\n" -#~ "O ficheiro '%s' será perdido para sempre.\n" - -#~ msgid "_Restore Tab" -#~ msgstr "_Restaurar Separadores" - -#~ msgid "_Minimize Tab" -#~ msgstr "_Minizar Separadores" - -#~ msgid "Erroneous clock time" -#~ msgstr "Hora do relógio incorrecta" - -#~ 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." - -#~ msgid "Copy %s to the folder %s." -#~ msgstr "Copiar %s para a pasta %s." - -#~ msgid "Minimize new Tabs" -#~ msgstr "Minimizar novos Separadores" - -#~ msgid "New tabs open minimized" -#~ msgstr "Minimizar novos separadores ao abrir" - -#~ msgid "_Recently visited pages" -#~ msgstr "Páginas _Recentes" - -#~ msgid "Reopen pages that you visited earlier" -#~ msgstr "Reabrir páginas visitadas anteriormente" - -#~ msgid "Show the saved bookmarks" -#~ msgstr "Mostrar marcadores guardados" - -#~ msgid "Original cookies only" -#~ msgstr "Apenas cookies originais" - -#~ msgid "Accept cookies from the original website only" -#~ msgstr "Apenas aceitar cookies do sítio web original" - -#~ msgid "Remember last visited pages" -#~ msgstr "Lembrar últimas páginas visitadas" - -#~ msgid "Whether the last visited pages are saved" -#~ msgstr "Marque se quiser guardar as últimas páginas visitadas" - -#~ msgid "Detect proxy server automatically" -#~ msgstr "Detectar servidor proxy automaticamente" - -#~ msgid "Whether to detect the proxy server automatically from the environment" -#~ msgstr "Marque se quiser detectar automaticamente o servidor proxy" - -#~ msgid "Set number of shortcuts" -#~ msgstr "Definir número de atalhos" - -#~ msgid "Enter number of shortcuts:" -#~ msgstr "Indique o número de atalhos" - -#~ 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." - -#~ msgid "Open _Link" -#~ msgstr "Abrir _Ligação" - -#~ msgid "Open Image in New Wi_ndow" -#~ msgstr "Abrir Imagem em Nova Ja_nela" +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "A pasta de configuração especificada é inválida." -#~ msgid "REGEX" -#~ msgstr "REGEX" +#~ msgid "Cookies" +#~ msgstr "\"Cookies\"" -#~ msgid "Not available on this platform" -#~ msgstr "Não disponível para esta plataforma" +#~ msgid "'Flash' Cookies" +#~ msgstr "\"Cookies Flash\"" -#~ msgid "Failed to get current time: %s\n" -#~ msgstr "Falha na obtenção da hora actual: %s\n" +#~ msgid "HTML5 _Databases" +#~ msgstr "Bases de _dados HTML5" -#~ msgid "Show panel _titles" -#~ msgstr "Mostrar _títulos do painel" +#~ msgid "Offline Application Cache" +#~ msgstr "\"Cache\" de aplicações \"offline\"" -#~ msgid "Options" -#~ msgstr "Opções" +#~ msgid "Lightweight web browser" +#~ msgstr "Navegador Web rápido" diff -Nru midori-0.2.8/po/pt_BR.po midori-0.4.6/po/pt_BR.po --- midori-0.2.8/po/pt_BR.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/pt_BR.po 2012-05-14 22:13:42.000000000 +0000 @@ -2,1194 +2,1162 @@ # Copyright (C) 2009 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Rogério Brito 2009 -# Sergio Cipolla 2010 -# +# Sergio Cipolla 2010, 2011 +# msgid "" msgstr "" -"Project-Id-Version: Midori 0.2.6\n" +"Project-Id-Version: Midori 0.2.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 13:27-0300\n" -"PO-Revision-Date: 2010-09-16 13:37-0300\n" +"POT-Creation-Date: 2012-04-12 01:18+0000\n" +"PO-Revision-Date: 2011-06-09 18:00-0300\n" "Last-Translator: Sérgio Cipolla \n" "Language-Team: Brazilian Portuguese \n" -"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Navegador web leve" +msgid "Browse the Web" +msgstr "Navegue na Web" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1322 -#: ../midori/main.c:1651 -#: ../midori/main.c:1659 -#: ../midori/main.c:1675 -#: ../midori/midori-websettings.c:312 +msgid "Internet;WWW;Explorer" +msgstr "Internet;WWW;Explorer" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072 +#: ../midori/main.c:2086 ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Navegador web" -#: ../midori/main.c:99 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Navegação Privada Midori" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Abrir uma nova janela de navegação privada" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4166 +msgid "Private Browsing" +msgstr "Navegação Privada" + +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "A configuração não pôde ser carregada: %s\n" -#: ../midori/main.c:148 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "O valor '%s' é inválido para %s" -#: ../midori/main.c:155 -#: ../midori/main.c:241 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valor de configuração '%s' inválido " -#: ../midori/main.c:366 -#: ../midori/main.c:470 -#: ../extensions/formhistory.c:439 +#: ../midori/main.c:380 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Os motores de pesquisa não puderam ser carregados. %s\n" + +#: ../midori/main.c:434 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Falha ao limpar o histórico: %s\n" + +#: ../midori/main.c:454 ../midori/main.c:581 +#: ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" msgstr "Falha ao abrir a base de dados: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:422 +#: ../midori/main.c:524 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "Falha ao excluir histórico antigo: %s\n" +msgstr "Falha ao excluir itens antigos do histórico: %s\n" -#: ../midori/main.c:453 -#: ../panels/midori-history.c:169 -#: ../panels/midori-history.c:199 +#: ../midori/main.c:564 ../panels/midori-history.c:232 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Falha ao excluir item do histórico: %s\n" -#: ../midori/main.c:498 +#: ../midori/main.c:611 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Os favoritos não puderam ser salvos. %s" -#: ../midori/main.c:525 +#: ../midori/main.c:633 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "A configuração não pôde ser salva. %s" -#: ../midori/main.c:563 +#: ../midori/main.c:668 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Os motores de pesquisa não puderam ser salvos. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:583 -#: ../midori/main.c:606 +#: ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" msgstr "O lixo não pôde ser salvo. %s" -#: ../midori/main.c:665 -#: ../midori/main.c:905 +#: ../midori/main.c:746 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Extensões" + +#: ../midori/main.c:760 +msgid "Privacy" +msgstr "Privacidade" + +#: ../midori/main.c:772 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"Os cookies armazenam dados de autenticação, jogos salvos ou perfis do " +"usuário para fins de propaganda." + +#: ../midori/main.c:828 #, c-format msgid "The session couldn't be saved. %s" msgstr "A sessão não pôde ser salva. %s" -#: ../midori/main.c:849 -msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "Nenhum certificado raiz disponível. Os certificados SSL não podem ser verificados." - -#: ../midori/main.c:939 -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 em que foi aberto. Se isso ocorrer repetidamente, tente uma das seguintes opções para resolver o problema." +#: ../midori/main.c:1046 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" +"Nenhum certificado raiz disponível. Os certificados SSL não podem ser " +"verificados." + +#: ../midori/main.c:1115 +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 em que foi aberto. Se isso " +"ocorrer repetidamente, tente uma das seguintes opções para resolver o " +"problema." -#: ../midori/main.c:954 +#: ../midori/main.c:1134 msgid "Modify _preferences" msgstr "Modificar _preferências" -#: ../midori/main.c:958 -msgid "Reset the last _session" -msgstr "Restaurar a última _sessão" - -#: ../midori/main.c:963 +#: ../midori/main.c:1138 msgid "Disable all _extensions" msgstr "Desabilitar todas as _extensões" -#: ../midori/main.c:1202 -#: ../midori/main.c:1946 +#: ../midori/main.c:1151 +msgid "Discard old tabs" +msgstr "Descartar abas antigas" + +#: ../midori/main.c:1152 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "Exibir as últimas abas sem carregá-las" + +#: ../midori/main.c:1153 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "Exibir as últimas abas abertas" + +#: ../midori/main.c:1400 ../midori/main.c:2464 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "A sessão não pôde ser carregada: %s\n" -#: ../midori/main.c:1322 -msgid "No filename specified" -msgstr "Nenhum nome de arquivo especificado" - -#: ../midori/main.c:1341 -msgid "An unknown error occured." -msgstr "Ocorreu um erro desconhecido." - -#: ../midori/main.c:1372 +#: ../midori/main.c:1538 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captura salva em: %s\n" -#: ../midori/main.c:1544 +#: ../midori/main.c:1951 msgid "Run ADDRESS as a web application" msgstr "Executar ENDEREÇO como aplicativo web" -#: ../midori/main.c:1544 +#: ../midori/main.c:1951 msgid "ADDRESS" msgstr "ENDEREÇO" -#: ../midori/main.c:1547 +#: ../midori/main.c:1954 msgid "Use FOLDER as configuration folder" msgstr "Usar PASTA como pasta de configuração" -#: ../midori/main.c:1547 +#: ../midori/main.c:1954 msgid "FOLDER" msgstr "PASTA" -#: ../midori/main.c:1550 +#: ../midori/main.c:1957 +msgid "Private browsing, no changes are saved" +msgstr "Navegação privada, nenhuma modificação é salva" + +#: ../midori/main.c:1959 msgid "Show a diagnostic dialog" msgstr "Exibir diálogo de diagnóstico" -#: ../midori/main.c:1552 +#: ../midori/main.c:1961 msgid "Run the specified filename as javascript" msgstr "Executar o arquivo especificado como javascript" -#: ../midori/main.c:1555 +#: ../midori/main.c:1963 msgid "Take a snapshot of the specified URI" -msgstr "Tirar uma captura do URI especificado" +msgstr "Capturar o URI especificado num arquivo PDF" -#: ../midori/main.c:1558 +#: ../midori/main.c:1965 msgid "Execute the specified command" msgstr "Executar o comando especificado" -#: ../midori/main.c:1560 +#: ../midori/main.c:1967 +msgid "List available commands to execute with -e/ --execute" +msgstr "Listar comandos disponíveis para execução com -e/ --execute" + +#: ../midori/main.c:1969 msgid "Display program version" msgstr "Exibir a versão do programa" -#: ../midori/main.c:1562 +#: ../midori/main.c:1971 msgid "Addresses" msgstr "Endereços" -#: ../midori/main.c:1564 +#: ../midori/main.c:1973 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquear URIs conforme a expressão regular PADRÃO" -#: ../midori/main.c:1564 +#: ../midori/main.c:1973 msgid "PATTERN" msgstr "PADRÃO" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1568 +#: ../midori/main.c:1977 msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "Restaurar o Midori após SEGUNDOS segundos de inatividade" +msgstr "Limpar a sessão do Midori após SEGUNDOS segundos de inatividade" -#: ../midori/main.c:1568 +#: ../midori/main.c:1977 msgid "SECONDS" msgstr "SEGUNDOS" -#: ../midori/main.c:1648 +#: ../midori/main.c:1980 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Redirecionar alertas do console para o ARQUIVO especificado" + +#: ../midori/main.c:1980 +msgid "FILENAME" +msgstr "ARQUIVO" + +#: ../midori/main.c:2045 msgid "[Addresses]" msgstr "[Endereços]" -#: ../midori/main.c:1676 +#: ../midori/main.c:2087 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor, envie comentários, sugestões e relatos de erros para:" -#: ../midori/main.c:1678 +#: ../midori/main.c:2089 msgid "Check for new versions at:" -msgstr "Verificar por novas versões a:" +msgstr "Verificar por novas versões em:" -#: ../midori/main.c:1795 -msgid "The specified configuration folder is invalid." -msgstr "A pasta de configuração especificada é inválida." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2173 +msgid "Saved logins and _passwords" +msgstr "Nomes de _usuário e senhas salvos" + +#: ../midori/main.c:2175 +msgid "Cookies and Website data" +msgstr "Cookies e dados de sites" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2179 ../midori/midori-websettings.c:996 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Cache da web" -#: ../midori/main.c:1843 -msgid "An instance of Midori is already running but not responding.\n" -msgstr "Uma instância do Midori já está em execução mas não está respondendo.\n" +#: ../midori/main.c:2182 +msgid "Website icons" +msgstr "Ícones de sites" -#: ../midori/main.c:1898 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "Os motores de pesquisa não puderam ser carregados. %s\n" +#: ../midori/main.c:2288 +msgid "An unknown error occured" +msgstr "Ocorreu um erro desconhecido." + +#: ../midori/main.c:2395 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "" +"Uma instância do Midori já está em execução mas não está respondendo.\n" -#: ../midori/main.c:1919 +#: ../midori/main.c:2431 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Os favoritos não puderam ser carregados: %s\n" -#: ../midori/main.c:1961 +#: ../midori/main.c:2479 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "O lixo não pôde ser carregado: %s\n" -#: ../midori/main.c:1974 +#: ../midori/main.c:2492 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "O histórico não pôde ser carregado: %s\n" -#: ../midori/main.c:1988 +#: ../midori/main.c:2508 msgid "The following errors occured:" msgstr "Ocorreram os seguintes erros:" -#: ../midori/main.c:2004 +#: ../midori/main.c:2524 msgid "_Ignore" msgstr "_Ignorar " -#: ../midori/midori-array.c:429 +#: ../midori/midori-app.c:1334 +msgid "_Bookmark" +msgstr "_Favorito" + +#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6042 +msgid "_Bookmarks" +msgstr "_Favoritos" + +#: ../midori/midori-app.c:1336 +msgid "Add Boo_kmark" +msgstr "Adicionar _favorito" + +#: ../midori/midori-app.c:1337 +msgid "_Console" +msgstr "_Console" + +#: ../midori/midori-app.c:1338 +msgid "_Extensions" +msgstr "_Extensões" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4569 +msgid "_History" +msgstr "_Histórico" + +#: ../midori/midori-app.c:1340 +msgid "_Homepage" +msgstr "_Página inicial" + +#: ../midori/midori-app.c:1341 +msgid "_Userscripts" +msgstr "Scripts de _usuário" + +#: ../midori/midori-app.c:1342 +msgid "New _Tab" +msgstr "_Nova aba" + +#: ../midori/midori-app.c:1343 +msgid "_Transfers" +msgstr "_Transferências" + +#: ../midori/midori-app.c:1344 +msgid "Netscape p_lugins" +msgstr "P_lugins Netscape" + +#: ../midori/midori-app.c:1345 +msgid "_Closed Tabs" +msgstr "Abas _fechadas" + +#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5198 +msgid "New _Window" +msgstr "Nova _janela" + +#: ../midori/midori-app.c:1347 +msgid "New _Folder" +msgstr "Nova _pasta" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "Arquivo não encontrado." -#: ../midori/midori-array.c:463 -#: ../midori/midori-array.c:486 -#: ../midori/midori-array.c:496 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Documento mal conformado." -#: ../midori/midori-array.c:505 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "Formato de favoritos não reconhecido." -#: ../midori/midori-array.c:716 +#: ../midori/midori-array.c:915 msgid "Writing failed." msgstr "Falha na escrita." -#: ../midori/midori-browser.c:336 -#: ../midori/midori-browser.c:4926 -#: ../midori/midori-browser.c:4932 +#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5280 +#: ../midori/midori-browser.c:5289 msgid "Reload the current page" msgstr "Recarregar a página atual" -#: ../midori/midori-browser.c:346 -#: ../midori/midori-browser.c:4929 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:5286 msgid "Stop loading the current page" msgstr "Parar o carregamento da página atual" -#: ../midori/midori-browser.c:453 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% carregado" - -#: ../midori/midori-browser.c:491 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" msgstr "Falha ao atualizar título: %s\n" -#: ../midori/midori-browser.c:504 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." msgstr "Ação inesperada '%s'." -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:579 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (navegação privada)" + +#: ../midori/midori-browser.c:693 ../midori/midori-browser.c:726 +msgid "Toplevel folder" +msgstr "Pasta principal" + +#: ../midori/midori-browser.c:784 msgid "New folder" msgstr "Nova pasta" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:784 msgid "Edit folder" msgstr "Editar pasta" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:786 msgid "New bookmark" msgstr "Novo favorito" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:786 msgid "Edit bookmark" msgstr "Editar favorito" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:828 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:779 -#: ../midori/midori-searchaction.c:958 -msgid "_Description:" -msgstr "_Descrição:" - -#: ../midori/midori-browser.c:798 -#: ../midori/midori-searchaction.c:972 +#: ../midori/midori-browser.c:848 ../midori/midori-searchaction.c:961 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Endereço:" -#: ../midori/midori-browser.c:830 -#: ../midori/midori-browser.c:4046 +#: ../midori/midori-browser.c:871 ../midori/midori-browser.c:4306 msgid "_Folder:" msgstr "_Pasta:" -#: ../midori/midori-browser.c:840 -#: ../midori/midori-browser.c:934 -#: ../midori/midori-browser.c:4051 -#: ../midori/midori-browser.c:4079 -msgid "Toplevel folder" -msgstr "Pasta superior" - -#: ../midori/midori-browser.c:872 +#: ../midori/midori-browser.c:887 msgid "Add to _Speed Dial" msgstr "Adicionar à _ligação rápida" -#: ../midori/midori-browser.c:885 +#: ../midori/midori-browser.c:900 msgid "Show in the tool_bar" msgstr "Exibir na _barra de ferramentas" -#: ../midori/midori-browser.c:900 +#: ../midori/midori-browser.c:915 msgid "Run as _web application" msgstr "Executar como aplicativo _web" -#: ../midori/midori-browser.c:979 +#: ../midori/midori-browser.c:986 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "O arquivo \"%s\" não pode ser salvo nessa pasta." + +#: ../midori/midori-browser.c:988 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Você não tem permissão de escrita nesse local." + +#: ../midori/midori-browser.c:995 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Não há espaço livre suficiente para baixar \"%s\"." -#: ../midori/midori-browser.c:983 +#: ../midori/midori-browser.c:998 #, c-format msgid "The file needs %s but only %s are left." msgstr "O arquivo precisa de %s e só há %s livre." -#: ../midori/midori-browser.c:1045 -#: ../midori/midori-browser.c:4087 -#: ../midori/midori-browser.c:4122 +#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4375 msgid "Save file as" msgstr "Salvar como" -#: ../midori/midori-browser.c:1438 +#: ../midori/midori-browser.c:1330 +msgid "New Window" +msgstr "Nova janela" + +#: ../midori/midori-browser.c:1330 +msgid "A new window has been opened" +msgstr "Uma nova janela foi aberta" + +#: ../midori/midori-browser.c:1333 +msgid "New Tab" +msgstr "Nova aba" + +#: ../midori/midori-browser.c:1333 +msgid "A new tab has been opened" +msgstr "Uma nova aba foi aberta" + +#: ../midori/midori-browser.c:1368 +msgid "Error opening the image!" +msgstr "Erro ao abrir a imagem!" + +#: ../midori/midori-browser.c:1369 +msgid "Can not open selected image in a default viewer." +msgstr "Não é possível abrir imagem selecionada em um visualizador padrão." + +#: ../midori/midori-browser.c:1375 +msgid "Error downloading the image!" +msgstr "Erro ao baixar a imagem!" + +#: ../midori/midori-browser.c:1376 +msgid "Can not download selected image." +msgstr "Não é possível baixar a imagem selecionada." + +#: ../midori/midori-browser.c:1481 msgid "Save file" msgstr "Salvar arquivo" -#: ../midori/midori-browser.c:2154 +#: ../midori/midori-browser.c:2349 msgid "Open file" msgstr "Abrir arquivo" -#: ../midori/midori-browser.c:2232 +#: ../midori/midori-browser.c:2481 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." msgstr "" -"Para usar o URI acima, abra um agregador de notícias. Geralmente há um menu ou botão \"Nova Inscrição\", \"Novo Feed de Notícias\" ou similar.\n" -" Alternativamente, vá para Preferências, Aplicativos e selecione um agregador de notícias. Na próxima vez em que clicar no ícone de um feed de notícias ele será adicionado automaticamente." +"Para usar o URI acima, abra um agregador de notícias. Geralmente há um menu " +"ou botão \"Nova Inscrição\", \"Novo Feed de Notícias\" ou similar.\n" +"Alternativamente, vá para Preferências, Aplicativos e selecione um agregador " +"de notícias. Na próxima vez em que clicar no ícone de um feed de notícias " +"ele será adicionado automaticamente." -#: ../midori/midori-browser.c:2238 -#: ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2487 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Novo feed" -#: ../midori/midori-browser.c:2281 -#: ../midori/midori-browser.c:4991 -#: ../panels/midori-bookmarks.c:400 +#: ../midori/midori-browser.c:2530 ../midori/midori-browser.c:5349 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "Adicionar novo favorito" -#: ../midori/midori-browser.c:2850 -#: ../midori/midori-searchaction.c:481 +#: ../midori/midori-browser.c:3029 ../midori/midori-searchaction.c:488 msgid "Empty" msgstr "Vazio" -#: ../midori/midori-browser.c:3323 -#: ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 -#: ../midori/sokoke.c:436 -#: ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "Não foi possível executar o programa externo." +#: ../midori/midori-browser.c:3449 +msgid "Toggle text cursor navigation" +msgstr "Habilitar/desabilitar navegação por cursor de texto" -#: ../midori/midori-browser.c:3566 -#: ../midori/midori-browser.c:5382 +#: ../midori/midori-browser.c:3765 ../midori/midori-browser.c:5735 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Falha ao inserir novo item no histórico: %s\n" -#: ../midori/midori-browser.c:3881 -#: ../panels/midori-bookmarks.c:713 -#: ../panels/midori-history.c:736 +#: ../midori/midori-browser.c:4094 ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 msgid "Open all in _Tabs" -msgstr "Abrir tudo em _abas" +msgstr "Abrir tudo em a_bas" -#: ../midori/midori-browser.c:3888 -#: ../panels/midori-bookmarks.c:719 -#: ../panels/midori-history.c:742 -#: ../extensions/feed-panel/feed-panel.c:542 +#: ../midori/midori-browser.c:4101 ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" -msgstr "Abrir em nova _aba" +msgstr "Abrir em nova a_ba" -#: ../midori/midori-browser.c:3891 -#: ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4014 -#: ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:744 -#: ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4104 ../midori/midori-view.c:2648 +#: ../midori/midori-view.c:4706 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Abrir em nova _janela" -#: ../midori/midori-browser.c:3969 +#: ../midori/midori-browser.c:4193 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3970 +#: ../midori/midori-browser.c:4194 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3971 +#: ../midori/midori-browser.c:4195 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3972 +#: ../midori/midori-browser.c:4196 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:4197 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3997 +#: ../midori/midori-browser.c:4198 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4219 msgid "Import bookmarks..." msgstr "Importar favoritos..." -#: ../midori/midori-browser.c:4000 -#: ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:4222 ../midori/midori-browser.c:5354 msgid "_Import bookmarks" msgstr "_Importar favoritos" -#: ../midori/midori-browser.c:4011 +#: ../midori/midori-browser.c:4233 msgid "_Application:" msgstr "_Aplicativo:" -#: ../midori/midori-browser.c:4038 -#: ../midori/midori-browser.c:5109 -#: ../midori/midori-websettings.c:226 -#: ../midori/midori-websettings.c:317 -#: ../katze/katze-utils.c:696 -msgid "Custom..." -msgstr "Personalizado..." +#: ../midori/midori-browser.c:4298 +msgid "Import from XBEL or HTML file" +msgstr "Importar de um arquivo XBEL ou HTML" + +#: ../midori/midori-browser.c:4333 +msgid "Import from a file" +msgstr "Importar de um arquivo" -#: ../midori/midori-browser.c:4098 +#: ../midori/midori-browser.c:4345 msgid "Failed to import bookmarks" msgstr "Falha ao importar favoritos" -#: ../midori/midori-browser.c:4139 +#: ../midori/midori-browser.c:4380 +msgid "XBEL Bookmarks" +msgstr "Favoritos XBEL" + +#: ../midori/midori-browser.c:4385 +msgid "Netscape Bookmarks" +msgstr "Favoritos Netscape" + +#: ../midori/midori-browser.c:4399 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "O Midori só pode exportar para XBEL (*.xbel) e Netscape (*.html)" + +#: ../midori/midori-browser.c:4414 msgid "Failed to export bookmarks" msgstr "Falha ao exportar favoritos" -#: ../midori/midori-browser.c:4192 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "Falha ao limpar o histórico: %s\n" - -#: ../midori/midori-browser.c:4200 -#, c-format -msgid "Failed to clear search history: %s\n" -msgstr "Falha ao limpar o histórico de pesquisa: %s\n" - #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4307 +#: ../midori/midori-browser.c:4536 msgid "Clear Private Data" msgstr "Limpar dados privados" -#: ../midori/midori-browser.c:4311 +#: ../midori/midori-browser.c:4540 msgid "_Clear private data" msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:4325 +#: ../midori/midori-browser.c:4553 msgid "Clear the following data:" msgstr "Limpar os seguintes dados:" -#: ../midori/midori-browser.c:4335 -#: ../midori/midori-preferences.c:532 -#: ../panels/midori-history.c:114 -msgid "History" -msgstr "Histórico" - -#: ../midori/midori-browser.c:4340 -msgid "Cookies" -msgstr "Cookies" - -#: ../midori/midori-browser.c:4345 -msgid "'Flash' Cookies" -msgstr "Cookies 'Flash'" - -#: ../midori/midori-browser.c:4350 -msgid "Website icons" -msgstr "Ícones de sites" - -#: ../midori/midori-browser.c:4355 -#: ../midori/sokoke.c:1314 -msgid "_Closed Tabs" -msgstr "Abas _fechadas" - -#: ../midori/midori-browser.c:4360 -#: ../extensions/web-cache.c:462 -msgid "Web Cache" -msgstr "Cache da web" +#: ../midori/midori-browser.c:4563 +msgid "Last open _tabs" +msgstr "Últimas abas abertas" -#: ../midori/midori-browser.c:4368 +#: ../midori/midori-browser.c:4589 msgid "Clear private data when _quitting Midori" msgstr "Limpar dados privados ao _sair do Midori" -#: ../midori/midori-browser.c:4509 +#: ../midori/midori-browser.c:4784 msgid "A lightweight web browser." msgstr "Um navegador web leve." -#: ../midori/midori-browser.c:4511 -msgid "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." -msgstr "Esta biblioteca é software livre; você pode redistribuí-la e/ou modificá-la nos termos da GNU Lesser General Public License conforme publicada pela Free Software Foundation; tanto na versão 2.1 ou (por sua opção) qualquer versão mais recente." +#: ../midori/midori-browser.c:4785 +msgid "See about:version for version info." +msgstr "Veja about:version para informações da versão." + +#: ../midori/midori-browser.c:4787 +msgid "" +"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." +msgstr "" +"Esta biblioteca é software livre; você pode redistribuí-la e/ou modificá-la " +"nos termos da GNU Lesser General Public License conforme publicada pela Free " +"Software Foundation; tanto na versão 2.1 ou (por sua opção) qualquer versão " +"mais recente." -#: ../midori/midori-browser.c:4530 +#: ../midori/midori-browser.c:4808 msgid "translator-credits" msgstr "" "Sérgio Cipolla \n" "Rogério Brito " -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:5196 msgid "_File" msgstr "_Arquivo" -#: ../midori/midori-browser.c:4841 -#: ../midori/sokoke.c:1315 -msgid "New _Window" -msgstr "Nova _janela" - -#: ../midori/midori-browser.c:4842 +#: ../midori/midori-browser.c:5199 msgid "Open a new window" msgstr "Abrir nova janela" -#: ../midori/midori-browser.c:4845 +#: ../midori/midori-browser.c:5202 msgid "Open a new tab" msgstr "Abrir nova aba" -#: ../midori/midori-browser.c:4847 -msgid "P_rivate Browsing" -msgstr "Navegação pri_vada" - -#: ../midori/midori-browser.c:4848 -msgid "Don't save any private data while browsing" -msgstr "Não salvar quaisquer dados privados ao navegar" +#: ../midori/midori-browser.c:5204 +msgid "New P_rivate Browsing Window" +msgstr "Nova janela de navegação pri_vada" -#: ../midori/midori-browser.c:4852 +#: ../midori/midori-browser.c:5208 msgid "Open a file" msgstr "Abrir arquivo" -#: ../midori/midori-browser.c:4855 +#: ../midori/midori-browser.c:5210 +msgid "_Save Page As..." +msgstr "_Salvar página como..." + +#: ../midori/midori-browser.c:5211 msgid "Save to a file" msgstr "Salvar para arquivo" -#: ../midori/midori-browser.c:4857 +#: ../midori/midori-browser.c:5213 msgid "Add to Speed _dial" -msgstr "Adicionar à ligação rápi_da" +msgstr "Adicionar à li_gação rápida" -#: ../midori/midori-browser.c:4858 -msgid "Add shortcut to speed dial" -msgstr "Adicionar atalho à ligação rápida" - -#: ../midori/midori-browser.c:4860 +#: ../midori/midori-browser.c:5217 msgid "Add Shortcut to the _desktop" msgstr "A_dicionar atalho à área de trabalho" -#: ../midori/midori-browser.c:4861 -msgid "Add shortcut to the desktop" -msgstr "Adicionar atalho à área de trabalho" +#: ../midori/midori-browser.c:5219 +msgid "Create _Launcher" +msgstr "Criar lança_dor" -#: ../midori/midori-browser.c:4863 +#: ../midori/midori-browser.c:5223 msgid "Subscribe to News _feed" msgstr "Inscrever _feed de notícias" -#: ../midori/midori-browser.c:4864 -msgid "Subscribe to this news feed" -msgstr "Inscrever este feed de notícias" - -#: ../midori/midori-browser.c:4869 +#: ../midori/midori-browser.c:5229 msgid "_Close Tab" msgstr "_Fechar aba" -#: ../midori/midori-browser.c:4870 +#: ../midori/midori-browser.c:5230 msgid "Close the current tab" msgstr "Fechar a aba atual" -#: ../midori/midori-browser.c:4872 +#: ../midori/midori-browser.c:5232 msgid "C_lose Window" msgstr "Fechar jane_la" -#: ../midori/midori-browser.c:4873 -msgid "Close this window" -msgstr "Fechar esta janela" - -#: ../midori/midori-browser.c:4876 +#: ../midori/midori-browser.c:5236 msgid "Print the current page" msgstr "Imprimir a página atual" -#: ../midori/midori-browser.c:4879 -msgid "Quit the application" -msgstr "Sair do aplicativo" +#: ../midori/midori-browser.c:5238 +msgid "Close a_ll Windows" +msgstr "Fechar _todas as janelas" -#: ../midori/midori-browser.c:4881 +#: ../midori/midori-browser.c:5241 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:4885 -msgid "Undo the last modification" -msgstr "Desfazer a última modificação" - -#: ../midori/midori-browser.c:4888 -msgid "Redo the last modification" -msgstr "Refazer a última modificação" - -#: ../midori/midori-browser.c:4892 -msgid "Cut the selected text" -msgstr "Recortar o texto selecionado" - -#: ../midori/midori-browser.c:4895 -#: ../midori/midori-browser.c:4898 -msgid "Copy the selected text" -msgstr "Copiar o texto selecionado" - -#: ../midori/midori-browser.c:4901 -msgid "Paste text from the clipboard" -msgstr "Colar texto da área de transferência" - -#: ../midori/midori-browser.c:4904 -msgid "Delete the selected text" -msgstr "Excluir o texto selecionado" - -#: ../midori/midori-browser.c:4907 -msgid "Select all text" -msgstr "Selecionar todo o texto" +#: ../midori/midori-browser.c:5264 +msgid "_Find..." +msgstr "Locali_zar..." -#: ../midori/midori-browser.c:4910 +#: ../midori/midori-browser.c:5265 msgid "Find a word or phrase in the page" msgstr "Localizar palavra ou frase na página" -#: ../midori/midori-browser.c:4912 +#: ../midori/midori-browser.c:5267 msgid "Find _Next" msgstr "Localizar _seguinte" -#: ../midori/midori-browser.c:4913 -msgid "Find the next occurrence of a word or phrase" -msgstr "Localizar a ocorrência seguinte da palavra ou frase" - -#: ../midori/midori-browser.c:4915 +#: ../midori/midori-browser.c:5270 msgid "Find _Previous" msgstr "Localizar _anterior" -#: ../midori/midori-browser.c:4916 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Localizar a ocorrência anterior da palavra ou frase" - -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:5274 msgid "Configure the application preferences" msgstr "Configurar preferências do aplicativo" -#: ../midori/midori-browser.c:4922 +#: ../midori/midori-browser.c:5276 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:5277 msgid "_Toolbars" msgstr "_Barras de ferramentas" -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:5282 +msgid "Reload page without caching" +msgstr "Recarregar a página sem caching" + +#: ../midori/midori-browser.c:5292 msgid "Increase the zoom level" msgstr "Ampliar" -#: ../midori/midori-browser.c:4938 +#: ../midori/midori-browser.c:5295 msgid "Decrease the zoom level" msgstr "Reduzir" -#: ../midori/midori-browser.c:4941 -msgid "Reset the zoom level" -msgstr "Tamanho normal" - -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:5299 msgid "_Encoding" msgstr "_Codificação" -#: ../midori/midori-browser.c:4944 +#: ../midori/midori-browser.c:5301 msgid "View So_urce" msgstr "Ver _fonte" -#: ../midori/midori-browser.c:4945 -msgid "View the source code of the page" -msgstr "Ver código fonte da página" +#: ../midori/midori-browser.c:5304 +msgid "Ca_ret Browsing" +msgstr "Navegação _por cursor" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:5308 msgid "Toggle fullscreen view" msgstr "Alternar tela cheia" -#: ../midori/midori-browser.c:4951 +#: ../midori/midori-browser.c:5310 msgid "Scroll _Left" msgstr "Rolar à _esquerda" -#: ../midori/midori-browser.c:4952 -msgid "Scroll to the left" -msgstr "Rolar à esquerda" - -#: ../midori/midori-browser.c:4954 +#: ../midori/midori-browser.c:5313 msgid "Scroll _Down" msgstr "Rolar para _baixo" -#: ../midori/midori-browser.c:4955 -msgid "Scroll down" -msgstr "Rolar para baixo" - -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:5316 msgid "Scroll _Up" msgstr "Rolar para _cima" -#: ../midori/midori-browser.c:4958 -msgid "Scroll up" -msgstr "Rolar para cima" - -#: ../midori/midori-browser.c:4960 +#: ../midori/midori-browser.c:5319 msgid "Scroll _Right" msgstr "Rolar à _direita" -#: ../midori/midori-browser.c:4961 -msgid "Scroll to the right" -msgstr "Rolar à direita" - -#: ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:5322 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:5325 msgid "Go back to the previous page" msgstr "Ir para a página anterior" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:5328 msgid "Go forward to the next page" msgstr "Ir para a página seguinte" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:5332 msgid "Go to the previous sub-page" msgstr "Ir para a subpágina anterior" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4978 +#: ../midori/midori-browser.c:5336 msgid "Go to the next sub-page" msgstr "Ir para a subpágina seguinte" -#: ../midori/midori-browser.c:4981 +#: ../midori/midori-browser.c:5339 msgid "Go to your homepage" msgstr "Ir para a página inicial" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:5341 msgid "Empty Trash" msgstr "Esvaziar lixo" -#: ../midori/midori-browser.c:4984 -msgid "Delete the contents of the trash" -msgstr "Excluir o conteúdo do lixo" - -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:5344 msgid "Undo _Close Tab" msgstr "De_sfazer fechar aba" -#: ../midori/midori-browser.c:4987 -msgid "Open the last closed tab" -msgstr "Abrir a última aba fechada" - -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:5351 msgid "Add a new _folder" msgstr "Adicionar _nova pasta" -#: ../midori/midori-browser.c:4994 -msgid "Add a new bookmark folder" -msgstr "Adicionar nova pasta de favoritos" - -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:5357 msgid "_Export bookmarks" msgstr "_Exportar favoritos" -#: ../midori/midori-browser.c:5002 -#: ../midori/midori-searchaction.c:490 +#: ../midori/midori-browser.c:5360 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "Gerenciar motores de _pesquisa" -#: ../midori/midori-browser.c:5003 -msgid "Add, edit and remove search engines..." -msgstr "Adicionar, editar e excluir motores de pesquisa..." - -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:5363 msgid "_Clear Private Data" -msgstr "_Limpar dados privados" +msgstr "Limpar _dados privados" -#: ../midori/midori-browser.c:5007 -msgid "Clear private data..." -msgstr "Limpar dados privados..." - -#: ../midori/midori-browser.c:5011 +#: ../midori/midori-browser.c:5366 msgid "_Inspect Page" -msgstr "Inspecionar página" - -#: ../midori/midori-browser.c:5012 -msgid "Inspect page details and access developer tools..." -msgstr "Inspecionar detalhes da página e acessar ferramentas de desenvolvimento..." +msgstr "_Inspecionar página" -#: ../midori/midori-browser.c:5017 +#: ../midori/midori-browser.c:5370 msgid "_Previous Tab" msgstr "Aba _anterior" -#: ../midori/midori-browser.c:5018 -msgid "Switch to the previous tab" -msgstr "Mudar para a aba anterior" - -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:5373 msgid "_Next Tab" msgstr "Aba _seguinte" -#: ../midori/midori-browser.c:5021 -msgid "Switch to the next tab" -msgstr "Mudar para a aba seguinte" +#: ../midori/midori-browser.c:5375 +msgid "Move Tab _Backward" +msgstr "Mover a aba para _trás" + +#: ../midori/midori-browser.c:5377 +msgid "_Move Tab Forward" +msgstr "Mover a aba para a _frente" -#: ../midori/midori-browser.c:5023 +#: ../midori/midori-browser.c:5380 msgid "Focus _Current Tab" -msgstr "_Focar aba atual" - -#: ../midori/midori-browser.c:5024 -msgid "Focus the current tab" -msgstr "Focar a aba atual" +msgstr "_Focar a aba atual" -#: ../midori/midori-browser.c:5026 -msgid "Minimize _Current Tab" -msgstr "Minimizar aba a_tual" +#: ../midori/midori-browser.c:5383 +msgid "Focus _Next view" +msgstr "Focar o _campo de visão seguinte" -#: ../midori/midori-browser.c:5027 -msgid "Minimize the current tab" -msgstr "Minimizar a aba atual" +#: ../midori/midori-browser.c:5386 +msgid "Only show the Icon of the _Current Tab" +msgstr "Exibir apenas o _ícone da aba atual" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5389 msgid "_Duplicate Current Tab" msgstr "Duplicar a_ba atual" -#: ../midori/midori-browser.c:5030 -msgid "Duplicate the current tab" -msgstr "Duplicar a aba atual" - -#: ../midori/midori-browser.c:5032 +#: ../midori/midori-browser.c:5392 msgid "Close Ot_her Tabs" msgstr "Fec_har outras abas" -#: ../midori/midori-browser.c:5033 -msgid "Close all tabs except the current tab" -msgstr "Fechar todas as abas exceto a atual" - -#: ../midori/midori-browser.c:5035 +#: ../midori/midori-browser.c:5395 msgid "Open last _session" -msgstr "Abrir _última sessão" +msgstr "Abrir a _última sessão" -#: ../midori/midori-browser.c:5036 -msgid "Open the tabs saved in the last session" -msgstr "Abrir as abas salvas na última sessão" - -#: ../midori/midori-browser.c:5038 +#: ../midori/midori-browser.c:5398 msgid "_Help" msgstr "Aj_uda" -#: ../midori/midori-browser.c:5040 -msgid "_Contents" -msgstr "_Conteúdo" - -#: ../midori/midori-browser.c:5041 -msgid "Show the documentation" -msgstr "Exibir a documentação" - -#: ../midori/midori-browser.c:5043 +#: ../midori/midori-browser.c:5400 msgid "_Frequent Questions" -msgstr "Perguntas _frequentes" - -#: ../midori/midori-browser.c:5044 -msgid "Show the Frequently Asked Questions" -msgstr "Exibir as perguntas frequentes" - -#: ../midori/midori-browser.c:5046 -msgid "_Report a Bug" -msgstr "_Relatar erro" +msgstr "Perguntas fre_quentes" -#: ../midori/midori-browser.c:5047 -msgid "Open Midori's bug tracker" -msgstr "Abrir o rastreador de bugs do Midori" +#: ../midori/midori-browser.c:5403 +msgid "_Report a Problem..." +msgstr "_Relatar um problema..." -#: ../midori/midori-browser.c:5050 -msgid "Show information about the program" -msgstr "Exibir informação sobre o programa" - -#: ../midori/midori-browser.c:5058 +#: ../midori/midori-browser.c:5415 msgid "_Menubar" msgstr "Barra de _menu" -#: ../midori/midori-browser.c:5059 -msgid "Show menubar" -msgstr "Exibir barra de menu" - -#: ../midori/midori-browser.c:5062 +#: ../midori/midori-browser.c:5419 msgid "_Navigationbar" msgstr "Barra de _navegação" -#: ../midori/midori-browser.c:5063 -msgid "Show navigationbar" -msgstr "Exibir barra de navegação" - -#: ../midori/midori-browser.c:5066 +#: ../midori/midori-browser.c:5423 msgid "Side_panel" msgstr "Painel _lateral" -#: ../midori/midori-browser.c:5067 -msgid "Show sidepanel" -msgstr "Exibir painel lateral" +#: ../midori/midori-browser.c:5424 +msgid "Sidepanel" +msgstr "Painel lateral" -#: ../midori/midori-browser.c:5070 +#: ../midori/midori-browser.c:5427 msgid "_Bookmarkbar" msgstr "Barra de _favoritos" -#: ../midori/midori-browser.c:5071 -msgid "Show bookmarkbar" -msgstr "Exibir barra de favoritos" - -#: ../midori/midori-browser.c:5074 -msgid "_Transferbar" -msgstr "Barra de _transferências" - -#: ../midori/midori-browser.c:5075 -msgid "Show transferbar" -msgstr "Exibir barra de transferências" - -#: ../midori/midori-browser.c:5078 +#: ../midori/midori-browser.c:5431 msgid "_Statusbar" msgstr "Barra de _status" -#: ../midori/midori-browser.c:5079 -msgid "Show statusbar" -msgstr "Exibir barra de status" - -#: ../midori/midori-browser.c:5087 +#: ../midori/midori-browser.c:5440 ../midori/midori-websettings.c:311 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5090 -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5443 ../midori/midori-websettings.c:236 msgid "Chinese (BIG5)" msgstr "Chinês (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:5447 msgid "Japanese (SHIFT__JIS)" msgstr "Japonês (SHIFT__JIS)" -#: ../midori/midori-browser.c:5097 -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5450 ../midori/midori-websettings.c:238 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5100 -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5453 ../midori/midori-websettings.c:239 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:5103 -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5456 ../midori/midori-websettings.c:240 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5106 -#: ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5459 ../midori/midori-websettings.c:241 msgid "Western (ISO-8859-1)" msgstr "Ocidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5625 +#: ../midori/midori-browser.c:5462 ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "Personalizado..." + +#: ../midori/midori-browser.c:5967 msgid "_Separator" msgstr "_Aba" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5974 msgid "_Location..." msgstr "_Localização..." -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5976 msgid "Open a particular location" msgstr "Abrir localização específica" -#: ../midori/midori-browser.c:5658 +#: ../midori/midori-browser.c:5998 msgid "_Web Search..." msgstr "Pesquisa _web..." -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:6000 msgid "Run a web search" msgstr "Pesquisar na web" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:6027 msgid "Reopen a previously closed tab or window" msgstr "Reabrir janela ou aba anteriormente fechada" -#: ../midori/midori-browser.c:5696 -#: ../midori/sokoke.c:1304 -msgid "_Bookmarks" -msgstr "_Favoritos" - -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:6044 msgid "Show the saved bookmarks" msgstr "Exibir favoritos salvos" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:6061 msgid "_Tools" msgstr "Ferramen_tas" -#: ../midori/midori-browser.c:5731 +#: ../midori/midori-browser.c:6077 msgid "_Window" msgstr "_Janela" -#: ../midori/midori-browser.c:5733 +#: ../midori/midori-browser.c:6079 msgid "Show a list of all open tabs" msgstr "Exibir lista das abas abertas" -#: ../midori/midori-browser.c:5747 +#: ../midori/midori-browser.c:6093 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:5749 +#: ../midori/midori-browser.c:6095 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:6314 +#: ../midori/midori-browser.c:6909 #, c-format msgid "Unexpected setting '%s'" msgstr "Configuração inesperada '%s'" -#: ../midori/midori-locationaction.c:390 +#: ../midori/midori-extension.c:329 #, c-format -msgid "Failed to select from history\n" -msgstr "Falha ao selecionar do histórico\n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "A configuração da extensão '%s' não pôde ser carregada: %s\n" -#: ../midori/midori-locationaction.c:474 +#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "Pesquisar por %s" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "A configuração da extensão '%s' não pôde ser salva: %s\n" -#: ../midori/midori-locationaction.c:497 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "Pesquisar com %s" -#: ../midori/midori-locationaction.c:1305 +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Pesquisar com..." + +#: ../midori/midori-locationaction.c:537 +#, c-format +msgid "Failed to select from history\n" +msgstr "Falha ao selecionar do histórico\n" + +#: ../midori/midori-locationaction.c:624 #, c-format -msgid "Failed to execute database statement\n" -msgstr "Falha ao executar afirmação da base de dados:\n" +msgid "Search for %s" +msgstr "Pesquisar por %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1361 +#: ../midori/midori-locationaction.c:1400 msgid "Paste and p_roceed" msgstr "Cola_r e prosseguir" -#: ../midori/midori-panel.c:412 -#: ../midori/midori-panel.c:414 -msgid "Detach chosen panel from the window" -msgstr "Separar da janela o painel escolhido" - -#: ../midori/midori-panel.c:424 -#: ../midori/midori-panel.c:426 -#: ../midori/midori-panel.c:596 -#: ../midori/midori-panel.c:599 +#: ../midori/midori-locationaction.c:1768 +msgid "Not verified" +msgstr "Não verificado" + +#: ../midori/midori-locationaction.c:1788 +msgid "Verified and encrypted connection" +msgstr "Verificado e conexão criptografada" + +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" msgstr "Alinhar painel lateral à direita" -#: ../midori/midori-panel.c:436 -#: ../midori/midori-panel.c:437 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Fechar painel" -#: ../midori/midori-panel.c:597 -#: ../midori/midori-panel.c:600 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Alinhar painel lateral à esquerda" -#: ../midori/midori-panel.c:754 -msgid "Hide operating controls" -msgstr "Ocultar controles operacionais" - -#: ../midori/midori-websettings.c:200 -msgid "Show Blank page" -msgstr "Exibir página em branco" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "Exibir ligação rápida" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" msgstr "Exibir a página inicial" -#: ../midori/midori-websettings.c:202 -msgid "Show last open tabs" -msgstr "Exibir as últimas abas abertas" - -#: ../midori/midori-websettings.c:204 -msgid "Show last tabs without loading" -msgstr "Exibir as últimas abas sem carregá-las" - -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:237 msgid "Japanese (SHIFT_JIS)" msgstr "Japonês (SHIFT_JIS)" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:257 msgid "New tab" msgstr "Nova aba" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:258 msgid "New window" msgstr "Nova janela" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:259 msgid "Current tab" msgstr "Aba atual" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:274 msgid "Default" msgstr "Padrão" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:275 msgid "Icons" msgstr "Ícones" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:276 msgid "Small icons" msgstr "Ícones pequenos" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:277 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:278 msgid "Icons and text" msgstr "Ícones e texto" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:279 msgid "Text beside icons" msgstr "Texto ao lado dos ícones" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:294 msgid "Automatic (GNOME or environment)" msgstr "Automático (GNOME ou ambiente)" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:295 msgid "HTTP proxy server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:296 msgid "No proxy server" msgstr "Sem servidor proxy" -#: ../midori/midori-websettings.c:295 -msgid "All cookies" -msgstr "Todos os cookies" - -#: ../midori/midori-websettings.c:296 -msgid "Session cookies" -msgstr "Cookies da sessão" - -#: ../midori/midori-websettings.c:297 -#: ../katze/katze-utils.c:672 -msgid "None" -msgstr "Nenhum" - #: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" @@ -1206,1100 +1174,1039 @@ msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:400 msgid "Remember last window size" msgstr "Lembrar último tamanho da janela" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:401 msgid "Whether to save the last window size" msgstr "Se o último tamanho da janela deve ser salvo" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:409 msgid "Last window width" msgstr "Última largura da janela" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:410 msgid "The last saved window width" msgstr "Última largura da janela salva" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:418 msgid "Last window height" msgstr "Última altura da janela" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:419 msgid "The last saved window height" msgstr "Última altura da janela salva" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:444 msgid "Last panel position" msgstr "Última posição do painel" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:445 msgid "The last saved panel position" msgstr "Última posição do painel salva" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:454 msgid "Last panel page" msgstr "Última página do painel" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:455 msgid "The last saved panel page" msgstr "Última página do painel salva" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:463 msgid "Last Web search" msgstr "Última pesquisa na web" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:464 msgid "The last saved Web search" msgstr "Última pesquisa na web salva" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:473 msgid "Show Menubar" msgstr "Exibir barra de menu" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:474 msgid "Whether to show the menubar" msgstr "Se a barra de menu deve ser exibida" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:482 msgid "Show Navigationbar" msgstr "Exibir barra de navegação" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:483 msgid "Whether to show the navigationbar" msgstr "Se a barra de navegação deve ser exibida" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:491 msgid "Show Bookmarkbar" msgstr "Exibir barra de favoritos" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:492 msgid "Whether to show the bookmarkbar" msgstr "Se a barra de favoritos deve ser exibida" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:500 msgid "Show Panel" msgstr "Exibir painel" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:501 msgid "Whether to show the panel" msgstr "Se o painel deve ser exibido" -#: ../midori/midori-websettings.c:485 -msgid "Show Transferbar" -msgstr "Exibir barra de transferências" - -#: ../midori/midori-websettings.c:486 -msgid "Whether to show the transferbar" -msgstr "Se a barra de transferências deve ser exibida" - -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:509 msgid "Show Statusbar" msgstr "Exibir barra de status" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:510 msgid "Whether to show the statusbar" msgstr "Se a barra de status deve ser exibida" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:519 msgid "Toolbar Style:" msgstr "Estilo da barra de ferramentas:" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:520 msgid "The style of the toolbar" msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:521 -msgid "Show progress in location entry" -msgstr "Exibir progresso no campo de endereço" - -#: ../midori/midori-websettings.c:522 -msgid "Whether to show loading progress in the location entry" -msgstr "Se o progresso do carregamento deve ser exibido no campo de endereço" - -#: ../midori/midori-websettings.c:537 -msgid "Search engines in location completion" -msgstr "Motores de pesquisa na complementação do endereço" - -#: ../midori/midori-websettings.c:538 -msgid "Whether to show search engines in the location completion" -msgstr "Se motores de pesquisa devem ser exibidos na complementação do endereço" - -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:529 msgid "Toolbar Items" msgstr "Itens da barra de ferramentas" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:530 msgid "The items to show on the toolbar" msgstr "Itens a serem exibidos na barra de ferramentas" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:538 msgid "Compact Sidepanel" msgstr "Painel lateral compacto" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:539 msgid "Whether to make the sidepanel compact" msgstr "Se o painel lateral deve ser compacto" -#: ../midori/midori-websettings.c:571 -msgid "Show operating controls of the panel" -msgstr "Exibir os controles operacionais do painel" - -#: ../midori/midori-websettings.c:572 -msgid "Whether to show the operating controls of the panel" -msgstr "Se os controles operacionais do painel devem ser exibidos" - -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:554 msgid "Align sidepanel on the right" msgstr "Alinhar painel lateral à direita" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:555 msgid "Whether to align the sidepanel on the right" msgstr "Se o painel lateral deve ser alinhado à direita" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:570 msgid "Open panels in separate windows" msgstr "Abrir painéis em janelas separadas" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:571 msgid "Whether to always open panels in separate windows" msgstr "Se os painéis devem ser sempre abertos em janelas separadas" -#: ../midori/midori-websettings.c:613 +#: ../midori/midori-websettings.c:580 msgid "When Midori starts:" msgstr "Ao iniciar o Midori:" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:581 msgid "What to do when Midori starts" msgstr "O que fazer ao iniciar o Midori" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:590 msgid "Homepage:" msgstr "Página inicial:" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:591 msgid "The homepage" msgstr "A página inicial" -#: ../midori/midori-websettings.c:639 +#: ../midori/midori-websettings.c:606 msgid "Show crash dialog" msgstr "Exibir diálogo de encerramento abrupto" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:607 msgid "Show a dialog after Midori crashed" msgstr "Exibir um diálogo após o encerramento abrupto do Midori" -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:656 -msgid "Show speed dial in new tabs" -msgstr "Exibir ligação rápida nas novas abas" - -#: ../midori/midori-websettings.c:657 -msgid "Show speed dial in newly opened tabs" -msgstr "Exibir ligação rápida nas abas recentemente abertas" - -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:615 msgid "Save downloaded files to:" msgstr "Salvar arquivos baixados em:" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:616 msgid "The folder downloaded files are saved to" msgstr "A pasta na qual salvar os arquivos baixados" -#: ../midori/midori-websettings.c:687 -msgid "Ask for the destination folder" -msgstr "Perguntar pela pasta de destino" - -#: ../midori/midori-websettings.c:688 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "Se é para perguntar em que pasta salvar o arquivo a ser baixado" - -#: ../midori/midori-websettings.c:707 -msgid "Notify when a transfer has been completed" -msgstr "Notificar ao concluir a transferência" - -#: ../midori/midori-websettings.c:708 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "Se uma notificação deve ser exibida ao concluir-se a transferência" - -#: ../midori/midori-websettings.c:720 -msgid "Download Manager" -msgstr "Gerenciador de downloads" - -#: ../midori/midori-websettings.c:721 -msgid "An external download manager" -msgstr "Um gerenciador de downloads externo" - -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:624 msgid "Text Editor" msgstr "Editor de texto" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:625 msgid "An external text editor" msgstr "Um editor de texto externo" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:640 msgid "News Aggregator" msgstr "Agregador de notícias" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:641 msgid "An external news aggregator" msgstr "Um agregador de notícias externo" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:649 msgid "Location entry Search" msgstr "Pesquisa no campo de endereço" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:650 msgid "The search to perform inside the location entry" msgstr "A pesquisa a ser executada pelo campo de endereço" -#: ../midori/midori-websettings.c:763 +#: ../midori/midori-websettings.c:658 msgid "Preferred Encoding" msgstr "Codificação preferida" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:659 msgid "The preferred character encoding" msgstr "A codificação de caracteres preferida" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:669 msgid "Always Show Tabbar" msgstr "Sempre exibir barra de abas" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:670 msgid "Always show the tabbar" msgstr "Se a barra de abas deve ser exibida mesmo com apenas uma aba aberta" -#: ../midori/midori-websettings.c:783 +#: ../midori/midori-websettings.c:683 msgid "Close Buttons on Tabs" msgstr "Botão fechar nas abas" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:684 msgid "Whether tabs have close buttons" msgstr "Se as abas devem ter um botão para fechar" -#: ../midori/midori-websettings.c:792 +#: ../midori/midori-websettings.c:709 msgid "Open new pages in:" msgstr "Abrir novas páginas em:" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:710 msgid "Where to open new pages" msgstr "Onde abrir novas páginas" -#: ../midori/midori-websettings.c:802 -msgid "Open external pages in:" -msgstr "Abrir páginas externas em:" - -#: ../midori/midori-websettings.c:803 -msgid "Where to open externally opened pages" -msgstr "Onde abrir páginas abertas externamente" - -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:719 msgid "Middle click opens Selection" -msgstr "Clique na roda do mouse abre seleção" +msgstr "Clicar o botão do meio do mouse abre seleção" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:720 msgid "Load an address from the selection via middle click" -msgstr "Carregar endereço selecionado clicando na roda do mouse" +msgstr "Carregar o endereço selecionado clicando o botão do meio do mouse" -#: ../midori/midori-websettings.c:821 +#: ../midori/midori-websettings.c:728 msgid "Open tabs in the background" msgstr "Abrir abas em segundo plano" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:729 msgid "Whether to open new tabs in the background" msgstr "Se as novas abas devem ser abertas em segundo plano" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:737 msgid "Open Tabs next to Current" msgstr "Abrir abas ao lado da atual" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:738 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Se as novas abas devem ser abertas ao lado da atual em vez de após a última" +msgstr "" +"Se as novas abas devem ser abertas ao lado da atual em vez de após a última" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:746 msgid "Open popups in tabs" msgstr "Abrir popups em abas" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:747 msgid "Whether to open popup windows in tabs" msgstr "Se janelas popup devem ser abertas em abas" -#: ../midori/midori-websettings.c:850 -#: ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Carregar imagens automaticamente" -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:758 msgid "Load and display images automatically" msgstr "Carregar e exibir as imagens automaticamente" -#: ../midori/midori-websettings.c:858 -#: ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 msgid "Enable scripts" msgstr "Habilitar scripts" -#: ../midori/midori-websettings.c:859 +#: ../midori/midori-websettings.c:766 msgid "Enable embedded scripting languages" msgstr "Habilitar linguagem de scripts incorporadas" -#: ../midori/midori-websettings.c:866 -#: ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" msgstr "Habilitar plugins Netscape" -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:774 msgid "Enable embedded Netscape plugin objects" msgstr "Habilitar plugins Netscape incorporados" -#: ../midori/midori-websettings.c:883 +#: ../midori/midori-websettings.c:789 +msgid "Enable Spell Checking" +msgstr "Habilitar verificação ortográfica" + +#: ../midori/midori-websettings.c:790 +msgid "Enable spell checking while typing" +msgstr "Habilitar verificação ortográfica ao digitar" + +#: ../midori/midori-websettings.c:796 msgid "Enable HTML5 database support" -msgstr "Habilitar suporte a dados HTML5" +msgstr "Habilitar suporte a bases de dados HTML5" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:797 msgid "Whether to enable HTML5 database support" -msgstr "Se o suporte a dados HTML5 deve ser habilitado" +msgstr "Se o suporte a bases de dados HTML5 deve ser habilitado" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:803 msgid "Enable HTML5 local storage support" msgstr "Habilitar suporte a armazenagem local HTML5" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:804 msgid "Whether to enable HTML5 local storage support" msgstr "Se o suporte a armazenagem local HTML5 deve ser habilitado" -#: ../midori/midori-websettings.c:899 +#: ../midori/midori-websettings.c:810 msgid "Enable offline web application cache" -msgstr "Habilitar cache de aplicativo web offline" +msgstr "Habilitar cache de aplicativos web offline" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:811 msgid "Whether to enable offline web application cache" -msgstr "Se o cache de aplicativo web offline deve ser habilitado" +msgstr "Se o cache de aplicativos web offline deve ser habilitado" + +#: ../midori/midori-websettings.c:827 +msgid "Flash window on background tabs" +msgstr "Piscar janela em abas de segundo plano" + +#: ../midori/midori-websettings.c:828 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "" +"Pisca a janela do navegador se uma nova aba for aberta em segundo plano" -#: ../midori/midori-websettings.c:925 +#: ../midori/midori-websettings.c:836 +msgid "Enable WebGL support" +msgstr "Habilitar suporte a WebGL" + +#: ../midori/midori-websettings.c:837 +msgid "Allow websites to use OpenGL rendering" +msgstr "Permitir que sites usem renderização OpenGL" + +#: ../midori/midori-websettings.c:863 msgid "Zoom Text and Images" msgstr "Zoom de texto e imagens" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:864 msgid "Whether to zoom text and images" msgstr "Se o zoom de texto e imagens pode ser ajustado" -#: ../midori/midori-websettings.c:941 +#: ../midori/midori-websettings.c:879 msgid "Find inline while typing" msgstr "Localizar na página ao digitar" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:880 msgid "Whether to automatically find inline while typing" -msgstr "Se a localização na página deve ser automaticamente ao digitar" +msgstr "Se a localização na página deve se dar automaticamente ao digitar" -#: ../midori/midori-websettings.c:957 +#: ../midori/midori-websettings.c:895 msgid "Kinetic scrolling" msgstr "Rolagem cinética" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:896 msgid "Whether scrolling should kinetically move according to speed" msgstr "Se a rolagem deve se mover cineticamente conforme a velocidade" -#: ../midori/midori-websettings.c:966 -msgid "Accept cookies" -msgstr "Aceitar cookies" - -#: ../midori/midori-websettings.c:967 -msgid "What type of cookies to accept" -msgstr "Tipo de cookies a aceitar" - -#: ../midori/midori-websettings.c:976 -msgid "Maximum cookie age" -msgstr "Antiguidade máxima dos cookies" +#: ../midori/midori-websettings.c:904 +msgid "Delete old Cookies after:" +msgstr "Excluir cookies antigos após:" -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:905 msgid "The maximum number of days to save cookies for" msgstr "O número máximo de dias para manter cookies salvos" -#: ../midori/midori-websettings.c:986 -msgid "Maximum history age" -msgstr "Antiguidade máxima do histórico" +#: ../midori/midori-websettings.c:921 +msgid "Only accept Cookies from sites you visit" +msgstr "Aceitar coockies apenas de sites visitados" + +#: ../midori/midori-websettings.c:922 +msgid "Block cookies sent by third-party websites" +msgstr "Bloquear coockies enviados por outros sites" + +#: ../midori/midori-websettings.c:936 +msgid "Delete pages from history after:" +msgstr "Excluir páginas do histórico após:" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:937 msgid "The maximum number of days to save the history for" msgstr "O número máximo de dias para os quais manter um histórico" -#: ../midori/midori-websettings.c:995 -msgid "Remember last downloaded files" -msgstr "Lembrar últimos arquivos baixados" - -#: ../midori/midori-websettings.c:996 -msgid "Whether the last downloaded files are saved" -msgstr "Se os últimos arquivos baixados devem ser lembrados" - -#: ../midori/midori-websettings.c:1013 +#: ../midori/midori-websettings.c:952 msgid "Proxy server" msgstr "Servidor proxy" -#: ../midori/midori-websettings.c:1014 +#: ../midori/midori-websettings.c:953 msgid "The type of proxy server to use" msgstr "O tipo de servidor a utilizar" -#: ../midori/midori-websettings.c:1023 +#: ../midori/midori-websettings.c:962 msgid "HTTP Proxy Server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:1024 +#: ../midori/midori-websettings.c:963 msgid "The proxy server used for HTTP connections" msgstr "Servidor proxy para conexões HTTP" +#: ../midori/midori-websettings.c:978 +msgid "Port" +msgstr "Porta" + +#: ../midori/midori-websettings.c:979 +msgid "The proxy server port used for HTTP connections" +msgstr "Porta do servidor proxy usado para conexões HTTPS" + +#: ../midori/midori-websettings.c:997 +msgid "The maximum size of cached pages on disk" +msgstr "O tamanho máximo no disco das páginas em cache" + #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1040 +#: ../midori/midori-websettings.c:1014 msgid "Identify as" msgstr "Identificar-se como" -#: ../midori/midori-websettings.c:1041 +#: ../midori/midori-websettings.c:1015 msgid "What to identify as to web pages" msgstr "Identificar-se para as páginas web como" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1031 msgid "Identification string" msgstr "Cadeia de identificação" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1032 msgid "The application identification string" msgstr "A cadeia de identificação do aplicativo" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1048 msgid "Preferred languages" msgstr "Idiomas preferidos" -#: ../midori/midori-websettings.c:1074 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "Uma lista de idiomas, separados por vírgulas, para o processamento de páginas web multilíngues, por exemplo \"pt\", \"ru,es\" ou \"en-us;q=1.0, fr-fr;q=0.667\"" +#: ../midori/midori-websettings.c:1049 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"Uma lista de idiomas, separados por vírgulas, para o processamento de " +"páginas web multilíngues, por exemplo \"pt\", \"ru,es\" ou \"en-us;q=1.0, fr-" +"fr;q=0.667\"" -#: ../midori/midori-websettings.c:1089 +#: ../midori/midori-websettings.c:1064 msgid "Clear private data" msgstr "Limpar dados privados" -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1065 msgid "The private data selected for deletion" msgstr "Os dados privados selecionados para exclusão" -#. 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:1227 -#: ../midori/midori-view.c:4442 -#: ../midori/midori-view.c:4446 +#: ../midori/midori-websettings.c:1080 +msgid "Clear data" +msgstr "Limpar dados" + +#: ../midori/midori-websettings.c:1081 +msgid "The data selected for deletion" +msgstr "Os dados selecionados para exclusão" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1130 +msgid "Strip referrer details sent to websites" +msgstr "Eliminar detalhes do referrer enviados a sites externos" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1132 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Se o cabeçalho \"Referer\" deve limitar-se ao nome do host" + +#: ../midori/midori-websettings.c:1146 +msgid "Always use my font choices" +msgstr "Sempre usar minhas escolhas de fonte" + +#: ../midori/midori-websettings.c:1147 +msgid "Override fonts picked by websites with user preferences" +msgstr "Substituir fontes escolhidas por sites com as preferencias do usuário" + +#: ../midori/midori-view.c:1353 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s quer salvar uma base de dados HTML5." + +#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1389 +msgid "_Deny" +msgstr "_Negar" + +#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1389 +msgid "_Allow" +msgstr "_Permitir" + +#: ../midori/midori-view.c:1385 +#, c-format +msgid "%s wants to know your location." +msgstr "%s quer saber a sua localização." + +#: ../midori/midori-view.c:1476 #, c-format msgid "Error - %s" msgstr "Erro - %s" -#: ../midori/midori-view.c:1228 +#: ../midori/midori-view.c:1477 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "A página '%s' não pôde ser carregada." -#: ../midori/midori-view.c:1230 +#: ../midori/midori-view.c:1479 msgid "Try again" -msgstr "Tente novamente" - -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1249 -#, c-format -msgid "Not found - %s" -msgstr "Não encontrado - %s" +msgstr "Tentar novamente" -#: ../midori/midori-view.c:1433 -#: ../midori/midori-view.c:2279 +#: ../midori/midori-view.c:1676 ../midori/midori-view.c:2589 #, c-format msgid "Send a message to %s" msgstr "Enviar uma mensagem para %s" -#: ../midori/midori-view.c:2060 -#: ../midori/midori-view.c:2446 +#: ../midori/midori-view.c:2419 ../midori/midori-view.c:2738 msgid "Inspect _Element" msgstr "Inspecionar _elemento" -#: ../midori/midori-view.c:2112 -#: ../midori/midori-view.c:2182 +#: ../midori/midori-view.c:2471 msgid "Open Link in New _Tab" -msgstr "Abrir link em nova _aba" +msgstr "Abrir link em nova a_ba" -#: ../midori/midori-view.c:2116 +#: ../midori/midori-view.c:2475 msgid "Open Link in _Foreground Tab" msgstr "Abrir link na aba em _primeiro plano" -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2476 msgid "Open Link in _Background Tab" msgstr "Abrir link na aba em _segundo plano" -#: ../midori/midori-view.c:2120 -#: ../midori/midori-view.c:2189 +#: ../midori/midori-view.c:2479 msgid "Open Link in New _Window" msgstr "Abrir link em nova _janela" -#: ../midori/midori-view.c:2123 +#: ../midori/midori-view.c:2482 msgid "Open Link as Web A_pplication" -msgstr "Abrir link como a_plicação web" +msgstr "Abrir link como aplicativo _web" -#: ../midori/midori-view.c:2126 +#: ../midori/midori-view.c:2487 msgid "Copy Link de_stination" msgstr "Copiar _destino do link" -#: ../midori/midori-view.c:2129 -#: ../midori/midori-view.c:2201 -msgid "_Save Link destination" -msgstr "_Salvar destino do link" - -#: ../midori/midori-view.c:2130 -#: ../midori/midori-view.c:2195 -msgid "_Download Link destination" -msgstr "_Baixar destino do link" - -#: ../midori/midori-view.c:2134 -#: ../midori/midori-view.c:2164 -#: ../midori/midori-view.c:2206 -msgid "Download with Download _Manager" -msgstr "Baixar com _gerenciador de downloads" - -#: ../midori/midori-view.c:2143 +#: ../midori/midori-view.c:2503 msgid "Open _Image in New Tab" msgstr "Abrir _imagem em nova aba" -#: ../midori/midori-view.c:2146 +#: ../midori/midori-view.c:2506 msgid "Copy Image _Address" msgstr "Copiar _endereço da imagem" -#: ../midori/midori-view.c:2149 +#: ../midori/midori-view.c:2509 msgid "Save I_mage" msgstr "Salvar i_magem" -#: ../midori/midori-view.c:2150 -msgid "Download I_mage" -msgstr "Baixar i_magem" +#: ../midori/midori-view.c:2512 +msgid "Open in Image _Viewer" +msgstr "Abrir no Visualizador de Imagens" -#: ../midori/midori-view.c:2157 +#: ../midori/midori-view.c:2519 msgid "Copy Video _Address" msgstr "Copiar _endereço do vídeo" -#: ../midori/midori-view.c:2160 +#: ../midori/midori-view.c:2522 msgid "Save _Video" msgstr "Salvar _vídeo" -#: ../midori/midori-view.c:2160 +#: ../midori/midori-view.c:2522 msgid "Download _Video" msgstr "Baixar _vídeo" -#: ../midori/midori-view.c:2223 +#: ../midori/midori-view.c:2548 msgid "Search _with" msgstr "Pesquisar _com" -#: ../midori/midori-view.c:2259 -#: ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2580 msgid "_Search the Web" msgstr "_Pesquisar na web" -#: ../midori/midori-view.c:2287 +#: ../midori/midori-view.c:2597 msgid "Open Address in New _Tab" -msgstr "Abrir endereço em nova _aba" +msgstr "Abrir endereço em nova a_ba" -#: ../midori/midori-view.c:2591 +#: ../midori/midori-view.c:2887 msgid "Open or download file" msgstr "Abrir ou baixar arquivo" -#: ../midori/midori-view.c:2610 +#: ../midori/midori-view.c:2906 #, c-format msgid "File Type: '%s'" msgstr "Tipo de arquivo: '%s'" -#: ../midori/midori-view.c:2613 +#: ../midori/midori-view.c:2908 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de arquivo: %s ('%s')" +#: ../midori/midori-view.c:2913 +#, c-format +msgid "File Name: %s" +msgstr "Nome do arquivo: %s" + #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2617 +#: ../midori/midori-view.c:2932 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:3158 +#: ../midori/midori-view.c:3578 #, c-format msgid "Inspect page - %s" msgstr "Inspecionar página - %s" -#: ../midori/midori-view.c:3439 -msgid "Speed dial" +#: ../midori/midori-view.c:3925 +msgid "Speed Dial" msgstr "Ligação rápida" -#: ../midori/midori-view.c:3440 +#: ../midori/midori-view.c:3926 ../midori/midori-view.c:4022 msgid "Click to add a shortcut" msgstr "Clique para adicionar um atalho" -#: ../midori/midori-view.c:3441 +#: ../midori/midori-view.c:3927 msgid "Enter shortcut address" msgstr "Informe o endereço do atalho" -#: ../midori/midori-view.c:3442 +#: ../midori/midori-view.c:3928 msgid "Enter shortcut title" msgstr "Informe o título do atalho" -#: ../midori/midori-view.c:3443 +#: ../midori/midori-view.c:3929 msgid "Are you sure you want to delete this shortcut?" -msgstr "Tem certeza de que quer excluir este atalho?" - -#: ../midori/midori-view.c:3444 -msgid "Set number of columns and rows" -msgstr "Definir número de colunas e linhas" - -#: ../midori/midori-view.c:3445 -msgid "Enter number of columns and rows:" -msgstr "Informe o número de colunas e linhas:" - -#: ../midori/midori-view.c:3446 -msgid "Invalid input for the size of the speed dial" -msgstr "Entrada inválida para o tamanho da ligação rápida" - -#: ../midori/midori-view.c:3447 -msgid "Thumb size:" -msgstr "Tamanho da miniatura:" +msgstr "Tem certeza de que quer excluir esse atalho?" -#: ../midori/midori-view.c:3448 -msgid "Small" -msgstr "Pequeno" - -#: ../midori/midori-view.c:3449 -msgid "Medium" -msgstr "Médio" - -#: ../midori/midori-view.c:3450 -msgid "Big" -msgstr "Grande" - -#: ../midori/midori-view.c:3476 -#, c-format -msgid "Document cannot be displayed" -msgstr "O documento não pode ser exibido" - -#: ../midori/midori-view.c:3499 +#: ../midori/midori-view.c:4091 #, c-format msgid "No documentation installed" msgstr "Nenhuma documentação instalada" -#: ../midori/midori-view.c:3618 +#: ../midori/midori-view.c:4167 +msgid "Midori doesn't store any personal data:" +msgstr "Midori não armazena quaisquer dados pessoais:" + +#: ../midori/midori-view.c:4168 +msgid "No history or web cookies are being saved." +msgstr "O histórico e cookies não estando sendo guardados." + +#: ../midori/midori-view.c:4169 +msgid "Extensions are disabled." +msgstr "As extensões estão desativadas." + +#: ../midori/midori-view.c:4170 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "O armazenamento local de HTML5, base de dados e cache da aplicação estão desativados." + +#: ../midori/midori-view.c:4171 +msgid "Midori prevents websites from tracking the user:" +msgstr "O Midori impede que sites obtenham dados do usuário:" + +#: ../midori/midori-view.c:4172 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "Os URL são removidos do nome da máquina." + +#: ../midori/midori-view.c:4173 +msgid "DNS prefetching is disabled." +msgstr "A obtenção prévia de DNS está desativada." + +#: ../midori/midori-view.c:4174 +msgid "The language and timezone are not revealed to websites." +msgstr "O idioma e o fuso horário não são revelados aos sites." + +#: ../midori/midori-view.c:4175 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "Os plugins do Flash e Netscape não podem ser listados pelos sites." + +#: ../midori/midori-view.c:4224 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "Os números de versão entre parênteses mostram a versão em execução." + +#: ../midori/midori-view.c:4280 msgid "Page loading delayed" msgstr "Carregamento da página postergado" -#: ../midori/midori-view.c:3619 +#: ../midori/midori-view.c:4281 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "Carregamento postergado seja por um encerramento abrupto recente ou pelas preferências de início." +msgstr "" +"Carregamento postergado seja por um encerramento abrupto recente ou pelas " +"preferências de início." -#: ../midori/midori-view.c:3620 +#: ../midori/midori-view.c:4282 msgid "Load Page" msgstr "Carregar página" -#: ../midori/midori-view.c:3764 +#: ../midori/midori-view.c:4448 msgid "Blank page" msgstr "Página em branco" -#: ../midori/midori-view.c:4018 +#: ../midori/midori-view.c:4710 msgid "_Duplicate Tab" msgstr "_Duplicar aba" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4715 msgid "Show Tab _Label" msgstr "Exibir _título da aba" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4715 msgid "Show Tab _Icon Only" msgstr "Exibir apenas o _ícone da aba" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4721 msgid "Close ot_her Tabs" msgstr "Fec_har outras abas" -#: ../midori/midori-view.c:4680 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5534 +msgid "previous" +msgstr "anterior" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5553 +msgid "next" +msgstr "próxima" + +#: ../midori/midori-view.c:5566 msgid "Print background images" msgstr "Imprimir imagens de fundo" -#: ../midori/midori-view.c:4681 +#: ../midori/midori-view.c:5567 msgid "Whether background images should be printed" msgstr "Se as imagens de fundo devem ser impressas" -#: ../midori/midori-view.c:4733 -#: ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:5599 msgid "Features" msgstr "Funcionalidades" -#. Page "General" -#: ../midori/midori-preferences.c:301 -msgid "General" -msgstr "Geral" - -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Início" -#: ../midori/midori-preferences.c:317 -#: ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Usar a _página atual" + +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Usar a página atual como página inicial" -#: ../midori/midori-preferences.c:334 -#: ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Transferências" - #. Page "Appearance" -#: ../midori/midori-preferences.c:352 -msgid "Appearance" -msgstr "Aparência" - -#: ../midori/midori-preferences.c:353 -msgid "Font settings" -msgstr "Configurações de fontes" - -#: ../midori/midori-preferences.c:355 -msgid "Default Font Family" -msgstr "Família de fontes padrão" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Fontes" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Família de fontes proporcionais" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "A família de fontes padrão usada para exibir texto" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "O tamanho de fonte padrão usado para exibir texto" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Família de fontes de largura fixa" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "A família de fontes usada para exibir texto com largura fixa" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" msgstr "O tamanho de fonte usado para exibir texto com largura fixa" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Tamanho mínimo de fonte" -#: ../midori/midori-preferences.c:374 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "O tamanho mínimo de fonte usado para exibir texto" #. Page "Behavior" -#: ../midori/midori-preferences.c:383 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:396 -msgid "Enforce 96 dots per inch" -msgstr "Forçar 96 pontos por polegada" - -#: ../midori/midori-preferences.c:397 -msgid "Enforce a video dot density of 96 DPI" -msgstr "Forçar resolução de vídeo de 96 PPP" - -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Permitir que os scripts abram popups" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "Se os scripts devem ter permissão para abrir janelas popup automaticamente" - -#: ../midori/midori-preferences.c:422 -msgid "Spell Checking" -msgstr "Verificação ortográfica" - -#: ../midori/midori-preferences.c:424 -msgid "Enable Spell Checking" -msgstr "Habilitar verificação ortográfica" - -#: ../midori/midori-preferences.c:425 -msgid "Enable spell checking while typing" -msgstr "Habilitar verificação ortográfica ao digitar" - -#: ../midori/midori-preferences.c:427 -msgid "Spelling dictionaries:" -msgstr "Dicionários de ortografia:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:431 -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áfica, por exemplo \"en_GB,pt_BR\"" +msgstr "" +"Se os scripts devem ter permissão para abrir janelas popup automaticamente" #. Page "Interface" -#: ../midori/midori-preferences.c:437 -msgid "Interface" -msgstr "Interface" - -#: ../midori/midori-preferences.c:438 -msgid "Navigationbar" -msgstr "Barra de navegação" - -#: ../midori/midori-preferences.c:448 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Navegação" -#. Page "Applications" -#: ../midori/midori-preferences.c:470 -msgid "Applications" -msgstr "Aplicativos" - -#: ../midori/midori-preferences.c:471 -msgid "External applications" -msgstr "Aplicativos externos" - #. Page "Network" -#: ../midori/midori-preferences.c:487 -#: ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "Rede" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:463 msgid "Hostname" msgstr "Nome da máquina" -#. Page "Privacy" -#: ../midori/midori-preferences.c:513 -msgid "Privacy" -msgstr "Privacidade" - -#: ../midori/midori-preferences.c:514 -msgid "Web Cookies" -msgstr "Cookies" - -#: ../midori/midori-preferences.c:523 -#: ../midori/midori-preferences.c:537 -msgid "days" -msgstr "dias" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "MB" -#: ../midori/midori-searchaction.c:914 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Adicionar motor de pesquisa" -#: ../midori/midori-searchaction.c:914 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Editar motor de pesquisa" -#: ../midori/midori-searchaction.c:942 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Nome:" -#: ../midori/midori-searchaction.c:986 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Descrição:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "_Ícone:" -#: ../midori/midori-searchaction.c:1000 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "_Palavra-chave:" -#: ../midori/midori-searchaction.c:1231 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "Gerenciar motores de pesquisa" -#: ../midori/midori-searchaction.c:1332 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "Usar como _padrão" -#: ../midori/sokoke.c:1303 -msgid "_Bookmark" -msgstr "_Favorito" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "Abrir com" -#: ../midori/sokoke.c:1305 -msgid "Add Boo_kmark" -msgstr "Adicionar _favorito" - -#: ../midori/sokoke.c:1306 -msgid "_Console" -msgstr "_Console" - -#: ../midori/sokoke.c:1307 -msgid "_Extensions" -msgstr "_Extensões" +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Escolha um aplicativo ou um comando para abrir \"%s\":" -#: ../midori/sokoke.c:1308 -msgid "_History" -msgstr "_Histórico" +#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "Não foi possível executar o programa externo." -#: ../midori/sokoke.c:1309 -msgid "_Homepage" -msgstr "_Página inicial" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d hora" +msgstr[1] "%d horas" -#: ../midori/sokoke.c:1310 -msgid "_Userscripts" -msgstr "Scripts de _usuário" +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minuto" +msgstr[1] "%d minutos" -#: ../midori/sokoke.c:1311 -msgid "New _Tab" -msgstr "_Nova aba" +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d segundo" +msgstr[1] "%d segundos" -#: ../midori/sokoke.c:1312 -msgid "_Transfers" -msgstr "_Transferências" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s de %s" -#: ../midori/sokoke.c:1313 -msgid "Netscape p_lugins" -msgstr "P_lugins Netscape" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/sokoke.c:1316 -msgid "New _Folder" -msgstr "Nova _pasta" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr " - %s para terminar" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:213 +#: ../toolbars/midori-findbar.c:291 msgid "_Inline Find:" msgstr "Local_izar na página:" -#: ../toolbars/midori-findbar.c:245 +#: ../toolbars/midori-findbar.c:317 msgid "Previous" msgstr "Anterior" -#: ../toolbars/midori-findbar.c:251 +#: ../toolbars/midori-findbar.c:323 msgid "Next" msgstr "Seguinte" -#: ../toolbars/midori-findbar.c:255 +#: ../toolbars/midori-findbar.c:327 msgid "Match Case" msgstr "Sensível ao caso" -#: ../toolbars/midori-findbar.c:264 +#: ../toolbars/midori-findbar.c:336 msgid "Highlight Matches" msgstr "Realçar correspondências" -#: ../toolbars/midori-findbar.c:275 +#: ../toolbars/midori-findbar.c:347 msgid "Close Findbar" msgstr "Fechar barra de localização" -#: ../toolbars/midori-transferbar.c:88 -#: ../panels/midori-transfers.c:273 -#, c-format -msgid "%s of %s" -msgstr "%s de %s" - -#: ../toolbars/midori-transferbar.c:123 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "O arquivo %s foi baixado." -#: ../toolbars/midori-transferbar.c:126 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Transferência concluída" -#: ../toolbars/midori-transferbar.c:257 -#: ../panels/midori-transfers.c:144 +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "O arquivo baixado é errôneo." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"A soma de verificação fornecida com o link não coincide. Isso significa que " +"o arquivo provavelmente está incompleto ou foi modificado." + +#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Limpar tudo" -#: ../toolbars/midori-transferbar.c:300 -#: ../toolbars/midori-transferbar.c:302 +#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 msgid "Some files are being downloaded" msgstr "Alguns arquivos estão sendo baixados" -#: ../toolbars/midori-transferbar.c:306 +#: ../toolbars/midori-transferbar.c:377 msgid "_Quit Midori" msgstr "_Sair do Midori" -#: ../toolbars/midori-transferbar.c:308 +#: ../toolbars/midori-transferbar.c:379 msgid "The transfers will be cancelled if Midori quits." msgstr "As transferências serão canceladas se sair do Midori." -#: ../panels/midori-bookmarks.c:116 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Favoritos" -#: ../panels/midori-bookmarks.c:269 +#: ../panels/midori-bookmarks.c:257 #, c-format msgid "Failed to add bookmark item: %s\n" -msgstr "Falha ao adicionar item dos favoritos: %s\n" +msgstr "Falha ao adicionar item aos favoritos: %s\n" -#: ../panels/midori-bookmarks.c:408 +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "Editar o favorito selecionado" -#: ../panels/midori-bookmarks.c:416 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "Excluir o favorito selecionado" -#: ../panels/midori-bookmarks.c:430 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" msgstr "Adicionar nova pasta" -#: ../panels/midori-bookmarks.c:562 -#: ../panels/midori-history.c:572 +#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 msgid "Separator" msgstr "Aba" -#: ../panels/midori-console.c:90 -msgid "Console" -msgstr "Console" - -#: ../panels/midori-console.c:351 -msgid "Copy _All" -msgstr "Copiar _tudo" - -#: ../panels/midori-console.c:352 -msgid "Copy All" -msgstr "Copiar tudo" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "Histórico" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Extensões" +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "Hoje" -#: ../panels/midori-history.c:146 -msgid "A week ago" -msgstr "Uma semana atrás" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "Ontem" -#: ../panels/midori-history.c:148 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 #, 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:151 -msgid "Today" -msgstr "Hoje" - -#: ../panels/midori-history.c:153 -msgid "Yesterday" -msgstr "Ontem" +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "Uma semana atrás" -#: ../panels/midori-history.c:324 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" msgstr "Tem certeza de que quer excluir todo o histórico?" -#: ../panels/midori-history.c:369 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" msgstr "Adicionar como favorito o item do histórico selecionado" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" msgstr "Excluir o item do histórico selecionado" -#: ../panels/midori-history.c:386 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "Limpar todo o histórico" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Transferências" + +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" msgstr "Abrir pas_ta de destino" -#: ../panels/midori-transfers.c:484 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" msgstr "Copiar loc_alização do link" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Autenticação requerida" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" @@ -2307,211 +2214,249 @@ "É necessário um nome de usuário e uma senha\n" "para abrir esta localização:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "Nome de usuário" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "Senha" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "_Lembrar senha" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "O ícone nomeado '%s' não pôde ser carregado" -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "O ícone do estoque '%s' não pôde ser carregado" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "Os quadros de animação estão corrompidos" -#: ../katze/katze-utils.c:503 -#: ../katze/katze-utils.c:898 +#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Propriedade '%s' é inválida para %s" -#: ../katze/katze-utils.c:549 -#: ../katze/katze-utils.c:578 -#: ../extensions/addons.c:119 +#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Escolher arquivo" -#: ../katze/katze-utils.c:564 +#: ../katze/katze-utils.c:506 msgid "Choose folder" msgstr "Escolher pasta" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "Nenhum" + +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "1 hora" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "1 dia" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "1 semana" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "1 mês" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "1 ano" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" -msgstr "Preferências para o %s" +msgstr "%s - Preferências" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:467 msgid "Configure Advertisement filters" msgstr "Configurar filtros de publicidade" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:498 #, 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é-configurada e clique em \"Adicionar\" para a adicioná-la à lista. Você pode encontrar mais listas em %s." - -#: ../extensions/adblock.c:587 -msgid "Configure _Advertisement filters..." -msgstr "Configurar filtros de _publicidade..." +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é-configurada e clique em " +"\"Adicionar\" para a adicioná-la à lista. Você pode encontrar mais listas em " +"%s." -#: ../extensions/adblock.c:841 +#: ../extensions/adblock.c:846 msgid "Edit rule" msgstr "Editar regra" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:860 msgid "_Rule:" msgstr "_Regra:" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:914 msgid "Bl_ock image" msgstr "Bl_oquear imagem" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:919 msgid "Bl_ock link" msgstr "Bl_oquear link" -#: ../extensions/adblock.c:1492 +#: ../extensions/adblock.c:1620 msgid "Advertisement blocker" msgstr "Bloqueador de publicidade" -#: ../extensions/adblock.c:1493 +#: ../extensions/adblock.c:1621 msgid "Block advertisements according to a filter list" msgstr "Bloquear publicidade de acordo com uma lista de filtros" -#: ../extensions/addons.c:130 -#: ../extensions/addons.c:490 +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "" +"Esta página aparentemente contém um script de usuário. Gostaria de instalá-" +"lo?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "_Instalar script de usuário" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "" +"Esta página aparentemente contém um estilo de usuário. Gostaria de instalá-" +"lo?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_Instalar estilo de usuário" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Não instalar" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Scripts de usuário" -#: ../extensions/addons.c:135 -#: ../extensions/addons.c:492 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Estilos de usuário" -#: ../extensions/addons.c:191 -#: ../extensions/addons.c:267 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Erro" -#: ../extensions/addons.c:231 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" -msgstr "Deseja excluir '%s'?" +msgstr "Você quer excluir '%s'?" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "Excluir script de usuário" -#: ../extensions/addons.c:238 +#: ../extensions/addons.c:428 msgid "Delete user style" msgstr "Excluir estilo de usuário" -#: ../extensions/addons.c:242 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." msgstr "O arquivo %s será permanentemente excluído." -#: ../extensions/addons.c:377 -#: ../extensions/addons.c:454 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "Abrir no editor de texto" -#: ../extensions/addons.c:379 -#: ../extensions/addons.c:463 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Abrir pasta de destino" -#: ../extensions/addons.c:445 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "Adicionar novo complemento" -#: ../extensions/addons.c:472 -msgid "Open target folder for selected addon" -msgstr "Abrir a pasta de destino para o complemento selecionado" - -#: ../extensions/addons.c:473 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "Excluir o complemento selecionado" -#: ../extensions/addons.c:1420 -#, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "A configuração da extensão '%s' não pôde ser salva: %s\n" - -#: ../extensions/addons.c:1421 -#: ../extensions/addons.c:1583 +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" msgstr "Extras de usuário" -#: ../extensions/addons.c:1542 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Não é possível monitorar a pasta '%s': %s" -#: ../extensions/addons.c:1584 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" msgstr "Suporte a scripts e estilos de usuário" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "Abas coloridas" -#: ../extensions/colorful-tabs.c:203 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Colorir distintamente cada aba" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Gerenciador de cookies" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "Excluir tudo" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "Excluir todos os cookies exibidos. Se um filtro for definido, só serão excluídos os cookies que correspondam ao filtro." +#: ../extensions/cookie-manager/cookie-manager-page.c:105 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"Excluir todos os cookies exibidos. Se um filtro for definido, só serão " +"excluídos os cookies que correspondam ao filtro." -#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "Expandir tudo" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "Ocultar tudo" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" -msgstr "Deseja realmente excluir todos os cookies?" +msgstr "Você quer realmente excluir todos os cookies?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Pergunta" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." msgstr "Apenas cookies que correspondam ao filtro serão excluídos." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "No fim da sessão" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2528,15 +2473,15 @@ "Seguro: %s\n" "Expiração: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Sim" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "Não" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" @@ -2545,82 +2490,76 @@ "Domínio: %s\n" "Cookies: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Nome" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "_Expandir tudo" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "_Ocultar tudo" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 msgid "Filter:" msgstr "Filtro:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "Informe uma cadeia filtro para apenas exibir cookies cujo nome ou domínio correspondam ao filtro" - -#: ../extensions/cookie-manager/main.c:40 -msgid "_Cookie Manager" -msgstr "Gerenciador de _cookies" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Informe uma cadeia filtro para apenas exibir cookies cujo nome ou domínio " +"correspondam ao filtro" -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Listar, ver e excluir cookies" -#: ../extensions/copy-tabs.c:39 +#: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" msgstr "Copiar _endereços das abas" -#: ../extensions/copy-tabs.c:96 +#: ../extensions/copy-tabs.c:95 msgid "Copy Addresses of Tabs" msgstr "Copiar endereços das abas" -#: ../extensions/copy-tabs.c:97 +#: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Copiar os endereços de toda as abas para a área de transferência" -#: ../extensions/external-applications.vala:93 -msgid "External Applications" -msgstr "Aplicativos externos" - -#: ../extensions/external-applications.vala:94 -msgid "Associate URL schemes with external commands" -msgstr "Associar os esquemas dos URL a comandos externos" - #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "Não foram encontrados os elementos Atom requeridos \"entry\" nos dados XML." +msgstr "" +"Não foram encontrados os elementos Atom requeridos \"entry\" nos dados XML." #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "Não foram encontrados os elementos Atom requeridos \"feed\" nos dados XML." +msgstr "" +"Não foram encontrados os elementos Atom requeridos \"feed\" nos dados XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:396 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Última atualização: %s." -#: ../extensions/feed-panel/feed-panel.c:668 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "Feeds" -#: ../extensions/feed-panel/feed-panel.c:721 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "Adicionar novo feed" -#: ../extensions/feed-panel/feed-panel.c:728 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "Excluir feed" -#: ../extensions/feed-panel/feed-panel.c:810 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "_Feeds" @@ -2649,11 +2588,13 @@ #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "Não foram encontrados os elementos RSS requeridos \"item\" nos dados XML." +msgstr "" +"Não foram encontrados os elementos RSS requeridos \"item\" nos dados XML." #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "Não foram encontrados os elementos RSS requeridos \"channel\" nos dados XML." +msgstr "" +"Não foram encontrados os elementos RSS requeridos \"channel\" nos dados XML." #: ../extensions/feed-panel/main.c:131 #, c-format @@ -2673,93 +2614,155 @@ msgid "Read Atom/ RSS feeds" msgstr "Ler feeds Atom/RSS" -#: ../extensions/formhistory.c:142 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" msgstr "Falha ao adicionar o valor de formulário: %s\n" -#: ../extensions/formhistory.c:454 -#: ../extensions/formhistory.c:458 +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "Histórico de formulários" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"É necessário um nome de usuário e uma senha\n" +"para abrir esta localização:" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "Lembrar senha nesta página?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Lembrar" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "Agora não" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Nunca para esta página" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "Alternar estado do formulário de histórico" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "Ativa ou desativa o formulário de histórico para a aba atual." + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Falha ao executar afirmação da base de dados: %s\n" -#: ../extensions/formhistory.c:501 +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" +"somente ativa o formulário de histórico através do atalho (Ctrl+Shift+F) por " +"aba" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "Preenchimento de formulários" + +#: ../extensions/formhistory/formhistory.c:669 msgid "Stores history of entered form data" -msgstr "Armazena o histórico de dados de formulário" +msgstr "Armazenar o histórico de dados de formulário" -#: ../extensions/formhistory.c:505 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 #, c-format -msgid "Not available: %s" -msgstr "Não disponível: %s" +msgid "Failed to select suggestions\n" +msgstr "Falha ao selecionar sugestões\n" -#: ../extensions/formhistory.c:506 -msgid "Resource files not installed" -msgstr "arquivos de configuração não instalados" +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Não há abas que não tenham sido visitadas" -#: ../extensions/formhistory.c:512 -msgid "Form history filler" -msgstr "Preenchimento de formulários" +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "Lista do histórico" -#: ../extensions/history-list.vala:174 -msgid "Next Tab (History List)" -msgstr "Aba seguinte (lista do histórico)" - -#: ../extensions/history-list.vala:175 -msgid "Next tab from history" -msgstr "Aba seguinte no histórico" - -#: ../extensions/history-list.vala:184 -msgid "Previous Tab (History List)" -msgstr "Aba anterior (lista do histórico)" - -#: ../extensions/history-list.vala:185 -msgid "Previous tab from history" -msgstr "Aba anterior no histórico" +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Comportamento ao fechar abas " + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Não fazer nada" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Ir para a última aba visualizada" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Ir para a aba mais nova" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Nova aba seguinte (lista do histórico)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Nova aba seguinte no histórico" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Nova aba anterior (lista do histórico)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Nova aba anterior no histórico" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Exibir aba em segundo plano (lista do histórico)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Exibir a aba selecionada em segundo plano" -#: ../extensions/history-list.vala:245 +#: ../extensions/history-list.vala:569 msgid "History List" msgstr "Lista do histórico" -#: ../extensions/history-list.vala:246 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Permite trocar de aba escolhendo de uma lista ordenada pelo último uso" +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "Ir para a última aba usada ao circular ou fechar abas" #: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" -msgstr "Gestos de mouse" +msgstr "Gestos do mouse" #: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Controlar o Midori movendo o mouse" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 -#: ../extensions/page-holder.c:175 -msgid "Pageholder" -msgstr "Fixador de página" - -#: ../extensions/page-holder.c:159 -msgid "_Pageholder" -msgstr "Fixador de _página" - -#: ../extensions/page-holder.c:176 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "Manter uma ou várias páginas abertas em paralelo às abas" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "Recarregar a página ou parar o recarregamento" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "Personalizar atalhos de teclado" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "Personalizar atalh_os..." -#: ../extensions/shortcuts.c:313 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Atalhos" -#: ../extensions/shortcuts.c:314 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "Ver e editar os atalhos de teclado" @@ -2771,72 +2774,79 @@ msgid "Display date and time in the statusbar" msgstr "Exibir a data e a hora na barra de status" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Imagens" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Scripts" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Plugins Netscape" -#: ../extensions/statusbar-features.c:147 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "Funcionalidades na barra de status" -#: ../extensions/statusbar-features.c:148 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" -msgstr "Ligar/desligar facilmente funcionalidades das páginas web" +msgstr "Habilitar/desabilitar facilmente funcionalidades das páginas web" -#: ../extensions/tab-panel.c:569 -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Painel de abas" -#: ../extensions/tab-panel.c:610 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "P_ainel de abas" -#: ../extensions/tab-panel.c:627 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Exibir as abas num painel vertical" -#: ../extensions/tabs-minimized.c:77 +#: ../extensions/tabs-minimized.c:76 msgid "Only Icons on Tabs by default" msgstr "Apenas ícones nas abas por padrão" -#: ../extensions/tabs-minimized.c:78 +#: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" msgstr "Novas abas sem título por padrão" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Personalizar barra de ferramentas" -#: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "Selecione os itens a serem exibidos na barra de ferramentas. Os itens podem ser reordenados ao arrastar e soltar." +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"Selecione os itens a serem exibidos na barra de ferramentas. Os itens podem " +"ser reordenados ao arrastar e soltar." -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Itens disponíveis" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Itens exibidos" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." -msgstr "Personalizar barra de _ferramentas..." +msgstr "Personalizar _barra de ferramentas..." + +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Personalizar..." -#: ../extensions/toolbar-editor.c:606 +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" msgstr "Editor da barra de ferramentas" -#: ../extensions/toolbar-editor.c:607 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" msgstr "Editar facilmente a barra de ferramentas" @@ -2844,60 +2854,525 @@ msgid "Cache HTTP communication on disk" msgstr "Pôr comunicações HTTP em cache" +#~ msgid "Lightweight web browser" +#~ msgstr "Navegador web leve" + +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "A pasta de configuração especificada é inválida." + +#~ msgid "Cookies" +#~ msgstr "Cookies" + +#~ msgid "'Flash' Cookies" +#~ msgstr "Cookies 'Flash'" + +#~ msgid "HTML5 _Databases" +#~ msgstr "Bases de _dados HTML5" + +#~ msgid "Offline Application Cache" +#~ msgstr "Cache de aplicativos offline" + +#~ msgid "Not available: %s" +#~ msgstr "Não disponível: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "arquivos de configuração não instalados" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "Não salvar quaisquer dados privados ao navegar" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Adicionar atalho à ligação rápida" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Adicionar atalho à área de trabalho" + +#~ msgid "Create a launcher" +#~ msgstr "Criar um lançador" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "Inscrever este feed de notícias" + +#~ msgid "Close this window" +#~ msgstr "Fechar esta janela" + +#~ msgid "Close all open windows" +#~ msgstr "Fechar todas as janelas abertas" + +#~ msgid "Undo the last modification" +#~ msgstr "Desfazer a última modificação" + +#~ msgid "Redo the last modification" +#~ msgstr "Refazer a última modificação" + +#~ msgid "Cut the selected text" +#~ msgstr "Recortar o texto selecionado" + +#~ msgid "Copy the selected text" +#~ msgstr "Copiar o texto selecionado" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "Colar texto da área de transferência" + +#~ msgid "Delete the selected text" +#~ msgstr "Excluir o texto selecionado" + +#~ msgid "Select all text" +#~ msgstr "Selecionar todo o texto" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Localizar a ocorrência seguinte da palavra ou frase" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Localizar a ocorrência anterior da palavra ou frase" + +#~ msgid "Reset the zoom level" +#~ msgstr "Tamanho normal" + +#~ msgid "View the source code of the page" +#~ msgstr "Ver código fonte da página" + +#~ msgid "Scroll to the left" +#~ msgstr "Rolar à esquerda" + +#~ msgid "Scroll down" +#~ msgstr "Rolar para baixo" + +#~ msgid "Scroll up" +#~ msgstr "Rolar para cima" + +#~ msgid "Scroll to the right" +#~ msgstr "Rolar à direita" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "Excluir o conteúdo do lixo" + +#~ msgid "Open the last closed tab" +#~ msgstr "Abrir a última aba fechada" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Adicionar nova pasta de favoritos" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Adicionar, editar e excluir motores de pesquisa..." + +#~ msgid "Clear private data..." +#~ msgstr "Limpar dados privados..." + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "" +#~ "Inspecionar detalhes da página e acessar ferramentas de desenvolvimento..." + +#~ msgid "Switch to the previous tab" +#~ msgstr "Mudar para a aba anterior" + +#~ msgid "Switch to the next tab" +#~ msgstr "Mudar para a aba seguinte" + +#~ msgid "Move tab behind the previous tab" +#~ msgstr "Mover a aba para trás da aba anterior" + +#~ msgid "Move tab in front of the next tab" +#~ msgstr "Mover a aba para frente da aba seguinte" + +#~ msgid "Focus the current tab" +#~ msgstr "Focar a aba atual" + +#~ msgid "Cycle focus between views" +#~ msgstr "Circular o foco entre os campos de visão" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Exibir apenas o ícone da aba atual" + +#~ msgid "Duplicate the current tab" +#~ msgstr "Duplicar a aba atual" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Fechar todas as abas exceto a atual" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Abrir as abas salvas na última sessão" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Exibir as perguntas frequentes" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Abrir o serviço de acompanhamento de erros do Midori" + +#~ msgid "Show information about the program" +#~ msgstr "Exibir informação sobre o programa" + +#~ msgid "Show menubar" +#~ msgstr "Exibir barra de menu" + +#~ msgid "Show navigationbar" +#~ msgstr "Exibir barra de navegação" + +#~ msgid "Show sidepanel" +#~ msgstr "Exibir painel lateral" + +#~ msgid "Show bookmarkbar" +#~ msgstr "Exibir barra de favoritos" + +#~ msgid "Show statusbar" +#~ msgstr "Exibir barra de status" + +#~ msgid "MD5-Checksum:" +#~ msgstr "Soma de verificação MD5:" + +#~ msgid "SHA1-Checksum:" +#~ msgstr "Soma de verificação SHA1:" + +#~ msgid "No filename specified" +#~ msgstr "Nenhum nome de arquivo especificado" + +#~ msgid "Set number of columns and rows" +#~ msgstr "Definir número de colunas e linhas" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Informe o número de colunas e linhas:" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "Entrada inválida para o tamanho da ligação rápida" + +#~ msgid "Thumb size:" +#~ msgstr "Tamanho da miniatura:" + +#~ msgid "Small" +#~ msgstr "Pequeno" + +#~ msgid "Medium" +#~ msgstr "Médio" + +#~ msgid "Big" +#~ msgstr "Grande" + +#~ msgid "Reset the last _session" +#~ msgstr "Apagar a última _sessão" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Configurar _filtros de publicidade..." + +#~ msgid "Not found - %s" +#~ msgstr "Não encontrado - %s" + +#~ msgid "Document cannot be displayed" +#~ msgstr "O documento não pode ser exibido" + +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "Forçar 96 pontos por polegada" + +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "Forçar resolução de vídeo de 96 PPP" + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "Alternar com Ctrl+Tab entre abas, ordenadas pelo último uso" + +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "Excluir cookies antigos após 1 hora" + +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "Excluir cookies antigos após 1 semana" + +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "Excluir cookies antigos após 1 mês" + +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "Excluir cookies antigos após 1 ano" + +#~ msgid "days" +#~ msgstr "dias" + +#~ msgid "All cookies" +#~ msgstr "Todos os cookies" + +#~ msgid "Session cookies" +#~ msgstr "Cookies da sessão" + +#~ msgid "Show Transferbar" +#~ msgstr "Exibir barra de transferências" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "Se a barra de transferências deve ser exibida" + +#~ msgid "Search engines in location completion" +#~ msgstr "Motores de pesquisa na complementação do endereço" + +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "" +#~ "Se motores de pesquisa devem ser exibidos na complementação do endereço" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "Exibir os controles operacionais do painel" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "Se os controles operacionais do painel devem ser exibidos" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Exibir ligação rápida nas novas abas" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Exibir ligação rápida nas abas recentemente abertas" + +#~ msgid "Download Manager" +#~ msgstr "Gerenciador de downloads" + +#~ msgid "An external download manager" +#~ msgstr "Um gerenciador de downloads externo" + +#~ msgid "Open external pages in:" +#~ msgstr "Abrir páginas externas em:" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "Onde abrir páginas abertas externamente" + +#~ msgid "Accept cookies" +#~ msgstr "Aceitar cookies" + +#~ msgid "What type of cookies to accept" +#~ msgstr "Tipo de cookies a aceitar" + +#~ msgid "Maximum cookie age" +#~ msgstr "Antiguidade máxima dos cookies" + +#~ msgid "Maximum history age" +#~ msgstr "Antiguidade máxima do histórico" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Lembrar últimos arquivos baixados" + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "Se os últimos arquivos baixados devem ser lembrados" + +#~ msgid "Appearance" +#~ msgstr "Aparência" + +#~ msgid "Applications" +#~ msgstr "Aplicativos" + +#~ msgid "Web Cookies" +#~ msgstr "Cookies" + +#~ msgid "General" +#~ msgstr "Geral" + +#~ msgid "Font settings" +#~ msgstr "Configurações de fontes" + +#~ msgid "Interface" +#~ msgstr "Interface" + +#~ msgid "Navigationbar" +#~ msgstr "Barra de navegação" + +#~ msgid "External applications" +#~ msgstr "Aplicativos externos" + +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "Excluir cookies ao sair do Midori" + +#~ msgid "Next Tab (History List)" +#~ msgstr "Aba seguinte (lista do histórico)" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "Aba anterior (lista do histórico)" + +#~ msgid "Previous tab from history" +#~ msgstr "Aba anterior no histórico" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "Falha ao executar afirmação da base de dados:\n" + +#~ msgid "%s of %s, %s/s" +#~ msgstr "%s de %s, %s/s" + +#~ msgid "Download with Download _Manager" +#~ msgstr "Baixar com _gerenciador de downloads" + +#~ msgid "Open target folder for selected addon" +#~ msgstr "Abrir a pasta de destino para o complemento selecionado" + +#~ msgid "Pageholder" +#~ msgstr "Fixador de página" + +#~ msgid "_Pageholder" +#~ msgstr "Fixador de _página" + +#~ msgid "Keep one or multiple pages open in parallel to your tabs" +#~ msgstr "Manter uma ou várias páginas abertas em paralelo às suas abas" + +#~ msgid "Quit the application" +#~ msgstr "Sair do aplicativo" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% carregado" + +#~ msgid "_Contents" +#~ msgstr "_Conteúdo" + +#~ msgid "Show the documentation" +#~ msgstr "Exibir a documentação" + +#~ msgid "_Transferbar" +#~ msgstr "Barra de _transferências" + +#~ msgid "Show transferbar" +#~ msgstr "Exibir barra de transferências" + +#~ msgid "Show Blank page" +#~ msgstr "Exibir página em branco" + +#~ msgid "Show progress in location entry" +#~ msgstr "Exibir progresso no campo de endereço" + +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "" +#~ "Se o progresso do carregamento deve ser exibido no campo de endereço" + +#~ msgid "Ask for the destination folder" +#~ msgstr "Perguntar pela pasta de destino" + +#~ msgid "Whether to ask for the destination folder when downloading a file" +#~ msgstr "Se é para perguntar em que pasta salvar o arquivo a ser baixado" + +#~ msgid "Whether to show a notification when a transfer has been completed" +#~ msgstr "Se uma notificação deve ser exibida ao concluir-se a transferência" + +#~ msgid "_Save Link destination" +#~ msgstr "_Salvar destino do link" + +#~ msgid "_Download Link destination" +#~ msgstr "_Baixar destino do link" + +#~ msgid "Download I_mage" +#~ msgstr "Baixar i_magem" + +#~ msgid "Failed to clear search history: %s\n" +#~ msgstr "Falha ao limpar o histórico de pesquisa: %s\n" + +#~ msgid "Detach chosen panel from the window" +#~ msgstr "Separar da janela o painel escolhido" + +#~ msgid "Hide operating controls" +#~ msgstr "Ocultar controles operacionais" + +#~ msgid "Spell Checking" +#~ msgstr "Verificação ortográfica" + +#~ 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áfica, por exemplo \"en_GB,pt_BR\"" + +#~ msgid "_Install %s" +#~ msgstr "_Instalar %s" + +#~ msgid "Minimize _Current Tab" +#~ msgstr "Minimizar aba a_tual" + +#~ msgid "Minimize the current tab" +#~ msgstr "Minimizar a aba atual" + +#~ msgid "External Applications" +#~ msgstr "Aplicativos externos" + +#~ msgid "Associate URL schemes with external commands" +#~ msgstr "Associar os esquemas dos URL a comandos externos" + +#~ msgid "_Accept" +#~ msgstr "_Aceitar" + +#~ msgid "Spelling dictionaries:" +#~ msgstr "Dicionários de ortografia:" + +#~ msgid "Console" +#~ msgstr "Console" + +#~ msgid "Copy _All" +#~ msgstr "Copiar _tudo" + +#~ msgid "Copy All" +#~ msgstr "Copiar tudo" + +#~ msgid "_Cookie Manager" +#~ msgstr "Gerenciador de _cookies" + #~ msgid "_Restore Tab" #~ msgstr "_Restaurar aba" + #~ msgid "_Minimize Tab" #~ msgstr "_Minimizar aba" + #~ msgid "Copy %s to the folder %s." #~ msgstr "Copiar %s para a pasta %s." + #~ msgid "Minimize new Tabs" #~ msgstr "Minimizar novas abas" + #~ msgid "New tabs open minimized" #~ msgstr "Novas abas abrem minimizadas" + #~ msgid "_Recently visited pages" #~ msgstr "Páginas _recentes" + #~ msgid "Reopen pages that you visited earlier" #~ msgstr "Reabrir páginas visitadas anteriormente" + #~ msgid "Original cookies only" #~ msgstr "Apenas cookies originais" -#~ msgid "Accept cookies from the original website only" -#~ msgstr "Apenas aceitar cookies do site web original" + #~ msgid "Remember last visited pages" #~ msgstr "Lembrar últimas páginas visitadas" + #~ msgid "Whether the last visited pages are saved" #~ msgstr "Se as últimas páginas visitadas devem ser salvas" + #~ msgid "Detect proxy server automatically" #~ msgstr "Detectar servidor proxy automaticamente" + #~ msgid "" #~ "Whether to detect the proxy server automatically from the environment" #~ msgstr "Se o servidor proxy deve ser detectado automaticamente" + #~ msgid "Set number of shortcuts" #~ msgstr "Definir número de atalhos" + #~ msgid "Enter number of shortcuts:" #~ msgstr "Informe o número de atalhos" + #~ msgid "Erroneous clock time" #~ msgstr "Hora do relógio incorreta" + #~ msgid "" #~ "The clock time lies in the past. Please check the current date and time." #~ msgstr "" #~ "O relógio está atrasado. Por favor, verifique a data e a hora atual." + #~ msgid "Open _Link" #~ msgstr "Abrir _link" + #~ msgid "" #~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." #~ msgstr "" #~ "Copiar scripts de usuário para a pasta %s e copiar estilos de usuário " #~ "para a pasta %s." + #~ msgid "Open Image in New Wi_ndow" #~ msgstr "Abrir imagem em nova ja_nela" + #~ msgid "REGEX" #~ msgstr "REGEX" + #~ msgid "Not available on this platform" #~ msgstr "Não disponível para esta plataforma" + #~ msgid "Failed to get current time: %s\n" #~ msgstr "Falha na obtenção da hora atual: %s\n" + #~ msgid "Show panel _titles" #~ msgstr "Exibir _títulos do painel" + #~ msgid "Options" #~ msgstr "Opções" - diff -Nru midori-0.2.8/po/ro.po midori-0.4.6/po/ro.po --- midori-0.2.8/po/ro.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/ro.po 2012-05-14 22:13:42.000000000 +0000 @@ -1,2375 +1,2480 @@ -# Romanian translations for midori package -# Traducerea în limba română pentru pachetul midori. -# Copyright (C) 2009-2010 THE midori'S COPYRIGHT HOLDER +# Romanian translation for Midori +# Traducerea în limba română pentru Midori. +# Copyright (C) 2009-2011 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Igor Știrbu 2009 -# Mișu Moldovan 2009-2010 +# Mișu Moldovan 2009-2011 # Andrei Popescu 2010 # msgid "" msgstr "" -"Project-Id-Version: midori 0.2.6\n" +"Project-Id-Version: midori 0.3.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-23 10:07+0000\n" -"PO-Revision-Date: 2010-05-29 14:32+0300\n" +"POT-Creation-Date: 2012-03-09 18:18+0000\n" +"PO-Revision-Date: 2011-07-30 16:21+0300\n" "Last-Translator: Mișu Moldovan \n" -"Language-Team: Romanian \n" +"Language-Team: Romanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n" +"Language: ro\n" +"X-Generator: Virtaal 0.6.1\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2);;\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Mic navigator pentru Internet" +msgid "Browse the Web" +msgstr "Navigați pe Internet" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 -#: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:313 +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "Internet;WWW;Navigator" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:1989 ../midori/main.c:2009 +#: ../midori/main.c:2023 ../midori/midori-websettings.c:308 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" -msgstr "Navigator Internet" +msgstr "Navigator web" + +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Navigare privată cu Midori" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Deschide o nouă fereastră de navigare privată" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4022 +msgid "Private Browsing" +msgstr "Navigare privată" -#: ../midori/main.c:102 +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Nu s-au putut încărca preferințele: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Valoarea „%s” nu este validă pentru %s" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" -msgstr "Valoare nevalidă pentru preferințe „%s”" +msgstr "Valoare nevalidă „%s” în preferințe" + +#: ../midori/main.c:364 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Nu s-au putut încărca motoarele de căutare. %s\n" -#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#: ../midori/main.c:418 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Nu s-a putut curăța istoricul: %s\n" + +#: ../midori/main.c:438 ../midori/main.c:562 +#: ../extensions/formhistory/formhistory.c:529 #, c-format msgid "Failed to open database: %s\n" -msgstr "Eșec la deschiderea bazei de date: %s\n" +msgstr "Nu s-a putut deschide baza de date: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:505 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "Eșec la ștergerea elementelor vechi din istoric: %s\n" +msgstr "Nu s-au putut șterge elementele vechi din istoric: %s\n" + +#: ../midori/main.c:545 ../panels/midori-history.c:231 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Nu s-a putut șterge elementul din istoric: %s\n" + +#: ../midori/main.c:592 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Nu s-au putut salva favoritele. %s" -#: ../midori/main.c:445 +#: ../midori/main.c:614 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Nu s-au putut salva preferințele. %s" -#: ../midori/main.c:483 +#: ../midori/main.c:649 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Nu s-au putut salva motoarele de căutare. %s" -#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Nu s-au putut salva favoritele. %s" - #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 ../midori/main.c:625 +#: ../midori/main.c:686 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Nu s-a putut salva gunoiul. %s" -#: ../midori/main.c:684 ../midori/main.c:924 +#: ../midori/main.c:727 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Extensii" + +#: ../midori/main.c:741 +msgid "Privacy" +msgstr "Intimitate" + +# dumol: Scurtat puțin pentru a nu lăbărța fereastra preferințelor +#: ../midori/main.c:753 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"Cookie-urile stochează autentificări, preferințe ori alte date, multe în " +"scopuri publicitare." + +#: ../midori/main.c:809 #, c-format msgid "The session couldn't be saved. %s" msgstr "Nu s-a putut salva sesiunea. %s" -#: ../midori/main.c:868 -msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "Niciun fișier cu certificate root nu este disponibil. Certificatele SSL nu vor putea fi verificate." - -#: ../midori/main.c:958 -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 "Se pare că Midori s-a terminat prematur la ultima pornire. Dacă se repetă problema, încercați una dintre opțiunile de mai jos pentru remediere." +#: ../midori/main.c:1027 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" +"Niciun fișier cu certificate root nu este disponibil. Certificatele SSL nu " +"vor putea fi verificate." + +#: ../midori/main.c:1096 +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 "" +"Se pare că Midori s-a terminat prematur la ultima pornire. Dacă se repetă " +"problema, încercați una dintre opțiunile de mai jos pentru remediere." -#: ../midori/main.c:973 +#: ../midori/main.c:1115 msgid "Modify _preferences" msgstr "_Editare preferințe" -#: ../midori/main.c:977 -msgid "Reset the last _session" -msgstr "_Sesiune nouă" - -#: ../midori/main.c:982 +#: ../midori/main.c:1119 msgid "Disable all _extensions" msgstr "_Fără extensii" -#: ../midori/main.c:1217 ../midori/main.c:1937 +#: ../midori/main.c:1132 +msgid "Discard old tabs" +msgstr "Uită taburile vechi" + +# dumol: Truc pentru a micșora lățimea ferestrei cu preferințe +#: ../midori/main.c:1133 ../midori/midori-websettings.c:217 +msgid "Show last tabs without loading" +msgstr "Ultimele taburi fără a le încărca" + +# dumol: Truc pentru a micșora lățimea ferestrei cu preferințe +#: ../midori/main.c:1134 ../midori/midori-websettings.c:216 +msgid "Show last open tabs" +msgstr "Ultimele taburi deschise" + +#: ../midori/main.c:1342 ../midori/main.c:2400 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Nu s-a putut încărca sesiunea: %s\n" -#: ../midori/main.c:1336 -msgid "No filename specified" -msgstr "Nu s-a precizat un fișier" - -#: ../midori/main.c:1355 -msgid "An unknown error occured." -msgstr "A intervenit o eroare necunoscută." - -#: ../midori/main.c:1386 +#: ../midori/main.c:1480 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captură salvată în: %s\n" -#: ../midori/main.c:1557 +#: ../midori/main.c:1892 msgid "Run ADDRESS as a web application" -msgstr "Tratează ADRESA ca o aplicație Internet" +msgstr "Deschide ADRESA ca o aplicație web" -#: ../midori/main.c:1557 +#: ../midori/main.c:1892 msgid "ADDRESS" msgstr "ADRESĂ" -#: ../midori/main.c:1560 +#: ../midori/main.c:1895 msgid "Use FOLDER as configuration folder" msgstr "Folosește DOSAR ca dosar cu preferințe" -#: ../midori/main.c:1560 +#: ../midori/main.c:1895 msgid "FOLDER" msgstr "DOSAR" -#: ../midori/main.c:1563 +#: ../midori/main.c:1898 +msgid "Private browsing, no changes are saved" +msgstr "Navigare privată, nu se salvează modificările" + +#: ../midori/main.c:1900 msgid "Show a diagnostic dialog" msgstr "Arată o fereastră de depanare" -#: ../midori/main.c:1565 +#: ../midori/main.c:1902 msgid "Run the specified filename as javascript" -msgstr "Execută fișierul precizat ca JavaScript" +msgstr "Execută ca JavaScript fișierul precizat" -#: ../midori/main.c:1568 +#: ../midori/main.c:1904 msgid "Take a snapshot of the specified URI" msgstr "Salvează o captură a URI-ului specificat" -#: ../midori/main.c:1571 +#: ../midori/main.c:1906 msgid "Execute the specified command" msgstr "Execută comanda specificată" -#: ../midori/main.c:1573 +#: ../midori/main.c:1908 +msgid "List available commands to execute with -e/ --execute" +msgstr "Arată comenzile ce pot fi executate cu -e / --execute" + +#: ../midori/main.c:1910 msgid "Display program version" -msgstr "Arată versiunea aplicației" +msgstr "Arată versiunea programului" -#: ../midori/main.c:1575 +#: ../midori/main.c:1912 msgid "Addresses" msgstr "Adrese" -#: ../midori/main.c:1577 +#: ../midori/main.c:1914 msgid "Block URIs according to regular expression PATTERN" -msgstr "Blochează URI-uri după un model regexp" +msgstr "Blochează URI-uri după modelul regexp MODEL" -#: ../midori/main.c:1577 +#: ../midori/main.c:1914 msgid "PATTERN" msgstr "MODEL" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1581 +#: ../midori/main.c:1918 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Repornește Midori după un număr de SECUNDE de inactivitate" -#: ../midori/main.c:1581 +#: ../midori/main.c:1918 msgid "SECONDS" msgstr "SECUNDE" -#: ../midori/main.c:1661 +#: ../midori/main.c:1921 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Redirectează avertizările din consolă în FIȘIER" + +#: ../midori/main.c:1921 +msgid "FILENAME" +msgstr "FIȘIER" + +#: ../midori/main.c:1986 msgid "[Addresses]" msgstr "[Adrese]" -#: ../midori/main.c:1689 +#: ../midori/main.c:1996 +msgid "The specified configuration folder is invalid." +msgstr "Dosarul cu preferințe precizat nu este valid." + +#: ../midori/main.c:2024 msgid "Please report comments, suggestions and bugs to:" -msgstr "Trimiteți comentarii, sugestii și raportați defectele la:" +msgstr "Trimiteți comentarii, sugestii și raportați problemele la:" -#: ../midori/main.c:1691 +#: ../midori/main.c:2026 msgid "Check for new versions at:" msgstr "Versiunile noi sunt disponibile la:" -#: ../midori/main.c:1788 -msgid "The specified configuration folder is invalid." -msgstr "Dosarul cu preferințe precizat nu este valid." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2110 +msgid "Saved logins and _passwords" +msgstr "_Parole și autentificări salvate" + +#: ../midori/main.c:2112 +msgid "Cookies and Website data" +msgstr "Cookie-uri și date ale site-urilor" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2116 ../midori/midori-websettings.c:971 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Cache web" -#: ../midori/main.c:1836 -msgid "An instance of Midori is already running but not responding.\n" -msgstr "O instanță de Midori este deja pornită, dar nu răspunde.\n" +#: ../midori/main.c:2119 +msgid "Website icons" +msgstr "Iconițe ale site-urilor web" -#: ../midori/main.c:1891 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "Nu s-au putut încărca motoarele de căutare. %s\n" +#: ../midori/main.c:2225 +msgid "An unknown error occured" +msgstr "A intervenit o eroare necunoscută" + +#: ../midori/main.c:2331 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "O instanță a programului Midori este deja pornită, dar nu răspunde.\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:2367 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Nu s-au putut încărca favoritele: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:2415 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Nu s-a putut încărca gunoiul: %s\n" -#: ../midori/main.c:1966 +#: ../midori/main.c:2428 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Nu s-a putut încărca istoricul: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:2444 msgid "The following errors occured:" msgstr "Au intervenit următoarele erori:" -#: ../midori/main.c:1996 +#: ../midori/main.c:2460 msgid "_Ignore" msgstr "_Ignoră" -#: ../midori/midori-array.c:428 +#: ../midori/midori-app.c:1331 +msgid "_Bookmark" +msgstr "_Favorit" + +#: ../midori/midori-app.c:1332 ../midori/midori-browser.c:5933 +msgid "_Bookmarks" +msgstr "Favori_te" + +#: ../midori/midori-app.c:1333 +msgid "Add Boo_kmark" +msgstr "Adau_gă un favorit" + +#: ../midori/midori-app.c:1334 +msgid "_Console" +msgstr "_Consolă" + +#: ../midori/midori-app.c:1335 +msgid "_Extensions" +msgstr "E_xtensii" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1336 ../midori/midori-browser.c:4502 +msgid "_History" +msgstr "_Istoric" + +#: ../midori/midori-app.c:1337 +msgid "_Homepage" +msgstr "Pagină de _start" + +#: ../midori/midori-app.c:1338 +msgid "_Userscripts" +msgstr "Scripturi pr_oprii" + +#: ../midori/midori-app.c:1339 +msgid "New _Tab" +msgstr "Ta_b nou" + +#: ../midori/midori-app.c:1340 +msgid "_Transfers" +msgstr "De_scărcări" + +#: ../midori/midori-app.c:1341 +msgid "Netscape p_lugins" +msgstr "Module _Netscape" + +#: ../midori/midori-app.c:1342 +msgid "_Closed Tabs" +msgstr "Taburi în_chise" + +#: ../midori/midori-app.c:1343 ../midori/midori-browser.c:5088 +msgid "New _Window" +msgstr "_Fereastră nouă" + +#: ../midori/midori-app.c:1344 +msgid "New _Folder" +msgstr "_Dosar nou" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "Nu s-a găsit fișierul." -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." -msgstr "Document deteriorat." +msgstr "Document nevalid." -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." -msgstr "Format necunoscut de favorite" +msgstr "Format necunoscut de favorite." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 -#, c-format +#: ../midori/midori-array.c:915 msgid "Writing failed." -msgstr "Eșec la scriere." +msgstr "Scrierea a eșuat." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:321 ../midori/midori-browser.c:5170 +#: ../midori/midori-browser.c:5179 msgid "Reload the current page" msgstr "Reîncarcă pagina curentă" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:5176 msgid "Stop loading the current page" msgstr "Oprește încărcarea paginii curente" -#: ../midori/midori-browser.c:460 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% încărcat" - -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:455 #, c-format msgid "Failed to update title: %s\n" -msgstr "Eșec la actualizarea titlului: %s\n" +msgstr "Nu s-a putut actualiza titlul: %s\n" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:468 #, c-format msgid "Unexpected action '%s'." msgstr "Acțiune neașteptată „%s”." -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:558 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Navigare privată)" + +#: ../midori/midori-browser.c:668 ../midori/midori-browser.c:701 +msgid "Toplevel folder" +msgstr "Dosarul rădăcină" + +#: ../midori/midori-browser.c:758 msgid "New folder" msgstr "Dosar nou" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:758 msgid "Edit folder" msgstr "Editare dosar" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:760 msgid "New bookmark" msgstr "Favorit nou" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:760 msgid "Edit bookmark" msgstr "Editare favorite" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:791 msgid "_Title:" msgstr "_Titlu:" -#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "_Descriere:" - -#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:811 ../midori/midori-searchaction.c:961 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Adresă:" -#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:834 ../midori/midori-browser.c:4239 msgid "_Folder:" msgstr "D_osar:" -#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 -msgid "Toplevel folder" -msgstr "Dosarul rădăcină" - -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:850 msgid "Add to _Speed Dial" -msgstr "Adaugă ca apel _rapid" +msgstr "Ada_ugă ca apel rapid" -#: ../midori/midori-browser.c:877 +#: ../midori/midori-browser.c:863 msgid "Show in the tool_bar" msgstr "Arată în _bara cu unelte" -#: ../midori/midori-browser.c:892 +#: ../midori/midori-browser.c:878 msgid "Run as _web application" -msgstr "Tratează ca o aplicație _Internet" +msgstr "Deschide ca o aplicație _web" + +#: ../midori/midori-browser.c:949 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Fișierul „%s” nu poate fi salvat în acest dosar." + +#: ../midori/midori-browser.c:951 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Nu aveți drepturile necesare pentru a scrie aici." -#: ../midori/midori-browser.c:986 +#: ../midori/midori-browser.c:958 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Nu există îndeajuns spațiu liber pentru a descărca „%s”." -#: ../midori/midori-browser.c:990 +#: ../midori/midori-browser.c:961 #, c-format msgid "The file needs %s but only %s are left." msgstr "Fișierul necesită %s, dar liberi sunt doar %s." -#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:999 ../midori/midori-browser.c:4308 msgid "Save file as" msgstr "Salvare fișier ca" -#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s din %s" +#: ../midori/midori-browser.c:1293 +msgid "New Window" +msgstr "Fereastră nouă" -#: ../midori/midori-browser.c:1456 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "S-a descărcat fișierul %s." +#: ../midori/midori-browser.c:1293 +msgid "A new window has been opened" +msgstr "S-a deschis o nouă fereastră" -#: ../midori/midori-browser.c:1460 -msgid "Transfer completed" -msgstr "Descărcare finalizată" +#: ../midori/midori-browser.c:1296 +msgid "New Tab" +msgstr "Tab nou" -#: ../midori/midori-browser.c:1600 +#: ../midori/midori-browser.c:1296 +msgid "A new tab has been opened" +msgstr "S-a deschis un nou tab" + +#: ../midori/midori-browser.c:1331 +msgid "Error opening the image!" +msgstr "Eroare la deschiderea imaginii!" + +#: ../midori/midori-browser.c:1332 +msgid "Can not open selected image in a default viewer." +msgstr "Nu s-a putut deschide imaginea selectată în programul asociat implicit." + +#: ../midori/midori-browser.c:1338 +msgid "Error downloading the image!" +msgstr "Eroare la descărcarea imaginii!" + +#: ../midori/midori-browser.c:1339 +msgid "Can not download selected image." +msgstr "Nu s-a putut descărca imaginea selectată." + +#: ../midori/midori-browser.c:1442 msgid "Save file" msgstr "Salvare fișier" -#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 -msgid "Some files are being downloaded" -msgstr "Unele fișiere sunt în curs de descărcare" - -#: ../midori/midori-browser.c:1923 -msgid "_Quit Midori" -msgstr "În_chidere Midori" - -#: ../midori/midori-browser.c:1925 -msgid "The transfers will be cancelled if Midori quits." -msgstr "Dacă închideți Midori, se vor pierde transferurile curente" - -#: ../midori/midori-browser.c:2386 +#: ../midori/midori-browser.c:2293 msgid "Open file" msgstr "Deschidere fișier" -#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2425 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr "" +"Pentru a deschide ca un agregator de știri adresa URI de mai sus. De obicei, " +"există un meniu ori un buton „Subscriere nouă”, „Nou flux de știri” ori ceva " +"asemănător.\n" +"Alternativ, puteți selecta un agregator de știri în secțiunea „Programe” a " +"preferințelor Midori. Data viitoare când veți mai da clic pe iconița unui " +"flux de știri, acesta va fi adăugat automat." + +#: ../midori/midori-browser.c:2431 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Flux nou" -#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 -#: ../panels/midori-bookmarks.c:233 +#: ../midori/midori-browser.c:2474 ../midori/midori-browser.c:5239 +#: ../panels/midori-bookmarks.c:426 msgid "Add a new bookmark" msgstr "Adăugare favorit nou" -#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Eșec la executarea comenzii pentru baza de date: %s\n" - -#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:2973 ../midori/midori-searchaction.c:488 msgid "Empty" msgstr "Gol" -#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "Nu s-a putut porni aplicația externă" +#: ../midori/midori-browser.c:3393 +msgid "Toggle text cursor navigation" +msgstr "Navigare cu sau fără cursor" -#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 +#: ../midori/midori-browser.c:3705 ../midori/midori-browser.c:5625 #, c-format msgid "Failed to insert new history item: %s\n" -msgstr "Eșec la inserarea în istoric a elementului: %s\n" +msgstr "Nu s-a putut insera noul element în istoric: %s\n" -#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:4036 ../panels/midori-bookmarks.c:742 +#: ../panels/midori-history.c:799 msgid "Open all in _Tabs" msgstr "Deschide tot în _taburi" -#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4043 ../panels/midori-bookmarks.c:748 +#: ../panels/midori-history.c:805 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Deschide într-un _tab nou" -#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4046 ../midori/midori-view.c:2573 +#: ../midori/midori-view.c:4522 ../panels/midori-bookmarks.c:750 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Deschide într-o _fereastră nouă" -#: ../midori/midori-browser.c:4657 +#: ../midori/midori-browser.c:4126 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4658 +#: ../midori/midori-browser.c:4127 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4128 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4660 +#: ../midori/midori-browser.c:4129 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4661 +#: ../midori/midori-browser.c:4130 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4682 +#: ../midori/midori-browser.c:4131 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4152 msgid "Import bookmarks..." -msgstr "Importare favorite..." +msgstr "Importare de favorite..." -#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:4155 ../midori/midori-browser.c:5244 msgid "_Import bookmarks" -msgstr "_Importă favoritele" +msgstr "Importă fa_voritele" -#: ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4166 msgid "_Application:" -msgstr "_Aplicație:" +msgstr "_Program:" -#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 -#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 -#: ../katze/katze-utils.c:691 -msgid "Custom..." -msgstr "Personalizare..." +#: ../midori/midori-browser.c:4231 +msgid "Import from XBEL or HTML file" +msgstr "Importă dintr-un fișier XBEL sau HTML" + +#: ../midori/midori-browser.c:4266 +msgid "Import from a file" +msgstr "Importă dintr-un fișier" -#: ../midori/midori-browser.c:4797 +#: ../midori/midori-browser.c:4278 msgid "Failed to import bookmarks" msgstr "Nu s-au putut importa favoritele" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4313 +msgid "XBEL Bookmarks" +msgstr "Favorite XBEL" + +#: ../midori/midori-browser.c:4318 +msgid "Netscape Bookmarks" +msgstr "Favorite Netscape" + +#: ../midori/midori-browser.c:4332 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "Midori exportă doar în formatele XBEL (*.xbel) sau Netscape (*.html)" + +#: ../midori/midori-browser.c:4347 msgid "Failed to export bookmarks" msgstr "Nu s-au putut exporta favoritele" -#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Eșec la ștergerea elementului din istoric: %s\n" - #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4994 +#: ../midori/midori-browser.c:4469 msgid "Clear Private Data" -msgstr "Șterge datele private" +msgstr "Ștergere de date private" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:4473 msgid "_Clear private data" -msgstr "Șterge datele pri_vate" +msgstr "Șt_erge datele private" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:4486 msgid "Clear the following data:" msgstr "Șterge următoarele date:" -#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 -msgid "History" -msgstr "Istoric" - -#: ../midori/midori-browser.c:5029 -msgid "Cookies" -msgstr "Cookie-uri" - -#: ../midori/midori-browser.c:5034 -msgid "'Flash' Cookies" -msgstr "Cookie-uri Flash" - -#: ../midori/midori-browser.c:5039 -msgid "Website icons" -msgstr "Iconițe site web" - -#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 -msgid "_Closed Tabs" -msgstr "Taburi în_chise" - -#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "Cache Internet" +# dumol: Truc pentru a micșora lățimea ferestrei cu preferințe +#: ../midori/midori-browser.c:4496 +msgid "Last open _tabs" +msgstr "Ultimele _taburi deschise" -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:4522 msgid "Clear private data when _quitting Midori" msgstr "Șterge datele pri_vate la ieșirea din Midori" -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:4698 msgid "A lightweight web browser." -msgstr "Un mic navigator pentru Internet." +msgstr "Un mic navigator web." -#: ../midori/midori-browser.c:5160 -msgid "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." -msgstr "Această bibliotecă este software liber ce poate fi redistribuit și/sau modificat în termenii licenței GNU LGPL (Lesser General Public License), publicată de Free Software Foundation, fie versiunea 2.1 ori o versiune ulterioară, la alegere." +#: ../midori/midori-browser.c:4699 +msgid "See about:version for version info." +msgstr "Consultați adresa about:version pentru detalii despre versiune." -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:4701 +msgid "" +"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." +msgstr "" +"Această bibliotecă este software liber ce poate fi redistribuit și/sau " +"modificat în termenii licenței GNU LGPL (Lesser General Public License), " +"publicată de Free Software Foundation, fie versiunea 2.1 ori o versiune " +"ulterioară, la alegere." + +#: ../midori/midori-browser.c:4722 msgid "translator-credits" msgstr "" "Igor Știrbu \n" "Mișu Moldovan \n" "Andrei Popescu " -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5086 msgid "_File" msgstr "_Fișier" -#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 -msgid "New _Window" -msgstr "_Fereastră nouă" - -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5089 msgid "Open a new window" msgstr "Deschide o fereastră nouă" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5092 msgid "Open a new tab" msgstr "Deschide un tab nou" -#: ../midori/midori-browser.c:5496 -msgid "P_rivate Browsing" -msgstr "Navigare p_rivată" - -#: ../midori/midori-browser.c:5497 -msgid "Don't save any private data while browsing" -msgstr "Nu salva date private în timpul navigării" +#: ../midori/midori-browser.c:5094 +msgid "New P_rivate Browsing Window" +msgstr "Navigare p_rivată în fereastră nouă" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5098 msgid "Open a file" msgstr "Deschide un fișier" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5100 +msgid "_Save Page As..." +msgstr "_Salvează pagina ca..." + +#: ../midori/midori-browser.c:5101 msgid "Save to a file" msgstr "Salvează într-un fișier" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:5103 msgid "Add to Speed _dial" -msgstr "Adaugă ca apel _rapid" - -#: ../midori/midori-browser.c:5507 -msgid "Add shortcut to speed dial" -msgstr "Adaugă scurtătură de apel rapid" +msgstr "Adaugă _ca apel rapid" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5107 msgid "Add Shortcut to the _desktop" -msgstr "A_daugă scurtătura la spațiul de lucru" +msgstr "Salvează lin_kul pe desktop" -#: ../midori/midori-browser.c:5510 -msgid "Add shortcut to the desktop" -msgstr "Adaugă scurtătura la spațiul de _lucru" +#: ../midori/midori-browser.c:5109 +msgid "Create _Launcher" +msgstr "Creează _lansator" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5113 msgid "Subscribe to News _feed" msgstr "Abonare la _fluxul de știri" -#: ../midori/midori-browser.c:5513 -msgid "Subscribe to this news feed" -msgstr "Abonare la acest flux de știri" - -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5119 msgid "_Close Tab" msgstr "În_chide tabul" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5120 msgid "Close the current tab" msgstr "Închide tabul curent" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5122 msgid "C_lose Window" msgstr "Înc_hide fereastra" -#: ../midori/midori-browser.c:5522 -msgid "Close this window" -msgstr "Închide fereastra curentă" - -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5126 msgid "Print the current page" msgstr "Tipărește pagina curentă" -#: ../midori/midori-browser.c:5528 -msgid "Quit the application" -msgstr "Ieșire din aplicație" +#: ../midori/midori-browser.c:5128 +msgid "Close a_ll Windows" +msgstr "Închide to_ate ferestrele" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5131 msgid "_Edit" msgstr "_Editare" -#: ../midori/midori-browser.c:5534 -msgid "Undo the last modification" -msgstr "Anulează ultima modificare" - -#: ../midori/midori-browser.c:5537 -msgid "Redo the last modification" -msgstr "Refă ultima modificare" - -#: ../midori/midori-browser.c:5541 -msgid "Cut the selected text" -msgstr "Taie textul selectat" - -#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 -msgid "Copy the selected text" -msgstr "Copiază textul selectat" - -#: ../midori/midori-browser.c:5550 -msgid "Paste text from the clipboard" -msgstr "Lipește textul din clipboard" - -#: ../midori/midori-browser.c:5553 -msgid "Delete the selected text" -msgstr "Șterge textul selectat" - -#: ../midori/midori-browser.c:5556 -msgid "Select all text" -msgstr "Selectează tot textul" +#: ../midori/midori-browser.c:5154 +msgid "_Find..." +msgstr "Ca_ută..." -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5155 msgid "Find a word or phrase in the page" msgstr "Caută un cuvânt sau o frază în pagină" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5157 msgid "Find _Next" msgstr "Caută înai_nte" -#: ../midori/midori-browser.c:5562 -msgid "Find the next occurrence of a word or phrase" -msgstr "Caută următoarea apariție a cuvântului sau a expresiei" - -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5160 msgid "Find _Previous" msgstr "Caută înap_oi" -#: ../midori/midori-browser.c:5565 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Caută apariția anterioară a cuvântului sau a expresiei" - -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5164 msgid "Configure the application preferences" msgstr "Schimbați preferințele programului" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5166 msgid "_View" msgstr "_Vizualizare" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5167 msgid "_Toolbars" msgstr "_Bare cu unelte" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5172 +msgid "Reload page without caching" +msgstr "Reîncarcă pagina de la sursă" + +#: ../midori/midori-browser.c:5182 msgid "Increase the zoom level" msgstr "Zoom mărit" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5185 msgid "Decrease the zoom level" msgstr "Zoom micșorat" -#: ../midori/midori-browser.c:5590 -msgid "Reset the zoom level" -msgstr "Zoom normal" - -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5189 msgid "_Encoding" msgstr "C_odare" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5191 msgid "View So_urce" -msgstr "Vizualizare s_ursă" +msgstr "Arată s_ursa" -#: ../midori/midori-browser.c:5594 -msgid "View the source code of the page" -msgstr "Vizualizare a codului sursă a paginii" +#: ../midori/midori-browser.c:5194 +msgid "Ca_ret Browsing" +msgstr "Navigare cu cu_rsor" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5198 msgid "Toggle fullscreen view" -msgstr "Comută modul pe tot ecranul" +msgstr "Comută pe tot ecranul" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5200 msgid "Scroll _Left" -msgstr "Derulare _stânga" - -#: ../midori/midori-browser.c:5601 -msgid "Scroll to the left" -msgstr "Derulare spre stânga" +msgstr "Derulare în _stânga" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5203 msgid "Scroll _Down" -msgstr "Derulare j_os" +msgstr "Derulare în j_os" -#: ../midori/midori-browser.c:5604 -msgid "Scroll down" -msgstr "Derulare în jos" - -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5206 msgid "Scroll _Up" -msgstr "Derulare _sus" - -#: ../midori/midori-browser.c:5607 -msgid "Scroll up" -msgstr "Derulare în sus" +msgstr "Derulare în _sus" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5209 msgid "Scroll _Right" -msgstr "Derulare _dreapta" +msgstr "Derulare în _dreapta" -#: ../midori/midori-browser.c:5610 -msgid "Scroll to the right" -msgstr "Derulare spre dreapta" - -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5212 msgid "_Go" msgstr "_Navigare" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5215 msgid "Go back to the previous page" msgstr "Salt la pagina anterioară" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5218 msgid "Go forward to the next page" msgstr "Salt la pagina următoare" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5222 msgid "Go to the previous sub-page" msgstr "Salt la sub-pagina anterioară" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5226 msgid "Go to the next sub-page" msgstr "Salt la sub-pagina următoare" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5229 msgid "Go to your homepage" -msgstr "Salt la pagina de pornire" +msgstr "Salt la pagina de start" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5231 msgid "Empty Trash" msgstr "Golește gunoiul" -#: ../midori/midori-browser.c:5633 -msgid "Delete the contents of the trash" -msgstr "Șterge conținutul coșului de gunoi" - -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5234 msgid "Undo _Close Tab" -msgstr "Revocă în_chiderea tabului" +msgstr "Re_vocă închiderea tabului" -#: ../midori/midori-browser.c:5636 -msgid "Open the last closed tab" -msgstr "Deschide ultimul tab închis" - -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5241 msgid "Add a new _folder" msgstr "Adaugă un _dosar nou" -#: ../midori/midori-browser.c:5643 -msgid "Add a new bookmark folder" -msgstr "Adaugă un dosar cu favorite" - -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5247 msgid "_Export bookmarks" msgstr "_Exportă favoritele" -#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5250 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" -msgstr "Gestionare _motoare de căutare" +msgstr "_Gestionați motoarele de căutare" -#: ../midori/midori-browser.c:5652 -msgid "Add, edit and remove search engines..." -msgstr "Adăugați, editați și ștergeți motoare de căutare..." - -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5253 msgid "_Clear Private Data" msgstr "Șt_erge datele private" -#: ../midori/midori-browser.c:5656 -msgid "Clear private data..." -msgstr "Ștergere date private..." - -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5256 msgid "_Inspect Page" -msgstr "_Inspectare pagină" +msgstr "_Inspectați pagina" -#: ../midori/midori-browser.c:5661 -msgid "Inspect page details and access developer tools..." -msgstr "Inspectați detaliile paginii și accesați uneltele de dezvoltare..." - -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5260 msgid "_Previous Tab" msgstr "Tabul a_nterior" -#: ../midori/midori-browser.c:5667 -msgid "Switch to the previous tab" -msgstr "Comută la tabul anterior" - -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5263 msgid "_Next Tab" msgstr "Tabul u_rmător" -#: ../midori/midori-browser.c:5670 -msgid "Switch to the next tab" -msgstr "Comută la tabul următor" +#: ../midori/midori-browser.c:5265 +msgid "Move Tab _Backward" +msgstr "M_ută înapoi tabul" + +#: ../midori/midori-browser.c:5267 +msgid "_Move Tab Forward" +msgstr "_Mută înainte tabul" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5270 msgid "Focus _Current Tab" -msgstr "Activează tabul _curent" +msgstr "Activează focusul tabului _curent" -#: ../midori/midori-browser.c:5673 -msgid "Focus the current tab" -msgstr "Activează tabul curent" +#: ../midori/midori-browser.c:5273 +msgid "Focus _Next view" +msgstr "Activează focusul _următorului widget" + +#: ../midori/midori-browser.c:5276 +msgid "Only show the Icon of the _Current Tab" +msgstr "Arată doar iconița tabului _curent" + +#: ../midori/midori-browser.c:5279 +msgid "_Duplicate Current Tab" +msgstr "_Duplică tabul curent" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5282 +msgid "Close Ot_her Tabs" +msgstr "Înc_hide celelalte taburi" + +#: ../midori/midori-browser.c:5285 msgid "Open last _session" msgstr "Deschide ultima _sesiune" -#: ../midori/midori-browser.c:5676 -msgid "Open the tabs saved in the last session" -msgstr "Deschide taburile salvate în ultima sesune" - -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5288 msgid "_Help" msgstr "_Ajutor" -#: ../midori/midori-browser.c:5680 -msgid "_Contents" -msgstr "_Conținut" - -#: ../midori/midori-browser.c:5681 -msgid "Show the documentation" -msgstr "Arată documentația" - -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5290 msgid "_Frequent Questions" msgstr "Întrebări _frecvente" -#: ../midori/midori-browser.c:5684 -msgid "Show the Frequently Asked Questions" -msgstr "Arată întrebările frecvente" - -#: ../midori/midori-browser.c:5686 -msgid "_Report a Bug" -msgstr "_Raportare defect" - -#: ../midori/midori-browser.c:5687 -msgid "Open Midori's bug tracker" -msgstr "Deschide gestionarul de defecte al Midori" - -#: ../midori/midori-browser.c:5690 -msgid "Show information about the program" -msgstr "Arată detalii despre aplicație" +#: ../midori/midori-browser.c:5293 +msgid "_Report a Problem..." +msgstr "_Raportați o problemă..." -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5305 msgid "_Menubar" msgstr "Bară de _meniu" -#: ../midori/midori-browser.c:5699 -msgid "Show menubar" -msgstr "Arată bara de meniu" - -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:5309 msgid "_Navigationbar" msgstr "Bară de _navigare" -#: ../midori/midori-browser.c:5703 -msgid "Show navigationbar" -msgstr "Arată bara de navigare" - -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5313 msgid "Side_panel" msgstr "_Panou lateral" -#: ../midori/midori-browser.c:5707 -msgid "Show sidepanel" -msgstr "Arată panoul lateral" +#: ../midori/midori-browser.c:5314 +msgid "Sidepanel" +msgstr "Panou lateral" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5317 msgid "_Bookmarkbar" msgstr "Bară cu _favorite" -#: ../midori/midori-browser.c:5711 -msgid "Show bookmarkbar" -msgstr "Arată bara cu favorite" - -#: ../midori/midori-browser.c:5714 -msgid "_Transferbar" -msgstr "Bară de _descărcare" - -#: ../midori/midori-browser.c:5715 -msgid "Show transferbar" -msgstr "Arată bara descărcărilor" - -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5321 msgid "_Statusbar" msgstr "Bară de _stare" -#: ../midori/midori-browser.c:5719 -msgid "Show statusbar" -msgstr "Arată bara de stare" - -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:307 msgid "_Automatic" msgstr "_Automată" -#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:232 msgid "Chinese (BIG5)" msgstr "Chineză (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5734 +#: ../midori/midori-browser.c:5337 msgid "Japanese (SHIFT__JIS)" msgstr "Japoneză (SHIFT__JIS)" -#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5340 ../midori/midori-websettings.c:234 msgid "Korean (EUC-KR)" msgstr "Coreeană (EUC-KR)" -#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5343 ../midori/midori-websettings.c:235 msgid "Russian (KOI8-R)" msgstr "Rusă (KOI8-R)" -#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5346 ../midori/midori-websettings.c:236 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5349 ../midori/midori-websettings.c:237 msgid "Western (ISO-8859-1)" msgstr "Vestică (ISO-8859-1)" -#: ../midori/midori-browser.c:6294 +#: ../midori/midori-browser.c:5352 ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:313 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "Personalizat" + +#: ../midori/midori-browser.c:5858 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:5865 msgid "_Location..." -msgstr "_Locație..." +msgstr "A_dresă..." -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:5867 msgid "Open a particular location" -msgstr "Deschide o anumită locație" +msgstr "Deschideți o anumită adresă" -#: ../midori/midori-browser.c:6327 +#: ../midori/midori-browser.c:5889 msgid "_Web Search..." -msgstr "Caută pe _Internet..." +msgstr "C_aută pe net..." -#: ../midori/midori-browser.c:6329 +#: ../midori/midori-browser.c:5891 msgid "Run a web search" -msgstr "Pornește o căutare pe Internet" +msgstr "Porniți o căutare pe net" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:5918 msgid "Reopen a previously closed tab or window" msgstr "Redeschideți taburi ori ferestre închise recent" -#: ../midori/midori-browser.c:6365 -msgid "_Recently visited pages" -msgstr "Pagini vizitate _recent" - -#: ../midori/midori-browser.c:6367 -msgid "Reopen pages that you visited earlier" -msgstr "Redeschideți pagini vizitate recent" - -#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 -msgid "_Bookmarks" -msgstr "Favo_rite" - -#: ../midori/midori-browser.c:6384 +#: ../midori/midori-browser.c:5935 msgid "Show the saved bookmarks" msgstr "Arată favoritele salvate" -#: ../midori/midori-browser.c:6399 +#: ../midori/midori-browser.c:5952 msgid "_Tools" msgstr "_Unelte" -#: ../midori/midori-browser.c:6412 +#: ../midori/midori-browser.c:5968 msgid "_Window" -msgstr "Fereas_tră" +msgstr "Fe_reastră" -#: ../midori/midori-browser.c:6414 +#: ../midori/midori-browser.c:5970 msgid "Show a list of all open tabs" msgstr "Arată lista tuturor taburilor deschise" -#: ../midori/midori-browser.c:6428 +#: ../midori/midori-browser.c:5984 msgid "_Menu" msgstr "_Meniu" -#: ../midori/midori-browser.c:6430 +#: ../midori/midori-browser.c:5986 msgid "Menu" msgstr "Meniu" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6634 -msgid "_Inline Find:" -msgstr "Căutare _inclusă:" - -#: ../midori/midori-browser.c:6665 -msgid "Previous" -msgstr "Anterioară" - -#: ../midori/midori-browser.c:6670 -msgid "Next" -msgstr "Următoare" - -#: ../midori/midori-browser.c:6675 -msgid "Match Case" -msgstr "Majuscule semnificative" - -#: ../midori/midori-browser.c:6684 -msgid "Highlight Matches" -msgstr "Evidențiază potrivirile" - -#: ../midori/midori-browser.c:6696 -msgid "Close Findbar" -msgstr "Închide bara de căutare" - -#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 -msgid "Clear All" -msgstr "Șterge tot" - -#: ../midori/midori-browser.c:7100 +#: ../midori/midori-browser.c:6664 #, c-format msgid "Unexpected setting '%s'" msgstr "Opțiune neașteptată „%s”" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-extension.c:310 +#, c-format +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "Opțiunile extensiei „%s” nu au putut fi încărcate: %s\n" + +#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1695 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Opțiunile extensiei „%s” nu au putut fi salvate: %s\n" + +#: ../midori/midori-locationaction.c:471 #, c-format msgid "Failed to select from history\n" -msgstr "Eșec la selectarea din istoric\n" +msgstr "Nu s-a putut selecta din istoric\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-locationaction.c:558 #, c-format msgid "Search for %s" msgstr "Caută %s" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:592 #, c-format msgid "Search with %s" msgstr "Caută cu %s" -#: ../midori/midori-locationaction.c:1197 -#, c-format -msgid "Failed to execute database statement\n" -msgstr "Eșec la executarea comenzii pentru baza de date\n" - #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1359 msgid "Paste and p_roceed" -msgstr "Lipește și c_ontinuă" +msgstr "Lipește și co_ntinuă" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 -msgid "Detach chosen panel from the window" -msgstr "Detașează de fereastră panoul ales" +#: ../midori/midori-locationaction.c:1727 +msgid "Not verified" +msgstr "Neverificată" + +#: ../midori/midori-locationaction.c:1747 +msgid "Verified and encrypted connection" +msgstr "Conexiune verificată și criptată" -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" msgstr "Aliniază la dreapta panoul lateral" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Închide panoul" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Aliniază la stânga panoul lateral" -#: ../midori/midori-panel.c:797 -msgid "Hide operating controls" -msgstr "Ascunde controalele active" - -#: ../midori/midori-websettings.c:204 -msgid "Show Blank page" -msgstr "Arată o pagină goală" +#: ../midori/midori-websettings.c:214 +msgid "Show Speed Dial" +msgstr "Arată apelurile rapide" -#: ../midori/midori-websettings.c:205 +# dumol: Truc pentru a micșora lățimea ferestrei cu preferințe +#: ../midori/midori-websettings.c:215 msgid "Show Homepage" -msgstr "Arată pagina de pornire" - -#: ../midori/midori-websettings.c:206 -msgid "Show last open tabs" -msgstr "Arată ultimele taburi deschise" +msgstr "Pagina de start" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:233 msgid "Japanese (SHIFT_JIS)" msgstr "Japoneză (SHIFT_JIS)" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:253 msgid "New tab" msgstr "Tab nou" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:254 msgid "New window" msgstr "Fereastră nouă" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:255 msgid "Current tab" msgstr "Tab curent" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:270 msgid "Default" msgstr "Implicit" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:271 msgid "Icons" msgstr "Iconițe" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:272 msgid "Small icons" msgstr "Iconițe mici" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:273 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:274 msgid "Icons and text" msgstr "Iconițe și text" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:275 msgid "Text beside icons" msgstr "Text lângă iconițe" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:290 msgid "Automatic (GNOME or environment)" msgstr "Automat (din mediu ori GNOME)" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:291 msgid "HTTP proxy server" msgstr "Server proxy HTTP" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:292 msgid "No proxy server" msgstr "Fără server proxy" -#: ../midori/midori-websettings.c:296 -msgid "All cookies" -msgstr "Toate cookie-urile" - -#: ../midori/midori-websettings.c:297 -msgid "Session cookies" -msgstr "Cookie-uri de sesiune" - -#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 -msgid "None" -msgstr "Fără" - -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:309 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:310 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:311 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:312 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:380 msgid "Remember last window size" msgstr "Reține dimensiunea ultimei ferestre" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:381 msgid "Whether to save the last window size" msgstr "Specifică dacă se salvează dimensiunea ultimei ferestre" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:389 msgid "Last window width" msgstr "Lățimea ultimei ferestre" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:390 msgid "The last saved window width" msgstr "Ultima lățime salvată a ferestrei" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:398 msgid "Last window height" msgstr "Înălțimea ultimei ferestre" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:399 msgid "The last saved window height" msgstr "Ultima înălțime salvată a ferestrei" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:424 msgid "Last panel position" msgstr "Ultima poziție a panoului" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:425 msgid "The last saved panel position" msgstr "Ultima poziție salvată a panoului" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:434 msgid "Last panel page" msgstr "Ultima pagină a panoului" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:435 msgid "The last saved panel page" msgstr "Ultima pagină salvată a panoului" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:443 msgid "Last Web search" -msgstr "Ultima căutare pe Internet" +msgstr "Ultima căutare pe net" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:444 msgid "The last saved Web search" -msgstr "Ultima căutare pe Internet salvată" +msgstr "Ultima căutare pe net salvată" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:453 msgid "Show Menubar" msgstr "Arată bara de meniu" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:454 msgid "Whether to show the menubar" msgstr "Specifică dacă să fie vizibilă bara de meniu" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:462 msgid "Show Navigationbar" msgstr "Arată bara de navigare" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the navigationbar" msgstr "Specifică dacă să fie vizibilă bara de navigare" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:471 msgid "Show Bookmarkbar" msgstr "Arată bara cu favorite" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the bookmarkbar" msgstr "Specifică dacă să fie vizibilă bara cu favorite" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:480 msgid "Show Panel" msgstr "Arată panoul" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:481 msgid "Whether to show the panel" msgstr "Specifică dacă să fie vizibil panoul" -#: ../midori/midori-websettings.c:486 -msgid "Show Transferbar" -msgstr "Arată bara descărcărilor" - -#: ../midori/midori-websettings.c:487 -msgid "Whether to show the transferbar" -msgstr "Specifică dacă să fie vizibilă bara descărcărilor" - -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:489 msgid "Show Statusbar" msgstr "Arată bara de stare" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:490 msgid "Whether to show the statusbar" msgstr "Specifică dacă să fie vizibilă bara de stare" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:499 msgid "Toolbar Style:" -msgstr "Stil bară cu unelte:" +msgstr "Stil pentru bara cu unelte:" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:500 msgid "The style of the toolbar" msgstr "Stilul barei cu unelte" -#: ../midori/midori-websettings.c:522 -msgid "Show progress in location entry" -msgstr "Arată progresul în bara de adrese" - -#: ../midori/midori-websettings.c:523 -msgid "Whether to show loading progress in the location entry" -msgstr "Specifică dacă să fie vizibil progresul încărcării în bara de adrese" - -#: ../midori/midori-websettings.c:538 -msgid "Search engines in location completion" -msgstr "Arată căutările la completarea adreselor" - -#: ../midori/midori-websettings.c:539 -msgid "Whether to show search engines in the location completion" -msgstr "Specifică dacă să fie vizibile motoarele de căutare la completarea în bara de adrese" - -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:509 msgid "Toolbar Items" msgstr "Elementele barei cu unelte" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:510 msgid "The items to show on the toolbar" msgstr "Elementele de arătat în bara cu unelte" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:518 msgid "Compact Sidepanel" msgstr "Panou lateral compact" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:519 msgid "Whether to make the sidepanel compact" msgstr "Specifică dacă panoul lateral e compact" -#: ../midori/midori-websettings.c:572 -msgid "Show operating controls of the panel" -msgstr "Arată controalele active ale panoului" - -#: ../midori/midori-websettings.c:573 -msgid "Whether to show the operating controls of the panel" -msgstr "Specifică dacă să fie vizibile controalele active ale panoului" - -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:534 msgid "Align sidepanel on the right" msgstr "Aliniază la dreapta panoul lateral" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:535 msgid "Whether to align the sidepanel on the right" msgstr "Specifică dacă panoul lateral se aliniază la dreapta" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:550 msgid "Open panels in separate windows" msgstr "Deschide panourile în ferestre separate" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:551 msgid "Whether to always open panels in separate windows" msgstr "Specifică dacă panourile noi se deschid în ferestre separate" -#: ../midori/midori-websettings.c:614 +# dumol: Truc pentru a micșora lățimea ferestrei cu preferințe +#: ../midori/midori-websettings.c:560 msgid "When Midori starts:" -msgstr "La pornirea Midori:" +msgstr "La pornirea Midori arată:" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:561 msgid "What to do when Midori starts" msgstr "Specificați cum să pornească Midori" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:570 msgid "Homepage:" -msgstr "Pagină de pornire:" +msgstr "Pagină de start:" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:571 msgid "The homepage" -msgstr "Pagina de pornire" +msgstr "Pagina de start" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:586 msgid "Show crash dialog" msgstr "Depanare după terminări premature" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:587 msgid "Show a dialog after Midori crashed" msgstr "Arată o fereastră de depanare la pornirea după o terminare prematură" -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:657 -msgid "Show speed dial in new tabs" -msgstr "Arată apelurile rapide în taburi noi" - -#: ../midori/midori-websettings.c:658 -msgid "Show speed dial in newly opened tabs" -msgstr "Arată apelurile rapide în taburile nou deschise" - -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:595 msgid "Save downloaded files to:" msgstr "Salvează fișierele descărcate în:" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:596 msgid "The folder downloaded files are saved to" msgstr "Calea către dosarul pentru salvarea fișierelor descărcate" -#: ../midori/midori-websettings.c:688 -msgid "Ask for the destination folder" -msgstr "Cere un dosar de destinație" - -#: ../midori/midori-websettings.c:689 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "Specifică dacă se va cere precizarea dosarului în care se face descărcarea" - -#: ../midori/midori-websettings.c:708 -msgid "Notify when a transfer has been completed" -msgstr "Notifică la finalizarea descărcărilor" - -#: ../midori/midori-websettings.c:709 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "Specifică dacă se afișează o notificare la finalizarea unei descărcări" - -#: ../midori/midori-websettings.c:721 -msgid "Download Manager" -msgstr "Gestionar de descărcări" - -#: ../midori/midori-websettings.c:722 -msgid "An external download manager" -msgstr "Gestionar extern de descărcări" - -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:604 msgid "Text Editor" msgstr "Editor de text" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:605 msgid "An external text editor" msgstr "Editor extern de text" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:620 msgid "News Aggregator" msgstr "Agregator de știri" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:621 msgid "An external news aggregator" msgstr "Agregator extern de știri" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:629 msgid "Location entry Search" msgstr "Căutarea în bara de adrese" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:630 msgid "The search to perform inside the location entry" msgstr "Căutarea de efectuat în bara de adrese" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:638 msgid "Preferred Encoding" msgstr "Codare preferată" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:639 msgid "The preferred character encoding" msgstr "Codarea de caractere preferată" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:649 msgid "Always Show Tabbar" msgstr "Arată întotdeauna bara cu taburi" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:650 msgid "Always show the tabbar" msgstr "Arată întotdeauna bara cu taburi" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:658 msgid "Close Buttons on Tabs" -msgstr "Butoane de închidere pe taburi" +msgstr "Butoane de închidere a taburilor" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:659 msgid "Whether tabs have close buttons" msgstr "Specifică dacă se adaugă butoane de închidere pe taburi" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:684 msgid "Open new pages in:" msgstr "Paginile noi se vor deschide în:" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:685 msgid "Where to open new pages" msgstr "Alegeți unde să se deschidă paginile noi" -#: ../midori/midori-websettings.c:803 -msgid "Open external pages in:" -msgstr "Paginile externe se vor deschide în:" - -#: ../midori/midori-websettings.c:804 -msgid "Where to open externally opened pages" -msgstr "Alegeți unde să se deschidă paginile externe" - -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:694 msgid "Middle click opens Selection" msgstr "Butonul din mijloc deschide selecția" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:695 msgid "Load an address from the selection via middle click" -msgstr "Încarcă adresa din clipboard prin clic pe butonul din mijloc al mausului" +msgstr "" +"Încarcă adresa din clipboard prin clic pe butonul din mijloc al mausului" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:703 msgid "Open tabs in the background" msgstr "Deschide taburile în fundal" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:704 msgid "Whether to open new tabs in the background" msgstr "Specifică dacă taburile noi se deschid în fundal" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:712 msgid "Open Tabs next to Current" msgstr "Deschide taburile lângă cel curent" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:713 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Specifică dacă taburile noi se deschid lângă cel curent sau după ultimul tab" +msgstr "" +"Specifică dacă taburile noi se deschid lângă cel curent sau după ultimul tab" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:721 msgid "Open popups in tabs" msgstr "Deschide popup-urile în taburi" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:722 msgid "Whether to open popup windows in tabs" msgstr "Specifică dacă ferestrele popup se deschid în taburi" -#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:732 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Încarcă automat imaginile" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:733 msgid "Load and display images automatically" msgstr "Încarcă și afișează automat imaginile" -#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:740 ../extensions/statusbar-features.c:143 msgid "Enable scripts" -msgstr "Execută scripturi" +msgstr "Execută scripturile" -#: ../midori/midori-websettings.c:860 +#: ../midori/midori-websettings.c:741 msgid "Enable embedded scripting languages" msgstr "Activează limbajele de scripting incluse" -#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:748 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" -msgstr "Utilizează module Netscape" +msgstr "Activează modulele Netscape" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:749 msgid "Enable embedded Netscape plugin objects" msgstr "Activează modulele Netscape incluse" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:764 +msgid "Enable Spell Checking" +msgstr "Activează verificarea ortografică" + +#: ../midori/midori-websettings.c:765 +msgid "Enable spell checking while typing" +msgstr "Verifică ortografia în timpul tastării" + +#: ../midori/midori-websettings.c:771 msgid "Enable HTML5 database support" msgstr "Suport pentru baze de date HTML5" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:772 msgid "Whether to enable HTML5 database support" msgstr "Specifică dacă să se activeze suportul pentru baze de date HTML5" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:778 msgid "Enable HTML5 local storage support" msgstr "Suport pentru stocare locală HTML5" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:779 msgid "Whether to enable HTML5 local storage support" msgstr "Specifică dacă să se activeze suportul pentru stocare locală HTML5" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:785 msgid "Enable offline web application cache" msgstr "Cache offline pentru aplicații web" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:786 msgid "Whether to enable offline web application cache" -msgstr "Specifică dacă să se activeze suportul pentru cache offline de aplicații web" +msgstr "" +"Specifică dacă să se activeze suportul pentru cache offline de aplicații web" + +#: ../midori/midori-websettings.c:802 +msgid "Flash window on background tabs" +msgstr "Evidențiere pentru taburile noi în fundal" + +#: ../midori/midori-websettings.c:803 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "Evidențiază pe moment fereastra la deschiderea unui tab nou în fundal" + +#: ../midori/midori-websettings.c:811 +msgid "Enable WebGL support" +msgstr "Suport pentru standardul WebGL" + +#: ../midori/midori-websettings.c:812 +msgid "Allow websites to use OpenGL rendering" +msgstr "Permite randarea WebGL în paginile web" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:838 msgid "Zoom Text and Images" msgstr "Scalează imaginile odată cu textul" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:839 msgid "Whether to zoom text and images" msgstr "Specifică dacă se scalează concomitent textul și imaginile" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:854 msgid "Find inline while typing" msgstr "Caută în pagină pe măsură ce se tastează" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:855 msgid "Whether to automatically find inline while typing" msgstr "Specifică dacă se caută automat pe măsură ce se tastează" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:870 msgid "Kinetic scrolling" msgstr "Derulare cinetică" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:871 msgid "Whether scrolling should kinetically move according to speed" -msgstr "Specifică dacă derularea ar trebui să se facă cinetic, în acord cu viteza" - -#: ../midori/midori-websettings.c:967 -msgid "Accept cookies" -msgstr "Acceptă cookie-uri" - -#: ../midori/midori-websettings.c:968 -msgid "What type of cookies to accept" -msgstr "Tipuri de cookie-uri acceptate" - -#: ../midori/midori-websettings.c:984 -msgid "Original cookies only" -msgstr "Doar cookie-uri originale" - -#: ../midori/midori-websettings.c:985 -msgid "Accept cookies from the original website only" -msgstr "Refuză cookie-uri de la alte servere" +msgstr "" +"Specifică dacă derularea ar trebui să se facă cinetic, în acord cu viteza " +"derulării" -#: ../midori/midori-websettings.c:993 -msgid "Maximum cookie age" -msgstr "Durată maximă pentru cookie-uri" +# dumol: Truc pentru a micșora lățimea ferestrei cu preferințe +#: ../midori/midori-websettings.c:879 +msgid "Delete old Cookies after:" +msgstr "Șterge cookie-urile vechi după:" -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:880 msgid "The maximum number of days to save cookies for" msgstr "Numărul maxim de zile pentru păstrarea cookie-urilor" -#: ../midori/midori-websettings.c:1011 -msgid "Remember last visited pages" -msgstr "Reține ultimele pagini vizitate" - -#: ../midori/midori-websettings.c:1012 -msgid "Whether the last visited pages are saved" -msgstr "Specifică dacă se rețin ultimele pagini vizitate" - -#: ../midori/midori-websettings.c:1020 -msgid "Maximum history age" -msgstr "Număr maxim de zile pentru istoric" +#: ../midori/midori-websettings.c:896 +msgid "Only accept Cookies from sites you visit" +msgstr "Nu accepta cookie-uri third-party" + +#: ../midori/midori-websettings.c:897 +msgid "Block cookies sent by third-party websites" +msgstr "" +"Blochează cookie-urile de la alte servere decât cel ce găzduiește pagina " +"curentă" + +#: ../midori/midori-websettings.c:911 +msgid "Delete pages from history after:" +msgstr "Șterge paginile din istoric după:" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:912 msgid "The maximum number of days to save the history for" msgstr "Numărul maxim de zile pentru păstrarea istoricului" -#: ../midori/midori-websettings.c:1029 -msgid "Remember last downloaded files" -msgstr "Reține ultimele fișiere descărcate" - -#: ../midori/midori-websettings.c:1030 -msgid "Whether the last downloaded files are saved" -msgstr "Specifică dacă se rețin ultimele fișiere descărcate" - -#: ../midori/midori-websettings.c:1047 +#: ../midori/midori-websettings.c:927 msgid "Proxy server" msgstr "Server proxy" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:928 msgid "The type of proxy server to use" msgstr "Tipul serverului proxy de utilizat" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:937 msgid "HTTP Proxy Server" msgstr "Server proxy HTTP" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:938 msgid "The proxy server used for HTTP connections" msgstr "Serverul proxy pentru conexiuni HTTP" -#: ../midori/midori-websettings.c:1073 -msgid "Detect proxy server automatically" -msgstr "Detectează automat serverul proxy" - -#: ../midori/midori-websettings.c:1074 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Specifică dacă se detectează automat serverul proxy din variabilele de mediu" +#: ../midori/midori-websettings.c:953 +msgid "Port" +msgstr "Port" + +#: ../midori/midori-websettings.c:954 +msgid "The proxy server port used for HTTP connections" +msgstr "Portul serverului proxy pentru conexiuni HTTP" + +#: ../midori/midori-websettings.c:972 +msgid "The maximum size of cached pages on disk" +msgstr "Mărimea maximă a paginilor din cache-ul pe disc" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:989 msgid "Identify as" msgstr "Identificare" -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:990 msgid "What to identify as to web pages" -msgstr "Alegeți identitatea de prezentat serverelor din Internet" +msgstr "Alegeți identitatea de prezentat serverelor web" -#: ../midori/midori-websettings.c:1107 +#: ../midori/midori-websettings.c:1006 msgid "Identification string" msgstr "Șir de identificare" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1007 msgid "The application identification string" -msgstr "Șirul de identificare al aplicației" +msgstr "Șirul de identificare al navigatorului" -#: ../midori/midori-websettings.c:1123 +#: ../midori/midori-websettings.c:1023 msgid "Preferred languages" msgstr "Limbă preferată" -#: ../midori/midori-websettings.c:1124 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "O listă de limbi preferate pentru afișarea paginilor multilingve, de exemplu: „ro”, „ro,en” ori „en-us;q=1.0, fr-fr;q=0.667”" +#: ../midori/midori-websettings.c:1024 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"O listă de limbi preferate pentru afișarea paginilor multilingve, de " +"exemplu: „ro”, „ro,en” ori „en-us;q=1.0, fr-fr;q=0.667”" -#: ../midori/midori-websettings.c:1139 +#: ../midori/midori-websettings.c:1039 msgid "Clear private data" -msgstr "Ștergere date private" +msgstr "Șterge datele private" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1040 msgid "The private data selected for deletion" msgstr "Datele private selectate pentru ștergere" -#. 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:1261 ../midori/midori-view.c:4528 -#: ../midori/midori-view.c:4532 +#: ../midori/midori-websettings.c:1055 +msgid "Clear data" +msgstr "Șterge datele" + +#: ../midori/midori-websettings.c:1056 +msgid "The data selected for deletion" +msgstr "Datele selectate pentru ștergere" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1105 +msgid "Strip referrer details sent to websites" +msgstr "Nu trimite serverelor detalii Referrer" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1107 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Specifică dacă antetul Referrer va fi scurtat la numele serverului" + +#: ../midori/midori-websettings.c:1121 +msgid "Always use my font choices" +msgstr "Folosește întotdeauna fonturile mele" + +#: ../midori/midori-websettings.c:1122 +msgid "Override fonts picked by websites with user preferences" +msgstr "Înlocuiește fonturile precizate în paginile web cu cele alese mai sus" + +#: ../midori/midori-view.c:1307 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s dorește să salveze o bază de date HTML5." + +#: ../midori/midori-view.c:1311 ../midori/midori-view.c:1343 +msgid "_Deny" +msgstr "_Refuză" + +#: ../midori/midori-view.c:1311 ../midori/midori-view.c:1343 +msgid "_Allow" +msgstr "_Acceptă" + +#: ../midori/midori-view.c:1339 +#, c-format +msgid "%s wants to know your location." +msgstr "%s dorește să vă identifice locația." + +#: ../midori/midori-view.c:1430 #, c-format msgid "Error - %s" msgstr "Eroare - %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1431 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Nu s-a putut încărca pagina „%s”." -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1433 msgid "Try again" msgstr "Reîncearcă" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 -#, c-format -msgid "Not found - %s" -msgstr "%s nu a fost găsit" - -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1610 ../midori/midori-view.c:2514 #, c-format msgid "Send a message to %s" -msgstr "Trimite un mesaj la %s" +msgstr "Scrieți un mail către %s" -#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2345 ../midori/midori-view.c:2663 msgid "Inspect _Element" -msgstr "Inspectare _element" +msgstr "_Inspectați elementul" -#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2397 msgid "Open Link in New _Tab" msgstr "Deschide linkul într-un _tab nou" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2401 msgid "Open Link in _Foreground Tab" -msgstr "Deschide lin_kul în tabul din prim-plan" +msgstr "Deschide lin_kul într-un tab nou în prim plan" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2402 msgid "Open Link in _Background Tab" -msgstr "Deschide linkul într-un tab din _fundal" +msgstr "Deschide linkul într-un tab nou în _fundal" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2405 msgid "Open Link in New _Window" msgstr "Deschide linkul într-o _fereastră nouă" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2408 msgid "Open Link as Web A_pplication" msgstr "Deschide linkul ca o aplicație _web" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2413 msgid "Copy Link de_stination" msgstr "Copiază de_stinația linkului" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 -msgid "_Save Link destination" -msgstr "_Salvează destinația linkului" - -#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 -msgid "_Download Link destination" -msgstr "_Descarcă destinația linkului" - -#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 -msgid "Download with Download _Manager" -msgstr "D_escarcă cu gestionarul de descărcări" - -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2429 msgid "Open _Image in New Tab" msgstr "Deschide _imaginea într-un tab nou" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2432 msgid "Copy Image _Address" msgstr "Copiază _adresa imaginii" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2435 msgid "Save I_mage" msgstr "Salvează i_maginea" -#: ../midori/midori-view.c:2229 -msgid "Download I_mage" -msgstr "Descarcă i_maginea" +#: ../midori/midori-view.c:2438 +msgid "Open in Image _Viewer" +msgstr "D_eschide imaginea în programul asociat" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2445 msgid "Copy Video _Address" msgstr "Copiază _adresa materialului video" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2448 msgid "Save _Video" msgstr "Salvează materialul _video" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2448 msgid "Download _Video" -msgstr "Descarcă materialul _video" +msgstr "Descarcă _materialul video" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2474 msgid "Search _with" msgstr "Caută c_u" -#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2506 msgid "_Search the Web" -msgstr "C_aută pe Internet" +msgstr "C_aută pe net" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2522 msgid "Open Address in New _Tab" msgstr "Deschide adresa într-un _tab nou" -#: ../midori/midori-view.c:2662 +#: ../midori/midori-view.c:2811 msgid "Open or download file" msgstr "Deschide sau descarcă fișierul" -#: ../midori/midori-view.c:2681 +#: ../midori/midori-view.c:2830 #, c-format msgid "File Type: '%s'" -msgstr "Tip fișier: „%s”" +msgstr "Tip de fișier: „%s”" -#: ../midori/midori-view.c:2684 +#: ../midori/midori-view.c:2832 #, c-format msgid "File Type: %s ('%s')" -msgstr "Tip fișier: %s („%s”)" +msgstr "Tip de fișier: %s („%s”)" + +#: ../midori/midori-view.c:2836 +#, c-format +msgid "File Name: %s" +msgstr "Nume fișier: %s" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2688 +#: ../midori/midori-view.c:2855 #, c-format msgid "Open %s" msgstr "Deschide %s" -#: ../midori/midori-view.c:3236 +#: ../midori/midori-view.c:3480 #, c-format msgid "Inspect page - %s" msgstr "Inspectare pagină - %s" -#: ../midori/midori-view.c:3501 -msgid "Speed dial" -msgstr "Culegere rapidă" +#: ../midori/midori-view.c:3781 +msgid "Speed Dial" +msgstr "Apeluri rapide" -#: ../midori/midori-view.c:3502 +# dumol: E ok dacă e mai lung... +#: ../midori/midori-view.c:3782 ../midori/midori-view.c:3878 msgid "Click to add a shortcut" -msgstr "Clic pentru a adăuga o scurtătură" +msgstr "Dați clic aici pentru a adăuga un apel rapid" -#: ../midori/midori-view.c:3503 +#: ../midori/midori-view.c:3783 msgid "Enter shortcut address" -msgstr "Introduceți adresa scurtăturii" +msgstr "Introduceți adresa apelului rapid" -#: ../midori/midori-view.c:3504 +#: ../midori/midori-view.c:3784 msgid "Enter shortcut title" -msgstr "Introduceți titlul scurtăturii" +msgstr "Introduceți titlul apelului rapid" -#: ../midori/midori-view.c:3505 +#: ../midori/midori-view.c:3785 msgid "Are you sure you want to delete this shortcut?" -msgstr "Sigur doriți să ștergeți această scurtătură?" +msgstr "Sigur doriți să ștergeți acest apel rapid?" -#: ../midori/midori-view.c:3506 -msgid "Set number of columns" -msgstr "Precizați numărul de coloane" +#: ../midori/midori-view.c:3947 +#, c-format +msgid "No documentation installed" +msgstr "Documentația nu este instalată" -#: ../midori/midori-view.c:3507 -msgid "Enter number of columns:" -msgstr "Introduceți numărul de coloane" +#: ../midori/midori-view.c:4023 +msgid "Midori doesn't store any personal data:" +msgstr "Midori nu stochează niciun fel de date personale:" + +#: ../midori/midori-view.c:4024 +msgid "No history or web cookies are being saved." +msgstr "Nu se salvează istoricul ori cookie-urile." + +#: ../midori/midori-view.c:4025 +msgid "Extensions are disabled." +msgstr "Extensiile sunt dezactivate." + +#: ../midori/midori-view.c:4026 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "Stocarea HTML5, bazele de date locale și cache-ul aplicațiilor web sunt dezactivate." + +#: ../midori/midori-view.c:4027 +msgid "Midori prevents websites from tracking the user:" +msgstr "Midori previne urmărirea utilizatorilor pe Internet:" + +#: ../midori/midori-view.c:4028 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "Antetele referrer sunt trunchiate la numele serverului." + +#: ../midori/midori-view.c:4029 +msgid "DNS prefetching is disabled." +msgstr "Cererile DNS nu se fac anticipat." + +#: ../midori/midori-view.c:4030 +msgid "The language and timezone are not revealed to websites." +msgstr "Limba și fusul orar nu sunt accesibile site-urilor web." + +#: ../midori/midori-view.c:4031 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "Modulele Netscape (Flash și altele) nu pot fi listate de site-uri." -#: ../midori/midori-view.c:3508 -msgid "Set number of shortcuts" -msgstr "Precizați numărul de combinații de taste" +#: ../midori/midori-view.c:4068 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "Cifrele dintre paranteze arată versiunile utilizate curent." -#: ../midori/midori-view.c:3509 -msgid "Enter number of shortcuts:" -msgstr "Introduceți numărul de combinații de taste" +#: ../midori/midori-view.c:4123 +msgid "Page loading delayed" +msgstr "Încărcarea paginii a fost întârziată." -#: ../midori/midori-view.c:3535 -#, c-format -msgid "Document cannot be displayed" -msgstr "Documentul nu poate fi afișat" +#: ../midori/midori-view.c:4124 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "" +"Încărcarea a fost întârziată din cauza unei terminări premature ori pentru " +"că așa ați optat în preferințele Midori." -#: ../midori/midori-view.c:3558 -#, c-format -msgid "No documentation installed" -msgstr "Documentația nu este instalată" +#: ../midori/midori-view.c:4125 +msgid "Load Page" +msgstr "Încarcă pagina" -#: ../midori/midori-view.c:3808 +#: ../midori/midori-view.c:4264 msgid "Blank page" msgstr "O pagină goală" -#: ../midori/midori-view.c:4068 +#: ../midori/midori-view.c:4526 msgid "_Duplicate Tab" msgstr "D_uplică tabul" -#: ../midori/midori-view.c:4073 -msgid "_Restore Tab" -msgstr "_Restaurează tabul" - -#: ../midori/midori-view.c:4073 -msgid "_Minimize Tab" -msgstr "_Minimizează tabul" +#: ../midori/midori-view.c:4531 +msgid "Show Tab _Label" +msgstr "_Arată eticheta tabului" + +#: ../midori/midori-view.c:4531 +msgid "Show Tab _Icon Only" +msgstr "_Arată doar iconița tabului" -#: ../midori/midori-view.c:4079 +#: ../midori/midori-view.c:4537 msgid "Close ot_her Tabs" msgstr "Înc_hide celelalte taburi" -#: ../midori/midori-view.c:4700 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5308 +msgid "previous" +msgstr "înapoi" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5327 +msgid "next" +msgstr "înainte" + +#: ../midori/midori-view.c:5340 msgid "Print background images" msgstr "Tipărește imaginile de fundal" -#: ../midori/midori-view.c:4701 +#: ../midori/midori-view.c:5341 msgid "Whether background images should be printed" msgstr "Specifică dacă se tipăresc și imaginile de fundal" -#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:5373 msgid "Features" msgstr "Facilități" -#. Page "General" -#: ../midori/midori-preferences.c:298 -msgid "General" -msgstr "Generale" - -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Pornire" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 -msgid "Use current page as homepage" -msgstr "Utilizează pagina curentă ca pagină de pornire" +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Tipărește pagina _curentă" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Transferuri" +#: ../midori/midori-preferences.c:314 +msgid "Use current page as homepage" +msgstr "Utilizează pagina curentă ca pagină de start" #. Page "Appearance" -#: ../midori/midori-preferences.c:349 -msgid "Appearance" -msgstr "Aspect" - -#: ../midori/midori-preferences.c:350 -msgid "Font settings" -msgstr "Preferințe fonturi" - -#: ../midori/midori-preferences.c:352 -msgid "Default Font Family" -msgstr "Familie implicită de fonturi" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Fonturi" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Familie de fonturi proporționale" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "Familie implicită de fonturi pentru afișarea textului" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "Mărime implicită a fontului pentru afișarea textului" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Familie de fonturi cu lățime fixă" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "Familie de fonturi utilizată pentru afișarea textului de lățime fixă" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" -msgstr "Mărimea fontului utilizată pentru afișarea textului de lățime fixă" +msgstr "Mărimea fontului utilizat pentru afișarea textului de lățime fixă" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Mărime minimă a fontului" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "Mărime minimă a fontului pentru afișarea textului" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Comportament" -#: ../midori/midori-preferences.c:393 -msgid "Enforce 96 dots per inch" -msgstr "Forțează afișarea în 96 DPI" - -#: ../midori/midori-preferences.c:394 -msgid "Enforce a video dot density of 96 DPI" -msgstr "Forțează la 96 DPI densitatea punctelor ecranului" - -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Permite popup-uri deschise de scripturi" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Specifică dacă se permite scripturilor deschiderea de ferestre popup" -#: ../midori/midori-preferences.c:419 -msgid "Spell Checking" -msgstr "Verificare ortografică" - -#: ../midori/midori-preferences.c:422 -msgid "Enable Spell Checking" -msgstr "Activează verificarea ortografică" - -#: ../midori/midori-preferences.c:423 -msgid "Enable spell checking while typing" -msgstr "Verifică ortografia pe măsură ce se tastează" - -#: ../midori/midori-preferences.c:425 -msgid "Spelling dictionaries:" -msgstr "Dicționare ortografice:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "O listă separată prin virgule de limbi pentru care se activează verificarea ortografică, de exemplu: „ro_RO,en_GB”" - #. Page "Interface" -#: ../midori/midori-preferences.c:435 -msgid "Interface" -msgstr "Interfață" - -#: ../midori/midori-preferences.c:436 -msgid "Navigationbar" -msgstr "Bară de navigare" - -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Navigare" -#. Page "Applications" -#: ../midori/midori-preferences.c:468 -msgid "Applications" -msgstr "Aplicații" - -#: ../midori/midori-preferences.c:469 -msgid "External applications" -msgstr "Aplicații externe" - #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:454 msgid "Network" msgstr "Rețea" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:461 msgid "Hostname" -msgstr "Nume server" - -#. Page "Privacy" -#: ../midori/midori-preferences.c:511 -msgid "Privacy" -msgstr "Intimitate" +msgstr "Nume ori IP" -#: ../midori/midori-preferences.c:512 -msgid "Web Cookies" -msgstr "Cookie-uri Internet" - -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 -msgid "days" -msgstr "zile" +#: ../midori/midori-preferences.c:485 +msgid "MB" +msgstr "MB" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" -msgstr "Adăugare motor de căutare" +msgstr "Adăugați un motor de căutare" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Editare motor de căutare" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Nume:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Descriere:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "_Iconiță:" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "_Etichetă:" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" -msgstr "Gestionare motoare de căutare" +msgstr "Gestionare a motoarelor de căutare" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "I_mplicit" -#: ../midori/sokoke.c:1294 -msgid "_Bookmark" -msgstr "_Favorit" +#: ../midori/sokoke.c:412 +msgid "Open with" +msgstr "Deschide cu" -#: ../midori/sokoke.c:1296 -msgid "Add Boo_kmark" -msgstr "Adaugă un fa_vorit" +#: ../midori/sokoke.c:420 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Alegeți o asociere pentru a deschide „%s”:" -#: ../midori/sokoke.c:1297 -msgid "_Console" -msgstr "_Consolă" +#: ../midori/sokoke.c:461 ../midori/sokoke.c:471 ../midori/sokoke.c:499 +#: ../midori/sokoke.c:528 ../midori/sokoke.c:542 +msgid "Could not run external program." +msgstr "Nu s-a putut porni programul extern." -#: ../midori/sokoke.c:1298 -msgid "_Extensions" -msgstr "E_xtensii" +#: ../midori/sokoke.c:1653 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "o oră" +msgstr[1] "%d ore" +msgstr[2] "%d de ore" + +#: ../midori/sokoke.c:1654 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "un minut" +msgstr[1] "%d minute" +msgstr[2] "%d de minute" + +#: ../midori/sokoke.c:1655 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "o secundă" +msgstr[1] "%d secunde" +msgstr[2] "%d de secunde" -#: ../midori/sokoke.c:1299 -msgid "_History" -msgstr "_Istoric" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1663 ../panels/midori-transfers.c:267 +#, c-format +msgid "%s of %s" +msgstr "%s din %s" -#: ../midori/sokoke.c:1300 -msgid "_Homepage" -msgstr "P_agină de pornire" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1672 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1675 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/sokoke.c:1301 -msgid "_Userscripts" -msgstr "Scripturi pr_oprii" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1692 +#, c-format +msgid " - %s remaining" +msgstr " - încă %s" -#: ../midori/sokoke.c:1302 -msgid "New _Tab" -msgstr "Ta_b nou" +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:263 +msgid "_Inline Find:" +msgstr "_Căutare în pagină:" -#: ../midori/sokoke.c:1303 -msgid "_Transfers" -msgstr "_Transferuri" +#: ../toolbars/midori-findbar.c:289 +msgid "Previous" +msgstr "Anterioară" -#: ../midori/sokoke.c:1304 -msgid "Netscape p_lugins" -msgstr "Module _Netscape" +#: ../toolbars/midori-findbar.c:295 +msgid "Next" +msgstr "Următoare" -#: ../midori/sokoke.c:1307 -msgid "New _Folder" -msgstr "_Dosar nou" +#: ../toolbars/midori-findbar.c:299 +msgid "Match Case" +msgstr "Majuscule semnificative" -#: ../panels/midori-bookmarks.c:111 +#: ../toolbars/midori-findbar.c:308 +msgid "Highlight Matches" +msgstr "Evidențiază potrivirile" + +#: ../toolbars/midori-findbar.c:319 +msgid "Close Findbar" +msgstr "Închide bara de căutare" + +#: ../toolbars/midori-transferbar.c:122 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "S-a descărcat fișierul „%s”." + +#: ../toolbars/midori-transferbar.c:125 +msgid "Transfer completed" +msgstr "Descărcare finalizată" + +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "Fișierul descărcat este corupt." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"Suma de control asociată linkului nu s-a potrivit. Probabil că fișierul este " +"incomplet sau a fost modificat ulterior." + +#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "Șterge tot" + +#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 +msgid "Some files are being downloaded" +msgstr "Unele fișiere sunt în curs de descărcare" + +#: ../toolbars/midori-transferbar.c:374 +msgid "_Quit Midori" +msgstr "În_chidere Midori" + +#: ../toolbars/midori-transferbar.c:376 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Dacă închideți Midori, se vor pierde descărcările curente." + +#: ../panels/midori-bookmarks.c:113 msgid "Bookmarks" msgstr "Favorite" -#: ../panels/midori-bookmarks.c:241 +#: ../panels/midori-bookmarks.c:256 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Nu s-a putut adăuga favoritul: %s\n" + +#: ../panels/midori-bookmarks.c:434 msgid "Edit the selected bookmark" -msgstr "Editare favorit selectat" +msgstr "Editați favoritul selectat" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:442 msgid "Delete the selected bookmark" -msgstr "Șterge favoritul selectat" +msgstr "Ștergeți favoritul selectat" -#: ../panels/midori-bookmarks.c:262 +#: ../panels/midori-bookmarks.c:457 msgid "Add a new folder" -msgstr "Adaugă un dosar nou" +msgstr "Adăugați un dosar nou" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:591 ../panels/midori-history.c:631 msgid "Separator" msgstr "Separator" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "Consolă" - -#: ../panels/midori-console.c:361 -msgid "Copy _All" -msgstr "Copiază t_ot" - -#: ../panels/midori-console.c:362 -msgid "Copy All" -msgstr "Copiază tot" - -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Extensii" +#: ../panels/midori-history.c:110 +msgid "History" +msgstr "Istoric" -#: ../panels/midori-history.c:273 -msgid "Erroneous clock time" -msgstr "Data de sistem este greșită" - -#: ../panels/midori-history.c:274 -msgid "The clock time lies in the past. Please check the current date and time." -msgstr "Data sistemului este în trecut. Verificați data și ora curentă." +#: ../panels/midori-history.c:157 ../panels/midori-history.c:188 +msgid "Today" +msgstr "Azi" -#: ../panels/midori-history.c:286 -msgid "A week ago" -msgstr "Săptămâna trecută" +#: ../panels/midori-history.c:159 ../panels/midori-history.c:190 +msgid "Yesterday" +msgstr "Ieri" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:161 ../panels/midori-history.c:185 #, c-format msgid "%d day ago" msgid_plural "%d days ago" -msgstr[0] "o zi în urmă" -msgstr[1] "%d zile în urmă" -msgstr[2] "%d de zile în urmă" - -#: ../panels/midori-history.c:291 -msgid "Today" -msgstr "Azi" +msgstr[0] "Ieri" +msgstr[1] "Acum %d zile" +msgstr[2] "Acum %d de zile" -#: ../panels/midori-history.c:293 -msgid "Yesterday" -msgstr "Ieri" +#: ../panels/midori-history.c:164 ../panels/midori-history.c:183 +msgid "A week ago" +msgstr "Acum o săptămână" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:359 msgid "Are you sure you want to remove all history items?" msgstr "Sigur doriți să ștergeți toate elementele din istoric?" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:405 msgid "Bookmark the selected history item" msgstr "Adaugă ca favorit elementul selectat din istoric" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:414 msgid "Delete the selected history item" msgstr "Șterge elementul selectat din istoric" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:422 msgid "Clear the entire history" msgstr "Șterge întregul istoric" -#: ../panels/midori-history.c:952 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Filtru:" +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Descărcări" -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "Deschide _dosarul de destinație" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" -msgstr "Copiază _adresa legăturii" +msgstr "Copiază _adresa linkului" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Autentificare obligatorie" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" msgstr "" -"Pentru a deschide această adresă sunt\n" -"necesare numele de utilizator și parola:" +"Pentru a deschide această adresă e nevoie\n" +"de numele unui cont de acces și parola sa:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" -msgstr "Utilizator" +msgstr "Nume" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "Parolă" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "_Reține parola" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Nu s-a putut încărca iconița cu numele „%s”" -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "Nu s-a putut încărca iconița-sistem „%s”" +msgstr "Nu s-a putut încărca iconița implicită „%s”" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "Cadrele animației sunt nevalide" -#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Proprietatea „%s” nu este validă pentru %s" -#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 +#: ../extensions/addons.c:308 msgid "Choose file" -msgstr "Selectare fișier" +msgstr "Selectați un fișier" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:500 msgid "Choose folder" -msgstr "Selectare dosar" +msgstr "Selectați un dosar" + +#: ../katze/katze-utils.c:604 +msgid "None" +msgstr "Fără" + +#: ../katze/katze-utils.c:719 +msgid "1 hour" +msgstr "o oră" + +#: ../katze/katze-utils.c:720 +msgid "1 day" +msgstr "o zi" + +#: ../katze/katze-utils.c:721 +msgid "1 week" +msgstr "o săptămână" + +#: ../katze/katze-utils.c:722 +msgid "1 month" +msgstr "o lună" + +#: ../katze/katze-utils.c:723 +msgid "1 year" +msgstr "un an" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" -msgstr "Preferințe %s" +msgstr "Preferințe pentru %s" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:467 msgid "Configure Advertisement filters" msgstr "Opțiuni pentru filtrarea reclamelor" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:498 #, 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 "Tastați adresa listei cu filtre preconfigurate în căsuța de text și faceți clic pe „Adaugă” pentru a o adăuga la listă. Mai multe liste pot fi găsite la %s." - -#: ../extensions/adblock.c:587 -msgid "Configure _Advertisement filters..." -msgstr "Opțiuni pentru _filtrarea reclamelor..." +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 "" +"Introduceți adresa listei cu filtre preconfigurate în căsuța de text și " +"faceți clic pe „Adaugă” pentru a o adăuga în listă. Puteți găsi mai multe " +"liste la %s." -#: ../extensions/adblock.c:841 +#: ../extensions/adblock.c:846 msgid "Edit rule" msgstr "Editare regulă" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:860 msgid "_Rule:" msgstr "_Regulă:" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:914 msgid "Bl_ock image" msgstr "Bl_ochează imaginea" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:919 msgid "Bl_ock link" msgstr "Bl_ochează linkul" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1538 msgid "Advertisement blocker" -msgstr "Blocare de reclame" +msgstr "Filtrare de reclame" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1539 msgid "Block advertisements according to a filter list" msgstr "Blochează reclamele conform unei liste de filtre" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "Copiază %s în dosarul %s." +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "" +"Această pagină pare să conțină un script de utilizator. Doriți să-l " +"instalați ca script propriu?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "_Instalează scriptul" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "" +"Această pagină pare să conțină un stil de utilizator. Doriți să-l instalați " +"ca stil propriu?" -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_Instalează stilul" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Nu instala" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Scripturi proprii" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Stiluri proprii" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Eroare" + +#: ../extensions/addons.c:421 #, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "Opțiunile extensiei „%s” nu au putut fi salvate: %s\n" +msgid "Do you want to delete '%s'?" +msgstr "Doriți să ștergeți „%s”?" + +#: ../extensions/addons.c:427 +msgid "Delete user script" +msgstr "Ștergere script propriu" + +#: ../extensions/addons.c:428 +msgid "Delete user style" +msgstr "Ștergere stil propriu" + +#: ../extensions/addons.c:431 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "Fișierul %s va fi șters definitiv." + +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "Deschide în editorul de text" + +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "Deschide dosarul țintă" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "Adăugare de noi elemente" + +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "Șterge elementul selectat" + +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" -msgstr "Module utilizator" +msgstr "Module proprii" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Nu se poate monitoriza dosarul „%s”: %s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" msgstr "Suport pentru scripturi și stiluri proprii" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "Taburi colorate" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" -msgstr "Nuanțează diferit fiecare tab" +msgstr "Colorează distinct taburile" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" -msgstr "Gestionare cookie-uri" +msgstr "Gestionare de cookie-uri" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "Șterge tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "Șterge toate cookie-urile afișate. Dacă se aplică un filtru, doar cookie-urile ce se potrivesc cu respectivul filtru vor fi șterse." +#: ../extensions/cookie-manager/cookie-manager-page.c:105 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"Șterge toate cookie-urile afișate. Dacă se aplică un filtru, doar cookie-" +"urile ce se potrivesc cu respectivul filtru vor fi șterse." -#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "Extinde tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "Pliază tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" msgstr "Sigur doriți să ștergeți toate cookie-urile?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Întrebare" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." msgstr "Doar cookie-urile ce se potrivesc cu filtrul vor fi șterse." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "Până la sfârșitul sesiunii" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2386,15 +2491,15 @@ "Securizare: %s\n" "Valabilitate: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Da" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "Nu" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" @@ -2403,30 +2508,46 @@ "Domeniu: %s\n" "Cookie-uri: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Nume" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "_Extinde tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "Plia_ză tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "Introduceți un filtru pentru a afișa doar cookie-urile ale căror nume ori domenii se potrivesc" - -#: ../extensions/cookie-manager/main.c:40 -msgid "_Cookie Manager" -msgstr "Gestionare _cookie-uri" +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +msgid "Filter:" +msgstr "Filtru:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Introduceți un filtru pentru a afișa doar cookie-urile ale căror nume ori " +"domenii se potrivesc" -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Vizualizați și ștergeți cookie-uri" +#: ../extensions/copy-tabs.c:38 +msgid "Copy Tab _Addresses" +msgstr "Copiază _adresele taburilor" + +#: ../extensions/copy-tabs.c:95 +msgid "Copy Addresses of Tabs" +msgstr "Copiere a adreselor taburilor" + +#: ../extensions/copy-tabs.c:96 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Copiază adresele taburilor în clipboard" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Nu s-au găsit elementele necesare Atom „entry” în datele XML." @@ -2436,42 +2557,42 @@ msgstr "Nu s-au găsit elementele necesare Atom „feed” în datele XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Ultima actualizare: %s." -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" -msgstr "Fluxuri" +msgstr "Fluxuri de știri" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "Adăugare flux nou" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "Șterge fluxul" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" -msgstr "_Fluxuri" +msgstr "_Fluxuri de știri" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Nu s-a găsit elementul rădăcină în datele fluxului XML." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Format de flux nesuportat." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" -msgstr "Eșec la analizarea fluxului XML: %s" +msgstr "Nu s-a putut prelucra fluxul XML: %s" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." @@ -2487,187 +2608,649 @@ #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "Nu s-au găsit elementele necesare „channel” în datele XML ale RSS-ului." - -#: ../extensions/feed-panel/main.c:132 -msgid "Error" -msgstr "Eroare" +msgstr "" +"Nu s-au găsit elementele necesare „channel” în datele XML ale RSS-ului." -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "Fluxul „%s” există deja" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Eroare la încărcarea fluxului „%s”" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" -msgstr "Panou cu fluxuri" +msgstr "Panou cu fluxuri de știri" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" -msgstr "Citește fluxuri Atom/RSS" +msgstr "Urmăriți fluxuri de știri Atom/RSS" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" -msgstr "Eșec la adăugarea elementului formularului: %s\n" +msgstr "Nu s-a putut adăuga valoarea formularului: %s\n" -#: ../extensions/formhistory.c:510 +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "Istoricul formularelor" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Pentru a deschide această adresă e nevoie\n" +"de numele unui cont de acces și parola sa:" + +#: ../extensions/formhistory/formhistory.c:292 +msgid "Remember password on this page?" +msgstr "Să se rețină parola pentru această pagină?" + +#: ../extensions/formhistory/formhistory.c:297 +msgid "Remember" +msgstr "Reține" + +#: ../extensions/formhistory/formhistory.c:298 +msgid "Not now" +msgstr "Nu acum" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Never for this page" +msgstr "Niciodată pentru pagina asta" + +#: ../extensions/formhistory/formhistory.c:435 +msgid "Toggle form history state" +msgstr "Comută starea istoricului formularelor" + +#: ../extensions/formhistory/formhistory.c:436 +msgid "Activate or deactivate form history for the current tab." +msgstr "Activează ori dezactivează istoricul formularelor pentru tabul curent" + +#: ../extensions/formhistory/formhistory.c:547 +#: ../extensions/formhistory/formhistory.c:551 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Nu s-a putut executa comanda asupra bazei de date: %s\n" + +#: ../extensions/formhistory/formhistory.c:627 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" +"activează per tab istoricul formularelor doar prin combinația de taste (Ctrl" +"+Shift+F)" + +#: ../extensions/formhistory/formhistory.c:666 +msgid "Form history filler" +msgstr "Istoric pentru formulare" + +#: ../extensions/formhistory/formhistory.c:667 msgid "Stores history of entered form data" msgstr "Salvează istoricul datelor introduse în formulare" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 #, c-format -msgid "Not available: %s" -msgstr "Indisponibil: %s" +msgid "Failed to select suggestions\n" +msgstr "Nu s-a putut selecta o sugestie\n" -#: ../extensions/formhistory.c:515 -msgid "Resource files not installed" -msgstr "Fișierele resursă nu sunt instalate" +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Nu există taburi nevizitate" -#: ../extensions/formhistory.c:521 -msgid "Form history filler" -msgstr "Completare istoric formulare" +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "Lista istoricului" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "La închiderea unui tab" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Nu face nimic" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Comută la ultimul tab vizualizat" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Comută la cel mai nou tab" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Următorul tab nou (din istoric)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Următorul tab nou din istoric" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Precedentul tab nou (din istoric)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Precedentul tab nou din istoric" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Arată tabul în fundal (în lista istoricului)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Arată în fundal tabul selectat curent" + +#: ../extensions/history-list.vala:569 +msgid "History List" +msgstr "Lista istoricului" + +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "La comutarea ori închiderea taburilor mută la ultimul tab folosit " + +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Gesturi de maus" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" -msgstr "Controlați Midori prin mișcările mausului" +msgstr "Controlați Midori prin gesturi de maus" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 -msgid "Pageholder" -msgstr "Loc pentru pagini" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "_Loc pentru pagini" - -#: ../extensions/page-holder.c:178 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "Ține una sau mai multe pagini deschise pe lângă taburi" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "Reîncarcă pagina ori oprește încărcarea" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" -msgstr "Schimbați combinațiile de taste" +msgstr "Personalizați combinațiile de taste" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." -msgstr "Schimbați c_ombinațiile de taste..." +msgstr "Personalizați c_ombinațiile de taste..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Combinații de taste" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "Vizualizați și editați combinațiile de taste" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/status-clock.c:174 +msgid "Statusbar Clock" +msgstr "Ceas în bara de stare" + +#: ../extensions/status-clock.c:175 +msgid "Display date and time in the statusbar" +msgstr "Arată data și ora în bara de stare" + +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Imagini" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Scripturi" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Module Netscape" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" -msgstr "Facilități bară de stare" +msgstr "Facilități web în bara de stare" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" -msgstr "Activați ori dezactivați cu ușurință facilități pentru paginile din Internet" +msgstr "Activați cu ușurință facilități pentru paginile web" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "Panou cu taburi" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "Panou cu t_aburi" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:684 msgid "Show tabs in a vertical panel" msgstr "Arată taburile într-un panou vertical" -#: ../extensions/tab-switcher.c:395 -msgid "Tab History List" -msgstr "Listă istoric taburi" - -#: ../extensions/tab-switcher.c:396 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Schimbați taburile alegând din lista sortată după ultima utilizare" +#: ../extensions/tabs-minimized.c:76 +msgid "Only Icons on Tabs by default" +msgstr "Doar iconițe în taburi" + +#: ../extensions/tabs-minimized.c:77 +msgid "New tabs have no label by default" +msgstr "Taburile noi nu vor avea implicit etichete de text" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" -msgstr "Personalizare bară cu unelte" +msgstr "Personalizați bara cu unelte" -#: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "Selectați elementele de afișat în bara cu unelte. Ele pot fi reordonate prin tragere și plasare." +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"Selectați elementele de afișat în bara cu unelte. Ele pot fi reordonate prin " +"tragere și plasare." -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Elemente disponibile" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Elemente afișate" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." -msgstr "Personalizare bară cu unel_te..." +msgstr "Personalizați bara cu unel_te..." + +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Personalizare..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" -msgstr "Editor bară cu unelte" +msgstr "Editor pentru bara cu unelte" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" -msgstr "Ajustare ușoară a aspectului barei cu unelte" +msgstr "Personalizați aspectul barei cu unelte" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" -msgstr "Stochează în cache-ul de pe disc comunicarea HTTP" +msgstr "Stochează comunicarea HTTP într-un cache pe disc" + +#~ msgid "Lightweight web browser" +#~ msgstr "Mic navigator web" + +#~ msgid "Cookies" +#~ msgstr "Cookie-uri" + +#~ msgid "'Flash' Cookies" +#~ msgstr "Cookie-uri Flash" + +#~ msgid "HTML5 _Databases" +#~ msgstr "Baze de _date HTML5" + +#~ msgid "Offline Application Cache" +#~ msgstr "Cache offline de aplicație" + +#~ msgid "Not available: %s" +#~ msgstr "Indisponibil: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "Fișierele resursă nu sunt instalate" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "Nu salva date private în timpul navigării" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Adaugă în pagina apelurilor rapide" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Salvează linkul pe desktop" + +#~ msgid "Create a launcher" +#~ msgstr "Creează un lansator" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "Abonare la acest flux de știri" + +#~ msgid "Close this window" +#~ msgstr "Închide fereastra curentă" + +#~ msgid "Close all open windows" +#~ msgstr "Închide toate ferestrele deschise" + +#~ msgid "Undo the last modification" +#~ msgstr "Anulează ultima modificare" + +#~ msgid "Redo the last modification" +#~ msgstr "Refă ultima modificare" + +#~ msgid "Cut the selected text" +#~ msgstr "Taie textul selectat" + +#~ msgid "Copy the selected text" +#~ msgstr "Copiază textul selectat" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "Lipește textul din clipboard" + +#~ msgid "Delete the selected text" +#~ msgstr "Șterge textul selectat" + +#~ msgid "Select all text" +#~ msgstr "Selectează tot textul" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Caută următoarea apariție a cuvântului sau a expresiei" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Caută precedenta apariție a cuvântului sau a expresiei" + +#~ msgid "Reset the zoom level" +#~ msgstr "Zoom normal" + +#~ msgid "View the source code of the page" +#~ msgstr "Vizualizați codul sursă al paginii" + +#~ msgid "Scroll to the left" +#~ msgstr "Derulare spre stânga" + +#~ msgid "Scroll down" +#~ msgstr "Derulare în jos" + +#~ msgid "Scroll up" +#~ msgstr "Derulare în sus" + +#~ msgid "Scroll to the right" +#~ msgstr "Derulare spre dreapta" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "Șterge conținutul coșului de gunoi" + +#~ msgid "Open the last closed tab" +#~ msgstr "Deschide ultimul tab închis" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Adaugă un dosar cu favorite" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Adăugați, editați și ștergeți motoare de căutare..." + +#~ msgid "Clear private data..." +#~ msgstr "Ștergere de date private..." + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "Inspectați detaliile paginii și accesați uneltele de dezvoltare..." + +#~ msgid "Switch to the previous tab" +#~ msgstr "Comută la tabul anterior" + +#~ msgid "Switch to the next tab" +#~ msgstr "Comută la tabul următor" + +#~ msgid "Move tab behind the previous tab" +#~ msgstr "Mută tabul după tabul următor" + +#~ msgid "Move tab in front of the next tab" +#~ msgstr "Mută tabul înaintea tabului anterior" + +#~ msgid "Focus the current tab" +#~ msgstr "Activează focusul tabului curent" + +#~ msgid "Cycle focus between views" +#~ msgstr "Schimbă focusul între vizualizări" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Arată doar iconița tabului curent" + +#~ msgid "Duplicate the current tab" +#~ msgstr "Duplică tabul curent" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Închide toate taburile înafara celui curent" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Deschide taburile salvate în ultima sesiune" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Arată întrebările frecvente" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Accesați baza de date cu probleme Midori" + +#~ msgid "Show information about the program" +#~ msgstr "Arată detalii despre program" + +#~ msgid "Show menubar" +#~ msgstr "Arată bara de meniu" + +#~ msgid "Show navigationbar" +#~ msgstr "Arată bara de navigare" + +#~ msgid "Show sidepanel" +#~ msgstr "Arată panoul lateral" + +#~ msgid "Show bookmarkbar" +#~ msgstr "Arată bara cu favorite" + +#~ msgid "Show statusbar" +#~ msgstr "Arată bara de stare" + +#~ msgid "MD5-Checksum:" +#~ msgstr "Sumă de control MD5:" + +#~ msgid "SHA1-Checksum:" +#~ msgstr "Sumă de control SHA1:" + +#~ msgid "No filename specified" +#~ msgstr "Nu s-a precizat un fișier" + +#~ msgid "Set number of columns and rows" +#~ msgstr "Precizați numărul de coloane și rânduri" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Introduceți numărul de coloane și rânduri:" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "Input invalid pentru dimensiunile apelurilor rapide" + +#~ msgid "Thumb size:" +#~ msgstr "Mărimea miniaturii:" + +#~ msgid "Small" +#~ msgstr "Mică" + +#~ msgid "Medium" +#~ msgstr "Medie" + +#~ msgid "Big" +#~ msgstr "Mare" + +#~ msgid "Reset the last _session" +#~ msgstr "_Sesiune nouă" + +#~ msgid "Quit the application" +#~ msgstr "Ieșire din Midori" + +#~ msgid "_Contents" +#~ msgstr "_Conținut" + +#~ msgid "Show the documentation" +#~ msgstr "Arată documentația" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "Nu s-a putut executa comanda asupra bazei de date\n" + +#~ msgid "Show Blank page" +#~ msgstr "O pagină goală" + +#~ msgid "All cookies" +#~ msgstr "Toate cookie-urile" + +#~ msgid "Session cookies" +#~ msgstr "Cookie-uri de sesiune" + +#~ msgid "Show Transferbar" +#~ msgstr "Arată bara descărcărilor" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "Specifică dacă să fie vizibilă bara descărcărilor" + +#~ msgid "Search engines in location completion" +#~ msgstr "Arată căutările la auto-completare" + +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "" +#~ "Specifică dacă să fie vizibile motoarele de căutare la completarea în " +#~ "bara de adrese" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "Arată controalele active ale panoului" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "Specifică dacă să fie vizibile controalele active ale panoului" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Arată apelurile rapide în taburi noi" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Arată apelurile rapide în taburile nou deschise" + +#~ msgid "Download Manager" +#~ msgstr "Manager de descărcări" + +#~ msgid "An external download manager" +#~ msgstr "Manager extern de descărcări" + +#~ msgid "Open external pages in:" +#~ msgstr "Paginile externe se vor deschide în:" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "Alegeți unde să se deschidă paginile externe" + +#~ msgid "Accept cookies" +#~ msgstr "Acceptă cookie-uri" + +#~ msgid "What type of cookies to accept" +#~ msgstr "Tipuri de cookie-uri acceptate" + +#~ msgid "Maximum cookie age" +#~ msgstr "Durată maximă pentru cookie-uri" + +#~ msgid "Maximum history age" +#~ msgstr "Număr maxim de zile pentru istoric" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Reține ultimele fișiere descărcate" + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "Specifică dacă se rețin ultimele fișiere descărcate" + +#~ msgid "Not found - %s" +#~ msgstr "Nu s-a găsit %s" + +#~ msgid "_Save Link destination" +#~ msgstr "_Salvează destinația linkului" + +#~ msgid "Download with Download _Manager" +#~ msgstr "D_escarcă cu managerul descărcărilor" + +#~ msgid "_Download Link destination" +#~ msgstr "_Descarcă destinația linkului" + +#~ msgid "Document cannot be displayed" +#~ msgstr "Documentul nu poate fi afișat" + +#~ msgid "General" +#~ msgstr "Generale" + +#~ msgid "Appearance" +#~ msgstr "Aspect" + +#~ msgid "Font settings" +#~ msgstr "Preferințe fonturi" + +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "Forțează afișarea în 96 DPI" + +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "Forțează la 96 DPI densitatea punctelor ecranului" + +#~ msgid "Interface" +#~ msgstr "Interfață" + +#~ msgid "Navigationbar" +#~ msgstr "Bară de navigare" + +#~ msgid "Applications" +#~ msgstr "Programe" + +#~ msgid "External applications" +#~ msgstr "Programe externe" + +#~ msgid "Web Cookies" +#~ msgstr "Cookie-uri web" + +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "Cookie-uri de șters la închiderea Midori:" + +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "Cele mai vechi de o oră" + +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "Cele mai vechi de o săptămână" + +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "Cele mai vechi de o lună" + +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "Cele mai vechi de un an" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Opțiuni pentru _filtrarea reclamelor..." + +#~ msgid "Open target folder for selected addon" +#~ msgstr "Deschide dosarul țintă pentru elementul selectat" + +#~ msgid "Next Tab (History List)" +#~ msgstr "Tabul următor (din istoric)" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "Tabul precedent (din istoric)" + +#~ msgid "Previous tab from history" +#~ msgstr "Tabul anterior din istoric" + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "Arată taburile la Ctrl+Tab (listate după istoricul utilizării)" + +#~ msgid "Pageholder" +#~ msgstr "Loc pentru pagini" + +#~ msgid "_Pageholder" +#~ msgstr "_Loc pentru pagini" -#~ msgid "Failed to get current time: %s\n" -#~ msgstr "Eșec la încercarea de obținere a datei curente: %s\n" +#~ msgid "Keep one or multiple pages open in parallel to your tabs" +#~ msgstr "Țineți una sau mai multe pagini deschise în paralel" -#~ msgid "Failed to add history item: %s\n" -#~ msgstr "Eșec la adăugarea elementului în istoric: %s\n" +#~ msgid "%d%% loaded" +#~ msgstr "%d%% încărcat" -#~ msgid "Show panel _titles" -#~ msgstr "Arată _titlurile panourilor" +#~ msgid "_Transferbar" +#~ msgstr "Bară de _descărcare" -#~ msgid "Options" -#~ msgstr "Opțiuni" +#~ msgid "Show transferbar" +#~ msgstr "Arată bara descărcărilor" -#~ msgid "Open _Link" -#~ msgstr "Deschide _linkul" +#~ msgid "Show progress in location entry" +#~ msgstr "Arată progresul în bara de adrese" -#~ msgid "Open Image in New Wi_ndow" -#~ msgstr "Deschide imaginea într-o _fereastră nouă" +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "" +#~ "Specifică dacă să fie vizibil progresul încărcării în bara de adrese" -#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "Copiază scripturile proprii în dosarul %s și copiază stilurile proprii în dosarul %s." +#~ msgid "Ask for the destination folder" +#~ msgstr "Cere un dosar de destinație" -#~ msgid "DNS prefetching" -#~ msgstr "Preîncărcare de date DNS" +#~ msgid "Whether to ask for the destination folder when downloading a file" +#~ msgstr "" +#~ "Specifică dacă se va cere precizarea dosarului în care se face descărcarea" -#~ msgid "Prefetch IP addresses of hovered links" -#~ msgstr "Preîncarcă adresele IP ale linkurilor de sub cursorul de maus" +#~ msgid "Whether to show a notification when a transfer has been completed" +#~ msgstr "" +#~ "Specifică dacă se afișează o notificare la finalizarea unei descărcări" -#~ msgid "Not available on this platform" -#~ msgstr "Indisponibil pe această platformă" +#~ msgid "Download I_mage" +#~ msgstr "Descarcă i_maginea" diff -Nru midori-0.2.8/po/ru.po midori-0.4.6/po/ru.po --- midori-0.2.8/po/ru.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/ru.po 2012-05-14 22:13:42.000000000 +0000 @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.2.6\n" +"Project-Id-Version: midori 0.2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 04:11+0000\n" -"PO-Revision-Date: 2010-06-26 00:55+0800\n" +"POT-Creation-Date: 2012-03-14 08:30+0000\n" +"PO-Revision-Date: 2011-10-09 14:28+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -19,2171 +19,2163 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Легковесный Интернет-обозреватель" +msgid "Browse the Web" +msgstr "Работа в Интернете" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1322 ../midori/main.c:1651 -#: ../midori/main.c:1659 ../midori/main.c:1675 -#: ../midori/midori-websettings.c:312 +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "Internet;Explorer;Интернет;браузер;обозреватель;www" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:1989 ../midori/main.c:2009 +#: ../midori/main.c:2023 ../midori/midori-websettings.c:308 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Интернет-обозреватель" -#: ../midori/main.c:99 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Midori (конфиденциальный режим)" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Открывает новое конфиденциальное окно" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4043 +msgid "Private Browsing" +msgstr "Конфиденциальный режим" + +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Не удалось загрузить настройки: %s\n" -#: ../midori/main.c:148 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Значение «%s» недействительно для %s" -#: ../midori/main.c:155 ../midori/main.c:241 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr "Недопустимое значение параметра: «%s»" -#: ../midori/main.c:366 ../midori/main.c:470 ../extensions/formhistory.c:439 +#: ../midori/main.c:364 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Не удалось загрузить средства поиска. %s\n" + +#: ../midori/main.c:418 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Не удалось очистить журнал: %s\n" + +#: ../midori/main.c:438 ../midori/main.c:562 +#: ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" msgstr "Не удалось открыть базу данных: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:422 +#: ../midori/main.c:505 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Не удалось удалить устаревшие записи из журнала: %s\n" -#: ../midori/main.c:453 ../panels/midori-history.c:169 -#: ../panels/midori-history.c:199 +#: ../midori/main.c:545 ../panels/midori-history.c:231 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Не удалось удалить запись из журнала: %s\n" -#: ../midori/main.c:498 +#: ../midori/main.c:592 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Не удалось сохранить закладки. %s" -#: ../midori/main.c:525 +#: ../midori/main.c:614 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Не удалось сохранить настройки. %s" -#: ../midori/main.c:563 +#: ../midori/main.c:649 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не удалось сохранить средства поиска. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:583 ../midori/main.c:606 +#: ../midori/main.c:686 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не удалось сохранить содержимое корзины. %s" -#: ../midori/main.c:665 ../midori/main.c:905 +#: ../midori/main.c:727 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Дополнения" + +#: ../midori/main.c:741 +msgid "Privacy" +msgstr "Конфиденциальность" + +#: ../midori/main.c:753 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"Фрагменты данных хранят текущего пользователя сайта, сохранения игр, а также " +"могут хранить информацию о пользователе в рекламных целях." + +#: ../midori/main.c:809 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %s" -#: ../midori/main.c:849 -msgid "No root certificate file is available. SSL certificates cannot be verified." +#: ../midori/main.c:1027 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." msgstr "Недоступен корневой сертификат. SSL сертификат не может быть проверен." -#: ../midori/main.c:939 -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:1096 +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:954 +#: ../midori/main.c:1115 msgid "Modify _preferences" msgstr "Изменить _параметры" -#: ../midori/main.c:958 -msgid "Reset the last _session" -msgstr "Удалить _данные последнего сеанса" - -#: ../midori/main.c:963 +#: ../midori/main.c:1119 msgid "Disable all _extensions" -msgstr "Отключить все _расширения" +msgstr "Отключить _все дополнения" + +#: ../midori/main.c:1132 +msgid "Discard old tabs" +msgstr "Закрыть все вкладки" -#: ../midori/main.c:1202 ../midori/main.c:1946 +#: ../midori/main.c:1133 ../midori/midori-websettings.c:217 +msgid "Show last tabs without loading" +msgstr "Открыть последние страницы без загрузки" + +#: ../midori/main.c:1134 ../midori/midori-websettings.c:216 +msgid "Show last open tabs" +msgstr "Открыть последние открытые страницы" + +#: ../midori/main.c:1342 ../midori/main.c:2400 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Не удалось загрузить сеанс: %s\n" -#: ../midori/main.c:1322 -msgid "No filename specified" -msgstr "Имя файла не задано" - -#: ../midori/main.c:1341 -msgid "An unknown error occured." -msgstr "Обнаружена неизвестная ошибка" - -#: ../midori/main.c:1372 +#: ../midori/main.c:1480 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Снимок сохранён в: %s\n" -#: ../midori/main.c:1544 +#: ../midori/main.c:1892 msgid "Run ADDRESS as a web application" msgstr "Запустить АДРЕС как веб-приложение" -#: ../midori/main.c:1544 +#: ../midori/main.c:1892 msgid "ADDRESS" msgstr "АДРЕС" -#: ../midori/main.c:1547 +#: ../midori/main.c:1895 msgid "Use FOLDER as configuration folder" msgstr "Использовать файлы параметров из ПАПКИ" -#: ../midori/main.c:1547 +#: ../midori/main.c:1895 msgid "FOLDER" msgstr "ПАПКА" -#: ../midori/main.c:1550 +#: ../midori/main.c:1898 +msgid "Private browsing, no changes are saved" +msgstr "Конфиденциальный режим, изменения не будут сохранены" + +#: ../midori/main.c:1900 msgid "Show a diagnostic dialog" msgstr "Показать окно действий" -#: ../midori/main.c:1552 +#: ../midori/main.c:1902 msgid "Run the specified filename as javascript" msgstr "Выполнить указанный файл как javascript" -#: ../midori/main.c:1555 +#: ../midori/main.c:1904 msgid "Take a snapshot of the specified URI" msgstr "Создать снимок указанной страницы" -#: ../midori/main.c:1558 +#: ../midori/main.c:1906 msgid "Execute the specified command" msgstr "Выполнить указанную команду" -#: ../midori/main.c:1560 +#: ../midori/main.c:1908 +msgid "List available commands to execute with -e/ --execute" +msgstr "Вывести список доступных команд для -e/ --execute" + +#: ../midori/main.c:1910 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:1562 +#: ../midori/main.c:1912 msgid "Addresses" msgstr "Адреса" -#: ../midori/main.c:1564 +#: ../midori/main.c:1914 msgid "Block URIs according to regular expression PATTERN" msgstr "Блокировать URI по ШАБЛОНУ (регулярное выражение)" -#: ../midori/main.c:1564 +#: ../midori/main.c:1914 msgid "PATTERN" msgstr "ШАБЛОН" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1568 +#: ../midori/main.c:1918 msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "Сбросить состояние Midori по прошествии указанного числа СЕКУНД бездействия" +msgstr "" +"Сбросить состояние Midori по прошествии указанного числа СЕКУНД бездействия" -#: ../midori/main.c:1568 +#: ../midori/main.c:1918 msgid "SECONDS" msgstr "СЕКУНД" -#: ../midori/main.c:1648 +#: ../midori/main.c:1921 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Перенаправить предупреждения из консоли в выбранный ФАЙЛ" + +#: ../midori/main.c:1921 +msgid "FILENAME" +msgstr "ФАЙЛ" + +#: ../midori/main.c:1986 msgid "[Addresses]" msgstr "[Адреса]" -#: ../midori/main.c:1676 +#: ../midori/main.c:1996 +msgid "The specified configuration folder is invalid." +msgstr "Указана некорректная папка файлов параметров." + +#: ../midori/main.c:2024 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:1678 +#: ../midori/main.c:2026 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#: ../midori/main.c:1795 -msgid "The specified configuration folder is invalid." -msgstr "Указана некорректная папка файлов параметров." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2110 +msgid "Saved logins and _passwords" +msgstr "Сохранённые логины и _пароли" + +#: ../midori/main.c:2112 +msgid "Cookies and Website data" +msgstr "Cookies и данные веб-сайта" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2116 ../midori/midori-websettings.c:979 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Сетевой кэш" + +#: ../midori/main.c:2119 +msgid "Website icons" +msgstr "Значки веб-сайтов" -#: ../midori/main.c:1843 +#: ../midori/main.c:2225 +msgid "An unknown error occured" +msgstr "Неизвестная ошибка" + +#: ../midori/main.c:2331 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/main.c:1898 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "Не удалось загрузить средства поиска. %s\n" - -#: ../midori/main.c:1919 +#: ../midori/main.c:2367 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/main.c:1961 +#: ../midori/main.c:2415 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/main.c:1974 +#: ../midori/main.c:2428 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/main.c:1988 +#: ../midori/main.c:2444 msgid "The following errors occured:" msgstr "Обнаружены следующие ошибки:" -#: ../midori/main.c:2004 +#: ../midori/main.c:2460 msgid "_Ignore" msgstr "_Игнорировать" -#: ../midori/midori-array.c:429 +#: ../midori/midori-app.c:1331 +msgid "_Bookmark" +msgstr "_Закладка" + +#: ../midori/midori-app.c:1332 ../midori/midori-browser.c:5934 +msgid "_Bookmarks" +msgstr "_Закладки" + +#: ../midori/midori-app.c:1333 +msgid "Add Boo_kmark" +msgstr "_Добавить закладку" + +#: ../midori/midori-app.c:1334 +msgid "_Console" +msgstr "_Консоль" + +#: ../midori/midori-app.c:1335 +msgid "_Extensions" +msgstr "_Дополнения" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1336 ../midori/midori-browser.c:4503 +msgid "_History" +msgstr "_Журнал" + +#: ../midori/midori-app.c:1337 +msgid "_Homepage" +msgstr "_Домашняя страница" + +#: ../midori/midori-app.c:1338 +msgid "_Userscripts" +msgstr "_Пользовательские сценарии" + +#: ../midori/midori-app.c:1339 +msgid "New _Tab" +msgstr "Но_вая вкладка" + +#: ../midori/midori-app.c:1340 +msgid "_Transfers" +msgstr "_Передачи" + +#: ../midori/midori-app.c:1341 +msgid "Netscape p_lugins" +msgstr "_Модули Netscape" + +#: ../midori/midori-app.c:1342 +msgid "_Closed Tabs" +msgstr "За_крытые вкладки" + +#: ../midori/midori-app.c:1343 ../midori/midori-browser.c:5089 +msgid "New _Window" +msgstr "_Новое окно" + +#: ../midori/midori-app.c:1344 +msgid "New _Folder" +msgstr "Новая папка" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "Файл не найден." -#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 -#: ../midori/midori-array.c:496 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Плохо сформированный документ." -#: ../midori/midori-array.c:505 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "Неизвестный формат закладок." -#: ../midori/midori-array.c:716 +#: ../midori/midori-array.c:915 msgid "Writing failed." msgstr "Ошибка записи." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4887 -#: ../midori/midori-browser.c:4893 +#: ../midori/midori-browser.c:322 ../midori/midori-browser.c:5171 +#: ../midori/midori-browser.c:5180 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4890 +#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5177 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:453 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% загружено" - -#: ../midori/midori-browser.c:491 +#: ../midori/midori-browser.c:456 #, c-format msgid "Failed to update title: %s\n" msgstr "Не удалось обновить заголовок: %s\n" -#: ../midori/midori-browser.c:504 +#: ../midori/midori-browser.c:469 #, c-format msgid "Unexpected action '%s'." msgstr "Неожиданное действие «%s»." -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:559 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (конфиденциальный режим)" + +#: ../midori/midori-browser.c:669 ../midori/midori-browser.c:702 +msgid "Toplevel folder" +msgstr "Корневая папка" + +#: ../midori/midori-browser.c:759 msgid "New folder" msgstr "Создание папки" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:759 msgid "Edit folder" msgstr "Изменить папку" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:761 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:761 msgid "Edit bookmark" msgstr "Изменение закладки" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:792 msgid "_Title:" msgstr "_Заголовок:" -#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:958 -msgid "_Description:" -msgstr "_Описание:" - -#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:972 +#: ../midori/midori-browser.c:812 ../midori/midori-searchaction.c:961 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4007 +#: ../midori/midori-browser.c:835 ../midori/midori-browser.c:4240 msgid "_Folder:" msgstr "_Папка:" -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 -#: ../midori/midori-browser.c:4012 ../midori/midori-browser.c:4040 -msgid "Toplevel folder" -msgstr "Корневая папка" - -#: ../midori/midori-browser.c:872 +#: ../midori/midori-browser.c:851 msgid "Add to _Speed Dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:885 +#: ../midori/midori-browser.c:864 msgid "Show in the tool_bar" msgstr "По_казывать на панели закладок" -#: ../midori/midori-browser.c:900 +#: ../midori/midori-browser.c:879 msgid "Run as _web application" msgstr "Запускать как _веб-приложение" -#: ../midori/midori-browser.c:979 +#: ../midori/midori-browser.c:950 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Файл «%s» не может быть сохранён в данную папку." + +#: ../midori/midori-browser.c:952 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "У вас недостаточно прав для записи указанного файла." + +#: ../midori/midori-browser.c:959 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Не хватает свободного места для загрузки \"%s\"." -#: ../midori/midori-browser.c:983 +#: ../midori/midori-browser.c:962 #, c-format msgid "The file needs %s but only %s are left." msgstr "Файл требует %s а %s доступно" -#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4048 -#: ../midori/midori-browser.c:4083 +#: ../midori/midori-browser.c:1000 ../midori/midori-browser.c:4309 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1438 +#: ../midori/midori-browser.c:1294 +msgid "New Window" +msgstr "Новое окно" + +#: ../midori/midori-browser.c:1294 +msgid "A new window has been opened" +msgstr "Открыто новое окно" + +#: ../midori/midori-browser.c:1297 +msgid "New Tab" +msgstr "Новая вкладка" + +#: ../midori/midori-browser.c:1297 +msgid "A new tab has been opened" +msgstr "Открыта новая вкладка" + +#: ../midori/midori-browser.c:1332 +msgid "Error opening the image!" +msgstr "Ошибка при открытии изображения!" + +#: ../midori/midori-browser.c:1333 +msgid "Can not open selected image in a default viewer." +msgstr "" +"Выделенное изображение не удалось открыть в программе просмотра по умолчанию." + +#: ../midori/midori-browser.c:1339 +msgid "Error downloading the image!" +msgstr "Ошибка при загрузке изображения!" + +#: ../midori/midori-browser.c:1340 +msgid "Can not download selected image." +msgstr "Не удалось загрузить выделенное изображение." + +#: ../midori/midori-browser.c:1443 msgid "Save file" msgstr "Сохранить файл" -#: ../midori/midori-browser.c:2154 +#: ../midori/midori-browser.c:2294 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2232 +#: ../midori/midori-browser.c:2426 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." msgstr "" -"Чтобы воспользоваться данным URI, откройте программу чтения новостей. Обычно необходимое действие называется «Добавить ленту» или «Добавить подписку».\n" -"В настройках Midori также можно установить программу чтения новостей. В таком случае, в следующий раз при нажатии на ссылку на ленту, она будет добавлена автоматически." +"Чтобы воспользоваться данным URI, откройте программу чтения новостей. Обычно " +"необходимое действие называется «Добавить ленту» или «Добавить подписку».\n" +"В настройках Midori также можно установить программу чтения новостей. В " +"таком случае, в следующий раз при нажатии на ссылку на ленту, она будет " +"добавлена автоматически." -#: ../midori/midori-browser.c:2238 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2432 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Новая лента" -#: ../midori/midori-browser.c:2281 ../midori/midori-browser.c:4952 -#: ../panels/midori-bookmarks.c:400 +#: ../midori/midori-browser.c:2475 ../midori/midori-browser.c:5240 +#: ../panels/midori-bookmarks.c:426 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3284 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "Не удалось выполнить внешнюю программу." +#: ../midori/midori-browser.c:2974 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "Очистить" -#: ../midori/midori-browser.c:3527 ../midori/midori-browser.c:5342 +#: ../midori/midori-browser.c:3394 +msgid "Toggle text cursor navigation" +msgstr "Режим перемещения по странице при помощи текстового курсора" + +#: ../midori/midori-browser.c:3706 ../midori/midori-browser.c:5626 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" -#: ../midori/midori-browser.c:3842 ../panels/midori-bookmarks.c:713 -#: ../panels/midori-history.c:736 +#: ../midori/midori-browser.c:4037 ../panels/midori-bookmarks.c:742 +#: ../panels/midori-history.c:799 msgid "Open all in _Tabs" msgstr "Открыть всё в отдельных _вкладках" -#: ../midori/midori-browser.c:3849 ../panels/midori-bookmarks.c:719 -#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:542 +#: ../midori/midori-browser.c:4044 ../panels/midori-bookmarks.c:748 +#: ../panels/midori-history.c:805 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:3852 ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:744 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4047 ../midori/midori-view.c:2594 +#: ../midori/midori-view.c:4543 ../panels/midori-bookmarks.c:750 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:3930 +#: ../midori/midori-browser.c:4127 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3931 +#: ../midori/midori-browser.c:4128 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3932 +#: ../midori/midori-browser.c:4129 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:4130 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:4131 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3958 +#: ../midori/midori-browser.c:4132 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4153 msgid "Import bookmarks..." msgstr "Импорт закладок..." -#: ../midori/midori-browser.c:3961 ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:4156 ../midori/midori-browser.c:5245 msgid "_Import bookmarks" msgstr "_Импортировать закладки" -#: ../midori/midori-browser.c:3972 +#: ../midori/midori-browser.c:4167 msgid "_Application:" msgstr "_Приложение:" -#: ../midori/midori-browser.c:3999 ../midori/midori-browser.c:5070 -#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 -#: ../katze/katze-utils.c:696 -msgid "Custom..." -msgstr "Выбрать..." +#: ../midori/midori-browser.c:4232 +msgid "Import from XBEL or HTML file" +msgstr "Импортировать из файла XBEL или HTML" + +#: ../midori/midori-browser.c:4267 +msgid "Import from a file" +msgstr "Импортировать из файла" -#: ../midori/midori-browser.c:4059 +#: ../midori/midori-browser.c:4279 msgid "Failed to import bookmarks" msgstr "Не удалось импортировать закладки" -#: ../midori/midori-browser.c:4100 -msgid "Failed to export bookmarks" -msgstr "Не удалось экспортировать закладки" +#: ../midori/midori-browser.c:4314 +msgid "XBEL Bookmarks" +msgstr "Закладки XBEL" + +#: ../midori/midori-browser.c:4319 +msgid "Netscape Bookmarks" +msgstr "Закладки Netscape" -#: ../midori/midori-browser.c:4153 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "Не удалось очистить историю: %s\n" +#: ../midori/midori-browser.c:4333 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "" +"Midori может сохранять закладки только в форматах XBEL (*.xbel) и Netscape " +"(*.html)" -#: ../midori/midori-browser.c:4161 -#, c-format -msgid "Failed to clear search history: %s\n" -msgstr "Не удалось очистить историю поиска: %s\n" +#: ../midori/midori-browser.c:4348 +msgid "Failed to export bookmarks" +msgstr "Не удалось экспортировать закладки" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4268 +#: ../midori/midori-browser.c:4470 msgid "Clear Private Data" msgstr "Удаление личных данных" -#: ../midori/midori-browser.c:4272 +#: ../midori/midori-browser.c:4474 msgid "_Clear private data" msgstr "_Удалить личные данные" -#: ../midori/midori-browser.c:4286 +#: ../midori/midori-browser.c:4487 msgid "Clear the following data:" msgstr "Удалить следующие данные:" -#: ../midori/midori-browser.c:4296 ../midori/midori-preferences.c:532 -#: ../panels/midori-history.c:114 -msgid "History" -msgstr "Журнал" - -#: ../midori/midori-browser.c:4301 -msgid "Cookies" -msgstr "Фрагменты данных" - -#: ../midori/midori-browser.c:4306 -msgid "'Flash' Cookies" -msgstr "Фрагменты данных Flash" - -#: ../midori/midori-browser.c:4311 -msgid "Website icons" -msgstr "Значки веб-сайтов" - -#: ../midori/midori-browser.c:4316 ../midori/sokoke.c:1314 -msgid "_Closed Tabs" -msgstr "За_крытые вкладки" - -#: ../midori/midori-browser.c:4321 ../extensions/web-cache.c:462 -msgid "Web Cache" -msgstr "Сетевой кэш" +#: ../midori/midori-browser.c:4497 +msgid "Last open _tabs" +msgstr "Открытые _вкладки" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4523 msgid "Clear private data when _quitting Midori" msgstr "Удалять личные данные _при закрытии Midori" -#: ../midori/midori-browser.c:4470 +#: ../midori/midori-browser.c:4699 msgid "A lightweight web browser." msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:4472 -msgid "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." -msgstr "Эта библиотека является свободным программным обеспечением. Вы можете распространять или изменять ее на условиях соответствия GNU Lesser General Public License опубликованной Free Software Foundation; либо версии 2.1 лицензии, либо (на ваше усмотрение) любой более поздней версии." +#: ../midori/midori-browser.c:4700 +msgid "See about:version for version info." +msgstr "" +"Посетите страницу about:version для получения информации о текущей версии." + +#: ../midori/midori-browser.c:4702 +msgid "" +"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." +msgstr "" +"Эта библиотека является свободным программным обеспечением. Вы можете " +"распространять или изменять ее на условиях соответствия GNU Lesser General " +"Public License опубликованной Free Software Foundation; либо версии 2.1 " +"лицензии, либо (на ваше усмотрение) любой более поздней версии." -#: ../midori/midori-browser.c:4491 +#: ../midori/midori-browser.c:4723 msgid "translator-credits" msgstr "" -"Troitskiy Nikita \n" -"Anton Shestakov \n" -"Alexandr Ponomarenko, 2009" +"Команда переводчиков Xfce\n" +"" -#: ../midori/midori-browser.c:4800 +#: ../midori/midori-browser.c:5087 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:4802 ../midori/sokoke.c:1315 -msgid "New _Window" -msgstr "_Новое окно" - -#: ../midori/midori-browser.c:4803 +#: ../midori/midori-browser.c:5090 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:4806 +#: ../midori/midori-browser.c:5093 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:4808 -msgid "P_rivate Browsing" -msgstr "Кон_фиденциальный режим" - -#: ../midori/midori-browser.c:4809 -msgid "Don't save any private data while browsing" -msgstr "Не сохранять персональные данные во время навигации" +#: ../midori/midori-browser.c:5095 +msgid "New P_rivate Browsing Window" +msgstr "Новое кон_фиденциальное окно" -#: ../midori/midori-browser.c:4813 +#: ../midori/midori-browser.c:5099 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:4816 +#: ../midori/midori-browser.c:5101 +msgid "_Save Page As..." +msgstr "Сохранить страницу _как..." + +#: ../midori/midori-browser.c:5102 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:5104 msgid "Add to Speed _dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:4819 -msgid "Add shortcut to speed dial" -msgstr "Добавить страницу в панель быстрого набора" - -#: ../midori/midori-browser.c:4821 +#: ../midori/midori-browser.c:5108 msgid "Add Shortcut to the _desktop" msgstr "Добавить кнопку запуска на _рабочий стол" -#: ../midori/midori-browser.c:4822 -msgid "Add shortcut to the desktop" -msgstr "Добавить кнопку запуска на рабочий стол" +#: ../midori/midori-browser.c:5110 +msgid "Create _Launcher" +msgstr "Создать кнопку _запуска" -#: ../midori/midori-browser.c:4824 +#: ../midori/midori-browser.c:5114 msgid "Subscribe to News _feed" msgstr "Подписаться на _ленту новостей" -#: ../midori/midori-browser.c:4825 -msgid "Subscribe to this news feed" -msgstr "Подписаться на эту ленту новостей" - -#: ../midori/midori-browser.c:4830 +#: ../midori/midori-browser.c:5120 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:4831 +#: ../midori/midori-browser.c:5121 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:5123 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:4834 -msgid "Close this window" -msgstr "Закрыть данное окно" - -#: ../midori/midori-browser.c:4837 +#: ../midori/midori-browser.c:5127 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:4840 -msgid "Quit the application" -msgstr "Выйти из программы" +#: ../midori/midori-browser.c:5129 +msgid "Close a_ll Windows" +msgstr "З_акрыть все окна" -#: ../midori/midori-browser.c:4842 +#: ../midori/midori-browser.c:5132 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:4846 -msgid "Undo the last modification" -msgstr "Отменить последнее изменение" - -#: ../midori/midori-browser.c:4849 -msgid "Redo the last modification" -msgstr "Повторить последнее изменение" - -#: ../midori/midori-browser.c:4853 -msgid "Cut the selected text" -msgstr "Вырезать выделенный текст" - -#: ../midori/midori-browser.c:4856 ../midori/midori-browser.c:4859 -msgid "Copy the selected text" -msgstr "Копировать выделенный текст" - -#: ../midori/midori-browser.c:4862 -msgid "Paste text from the clipboard" -msgstr "Вставить текст из буфера обмена" - -#: ../midori/midori-browser.c:4865 -msgid "Delete the selected text" -msgstr "Удалить выделенный текст" - -#: ../midori/midori-browser.c:4868 -msgid "Select all text" -msgstr "Выделить весь текст" +#: ../midori/midori-browser.c:5155 +msgid "_Find..." +msgstr "_Найти..." -#: ../midori/midori-browser.c:4871 +#: ../midori/midori-browser.c:5156 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:5158 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:4874 -msgid "Find the next occurrence of a word or phrase" -msgstr "Найти следующее местонахождение слова или фразы" - -#: ../midori/midori-browser.c:4876 +#: ../midori/midori-browser.c:5161 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:4877 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Найти предыдущее местонахождение слова или фразы" - -#: ../midori/midori-browser.c:4881 +#: ../midori/midori-browser.c:5165 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:5167 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:4884 +#: ../midori/midori-browser.c:5168 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:4896 +#: ../midori/midori-browser.c:5173 +msgid "Reload page without caching" +msgstr "Обновить страницу без кэширования" + +#: ../midori/midori-browser.c:5183 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:4899 +#: ../midori/midori-browser.c:5186 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:4902 -msgid "Reset the zoom level" -msgstr "Сбросить значение масштаба" - -#: ../midori/midori-browser.c:4903 +#: ../midori/midori-browser.c:5190 msgid "_Encoding" msgstr "_Кодировка" -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:5192 msgid "View So_urce" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:4906 -msgid "View the source code of the page" -msgstr "Просмотр исходного кода страницы" +#: ../midori/midori-browser.c:5195 +msgid "Ca_ret Browsing" +msgstr "Перемещение к_урсором" -#: ../midori/midori-browser.c:4909 +#: ../midori/midori-browser.c:5199 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:4912 +#: ../midori/midori-browser.c:5201 msgid "Scroll _Left" msgstr "Смещение _влево" -#: ../midori/midori-browser.c:4913 -msgid "Scroll to the left" -msgstr "Сместить влево" - -#: ../midori/midori-browser.c:4915 +#: ../midori/midori-browser.c:5204 msgid "Scroll _Down" msgstr "Смещение _вниз" -#: ../midori/midori-browser.c:4916 -msgid "Scroll down" -msgstr "Сместить вниз" - -#: ../midori/midori-browser.c:4918 +#: ../midori/midori-browser.c:5207 msgid "Scroll _Up" msgstr "Смещение _вверх" -#: ../midori/midori-browser.c:4919 -msgid "Scroll up" -msgstr "Сместить вверх" - -#: ../midori/midori-browser.c:4921 +#: ../midori/midori-browser.c:5210 msgid "Scroll _Right" msgstr "Смещение _вправо" -#: ../midori/midori-browser.c:4922 -msgid "Scroll to the right" -msgstr "Сместить вправо" - -#: ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:5213 msgid "_Go" msgstr "П_ереход" -#: ../midori/midori-browser.c:4928 +#: ../midori/midori-browser.c:5216 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:4931 +#: ../midori/midori-browser.c:5219 msgid "Go forward to the next page" msgstr "На следующую страницу" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:5223 msgid "Go to the previous sub-page" msgstr "На предыдущую подстраницу" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4939 +#: ../midori/midori-browser.c:5227 msgid "Go to the next sub-page" msgstr "На следующую подстраницу" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:5230 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:4944 +#: ../midori/midori-browser.c:5232 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:4945 -msgid "Delete the contents of the trash" -msgstr "Удалить содержимое корзины" - -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:5235 msgid "Undo _Close Tab" msgstr "О_тменить закрытие вкладки" -#: ../midori/midori-browser.c:4948 -msgid "Open the last closed tab" -msgstr "Открыть последнюю закрытую вкладку" - -#: ../midori/midori-browser.c:4954 +#: ../midori/midori-browser.c:5242 msgid "Add a new _folder" msgstr "_Создать папку" -#: ../midori/midori-browser.c:4955 -msgid "Add a new bookmark folder" -msgstr "Создать папку закладок" - -#: ../midori/midori-browser.c:4960 +#: ../midori/midori-browser.c:5248 msgid "_Export bookmarks" msgstr "_Экспортировать закладки" -#: ../midori/midori-browser.c:4963 ../midori/midori-searchaction.c:490 +#: ../midori/midori-browser.c:5251 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:4964 -msgid "Add, edit and remove search engines..." -msgstr "Добавление, правка и удаление средства поиска..." - -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:5254 msgid "_Clear Private Data" msgstr "Уда_лить личные данные" -#: ../midori/midori-browser.c:4968 -msgid "Clear private data..." -msgstr "Удалить личные данные..." - -#: ../midori/midori-browser.c:4972 +#: ../midori/midori-browser.c:5257 msgid "_Inspect Page" msgstr "_Информация о странице" -#: ../midori/midori-browser.c:4973 -msgid "Inspect page details and access developer tools..." -msgstr "Показать информацию о странице и инструменты разработчика..." - -#: ../midori/midori-browser.c:4978 +#: ../midori/midori-browser.c:5261 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:4979 -msgid "Switch to the previous tab" -msgstr "Переключиться на предыдущую вкладку" - -#: ../midori/midori-browser.c:4981 +#: ../midori/midori-browser.c:5264 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:4982 -msgid "Switch to the next tab" -msgstr "Переключиться на следующую вкладку" +#: ../midori/midori-browser.c:5266 +msgid "Move Tab _Backward" +msgstr "Переместить вкладку _назад" + +#: ../midori/midori-browser.c:5268 +msgid "_Move Tab Forward" +msgstr "Переместить вкладку _вперёд" -#: ../midori/midori-browser.c:4984 +#: ../midori/midori-browser.c:5271 msgid "Focus _Current Tab" msgstr "_Фокус на текущую вкладку" -#: ../midori/midori-browser.c:4985 -msgid "Focus the current tab" -msgstr "Перевести фокус ввода на текущую вкладку" - -#: ../midori/midori-browser.c:4987 +#: ../midori/midori-browser.c:5274 #, fuzzy -msgid "Minimize _Current Tab" -msgstr "Сворачивать новые вкладки" +msgid "Focus _Next view" +msgstr "Фокус _следующего вида" -#: ../midori/midori-browser.c:4988 -#, fuzzy -msgid "Minimize the current tab" -msgstr "Закрыть данную вкладку" +#: ../midori/midori-browser.c:5277 +msgid "Only show the Icon of the _Current Tab" +msgstr "Показывать иконку только текущей вкладки" -#: ../midori/midori-browser.c:4990 +#: ../midori/midori-browser.c:5280 msgid "_Duplicate Current Tab" -msgstr "_Дублировать текущую вкладку" - -#: ../midori/midori-browser.c:4991 -#, fuzzy -msgid "Duplicate the current tab" -msgstr "Закрыть текущую вкладку" +msgstr "_Сделать копию текущей вкладки" -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:5283 msgid "Close Ot_her Tabs" msgstr "З_акрыть остальные" -#: ../midori/midori-browser.c:4994 -msgid "Close all tabs except the current tab" -msgstr "Закрыть все вкладки кроме текущей" - -#: ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:5286 msgid "Open last _session" msgstr "Открыть предыдущий _сеанс" -#: ../midori/midori-browser.c:4997 -msgid "Open the tabs saved in the last session" -msgstr "Открыть вкладки из предыдущего сеанса" - -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:5289 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:5001 -msgid "_Contents" -msgstr "_Содержание" - -#: ../midori/midori-browser.c:5002 -msgid "Show the documentation" -msgstr "Документация" - -#: ../midori/midori-browser.c:5004 +#: ../midori/midori-browser.c:5291 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:5005 -msgid "Show the Frequently Asked Questions" -msgstr "Часто задаваемые вопросы (в сети)" - -#: ../midori/midori-browser.c:5007 -msgid "_Report a Bug" -msgstr "Соо_бщить об ошибке" - -#: ../midori/midori-browser.c:5008 -msgid "Open Midori's bug tracker" -msgstr "Открыть систему отчётов об ошибках Midori" - -#: ../midori/midori-browser.c:5011 -msgid "Show information about the program" -msgstr "О программе" +#: ../midori/midori-browser.c:5294 +msgid "_Report a Problem..." +msgstr "_Сообщить об ошибке..." -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:5306 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5020 -msgid "Show menubar" -msgstr "Показать строку меню" - -#: ../midori/midori-browser.c:5023 +#: ../midori/midori-browser.c:5310 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:5024 -msgid "Show navigationbar" -msgstr "Показать панель навигации" - -#: ../midori/midori-browser.c:5027 +#: ../midori/midori-browser.c:5314 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:5028 -msgid "Show sidepanel" -msgstr "Показать боковую панель" +#: ../midori/midori-browser.c:5315 +msgid "Sidepanel" +msgstr "Боковая панель" -#: ../midori/midori-browser.c:5031 +#: ../midori/midori-browser.c:5318 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5032 -msgid "Show bookmarkbar" -msgstr "Показать панель закладок" - -#: ../midori/midori-browser.c:5035 -msgid "_Transferbar" -msgstr "П_ередачи" - -#: ../midori/midori-browser.c:5036 -msgid "Show transferbar" -msgstr "Показать вкладку передачи" - -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:5322 msgid "_Statusbar" msgstr "_Строка состояния" -#: ../midori/midori-browser.c:5040 -msgid "Show statusbar" -msgstr "Показать строку состояния" - -#: ../midori/midori-browser.c:5048 +#: ../midori/midori-browser.c:5331 ../midori/midori-websettings.c:307 msgid "_Automatic" msgstr "_Автоматически" -#: ../midori/midori-browser.c:5051 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5334 ../midori/midori-websettings.c:232 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5055 +#: ../midori/midori-browser.c:5338 msgid "Japanese (SHIFT__JIS)" msgstr "Японская (SHIFT__JIS)" -#: ../midori/midori-browser.c:5058 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5341 ../midori/midori-websettings.c:234 msgid "Korean (EUC-KR)" msgstr "Корейская (EUC-KR)" -#: ../midori/midori-browser.c:5061 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5344 ../midori/midori-websettings.c:235 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-browser.c:5064 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5347 ../midori/midori-websettings.c:236 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-browser.c:5067 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5350 ../midori/midori-websettings.c:237 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-browser.c:5585 +#: ../midori/midori-browser.c:5353 ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:313 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "Выбрать..." + +#: ../midori/midori-browser.c:5859 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5866 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5868 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:5890 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5892 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5919 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5936 +msgid "Show the saved bookmarks" +msgstr "Показать все сохранённые закладки" + +#: ../midori/midori-browser.c:5953 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5969 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5971 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" -#: ../midori/midori-browser.c:5689 +#: ../midori/midori-browser.c:5985 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5987 msgid "Menu" msgstr "Меню" -#: ../midori/midori-browser.c:6256 +#: ../midori/midori-browser.c:6665 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" -#: ../midori/midori-locationaction.c:390 +#: ../midori/midori-extension.c:310 #, c-format -msgid "Failed to select from history\n" -msgstr "Не удалось найти в истории\n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "Не удалось загрузить настройки дополнения «%s»: %s\n" -#: ../midori/midori-locationaction.c:474 +#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "Поиск %s" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Не удалось сохранить настройки дополнения «%s»: %s\n" -#: ../midori/midori-locationaction.c:497 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "Найти с помощью %s" -#: ../midori/midori-locationaction.c:1305 +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Найти с помощью..." + +#: ../midori/midori-locationaction.c:537 +#, c-format +msgid "Failed to select from history\n" +msgstr "Не удалось найти в истории\n" + +#: ../midori/midori-locationaction.c:624 #, c-format -msgid "Failed to execute database statement\n" -msgstr "Не удалось выполнить запрос к базе данных\n" +msgid "Search for %s" +msgstr "Поиск %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1361 +#: ../midori/midori-locationaction.c:1399 msgid "Paste and p_roceed" msgstr "Вс&тавить и перейти" -#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 -msgid "Detach chosen panel from the window" -msgstr "Отсоединить выбранную панель от главного окна" +#: ../midori/midori-locationaction.c:1767 +msgid "Not verified" +msgstr "Непроверенное соединение" + +#: ../midori/midori-locationaction.c:1787 +msgid "Verified and encrypted connection" +msgstr "Проверенное защищённое соединение" -#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 -#: ../midori/midori-panel.c:596 ../midori/midori-panel.c:599 +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" msgstr "Расположить панель справа" -#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Закрыть панель" -#: ../midori/midori-panel.c:597 ../midori/midori-panel.c:600 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Расположить панель слева" -#: ../midori/midori-panel.c:754 -msgid "Hide operating controls" -msgstr "Скрыть элементы управления" - -#: ../midori/midori-websettings.c:200 -msgid "Show Blank page" -msgstr "Открыть пустую страницу" +#: ../midori/midori-websettings.c:214 +msgid "Show Speed Dial" +msgstr "Показать быстрый набор" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:215 msgid "Show Homepage" msgstr "Открыть домашнюю страницу" -#: ../midori/midori-websettings.c:202 -msgid "Show last open tabs" -msgstr "Открыть последние открытые страницы" - -#: ../midori/midori-websettings.c:204 -msgid "Show last tabs without loading" -msgstr "Открыть последние страницы без загрузки" - -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:233 msgid "Japanese (SHIFT_JIS)" msgstr "Японская (SHIFT_JIS)" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:253 msgid "New tab" msgstr "Новая вкладка" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:254 msgid "New window" msgstr "Новое окно" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:255 msgid "Current tab" msgstr "Текущая вкладка" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:270 msgid "Default" msgstr "По умолчанию" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:271 msgid "Icons" msgstr "Только значки" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:272 msgid "Small icons" msgstr "Маленькие значки" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:273 msgid "Text" msgstr "Только текст" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:274 msgid "Icons and text" msgstr "Текст под значками" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:275 msgid "Text beside icons" msgstr "Текст рядом со значками" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:290 msgid "Automatic (GNOME or environment)" msgstr "Автоматически (GNOME или переменные окружения)" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:291 msgid "HTTP proxy server" msgstr "Прокси-сервер HTTP" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:292 msgid "No proxy server" msgstr "Не использовать прокси" -#: ../midori/midori-websettings.c:295 -msgid "All cookies" -msgstr "Все" - -#: ../midori/midori-websettings.c:296 -msgid "Session cookies" -msgstr "С информацией о сеансе" - -#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 -msgid "None" -msgstr "Нет" - -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:309 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:310 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:311 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:312 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:388 msgid "Remember last window size" msgstr "Запоминать размер окна" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:389 msgid "Whether to save the last window size" msgstr "Запоминать размер окна при закрытии" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:397 msgid "Last window width" msgstr "Ширина окна" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:398 msgid "The last saved window width" msgstr "Последняя сохранённая ширина окна" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:406 msgid "Last window height" msgstr "Высота окна" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:407 msgid "The last saved window height" msgstr "Последняя сохранённая высота окна" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:432 msgid "Last panel position" msgstr "Позиция панели" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:433 msgid "The last saved panel position" msgstr "Последняя сохранённая позиция панели" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:442 msgid "Last panel page" msgstr "Последняя страница панели" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:443 msgid "The last saved panel page" msgstr "Последняя сохранённая страница панели" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:451 msgid "Last Web search" msgstr "Последний поисковый запрос" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:452 msgid "The last saved Web search" msgstr "Последний сохранённый поисковый запрос" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:461 msgid "Show Menubar" msgstr "Показать меню" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:462 msgid "Whether to show the menubar" msgstr "Показывать панель меню" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:470 msgid "Show Navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:471 msgid "Whether to show the navigationbar" msgstr "Показывать панель навигации" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:479 msgid "Show Bookmarkbar" msgstr "Показать закладки" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:480 msgid "Whether to show the bookmarkbar" msgstr "Показывать закладки" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:488 msgid "Show Panel" msgstr "Показать панель" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:489 msgid "Whether to show the panel" msgstr "Показывать панель" -#: ../midori/midori-websettings.c:485 -msgid "Show Transferbar" -msgstr "Показать панель передач" - -#: ../midori/midori-websettings.c:486 -msgid "Whether to show the transferbar" -msgstr "Показывать панель передач" - -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:497 msgid "Show Statusbar" msgstr "Показать строку состояния" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:498 msgid "Whether to show the statusbar" msgstr "Показывать строку состояния" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:507 msgid "Toolbar Style:" msgstr "Стиль панели инструментов:" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:508 msgid "The style of the toolbar" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:521 -msgid "Show progress in location entry" -msgstr "Показывать прогресс загрузки страницы в адресной строке" - -#: ../midori/midori-websettings.c:522 -msgid "Whether to show loading progress in the location entry" -msgstr "Показывать ход загрузки страницы в виде полосы в адресной строке" - -#: ../midori/midori-websettings.c:537 -msgid "Search engines in location completion" -msgstr "Показывать средства поиска при автодополнении адреса" - -#: ../midori/midori-websettings.c:538 -msgid "Whether to show search engines in the location completion" -msgstr "Показывать средства поиска при вводе текста в адресную строку" - -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:517 msgid "Toolbar Items" msgstr "Элементы панели навигации" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:518 msgid "The items to show on the toolbar" msgstr "Элементы, которые будут показаны на панели инструментов" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:526 msgid "Compact Sidepanel" msgstr "Компактная боковая панель" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:527 msgid "Whether to make the sidepanel compact" msgstr "Не показывать подписи к значкам в боковой панели" -#: ../midori/midori-websettings.c:571 -msgid "Show operating controls of the panel" -msgstr "Показать элементы управления панелью" - -#: ../midori/midori-websettings.c:572 -msgid "Whether to show the operating controls of the panel" -msgstr "Показывать элементы управления панелью" - -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:542 msgid "Align sidepanel on the right" msgstr "Расположить панель справа" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:543 msgid "Whether to align the sidepanel on the right" msgstr "Расположить боковую панель справа" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:558 msgid "Open panels in separate windows" msgstr "Открывать панели в отдельных окнах" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:559 msgid "Whether to always open panels in separate windows" msgstr "Панели при открытии будут отделены от главного окна" -#: ../midori/midori-websettings.c:613 +#: ../midori/midori-websettings.c:568 msgid "When Midori starts:" msgstr "При запуске:" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:569 msgid "What to do when Midori starts" msgstr "Действия, выполняемые при запуске Midori" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:578 msgid "Homepage:" msgstr "Домашняя страница:" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:579 msgid "The homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:639 +#: ../midori/midori-websettings.c:594 msgid "Show crash dialog" msgstr "Показывать окно действий после сбоя" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:595 msgid "Show a dialog after Midori crashed" msgstr "Показывать окно действий после аварийного завершения работы" -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:656 -msgid "Show speed dial in new tabs" -msgstr "Показывать панель быстрого набора в новых вкладках" - -#: ../midori/midori-websettings.c:657 -msgid "Show speed dial in newly opened tabs" -msgstr "Показывать панель быстрого набора в только что открытых вкладках" - -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:603 msgid "Save downloaded files to:" msgstr "Сохранять загружаемые файлы в:" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:604 msgid "The folder downloaded files are saved to" msgstr "Папка, в которую будут сохраняться файлы" -#: ../midori/midori-websettings.c:687 -msgid "Ask for the destination folder" -msgstr "Запрашивать папку для загрузок" - -#: ../midori/midori-websettings.c:688 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "Запрашивать конечную папку для каждого файла" - -#: ../midori/midori-websettings.c:707 -msgid "Notify when a transfer has been completed" -msgstr "Уведомлять по завершении передачи" - -#: ../midori/midori-websettings.c:708 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "Показывать уведомление по окончании передачи файлов" - -#: ../midori/midori-websettings.c:720 -msgid "Download Manager" -msgstr "Менеджер загрузок" - -#: ../midori/midori-websettings.c:721 -msgid "An external download manager" -msgstr "Внешний администратор загрузок" - -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:612 msgid "Text Editor" msgstr "Текстовый редактор" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:613 msgid "An external text editor" msgstr "Пользовательский текстовый редактор" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:628 msgid "News Aggregator" msgstr "Программа чтения лент новостей" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:629 msgid "An external news aggregator" msgstr "Программа чтения новостей" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:637 msgid "Location entry Search" msgstr "Поиск из адресной строки" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:638 msgid "The search to perform inside the location entry" msgstr "Поиск, производимый при вводе фразы в адресную строку" -#: ../midori/midori-websettings.c:763 +#: ../midori/midori-websettings.c:646 msgid "Preferred Encoding" msgstr "Предпочтительная кодировка" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:647 msgid "The preferred character encoding" msgstr "Предпочтительная кодировка символов" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:657 msgid "Always Show Tabbar" msgstr "Всегда показывать строку вкладок" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:658 msgid "Always show the tabbar" msgstr "Всегда показывать строку закладок" -#: ../midori/midori-websettings.c:783 +#: ../midori/midori-websettings.c:666 msgid "Close Buttons on Tabs" msgstr "Кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:667 msgid "Whether tabs have close buttons" msgstr "Наличие кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:792 +#: ../midori/midori-websettings.c:692 msgid "Open new pages in:" msgstr "Открывать новые страницы в:" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:693 msgid "Where to open new pages" msgstr "Расположение новых страниц при открытии" -#: ../midori/midori-websettings.c:802 -msgid "Open external pages in:" -msgstr "Открывать внешние страницы в:" - -#: ../midori/midori-websettings.c:803 -msgid "Where to open externally opened pages" -msgstr "Расположение сторонних страниц при открытии" - -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:702 msgid "Middle click opens Selection" msgstr "Переходить на выделенный адрес по средней кнопке" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:703 msgid "Load an address from the selection via middle click" msgstr "Загружать выделенный адрес средней кнопкой мыши" -#: ../midori/midori-websettings.c:821 +#: ../midori/midori-websettings.c:711 msgid "Open tabs in the background" msgstr "Открывать вкладки в фоне" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:712 msgid "Whether to open new tabs in the background" msgstr "Открывать новые вкладки в фоне" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:720 msgid "Open Tabs next to Current" msgstr "Открывать новые вкладки рядом с текущей" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:721 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Открывать новую вкладку в следующей за данной или за последней" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:729 msgid "Open popups in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:730 msgid "Whether to open popup windows in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:740 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Загружать изображения автоматически" -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:741 msgid "Load and display images automatically" msgstr "Загружать и отображать изображения автоматически" -#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:748 ../extensions/statusbar-features.c:143 msgid "Enable scripts" msgstr "Выполнять сценарии" -#: ../midori/midori-websettings.c:859 +#: ../midori/midori-websettings.c:749 msgid "Enable embedded scripting languages" msgstr "Выполнять встроенные сценарии на страницах" -#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:756 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" msgstr "Использовать модули Netscape" -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:757 msgid "Enable embedded Netscape plugin objects" msgstr "Разрешить встроенные объекты модулей Netscape на страницах" -#: ../midori/midori-websettings.c:883 +#: ../midori/midori-websettings.c:772 +msgid "Enable Spell Checking" +msgstr "Проверять орфографию" + +#: ../midori/midori-websettings.c:773 +msgid "Enable spell checking while typing" +msgstr "Проверять правописание вводимого текста" + +#: ../midori/midori-websettings.c:779 msgid "Enable HTML5 database support" msgstr "Включить поддержку баз данных HTML5" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:780 msgid "Whether to enable HTML5 database support" msgstr "Включить поддержку баз данных стандарта HTML5" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:786 msgid "Enable HTML5 local storage support" msgstr "Включить поддержку локального хранилища HTML5" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:787 msgid "Whether to enable HTML5 local storage support" msgstr "Включить поддержку локального хранилища (localStorage) стандарта HTML5" -#: ../midori/midori-websettings.c:899 +#: ../midori/midori-websettings.c:793 msgid "Enable offline web application cache" msgstr "Включить кэш веб-приложений" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:794 msgid "Whether to enable offline web application cache" msgstr "Кэшировать данные веб-приложений для автономной работы" -#: ../midori/midori-websettings.c:925 +#: ../midori/midori-websettings.c:810 +msgid "Flash window on background tabs" +msgstr "Вспышка при открытии фоновой вкладки" + +#: ../midori/midori-websettings.c:811 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "" +"Окно браузера будет кратковременно менять прозрачность при открытии вкладки " +"в фоне" + +#: ../midori/midori-websettings.c:819 +msgid "Enable WebGL support" +msgstr "Включить поддержку WebGL" + +#: ../midori/midori-websettings.c:820 +msgid "Allow websites to use OpenGL rendering" +msgstr "Разрешить сайтам использовать графику OpenGL" + +#: ../midori/midori-websettings.c:846 msgid "Zoom Text and Images" msgstr "Масштабировать изображения" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:847 msgid "Whether to zoom text and images" msgstr "Изменять масштаб изображений при масштабировании страницы" -#: ../midori/midori-websettings.c:941 +#: ../midori/midori-websettings.c:862 msgid "Find inline while typing" msgstr "Искать текст на странице по мере его набора" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:863 msgid "Whether to automatically find inline while typing" -msgstr "По мере ввода текста на странице будет осуществляться быстрый поиск по фразе" +msgstr "" +"По мере ввода текста на странице будет осуществляться быстрый поиск по фразе" -#: ../midori/midori-websettings.c:957 +#: ../midori/midori-websettings.c:878 msgid "Kinetic scrolling" msgstr "Инерционная прокрутка" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:879 msgid "Whether scrolling should kinetically move according to speed" msgstr "Должна ли прокрутка продолжаться по инерции с учётом скорости" -#: ../midori/midori-websettings.c:966 -msgid "Accept cookies" -msgstr "Принимать фрагменты данных" - -#: ../midori/midori-websettings.c:967 -msgid "What type of cookies to accept" -msgstr "Разрешённый тип фрагментов данных" - -#: ../midori/midori-websettings.c:976 -msgid "Maximum cookie age" -msgstr "Хранить фрагменты данных" +#: ../midori/midori-websettings.c:887 +msgid "Delete old Cookies after:" +msgstr "Удалять старые фрагменты данных через:" -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:888 msgid "The maximum number of days to save cookies for" msgstr "Срок хранения фрагментов данных" -#: ../midori/midori-websettings.c:986 -msgid "Maximum history age" -msgstr "Хранить историю за последние" +#: ../midori/midori-websettings.c:904 +msgid "Only accept Cookies from sites you visit" +msgstr "Принимать фрагменты данных только с посещаемых сайтов" + +#: ../midori/midori-websettings.c:905 +msgid "Block cookies sent by third-party websites" +msgstr "Блокировать фрагменты данных от посторонних сайтов" + +#: ../midori/midori-websettings.c:919 +msgid "Delete pages from history after:" +msgstr "Хранить историю посещений:" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:920 msgid "The maximum number of days to save the history for" msgstr "Срок хранения записей в журнале" -#: ../midori/midori-websettings.c:995 -msgid "Remember last downloaded files" -msgstr "Запоминать последние загруженные файлы" - -#: ../midori/midori-websettings.c:996 -msgid "Whether the last downloaded files are saved" -msgstr "Сохранять историю последних загрузок" - -#: ../midori/midori-websettings.c:1013 +#: ../midori/midori-websettings.c:935 msgid "Proxy server" msgstr "Прокси-сервер" -#: ../midori/midori-websettings.c:1014 +#: ../midori/midori-websettings.c:936 msgid "The type of proxy server to use" msgstr "Тип прокси-сервера" -#: ../midori/midori-websettings.c:1023 +#: ../midori/midori-websettings.c:945 msgid "HTTP Proxy Server" msgstr "Прокси-сервер HTTP" -#: ../midori/midori-websettings.c:1024 +#: ../midori/midori-websettings.c:946 msgid "The proxy server used for HTTP connections" msgstr "Прокси-сервер для соединений по HTTP" +#: ../midori/midori-websettings.c:961 +msgid "Port" +msgstr "Порт" + +#: ../midori/midori-websettings.c:962 +msgid "The proxy server port used for HTTP connections" +msgstr "Порт прокси-сервера для соединений по HTTP" + +#: ../midori/midori-websettings.c:980 +msgid "The maximum size of cached pages on disk" +msgstr "Максимальный размер кэша страниц на диске" + #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1040 +#: ../midori/midori-websettings.c:997 msgid "Identify as" msgstr "Представляться как" -#: ../midori/midori-websettings.c:1041 +#: ../midori/midori-websettings.c:998 msgid "What to identify as to web pages" msgstr "Строка, которая будет посылаться на запросы идентификации обозревателя" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1014 msgid "Identification string" msgstr "Строка идентификации" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1015 msgid "The application identification string" msgstr "Строка идентификации приложения" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1031 msgid "Preferred languages" msgstr "Предпочитаемые языки" -#: ../midori/midori-websettings.c:1074 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "Список предпочитаемых языков для отображения многоязычных страниц, например, «de», «ru,en» или «en-us;q=1.0, fr-fr;q=0.667»" +#: ../midori/midori-websettings.c:1032 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"Список предпочитаемых языков для отображения многоязычных страниц, например, " +"«de», «ru,en» или «en-us;q=1.0, fr-fr;q=0.667»" -#: ../midori/midori-websettings.c:1089 +#: ../midori/midori-websettings.c:1047 msgid "Clear private data" msgstr "Удалить личные данные" -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1048 msgid "The private data selected for deletion" 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:1227 ../midori/midori-view.c:4442 -#: ../midori/midori-view.c:4446 +#: ../midori/midori-websettings.c:1063 +msgid "Clear data" +msgstr "Удалить данные" + +#: ../midori/midori-websettings.c:1064 +msgid "The data selected for deletion" +msgstr "Выбранные для удаления данные" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1113 +msgid "Strip referrer details sent to websites" +msgstr "Передавать в «referer» только название сайта" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1115 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "" +"Заголовок «Referer» будет содержать только домен, а не адрес конкретной " +"страницы" + +#: ../midori/midori-websettings.c:1129 +msgid "Always use my font choices" +msgstr "Всегда использовать" + +#: ../midori/midori-websettings.c:1130 +msgid "Override fonts picked by websites with user preferences" +msgstr "Использовать шрифты пользователя вместо предлагаемых сайтом" + +#: ../midori/midori-view.c:1307 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s запрашивает доступ к базе данных HTML5." + +#: ../midori/midori-view.c:1311 ../midori/midori-view.c:1343 +msgid "_Deny" +msgstr "_Запретить" + +#: ../midori/midori-view.c:1311 ../midori/midori-view.c:1343 +msgid "_Allow" +msgstr "_Разрешить" + +#: ../midori/midori-view.c:1339 +#, c-format +msgid "%s wants to know your location." +msgstr "%s хочет знать ваше местоположение." + +#: ../midori/midori-view.c:1430 #, c-format msgid "Error - %s" msgstr "Ошибка — %s" -#: ../midori/midori-view.c:1228 +#: ../midori/midori-view.c:1431 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Не удалось открыть страницу «%s»." -#: ../midori/midori-view.c:1230 +#: ../midori/midori-view.c:1433 msgid "Try again" msgstr "Попытаться снова" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1249 -#, c-format -msgid "Not found - %s" -msgstr "Страница не найдена — %s" - -#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 +#: ../midori/midori-view.c:1630 ../midori/midori-view.c:2535 #, c-format msgid "Send a message to %s" msgstr "Отправить сообщение %s" -#: ../midori/midori-view.c:2060 ../midori/midori-view.c:2446 +#: ../midori/midori-view.c:2365 ../midori/midori-view.c:2684 msgid "Inspect _Element" msgstr "Исследовать _элемент" -#: ../midori/midori-view.c:2112 ../midori/midori-view.c:2182 +#: ../midori/midori-view.c:2417 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:2116 +#: ../midori/midori-view.c:2421 msgid "Open Link in _Foreground Tab" msgstr "Открыть ссылку в новой _активной вкладке" -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2422 msgid "Open Link in _Background Tab" msgstr "Открыть ссылку в _фоновой вкладке" -#: ../midori/midori-view.c:2120 ../midori/midori-view.c:2189 +#: ../midori/midori-view.c:2425 msgid "Open Link in New _Window" msgstr "Открыть ссылку в _новом окне" -#: ../midori/midori-view.c:2123 +#: ../midori/midori-view.c:2428 msgid "Open Link as Web A_pplication" msgstr "Открыть ссылку как веб-_приложение" -#: ../midori/midori-view.c:2126 +#: ../midori/midori-view.c:2433 msgid "Copy Link de_stination" msgstr "_Копировать адрес ссылки" -#: ../midori/midori-view.c:2129 ../midori/midori-view.c:2201 -msgid "_Save Link destination" -msgstr "_Сохранить объект" - -#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2195 -msgid "_Download Link destination" -msgstr "_Загрузить объект" - -#: ../midori/midori-view.c:2134 ../midori/midori-view.c:2164 -#: ../midori/midori-view.c:2206 -msgid "Download with Download _Manager" -msgstr "Загрузить с помощью _менеджера загрузок" - -#: ../midori/midori-view.c:2143 +#: ../midori/midori-view.c:2449 msgid "Open _Image in New Tab" msgstr "Открыть изображение в новой _вкладке" -#: ../midori/midori-view.c:2146 +#: ../midori/midori-view.c:2452 msgid "Copy Image _Address" msgstr "Копировать _адрес изображения" -#: ../midori/midori-view.c:2149 +#: ../midori/midori-view.c:2455 msgid "Save I_mage" msgstr "Сохранить _изображение" -#: ../midori/midori-view.c:2150 -msgid "Download I_mage" -msgstr "Загрузить _изображение" +#: ../midori/midori-view.c:2458 +msgid "Open in Image _Viewer" +msgstr "Открыть изображение в программе прос_мотра" -#: ../midori/midori-view.c:2157 +#: ../midori/midori-view.c:2465 msgid "Copy Video _Address" msgstr "Копировать _адрес видео" -#: ../midori/midori-view.c:2160 +#: ../midori/midori-view.c:2468 msgid "Save _Video" msgstr "Сохранить _видео" -#: ../midori/midori-view.c:2160 +#: ../midori/midori-view.c:2468 msgid "Download _Video" msgstr "Загрузить _видео" -#: ../midori/midori-view.c:2223 +#: ../midori/midori-view.c:2494 msgid "Search _with" msgstr "Найти _с помощью" -#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2526 msgid "_Search the Web" msgstr "_Найти в сети" -#: ../midori/midori-view.c:2287 +#: ../midori/midori-view.c:2543 msgid "Open Address in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:2591 +#: ../midori/midori-view.c:2832 msgid "Open or download file" msgstr "Открыть или сохранить файл" -#: ../midori/midori-view.c:2610 +#: ../midori/midori-view.c:2851 #, c-format msgid "File Type: '%s'" msgstr "Тип файла: «%s»" -#: ../midori/midori-view.c:2613 +#: ../midori/midori-view.c:2853 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файла: %s («%s»)" +#: ../midori/midori-view.c:2857 +#, c-format +msgid "File Name: %s" +msgstr "Имя файла: «%s»" + #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2617 +#: ../midori/midori-view.c:2876 #, c-format msgid "Open %s" msgstr "Файл %s" -#: ../midori/midori-view.c:3158 +#: ../midori/midori-view.c:3501 #, c-format msgid "Inspect page - %s" msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:3439 -msgid "Speed dial" +#: ../midori/midori-view.c:3802 +msgid "Speed Dial" msgstr "Быстрый набор" -#: ../midori/midori-view.c:3440 +#: ../midori/midori-view.c:3803 ../midori/midori-view.c:3899 msgid "Click to add a shortcut" msgstr "Нажмите, чтобы добавить закладку" -#: ../midori/midori-view.c:3441 +#: ../midori/midori-view.c:3804 msgid "Enter shortcut address" msgstr "Введите адрес страницы" -#: ../midori/midori-view.c:3442 +#: ../midori/midori-view.c:3805 msgid "Enter shortcut title" msgstr "Введите название закладки" -#: ../midori/midori-view.c:3443 +#: ../midori/midori-view.c:3806 msgid "Are you sure you want to delete this shortcut?" msgstr "Удалить визуальную закладку?" -#: ../midori/midori-view.c:3444 -msgid "Set number of columns and rows" -msgstr "Установить количество закладок" - -#: ../midori/midori-view.c:3445 -msgid "Enter number of columns and rows:" -msgstr "Введите число столбцов и строк:" - -#: ../midori/midori-view.c:3446 -msgid "Invalid input for the size of the speed dial" -msgstr "Проверьте правильность ввода" - -#: ../midori/midori-view.c:3447 -msgid "Thumb size:" -msgstr "Размер миниатюр:" - -#: ../midori/midori-view.c:3448 -msgid "Small" -msgstr "Маленький" - -#: ../midori/midori-view.c:3449 -msgid "Medium" -msgstr "Средний" - -#: ../midori/midori-view.c:3450 -msgid "Big" -msgstr "Большой" - -#: ../midori/midori-view.c:3476 -#, c-format -msgid "Document cannot be displayed" -msgstr "Не удалось отобразить документ" - -#: ../midori/midori-view.c:3499 +#: ../midori/midori-view.c:3968 #, c-format msgid "No documentation installed" msgstr "Документация не установлена" -#: ../midori/midori-view.c:3618 +#: ../midori/midori-view.c:4044 +msgid "Midori doesn't store any personal data:" +msgstr "Midori не сохраняет личные данные:" + +#: ../midori/midori-view.c:4045 +msgid "No history or web cookies are being saved." +msgstr "Не было сохранено ни истории, ни cookies." + +#: ../midori/midori-view.c:4046 +msgid "Extensions are disabled." +msgstr "Дополнения отключены." + +#: ../midori/midori-view.c:4047 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "Хранилище HTML5, локальная база данных и кэши приложений отключены." + +#: ../midori/midori-view.c:4048 +msgid "Midori prevents websites from tracking the user:" +msgstr "Midori затрудняет отслеживание сайтами пользователя:" + +#: ../midori/midori-view.c:4049 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "Исходные адреса усекаются до имени узла." + +#: ../midori/midori-view.c:4050 +msgid "DNS prefetching is disabled." +msgstr "Упреждающие запросы DNS отключены." + +#: ../midori/midori-view.c:4051 +msgid "The language and timezone are not revealed to websites." +msgstr "Сайтам не передается язык и часовой пояс." + +#: ../midori/midori-view.c:4052 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "Сайтам не сообщается о наличии Flash и прочих модулей Netscape." + +#: ../midori/midori-view.c:4089 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "Числа в скобках обозначают используемые в данный момент версии." + +#: ../midori/midori-view.c:4144 msgid "Page loading delayed" msgstr "Загрузка страницы отложена" -#: ../midori/midori-view.c:3619 +#: ../midori/midori-view.c:4145 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "Загрузка страницы была отложена из-за сбоя или как следствие соответствующей настройки." +msgstr "" +"Загрузка страницы была отложена из-за сбоя или как следствие соответствующей " +"настройки." -#: ../midori/midori-view.c:3620 +#: ../midori/midori-view.c:4146 msgid "Load Page" msgstr "Загрузить страницу" -#: ../midori/midori-view.c:3764 +#: ../midori/midori-view.c:4285 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-view.c:4018 +#: ../midori/midori-view.c:4547 msgid "_Duplicate Tab" msgstr "Сделать _копию" -#: ../midori/midori-view.c:4023 -#, fuzzy +#: ../midori/midori-view.c:4552 msgid "Show Tab _Label" -msgstr "Показать панель" +msgstr "_Показать заголовок" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4552 msgid "Show Tab _Icon Only" -msgstr "" +msgstr "_Скрыть заголовок" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4558 msgid "Close ot_her Tabs" msgstr "З_акрыть остальные" -#: ../midori/midori-view.c:4680 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5329 +msgid "previous" +msgstr "назад" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5348 +msgid "next" +msgstr "далее" + +#: ../midori/midori-view.c:5361 msgid "Print background images" msgstr "Печатать фоновые изображения" -#: ../midori/midori-view.c:4681 +#: ../midori/midori-view.c:5362 msgid "Whether background images should be printed" msgstr "Должны ли быть выведены на печать фоновые изображения" -#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:5394 msgid "Features" msgstr "Возможности" -#. Page "General" -#: ../midori/midori-preferences.c:301 -msgid "General" -msgstr "Общие" - -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Запуск" -#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Т_екущая страница" + +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Установить текущую страницу в качестве домашней" -#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Передачи" - #. Page "Appearance" -#: ../midori/midori-preferences.c:352 -msgid "Appearance" -msgstr "Внешний вид" - -#: ../midori/midori-preferences.c:353 -msgid "Font settings" -msgstr "Настройки шрифта" - -#: ../midori/midori-preferences.c:355 -msgid "Default Font Family" -msgstr "Семейство шрифта по умолчанию" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Шрифты" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Семейство пропорционального шрифта" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "Семейство шрифта для отображения текста по умолчанию" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "Размер шрифта для отображения текста по умолчанию" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Семейство моноширинного шрифта" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "Семейство моноширинного шрифта для отображения текста" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" msgstr "Размер моноширинного шрифта для отображения текста" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Минимальный размер шрифта" -#: ../midori/midori-preferences.c:374 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "Наименьший размер шрифта для отображения текста" #. Page "Behavior" -#: ../midori/midori-preferences.c:383 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Поведение" -#: ../midori/midori-preferences.c:396 -msgid "Enforce 96 dots per inch" -msgstr "Всегда использовать разрешение 96 точек на дюйм" - -#: ../midori/midori-preferences.c:397 -msgid "Enforce a video dot density of 96 DPI" -msgstr "Принудительно использовать разрешение 96 точек на дюйм" - -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Разрешить сценариям открывать всплывающие окна" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "Разрешено ли сценариям открывать всплывающие окна без вмешательства пользователя" - -#: ../midori/midori-preferences.c:422 -msgid "Spell Checking" -msgstr "Проверка орфографии" - -#: ../midori/midori-preferences.c:424 -msgid "Enable Spell Checking" -msgstr "Проверять орфографию" - -#: ../midori/midori-preferences.c:425 -msgid "Enable spell checking while typing" -msgstr "Проверять правописание вводимого текста" - -#: ../midori/midori-preferences.c:427 -msgid "Spelling dictionaries:" -msgstr "Словари:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:431 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "Список языков для проверки орфографии через запятую, например, «en_US,ru»" +msgstr "" +"Разрешено ли сценариям открывать всплывающие окна без вмешательства " +"пользователя" #. Page "Interface" -#: ../midori/midori-preferences.c:437 -msgid "Interface" -msgstr "Интерфейс" - -#: ../midori/midori-preferences.c:438 -msgid "Navigationbar" -msgstr "Панель навигации" - -#: ../midori/midori-preferences.c:448 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Навигация" -#. Page "Applications" -#: ../midori/midori-preferences.c:470 -msgid "Applications" -msgstr "Приложения" - -#: ../midori/midori-preferences.c:471 -msgid "External applications" -msgstr "Внешние приложения" - #. Page "Network" -#: ../midori/midori-preferences.c:487 ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:454 msgid "Network" msgstr "Сеть" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:461 msgid "Hostname" msgstr "Адрес" -#. Page "Privacy" -#: ../midori/midori-preferences.c:513 -msgid "Privacy" -msgstr "Конфиденциальность" - -#: ../midori/midori-preferences.c:514 -msgid "Web Cookies" -msgstr "Фрагменты данных" - -#: ../midori/midori-preferences.c:523 ../midori/midori-preferences.c:537 -msgid "days" -msgstr "дней" - -#: ../midori/midori-searchaction.c:481 -msgid "Empty" -msgstr "Очистить" +#: ../midori/midori-preferences.c:485 +msgid "MB" +msgstr "МБ" -#: ../midori/midori-searchaction.c:914 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Добавление средства поиска" -#: ../midori/midori-searchaction.c:914 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Правка средства поиска" -#: ../midori/midori-searchaction.c:942 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Имя:" -#: ../midori/midori-searchaction.c:986 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Описание:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "_Значок:" -#: ../midori/midori-searchaction.c:1000 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "_Признак:" -#: ../midori/midori-searchaction.c:1231 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "Управление средствами поиска" -#: ../midori/midori-searchaction.c:1332 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "Использовать _по умолчанию" -#: ../midori/sokoke.c:1303 -msgid "_Bookmark" -msgstr "_Закладка" - -#: ../midori/sokoke.c:1304 -msgid "_Bookmarks" -msgstr "_Закладки" +#: ../midori/sokoke.c:412 +msgid "Open with" +msgstr "Открыть с помощью" -#: ../midori/sokoke.c:1305 -msgid "Add Boo_kmark" -msgstr "_Добавить закладку" - -#: ../midori/sokoke.c:1306 -msgid "_Console" -msgstr "_Консоль" - -#: ../midori/sokoke.c:1307 -msgid "_Extensions" -msgstr "_Дополнения" - -#: ../midori/sokoke.c:1308 -msgid "_History" -msgstr "_Журнал" - -#: ../midori/sokoke.c:1309 -msgid "_Homepage" -msgstr "_Домашняя страница" +#: ../midori/sokoke.c:420 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Выберите приложение или команду для «%s»:" -#: ../midori/sokoke.c:1310 -msgid "_Userscripts" -msgstr "_Сценарии пользователя" +#: ../midori/sokoke.c:461 ../midori/sokoke.c:471 ../midori/sokoke.c:499 +#: ../midori/sokoke.c:528 ../midori/sokoke.c:542 +msgid "Could not run external program." +msgstr "Не удалось выполнить внешнюю программу." -#: ../midori/sokoke.c:1311 -msgid "New _Tab" -msgstr "Но_вая вкладка" +#: ../midori/sokoke.c:1653 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d час" +msgstr[1] "%d часа" +msgstr[2] "%d часов" + +#: ../midori/sokoke.c:1654 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d минута" +msgstr[1] "%d минуты" +msgstr[2] "%d минут" + +#: ../midori/sokoke.c:1655 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d секунда" +msgstr[1] "%d секунды" +msgstr[2] "%d секунд" -#: ../midori/sokoke.c:1312 -msgid "_Transfers" -msgstr "_Передачи" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1663 ../panels/midori-transfers.c:267 +#, c-format +msgid "%s of %s" +msgstr "%s из %s" -#: ../midori/sokoke.c:1313 -msgid "Netscape p_lugins" -msgstr "_Модули Netscape" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1672 +msgid "?B" +msgstr "?Б" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1675 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/sokoke.c:1316 -msgid "New _Folder" -msgstr "Новая папка" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1692 +#, c-format +msgid " - %s remaining" +msgstr " - осталось %s" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:213 +#: ../toolbars/midori-findbar.c:263 msgid "_Inline Find:" msgstr "_Найти:" -#: ../toolbars/midori-findbar.c:245 +#: ../toolbars/midori-findbar.c:289 msgid "Previous" msgstr "Назад" -#: ../toolbars/midori-findbar.c:251 +#: ../toolbars/midori-findbar.c:295 msgid "Next" msgstr "Далее" -#: ../toolbars/midori-findbar.c:255 +#: ../toolbars/midori-findbar.c:299 msgid "Match Case" msgstr "Учитывать регистр" -#: ../toolbars/midori-findbar.c:264 +#: ../toolbars/midori-findbar.c:308 msgid "Highlight Matches" msgstr "Подсветить совпадения" -#: ../toolbars/midori-findbar.c:275 +#: ../toolbars/midori-findbar.c:319 msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 -#, c-format -msgid "%s of %s" -msgstr "%s из %s" - -#: ../toolbars/midori-transferbar.c:123 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "Файл «%s» загружен." -#: ../toolbars/midori-transferbar.c:126 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Загрузка завершена" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "Загруженный файл повреждён." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"Контрольная сумма, указанная в ссылке, не совпадает. Возможно, файл был " +"изменён или загружен не до конца." + +#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Убрать завершённые" -#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 +#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 msgid "Some files are being downloaded" msgstr "Некоторые файлы загружаются" -#: ../toolbars/midori-transferbar.c:306 +#: ../toolbars/midori-transferbar.c:374 msgid "_Quit Midori" msgstr "В_ыйти из Midori" -#: ../toolbars/midori-transferbar.c:308 +#: ../toolbars/midori-transferbar.c:376 msgid "The transfers will be cancelled if Midori quits." msgstr "Загрузки будут отменены при закрытии Midori." -#: ../panels/midori-bookmarks.c:116 +#: ../panels/midori-bookmarks.c:113 msgid "Bookmarks" msgstr "Закладки" -#: ../panels/midori-bookmarks.c:269 +#: ../panels/midori-bookmarks.c:256 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Не удалось добавить закладку: %s\n" -#: ../panels/midori-bookmarks.c:408 +#: ../panels/midori-bookmarks.c:434 msgid "Edit the selected bookmark" msgstr "Редактировать закладку" -#: ../panels/midori-bookmarks.c:416 +#: ../panels/midori-bookmarks.c:442 msgid "Delete the selected bookmark" msgstr "Удалить закладку" -#: ../panels/midori-bookmarks.c:430 +#: ../panels/midori-bookmarks.c:457 msgid "Add a new folder" msgstr "Создать папку" -#: ../panels/midori-bookmarks.c:562 ../panels/midori-history.c:572 +#: ../panels/midori-bookmarks.c:591 ../panels/midori-history.c:631 msgid "Separator" msgstr "Разделитель" -#: ../panels/midori-console.c:90 -msgid "Console" -msgstr "Консоль" - -#: ../panels/midori-console.c:351 -msgid "Copy _All" -msgstr "Копировать все" - -#: ../panels/midori-console.c:352 -msgid "Copy All" -msgstr "Копировать все" +#: ../panels/midori-history.c:110 +msgid "History" +msgstr "Журнал" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Дополнения" +#: ../panels/midori-history.c:157 ../panels/midori-history.c:188 +msgid "Today" +msgstr "Сегодня" -#: ../panels/midori-history.c:146 -msgid "A week ago" -msgstr "Неделю назад" +#: ../panels/midori-history.c:159 ../panels/midori-history.c:190 +msgid "Yesterday" +msgstr "Вчера" -#: ../panels/midori-history.c:148 +#: ../panels/midori-history.c:161 ../panels/midori-history.c:185 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -2191,43 +2183,43 @@ msgstr[1] "%d дня назад" msgstr[2] "%d дней назад" -#: ../panels/midori-history.c:151 -msgid "Today" -msgstr "Сегодня" - -#: ../panels/midori-history.c:153 -msgid "Yesterday" -msgstr "Вчера" +#: ../panels/midori-history.c:164 ../panels/midori-history.c:183 +msgid "A week ago" +msgstr "Неделю назад" -#: ../panels/midori-history.c:324 +#: ../panels/midori-history.c:359 msgid "Are you sure you want to remove all history items?" msgstr "Удалить все записи в журнале?" -#: ../panels/midori-history.c:369 +#: ../panels/midori-history.c:405 msgid "Bookmark the selected history item" msgstr "Добавить выделенную запись в закладки" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:414 msgid "Delete the selected history item" msgstr "Удалить запись из журнала" -#: ../panels/midori-history.c:386 +#: ../panels/midori-history.c:422 msgid "Clear the entire history" msgstr "Очистить весь журнал" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Загрузки" + +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "Открыть _папку загрузок" -#: ../panels/midori-transfers.c:484 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" msgstr "Копировать _адрес ссылки" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Требуется авторизация" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" @@ -2235,207 +2227,244 @@ "Для просмотра этой страницы требуются\n" "имя пользователя и пароль:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "Имя пользователя" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "Пароль" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "_Запомнить пароль" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Не удалось загрузить именованный значок «%s»" -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Не удалось загрузить системный значок «%s»" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "Кадры анимации повреждены" -#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Свойство «%s» недействительно для %s" -#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 -#: ../extensions/addons.c:119 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Выберите файл" -#: ../katze/katze-utils.c:564 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "Выберите папку" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:604 +msgid "None" +msgstr "Нет" + +#: ../katze/katze-utils.c:719 +msgid "1 hour" +msgstr "1 час" + +#: ../katze/katze-utils.c:720 +msgid "1 day" +msgstr "1 день" + +#: ../katze/katze-utils.c:721 +msgid "1 week" +msgstr "1 неделю" + +#: ../katze/katze-utils.c:722 +msgid "1 month" +msgstr "1 месяц" + +#: ../katze/katze-utils.c:723 +msgid "1 year" +msgstr "1 год" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Параметры %s" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:467 msgid "Configure Advertisement filters" msgstr "Настройка рекламных фильтров" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:498 #, 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:587 -msgid "Configure _Advertisement filters..." -msgstr "_Настроить рекламные фильтры..." +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:841 +#: ../extensions/adblock.c:846 msgid "Edit rule" msgstr "Редактирование правила" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:860 msgid "_Rule:" msgstr "_Правило:" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:914 msgid "Bl_ock image" msgstr "Бл_окировать изображение" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:919 msgid "Bl_ock link" msgstr "Бл_окировать ссылку" -#: ../extensions/adblock.c:1492 +#: ../extensions/adblock.c:1620 msgid "Advertisement blocker" msgstr "Блокировка рекламы" -#: ../extensions/adblock.c:1493 +#: ../extensions/adblock.c:1621 msgid "Block advertisements according to a filter list" msgstr "Блокирует рекламу по списку фильтров" -#: ../extensions/addons.c:130 ../extensions/addons.c:490 +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "Эта страница содержит пользовательский сценарий. Установить?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "_Установить пользовательский сценарий" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "Эта страница содержит пользовательский стиль. Установить?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_Установить пользовательский стиль" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Не устанавливать" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" -msgstr "Сценарии" +msgstr "Пользовательские сценарии" -#: ../extensions/addons.c:135 ../extensions/addons.c:492 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" -msgstr "Стили пользователя" +msgstr "Пользовательские стили" -#: ../extensions/addons.c:191 ../extensions/addons.c:267 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Ошибка" -#: ../extensions/addons.c:231 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" -msgstr "Удалить '%s'?" +msgstr "Удалить «%s»?" -#: ../extensions/addons.c:237 -#, fuzzy +#: ../extensions/addons.c:427 msgid "Delete user script" -msgstr "Сценарии" +msgstr "Удаление сценария" -#: ../extensions/addons.c:238 -#, fuzzy +#: ../extensions/addons.c:428 msgid "Delete user style" -msgstr "Удалить ленту" +msgstr "Удаление стиля" -#: ../extensions/addons.c:242 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." -msgstr "Файл %s будет удален." +msgstr "Файл «%s» будет удалён безвозвратно." -#: ../extensions/addons.c:377 ../extensions/addons.c:454 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "Открыть в текстовом редакторе" -#: ../extensions/addons.c:379 ../extensions/addons.c:463 -#, fuzzy +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" -msgstr "Открыть _папку загрузок" +msgstr "Открыть папку с файлом" -#: ../extensions/addons.c:445 -#, fuzzy +#: ../extensions/addons.c:638 msgid "Add new addon" -msgstr "Добавить ленту" - -#: ../extensions/addons.c:472 -msgid "Open target folder for selected addon" -msgstr "" +msgstr "Добавить дополнение" -#: ../extensions/addons.c:473 +#: ../extensions/addons.c:664 msgid "Remove selected addon" -msgstr "" - -#: ../extensions/addons.c:1420 -#, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "Настройки расширения '%s' не могут быть сохранены: %s\n" +msgstr "Удалить выбранное дополнение" -#: ../extensions/addons.c:1421 ../extensions/addons.c:1583 +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" msgstr "Пользовательские дополнения" -#: ../extensions/addons.c:1542 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Отслеживание изменений в «%s» отключено: %s" -#: ../extensions/addons.c:1584 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" msgstr "Поддержка пользовательских сценариев и стилей" -#: ../extensions/colorful-tabs.c:202 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "Цветные вкладки" -#: ../extensions/colorful-tabs.c:203 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Каждая вкладка имеет свой цвет" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Менеджер фрагментов данных" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "Удалить всё" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 -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:105 +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:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "Развернуть всё" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "Свернуть всё" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" msgstr "Удалить все сохранённые фрагменты данных?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Вопрос" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." msgstr "Будут удалены только фрагменты, удовлетворяющие условиям фильтра." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "В конце сеанса" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2452,15 +2481,15 @@ "Защищённый: %s\n" "Срок истекает: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Да" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "Нет" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" @@ -2469,54 +2498,44 @@ "Домен: %s\n" "Фрагментов данных: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Имя" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "_Развернуть всё" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "_Свернуть всё" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 msgid "Filter:" msgstr "Фильтр:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +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" -msgstr "Менеджер _фрагментов данных" - -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Просмотр и удаление фрагментов данных" -#: ../extensions/copy-tabs.c:39 +#: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" msgstr "Копировать _адреса вкладок" -#: ../extensions/copy-tabs.c:96 +#: ../extensions/copy-tabs.c:95 msgid "Copy Addresses of Tabs" msgstr "Скопировать адреса вкладок" -#: ../extensions/copy-tabs.c:97 +#: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Копирует адреса всех вкладок в буфер обмена" -#: ../extensions/external-applications.vala:93 -msgid "External Applications" -msgstr "Внешние приложения" - -#: ../extensions/external-applications.vala:94 -msgid "Associate URL schemes with external commands" -msgstr "Ассоциировать ссылки с внешними командами" - #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Не удалось найти обязательные элементы Atom «entry» в данных XML." @@ -2526,25 +2545,25 @@ msgstr "Не удалось найти обязательные элементы Atom «feed» в данных XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:396 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Последнее обновление: %s." -#: ../extensions/feed-panel/feed-panel.c:668 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "Ленты" -#: ../extensions/feed-panel/feed-panel.c:721 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "Добавить ленту" -#: ../extensions/feed-panel/feed-panel.c:728 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "Удалить ленту" -#: ../extensions/feed-panel/feed-panel.c:810 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "Л_енты" @@ -2597,56 +2616,128 @@ msgid "Read Atom/ RSS feeds" msgstr "Чтение лент RSS/Atom" -#: ../extensions/formhistory.c:142 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" msgstr "Не удалось добавить значение: %s\n" -#: ../extensions/formhistory.c:454 ../extensions/formhistory.c:458 +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "История форм ввода" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Для просмотра этой страницы требуются\n" +"имя пользователя и пароль:" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "Запомнить пароль для данной страницы?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Запомнить" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "Не сейчас" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Не запоминать" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "Хранить данные форм" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "Включение хранения данных форм для текущей вкладки." + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Не удалось выполнить запрос к базе данных: %s\n" -#: ../extensions/formhistory.c:501 +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "Включать заполнение форм вручную для каждой вкладки (Ctrl+Shift+F)" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "История форм ввода" + +#: ../extensions/formhistory/formhistory.c:669 msgid "Stores history of entered form data" msgstr "Хранит данные, введённые ранее в формы ввода" -#: ../extensions/formhistory.c:505 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#, fuzzy, c-format +msgid "Failed to select suggestions\n" +msgstr "Не удалось найти в истории\n" + +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Нет непосещенных вкладок" + +# Используется как заголовок окна настроек дополнения: «Параметры » +#: ../extensions/history-list.vala:235 #, c-format -msgid "Not available: %s" -msgstr "Недоступно: %s" +msgid "History-List" +msgstr "истории вкладок" -#: ../extensions/formhistory.c:506 -msgid "Resource files not installed" -msgstr "Файлы ресурсов не установлены" +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "При закрытии вкладки:" -#: ../extensions/formhistory.c:512 -msgid "Form history filler" -msgstr "История форм ввода" +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Ничего не делать" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Переключиться на последнюю активную вкладку" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Переключиться на последнюю открытую вкладку" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Следующая вкладка (из истории вкладок)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Следующая новая вкладка из истории" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Предыдущая новая вкладка (из истории вкладок)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Предыдущая новая вкладка из истории" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Открыть вкладку на заднем плане" -#: ../extensions/history-list.vala:174 -msgid "Next Tab (History List)" -msgstr "Следующая вкладка (Список истории)" - -#: ../extensions/history-list.vala:175 -msgid "Next tab from history" -msgstr "Следующая вкладка из истории" - -#: ../extensions/history-list.vala:184 -msgid "Previous Tab (History List)" -msgstr "Предыдущая вкладка (Список истории)" - -#: ../extensions/history-list.vala:185 -msgid "Previous tab from history" -msgstr "Предыдущая вкладка из истории" +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Открывает выделенную вкладку на заднем плане" -#: ../extensions/history-list.vala:245 +#: ../extensions/history-list.vala:569 msgid "History List" -msgstr "Список истории" +msgstr "История вкладок" -#: ../extensions/history-list.vala:246 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Отображает список вкладок в порядке времени последнего использования" +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "Переход к последней использовавшейся вкладке" #: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" @@ -2656,108 +2747,105 @@ 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:175 -msgid "Pageholder" -msgstr "Контейнер" - -#: ../extensions/page-holder.c:159 -msgid "_Pageholder" -msgstr "К_онтейнер" - -#: ../extensions/page-holder.c:176 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "Дополнительная область для просмотра страниц" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "Обновить/остановить обновление страницы" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "Настройка комбинаций клавиш" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "_Настроить клавиши..." -#: ../extensions/shortcuts.c:313 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Комбинации клавиш" -#: ../extensions/shortcuts.c:314 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "Просмотр и изменение «горячих клавиш»" #: ../extensions/status-clock.c:174 msgid "Statusbar Clock" -msgstr "Часы в строке статуса" +msgstr "Часы в строке состояния" #: ../extensions/status-clock.c:175 msgid "Display date and time in the statusbar" -msgstr "Показывать дату и время в строке статуса" +msgstr "Показывать дату и время в строке состояния" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Изображения" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Сценарии" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Модули Netscape" -#: ../extensions/statusbar-features.c:147 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "Настройка возможностей" -#: ../extensions/statusbar-features.c:148 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" msgstr "Быстрая настройка режимов отображения страниц" -#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683 msgid "Tab Panel" msgstr "Панель вкладок" -#: ../extensions/tab-panel.c:610 +#: ../extensions/tab-panel.c:666 msgid "T_ab Panel" msgstr "П_анель вкладок" -#: ../extensions/tab-panel.c:627 +#: ../extensions/tab-panel.c:684 msgid "Show tabs in a vertical panel" msgstr "Показ вкладок в боковой панели" -#: ../extensions/tabs-minimized.c:77 +#: ../extensions/tabs-minimized.c:76 msgid "Only Icons on Tabs by default" -msgstr "" +msgstr "Только значок на новых вкладках" -#: ../extensions/tabs-minimized.c:78 +#: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" -msgstr "Новые вкладки не имеют названия по умолчанию" +msgstr "У новых вкладок скрыт заголовок и виден только значок" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Настройка панели инструментов" -#: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." msgstr "Выбрать и изменить порядок элементов можно с помощью мыши." -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Доступные элементы" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Отображаемые элементы" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "Настроить панель _инструментов..." -#: ../extensions/toolbar-editor.c:606 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "Н_астроить..." + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" msgstr "Редактор панели инструментов" -#: ../extensions/toolbar-editor.c:607 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" msgstr "Простой редактор панели инструментов" @@ -2765,6 +2853,437 @@ msgid "Cache HTTP communication on disk" msgstr "Кэширует принятые данные (HTTP) на диске" +#~ msgid "Cookies" +#~ msgstr "Фрагменты данных" + +#~ msgid "'Flash' Cookies" +#~ msgstr "Фрагменты данных Flash" + +#~ msgid "HTML5 _Databases" +#~ msgstr "_Базы данных HTML5" + +#~ msgid "Offline Application Cache" +#~ msgstr "Кэш веб-приложений" + +#~ msgid "Lightweight web browser" +#~ msgstr "Легковесный Интернет-обозреватель" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "Не сохранять персональные данные во время навигации" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Добавить страницу в панель быстрого набора" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Добавить кнопку запуска на рабочий стол" + +#~ msgid "Create a launcher" +#~ msgstr "Создать кнопку запуска" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "Подписаться на эту ленту новостей" + +#~ msgid "Close this window" +#~ msgstr "Закрыть данное окно" + +#~ msgid "Close all open windows" +#~ msgstr "Закрыть все открытые окна" + +#~ msgid "Undo the last modification" +#~ msgstr "Отменить последнее изменение" + +#~ msgid "Redo the last modification" +#~ msgstr "Повторить последнее изменение" + +#~ msgid "Cut the selected text" +#~ msgstr "Вырезать выделенный текст" + +#~ msgid "Copy the selected text" +#~ msgstr "Копировать выделенный текст" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "Вставить текст из буфера обмена" + +#~ msgid "Delete the selected text" +#~ msgstr "Удалить выделенный текст" + +#~ msgid "Select all text" +#~ msgstr "Выделить весь текст" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Найти следующее местонахождение слова или фразы" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Найти предыдущее местонахождение слова или фразы" + +#~ msgid "Reset the zoom level" +#~ msgstr "Сбросить значение масштаба" + +#~ msgid "View the source code of the page" +#~ msgstr "Просмотр исходного кода страницы" + +#~ msgid "Scroll to the left" +#~ msgstr "Сместить влево" + +#~ msgid "Scroll down" +#~ msgstr "Сместить вниз" + +#~ msgid "Scroll up" +#~ msgstr "Сместить вверх" + +#~ msgid "Scroll to the right" +#~ msgstr "Сместить вправо" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "Удалить содержимое корзины" + +#~ msgid "Open the last closed tab" +#~ msgstr "Открыть последнюю закрытую вкладку" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Создать папку закладок" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Добавление, правка и удаление средства поиска..." + +#~ msgid "Clear private data..." +#~ msgstr "Удалить личные данные..." + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "Показать информацию о странице и инструменты разработчика..." + +#~ msgid "Switch to the previous tab" +#~ msgstr "Переключиться на предыдущую вкладку" + +#~ msgid "Switch to the next tab" +#~ msgstr "Переключиться на следующую вкладку" + +#~ msgid "Move tab behind the previous tab" +#~ msgstr "Поменять предыдущую и текущую вкладку местами" + +#~ msgid "Move tab in front of the next tab" +#~ msgstr "Поменять текущую и следующую вкладку местами" + +#~ msgid "Focus the current tab" +#~ msgstr "Перевести фокус ввода на текущую вкладку" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Показывать иконку только данной вкладки" + +#~ msgid "Duplicate the current tab" +#~ msgstr "Сделать копию текущей вкладки" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Закрыть все вкладки кроме текущей" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Открыть вкладки из предыдущего сеанса" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Часто задаваемые вопросы (в сети)" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Открыть систему отчётов об ошибках Midori" + +#~ msgid "Show information about the program" +#~ msgstr "О программе" + +#~ msgid "Show menubar" +#~ msgstr "Показать строку меню" + +#~ msgid "Show navigationbar" +#~ msgstr "Показать панель навигации" + +#~ msgid "Show sidepanel" +#~ msgstr "Показать боковую панель" + +#~ msgid "Show bookmarkbar" +#~ msgstr "Показать панель закладок" + +#~ msgid "Show statusbar" +#~ msgstr "Показать строку состояния" + +#~ msgid "MD5-Checksum:" +#~ msgstr "Контрольная сумма MD5:" + +#~ msgid "SHA1-Checksum:" +#~ msgstr "Контрольная сумма SHA1:" + +#~ msgid "Not available: %s" +#~ msgstr "Недоступно: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "Файлы ресурсов не установлены" + +#~ msgid "No filename specified" +#~ msgstr "Имя файла не задано" + +#~ msgid "Set number of columns and rows" +#~ msgstr "Установить количество закладок" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Введите число столбцов и строк:" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "Проверьте правильность ввода" + +#~ msgid "Thumb size:" +#~ msgstr "Размер миниатюр:" + +#~ msgid "Small" +#~ msgstr "Маленький" + +#~ msgid "Medium" +#~ msgstr "Средний" + +#~ msgid "Big" +#~ msgstr "Большой" + +#~ msgid "Reset the last _session" +#~ msgstr "Удалить _данные последнего сеанса" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "Не удалось выполнить запрос к базе данных\n" + +#~ msgid "All cookies" +#~ msgstr "Все" + +#~ msgid "Session cookies" +#~ msgstr "С информацией о сеансе" + +#~ msgid "Show Transferbar" +#~ msgstr "Показать панель передач" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "Показывать панель передач" + +#~ msgid "Search engines in location completion" +#~ msgstr "Показывать средства поиска при автодополнении адреса" + +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "Показывать средства поиска при вводе текста в адресную строку" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "Показать элементы управления панелью" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "Показывать элементы управления панелью" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Показывать панель быстрого набора в новых вкладках" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Показывать панель быстрого набора в только что открытых вкладках" + +#~ msgid "Download Manager" +#~ msgstr "Менеджер загрузок" + +#~ msgid "An external download manager" +#~ msgstr "Внешний администратор загрузок" + +#~ msgid "Open external pages in:" +#~ msgstr "Открывать внешние страницы в:" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "Расположение сторонних страниц при открытии" + +#~ msgid "Accept cookies" +#~ msgstr "Принимать фрагменты данных" + +#~ msgid "What type of cookies to accept" +#~ msgstr "Разрешённый тип фрагментов данных" + +#~ msgid "Maximum cookie age" +#~ msgstr "Хранить фрагменты данных" + +#~ msgid "Maximum history age" +#~ msgstr "Хранить историю за последние" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Запоминать последние загруженные файлы" + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "Сохранять историю последних загрузок" + +#~ msgid "Not found - %s" +#~ msgstr "Страница не найдена — %s" + +#~ msgid "Download with Download _Manager" +#~ msgstr "Загрузить с помощью _менеджера загрузок" + +#~ msgid "Document cannot be displayed" +#~ msgstr "Не удалось отобразить документ" + +#~ msgid "General" +#~ msgstr "Общие" + +#~ msgid "Appearance" +#~ msgstr "Внешний вид" + +#~ msgid "Font settings" +#~ msgstr "Настройки шрифта" + +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "Всегда использовать разрешение 96 точек на дюйм" + +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "Принудительно использовать разрешение 96 точек на дюйм" + +#~ msgid "Interface" +#~ msgstr "Интерфейс" + +#~ msgid "Navigationbar" +#~ msgstr "Панель навигации" + +#~ msgid "Applications" +#~ msgstr "Приложения" + +#~ msgid "External applications" +#~ msgstr "Внешние приложения" + +#~ msgid "Web Cookies" +#~ msgstr "Фрагменты данных" + +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "Удалять фрагменты данных при закрытии Midori" + +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "Удалять старые фрагменты данных через час" + +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "Удалять старые фрагменты данных через неделю" + +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "Удалять старые фрагменты данных через месяц" + +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "Удалять старые фрагменты данных через год" + +#~ msgid "days" +#~ msgstr "дней" + +#~ msgid "%s of %s, %s/s" +#~ msgstr "%s из %s, %s/s" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "_Настроить рекламные фильтры..." + +#~ msgid "Open target folder for selected addon" +#~ msgstr "Открыть папку с выбранным дополнением" + +#~ msgid "Next Tab (History List)" +#~ msgstr "Следующая вкладка (история вкладок)" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "Предыдущая вкладка (история вкладок)" + +#~ msgid "Previous tab from history" +#~ msgstr "Предыдущая вкладка из истории" + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "" +#~ "Переключение вкладок по Ctrl-Tab в порядке времени последнего " +#~ "использования" + +#~ msgid "Pageholder" +#~ msgstr "Контейнер" + +#~ msgid "_Pageholder" +#~ msgstr "К_онтейнер" + +#~ msgid "Keep one or multiple pages open in parallel to your tabs" +#~ msgstr "Дополнительная область для просмотра страниц" + +#~ msgid "Quit the application" +#~ msgstr "Выйти из программы" + +#~ msgid "_Contents" +#~ msgstr "_Содержание" + +#~ msgid "Show the documentation" +#~ msgstr "Документация" + +#~ msgid "Show Blank page" +#~ msgstr "Открыть пустую страницу" + +#~ msgid "_Save Link destination" +#~ msgstr "_Сохранить объект" + +#~ msgid "_Download Link destination" +#~ msgstr "_Загрузить объект" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% загружено" + +#~ msgid "_Transferbar" +#~ msgstr "П_ередачи" + +#~ msgid "Show transferbar" +#~ msgstr "Показать вкладку передачи" + +#~ msgid "Show progress in location entry" +#~ msgstr "Показывать прогресс загрузки страницы в адресной строке" + +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "Показывать ход загрузки страницы в виде полосы в адресной строке" + +#~ msgid "Ask for the destination folder" +#~ msgstr "Запрашивать папку для загрузок" + +#~ msgid "Whether to ask for the destination folder when downloading a file" +#~ msgstr "Запрашивать конечную папку для каждого файла" + +#~ msgid "Whether to show a notification when a transfer has been completed" +#~ msgstr "Показывать уведомление по окончании передачи файлов" + +#~ msgid "Download I_mage" +#~ msgstr "Загрузить _изображение" + +#~ msgid "Failed to clear search history: %s\n" +#~ msgstr "Не удалось очистить журнал поисковых запросов: %s\n" + +#~ msgid "Minimize _Current Tab" +#~ msgstr "С_вернуть текущую вкладку" + +#~ msgid "Minimize the current tab" +#~ msgstr "Свернуть текущую вкладку" + +#~ msgid "Detach chosen panel from the window" +#~ msgstr "Отсоединить выбранную панель от главного окна" + +#~ msgid "Hide operating controls" +#~ msgstr "Скрыть элементы управления" + +#~ msgid "Spell Checking" +#~ msgstr "Проверка орфографии" + +#~ msgid "" +#~ "A comma separated list of languages to be used for spell checking, for " +#~ "example \"en_GB,de_DE\"" +#~ msgstr "" +#~ "Список языков для проверки орфографии через запятую, например, «en_US,ru»" + +#~ msgid "External Applications" +#~ msgstr "Внешние приложения" + +#~ msgid "Associate URL schemes with external commands" +#~ msgstr "Ассоциация ссылок с внешними командами" + +#~ msgid "Spelling dictionaries:" +#~ msgstr "Словари:" + +#~ msgid "Console" +#~ msgstr "Консоль" + +#~ msgid "Copy _All" +#~ msgstr "Копировать все" + +#~ msgid "Copy All" +#~ msgstr "Копировать все" + +#~ msgid "_Cookie Manager" +#~ msgstr "Менеджер _фрагментов данных" + #~ msgid "_Recently visited pages" #~ msgstr "_Недавно посещённые страницы" @@ -2774,9 +3293,6 @@ #~ msgid "Original cookies only" #~ msgstr "Только оригинальные фрагменты данных" -#~ msgid "Accept cookies from the original website only" -#~ msgstr "Принимать фрагменты данных только с оригинального сайта" - #~ msgid "Remember last visited pages" #~ msgstr "Запоминать посещённые страницы" @@ -2786,7 +3302,8 @@ #~ msgid "Detect proxy server automatically" #~ msgstr "Автоматически обнаруживать прокси-сервер" -#~ msgid "Whether to detect the proxy server automatically from the environment" +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" #~ msgstr "Брать данные о прокси-сервере из переменных окружения" #~ msgid "_Restore Tab" @@ -2798,7 +3315,8 @@ #~ msgid "Erroneous clock time" #~ msgstr "Некорректное время" -#~ msgid "The clock time lies in the past. Please check the current date and time." +#~ msgid "" +#~ "The clock time lies in the past. Please check the current date and time." #~ msgstr "Дата находится в прошлом. Проверьте системное время." #~ msgid "Copy %s to the folder %s." @@ -2807,17 +3325,17 @@ #~ msgid "New tabs open minimized" #~ msgstr "Новые закладки открываются свёрнутыми" -#~ msgid "Show the saved bookmarks" -#~ msgstr "Показать все сохранённые закладки" - #~ msgid "Set number of shortcuts" #~ msgstr "Установить число закладок" #~ msgid "Enter number of shortcuts:" #~ msgstr "Введите число закладок:" -#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "Установленными считаются пользовательские сценарии, расположенные в «%s» и стили, расположенные в «%s»." +#~ msgid "" +#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "" +#~ "Установленными считаются пользовательские сценарии, расположенные в «%s» " +#~ "и стили, расположенные в «%s»." #~ msgid "Open _Link" #~ msgstr "_Открыть ссылку" @@ -2849,9 +3367,6 @@ #~ msgid "Enable special extensions for developers" #~ msgstr "Включить особые расширения для разработчиков" -#~ msgid "DNS prefetching" -#~ msgstr "Упреждающие запросы DNS" - #~ msgid "Prefetch IP addresses of hovered links" #~ msgstr "Упреждающие запросы DNS при наведении на ссылки" @@ -2879,9 +3394,6 @@ #~ msgid "The character encoding to use by default" #~ msgstr "Кодировка символов, которая будет использоваться по умолчанию" -#~ msgid "MB" -#~ msgstr "МБ" - #~ msgid "Encoding" #~ msgstr "Кодировка" @@ -2894,12 +3406,6 @@ #~ msgid "User_styles" #~ msgstr "С_тили пользователя" -#~ msgid "_Closed Tabs and Windows" -#~ msgstr "За_крытые вкладки и окна" - -#~ msgid "Last open pages" -#~ msgstr "Последние открытые страницы" - #~ msgid "Both" #~ msgstr "Значки и текст" diff -Nru midori-0.2.8/po/sk.po midori-0.4.6/po/sk.po --- midori-0.2.8/po/sk.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/sk.po 2012-05-14 22:13:42.000000000 +0000 @@ -2,2196 +2,2177 @@ # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Robert Hartl 2009, 2009, 2010. +# Tomáš Vadina , 2011, 2012. +# msgid "" msgstr "" -"Project-Id-Version: Midori 0.1.9-3345559\n" +"Project-Id-Version: Midori 0.3.6-1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-25 16:26+0000\n" -"PO-Revision-Date: 2010-03-08 12:24+0100\n" -"Last-Translator: Robert Hartl \n" -"Language-Team: Slovak \n" +"POT-Creation-Date: 2012-04-23 07:33+0000\n" +"PO-Revision-Date: 2012-04-23 09:49+0200\n" +"Last-Translator: Tomáš Vadina \n" +"Language-Team: slovenčina \n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" +"X-Poedit-Language: Slovak\n" +"X-Poedit-Country: SLOVAKIA\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Ľahký internetový prehliadač" +msgid "Browse the Web" +msgstr "Prehliadať internet" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 -#: ../midori/main.c:1636 ../midori/main.c:1652 -#: ../midori/midori-websettings.c:314 +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "Internet; WWW; Prehliadač" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072 +#: ../midori/main.c:2086 ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Internetový prehliadač" -#: ../midori/main.c:102 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Midori - súkromné prehliadanie" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Otvoriť nové okno súkromného prehliadania" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164 +msgid "Private Browsing" +msgstr "Súkromné prehliadanie" + +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Konfigurácia sa nemôže načítať: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Hodnota '%s' nie je platná pre %s" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr "Neplatná hodnota '%s' v konfigurácii" -#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 +#: ../midori/main.c:380 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Vyhľadávacie nástroje nemôžu byť načítané.%s\n" + +#: ../midori/main.c:434 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Nepodarilo sa zmazať históriu: %s\n" + +#: ../midori/main.c:454 ../midori/main.c:581 +#: ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" msgstr "Zlyhalo otvorenie databázy: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:524 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Nepodarilo sa odstrániť staré položky histórie: %s\n" -#: ../midori/main.c:468 +#: ../midori/main.c:564 ../panels/midori-history.c:232 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Nepodarilo sa odstrániť položku histórie: %s\n" + +#: ../midori/main.c:611 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Záložky sa nepodarilo uložiť. %s" -#: ../midori/main.c:500 +#: ../midori/main.c:633 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Nastavenie sa nepodarilo uložiť. %s" -#: ../midori/main.c:538 +#: ../midori/main.c:668 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Vyhľadávače sa nepodarilo uložiť. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:558 ../midori/main.c:581 +#: ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Zoznam zavretých kariet sa nepodarilo uložiť %s" -#: ../midori/main.c:640 ../midori/main.c:880 +#: ../midori/main.c:746 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Rozšírenia" + +#: ../midori/main.c:760 +msgid "Privacy" +msgstr "Súkromie" + +#: ../midori/main.c:772 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"V cookies sa ukladajú prihlasovacie údaje, zostavy hier alebo používateľské " +"dáta pre reklamu." + +#: ../midori/main.c:828 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sedenie sa nepodarilo uložiť. %s" -#: ../midori/main.c:824 -msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "Nie sú k dispozícií žiadne koreňové certifikáty. SSL certifikáty nemôžu byť overené." - -#: ../midori/main.c:914 -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á sa, če Midori nebolo naposledy riadne ukončené. Ak sa to stáva opakovane, pre odstránenie problému skúste nasledujúce možnosti." +#: ../midori/main.c:1046 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" +"Nie sú k dispozícií žiadne koreňové certifikáty. SSL certifikáty nemôžu byť " +"overené." + +#: ../midori/main.c:1115 +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á sa, že Midori nebolo naposledy riadne ukončené. Ak sa to stáva " +"opakovane, pre odstránenie problému skúste nasledujúce možnosti." -#: ../midori/main.c:929 +#: ../midori/main.c:1134 msgid "Modify _preferences" msgstr "Zmeniť _predvoľby" -#: ../midori/main.c:933 -msgid "Reset the last _session" -msgstr "Vymazať posledne _sedenie" - -#: ../midori/main.c:938 +#: ../midori/main.c:1138 msgid "Disable all _extensions" msgstr "Zakázať všetky _rozšírenia" -#: ../midori/main.c:1174 ../midori/main.c:1905 +#: ../midori/main.c:1151 +msgid "Discard old tabs" +msgstr "Zahodiť staré karty" + +#: ../midori/main.c:1152 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "Zobraziť naposledy otvorené karty bez načítania" + +#: ../midori/main.c:1153 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "Zobraziť naposledy otvorené karty" + +#: ../midori/main.c:1400 ../midori/main.c:2464 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sedenie nie je možné načítať: %s\n" -#: ../midori/main.c:1298 -msgid "No filename specified" -msgstr "Nebol zadaný názov súboru" - -#: ../midori/main.c:1317 -msgid "An unknown error occured." -msgstr "Nastala neznáma chyba." - -#: ../midori/main.c:1348 +#: ../midori/main.c:1538 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Snímok uložený do: %s\n" -#: ../midori/main.c:1520 +#: ../midori/main.c:1951 msgid "Run ADDRESS as a web application" msgstr "Spustiť ADDRESS ako webovú aplikáciu" -#: ../midori/main.c:1520 +#: ../midori/main.c:1951 msgid "ADDRESS" msgstr "ADRESA" -#: ../midori/main.c:1523 +#: ../midori/main.c:1954 msgid "Use FOLDER as configuration folder" msgstr "Použiť PRIEČINOK ako konfiguračný priečinok" -#: ../midori/main.c:1523 +#: ../midori/main.c:1954 msgid "FOLDER" msgstr "PRIEČINOK" -#: ../midori/main.c:1526 +#: ../midori/main.c:1957 +msgid "Private browsing, no changes are saved" +msgstr "Súkromné prehliadanie, nič sa neukladá" + +#: ../midori/main.c:1959 msgid "Show a diagnostic dialog" msgstr "Zobraziť dialóg po spadnutí" -#: ../midori/main.c:1528 +#: ../midori/main.c:1961 msgid "Run the specified filename as javascript" msgstr "Spustiť zadaný názov súboru ako javaskript" -#: ../midori/main.c:1531 +#: ../midori/main.c:1963 msgid "Take a snapshot of the specified URI" msgstr "Urobiť snímok požadovanej URI" -#: ../midori/main.c:1534 +#: ../midori/main.c:1965 msgid "Execute the specified command" msgstr "Spustiť zadaný príkaz" -#: ../midori/main.c:1536 +#: ../midori/main.c:1967 +msgid "List available commands to execute with -e/ --execute" +msgstr "Zoznam možných programov použiteľných s parametrom -e/ --execute" + +#: ../midori/main.c:1969 msgid "Display program version" msgstr "Zobraziť verziu programu" -#: ../midori/main.c:1538 +#: ../midori/main.c:1971 msgid "Addresses" msgstr "Adresy" -#: ../midori/main.c:1540 +#: ../midori/main.c:1973 msgid "Block URIs according to regular expression PATTERN" -msgstr "" +msgstr "Blokovať adresy URI pomocou regulárneho výrazu REGVÝRAZ" -#: ../midori/main.c:1540 +#: ../midori/main.c:1973 msgid "PATTERN" -msgstr "" +msgstr "REGVÝRAZ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1544 +#: ../midori/main.c:1977 msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "" +msgstr "Resetovať Midori po SEKUNDY sekundy nečinnosti" -#: ../midori/main.c:1544 +#: ../midori/main.c:1977 msgid "SECONDS" msgstr "SEKUNDY" -#: ../midori/main.c:1625 +#: ../midori/main.c:1980 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Presmeruje varovania konzoly do zadaného MENA_SÚBORU" + +#: ../midori/main.c:1980 +msgid "FILENAME" +msgstr "MENO_SÚBORU" + +#: ../midori/main.c:2045 msgid "[Addresses]" msgstr "[Adresy]" -#: ../midori/main.c:1653 +#: ../midori/main.c:2087 msgid "Please report comments, suggestions and bugs to:" msgstr "Vaše komentáre, požiadavky a chyby prosím posielajte na:" -#: ../midori/main.c:1655 +#: ../midori/main.c:2089 msgid "Check for new versions at:" msgstr "Skontrolovať nové verzie na:" -#: ../midori/main.c:1752 -msgid "The specified configuration folder is invalid." -msgstr "Vybraný konfiguračný priečinok nie je platný." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2173 +msgid "Saved logins and _passwords" +msgstr "Uložené _prihlasovacie mená a heslá" + +#: ../midori/main.c:2175 +msgid "Cookies and Website data" +msgstr "Cookies a dáta webstránky" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2179 ../midori/midori-websettings.c:996 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Vyrovnávacia pamäť stránok" + +#: ../midori/main.c:2182 +msgid "Website icons" +msgstr "Ikony webových stránok" + +#: ../midori/main.c:2288 +msgid "An unknown error occured" +msgstr "Vyskytla sa neznáma chyba" -#: ../midori/main.c:1800 +#: ../midori/main.c:2395 msgid "An instance of Midori is already running but not responding.\n" -msgstr "Midori síce beži, ale neodpovedá.\n" +msgstr "Midori síce beží, ale neodpovedá.\n" -#: ../midori/main.c:1855 +#: ../midori/main.c:2431 #, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "Vyhľadávacie nástroje nemôžu byť načítané.%s\n" - -#: ../midori/main.c:1877 -#, fuzzy, c-format msgid "Bookmarks couldn't be loaded: %s\n" -msgstr "Záložky nie je možné načítať: %s\n" +msgstr "Záložky nemôžu byť načítané: %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:2479 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Zatvorené karty nemôžu byť načítane: %s\n" -#: ../midori/main.c:1934 +#: ../midori/main.c:2492 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Históriu nie je možné načítať: %s\n" -#: ../midori/main.c:1948 +#: ../midori/main.c:2508 msgid "The following errors occured:" msgstr "Došlo k nasledujúcim chybám:" -#: ../midori/main.c:1964 +#: ../midori/main.c:2524 msgid "_Ignore" msgstr "_Ignorovať" -#: ../midori/midori-array.c:428 +#: ../midori/midori-app.c:1334 +msgid "_Bookmark" +msgstr "_Záložka" + +#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060 +msgid "_Bookmarks" +msgstr "_Záložky" + +#: ../midori/midori-app.c:1336 +msgid "Add Boo_kmark" +msgstr "Pridať záložku" + +#: ../midori/midori-app.c:1337 +msgid "_Console" +msgstr "_Konzola" + +#: ../midori/midori-app.c:1338 +msgid "_Extensions" +msgstr "_Rozšírenia" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589 +msgid "_History" +msgstr "_História" + +#: ../midori/midori-app.c:1340 +msgid "_Homepage" +msgstr "_Domovská stránka" + +#: ../midori/midori-app.c:1341 +msgid "_Userscripts" +msgstr "_Užívateľské skripty" + +#: ../midori/midori-app.c:1342 +msgid "New _Tab" +msgstr "Nová _karta" + +#: ../midori/midori-app.c:1343 +msgid "_Transfers" +msgstr "_Prenosy" + +#: ../midori/midori-app.c:1344 +msgid "Netscape p_lugins" +msgstr "Pluginy _Netscape" + +#: ../midori/midori-app.c:1345 +msgid "_Closed Tabs" +msgstr "_Zatvorené karty" + +#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216 +msgid "New _Window" +msgstr "Nové _okno" + +#: ../midori/midori-app.c:1347 +msgid "New _Folder" +msgstr "Nový _priečinok" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "Súbor sa nenašiel." -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Nesprávny formát dokumentu." -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "Neznámy formát záložiek" -#: ../midori/midori-array.c:718 +#: ../midori/midori-array.c:915 msgid "Writing failed." msgstr "Zapisovanie zlyhalo." -#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5245 -#: ../midori/midori-browser.c:5251 +#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298 +#: ../midori/midori-browser.c:5307 msgid "Reload the current page" msgstr "Obnoviť aktuálnu stránku" -#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5248 +#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304 msgid "Stop loading the current page" msgstr "Zastaviť načítanie aktuálnej stránky" -#: ../midori/midori-browser.c:456 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% načítaný" - -#: ../midori/midori-browser.c:494 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" msgstr "Nepodarilo sa aktualizovať titulok: %s\n" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." msgstr "Neočakávaná akcia '%s'." -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:569 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Súkromné prehliadanie)" + +#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716 +msgid "Toplevel folder" +msgstr "Priečinok najvyššej úrovne" + +#: ../midori/midori-browser.c:774 msgid "New folder" msgstr "Nový priečinok" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:774 msgid "Edit folder" msgstr "Upraviť priečinok" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:776 msgid "New bookmark" msgstr "Nová záložka" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:776 msgid "Edit bookmark" msgstr "Upraviť záložku" -#: ../midori/midori-browser.c:764 +#: ../midori/midori-browser.c:818 msgid "_Title:" msgstr "_Názov:" -#: ../midori/midori-browser.c:777 ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "_Poznámka:" - -#: ../midori/midori-browser.c:796 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4401 +#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326 msgid "_Folder:" msgstr "_Priečinok:" -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:940 -#: ../midori/midori-browser.c:4406 ../midori/midori-browser.c:4438 -msgid "Toplevel folder" -msgstr "Priečinok najvyššej úrovne" - -#: ../midori/midori-browser.c:874 +#: ../midori/midori-browser.c:877 msgid "Add to _Speed Dial" msgstr "Pridať do _rýchleho prístupu" -#: ../midori/midori-browser.c:887 +#: ../midori/midori-browser.c:890 msgid "Show in the tool_bar" msgstr "Zobraziť v paneli _nástrojov" -#: ../midori/midori-browser.c:902 +#: ../midori/midori-browser.c:905 msgid "Run as _web application" msgstr "Spustiť ako _webovú aplikáciu" -#: ../midori/midori-browser.c:994 +#: ../midori/midori-browser.c:976 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Súbor \"%s\" nemôže byť uložený do tohoto priečinka." + +#: ../midori/midori-browser.c:978 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Nemáte oprávnenia k zápisu." + +#: ../midori/midori-browser.c:985 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Nie je dosť miesta pre stiahnutie \"%s\"." -#: ../midori/midori-browser.c:998 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "Potrebuje %s, ale k dispozícií je iba %s." -#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4456 -#: ../midori/midori-browser.c:4488 +#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395 msgid "Save file as" msgstr "Uložiť súbor ako" -#: ../midori/midori-browser.c:1448 +#: ../midori/midori-browser.c:1320 +msgid "New Window" +msgstr "Nové okno" + +#: ../midori/midori-browser.c:1320 +msgid "A new window has been opened" +msgstr "Bolo otvorené nové okno" + +#: ../midori/midori-browser.c:1323 +msgid "New Tab" +msgstr "Nová karta" + +#: ../midori/midori-browser.c:1323 +msgid "A new tab has been opened" +msgstr "Bola otvorená nová karta" + +#: ../midori/midori-browser.c:1358 +msgid "Error opening the image!" +msgstr "Chyba pri otváraní obrázku!" + +#: ../midori/midori-browser.c:1359 +msgid "Can not open selected image in a default viewer." +msgstr "" +"Nie je možné otvoriť vybraný obrázok v predvolenom prehliadači obrázkov." + +#: ../midori/midori-browser.c:1365 +msgid "Error downloading the image!" +msgstr "Chyba pri sťahovaní obrázku!" + +#: ../midori/midori-browser.c:1366 +msgid "Can not download selected image." +msgstr "Nepodarilo sa stiahnuť vybraný obrázok." + +#: ../midori/midori-browser.c:1492 msgid "Save file" msgstr "Uložiť súbor" -#: ../midori/midori-browser.c:2152 +#: ../midori/midori-browser.c:2367 msgid "Open file" msgstr "Otvoriť súbor" -#: ../midori/midori-browser.c:2230 +#: ../midori/midori-browser.c:2499 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." -msgstr "" +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr "" +"Pokiaľ použijete hore uvedenú URI adresu, otvorí sa čítačka správ RSS. " +"Obyčajne je v ňom položka menu alebo tlačidlo \"Nový kanál\" (alebo s " +"podobným názvom).\n" +"Ďalšia možnosť je zmena nastavení Midori (Upraviť -> Nastavenia -> záložka " +"Aplikácie, položka Čítačka RSS). Najbližšie kliknutie na ikonu RSS pridá " +"kanál priamo do čítačky RSS." -#: ../midori/midori-browser.c:2236 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nový kanál" -#: ../midori/midori-browser.c:2279 ../midori/midori-browser.c:5310 -#: ../panels/midori-bookmarks.c:422 +#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "Pridať novú záložku" -#: ../midori/midori-browser.c:2748 ../panels/midori-bookmarks.c:203 -#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 -#: ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Nepodarilo sa spustiť databázový príkaz: %s\n" - -#: ../midori/midori-browser.c:2828 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 msgid "Empty" msgstr "Prázdne" -#: ../midori/midori-browser.c:3446 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "Nie je možné spustiť externý program" +#: ../midori/midori-browser.c:3467 +msgid "Toggle text cursor navigation" +msgstr "Prepína navigáciu pomocou kurzora" -#: ../midori/midori-browser.c:3760 ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nepodarilo sa vložiť novú položku histórie: %s\n" -#: ../midori/midori-browser.c:4094 ../panels/midori-bookmarks.c:780 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 msgid "Open all in _Tabs" msgstr "Otvoriť všetky na _kartách" -#: ../midori/midori-browser.c:4101 ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Otvoriť na novej _karte" -#: ../midori/midori-browser.c:4104 ../midori/midori-view.c:2424 -#: ../midori/midori-view.c:4103 ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657 +#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Otvoriť v novom _okne" -#: ../midori/midori-browser.c:4327 +#: ../midori/midori-browser.c:4213 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4328 +#: ../midori/midori-browser.c:4214 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4215 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4216 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4217 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4352 +#: ../midori/midori-browser.c:4218 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4239 msgid "Import bookmarks..." msgstr "Importovať záložky..." -#: ../midori/midori-browser.c:4355 ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372 msgid "_Import bookmarks" msgstr "_Importovať záložky" -#: ../midori/midori-browser.c:4366 +#: ../midori/midori-browser.c:4253 msgid "_Application:" msgstr "_Aplikácia:" -#: ../midori/midori-browser.c:4393 ../midori/midori-browser.c:5419 -#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 -#: ../katze/katze-utils.c:691 -msgid "Custom..." -msgstr "Vlastné..." +#: ../midori/midori-browser.c:4318 +msgid "Import from XBEL or HTML file" +msgstr "Importovať zo súboru typu XBEL, alebo HTML" + +#: ../midori/midori-browser.c:4353 +msgid "Import from a file" +msgstr "Importovať zo súboru" -#: ../midori/midori-browser.c:4467 +#: ../midori/midori-browser.c:4365 msgid "Failed to import bookmarks" msgstr "Nepodarilo sa importovať záložky" -#: ../midori/midori-browser.c:4503 +#: ../midori/midori-browser.c:4400 +msgid "XBEL Bookmarks" +msgstr "Záložky vo formáte XBEL" + +#: ../midori/midori-browser.c:4405 +msgid "Netscape Bookmarks" +msgstr "Záložky z Netscape" + +#: ../midori/midori-browser.c:4419 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "" +"Z Midori je možné exportovať záložky iba vo formáte XBEL (*.xbel) a Netscape " +"(*.html)" + +#: ../midori/midori-browser.c:4434 msgid "Failed to export bookmarks" msgstr "Nepodarilo sa exportovať záložky" -#: ../midori/midori-browser.c:4557 ../panels/midori-bookmarks.c:271 -#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Nepodarilo sa odstrániť položku histórie: %s\n" - #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4664 +#: ../midori/midori-browser.c:4556 msgid "Clear Private Data" msgstr "Odstrániť súkromné údaje" -#: ../midori/midori-browser.c:4668 +#: ../midori/midori-browser.c:4560 msgid "_Clear private data" msgstr "_Odstrániť súkromné údaje" -#: ../midori/midori-browser.c:4682 +#: ../midori/midori-browser.c:4573 msgid "Clear the following data:" msgstr "Odstrániť nasledujúce údaje:" -#: ../midori/midori-browser.c:4693 ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 -msgid "History" -msgstr "História" - -#: ../midori/midori-browser.c:4699 -msgid "Cookies" -msgstr "Cookies" - -#: ../midori/midori-browser.c:4704 -msgid "'Flash' Cookies" -msgstr "Cookies z Flash" - -#: ../midori/midori-browser.c:4709 -msgid "Website icons" -msgstr "Ikony webových stránok" - -#: ../midori/midori-browser.c:4714 ../midori/sokoke.c:1298 -msgid "_Closed Tabs" -msgstr "_Zatvorené karty" - -#: ../midori/midori-browser.c:4719 ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "Vyrovnávacia pamäť stránok" +#: ../midori/midori-browser.c:4583 +msgid "Last open _tabs" +msgstr "Naposledy otvorené _karty" -#: ../midori/midori-browser.c:4727 +#: ../midori/midori-browser.c:4609 msgid "Clear private data when _quitting Midori" msgstr "Odstrániť súkromné údaje pri _ukončení Midori" -#: ../midori/midori-browser.c:4828 +#: ../midori/midori-browser.c:4804 msgid "A lightweight web browser." msgstr "Ľahký internetový prehliadač." -#: ../midori/midori-browser.c:4830 -msgid "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." -msgstr "" +#: ../midori/midori-browser.c:4805 +msgid "See about:version for version info." +msgstr "about:version v adresnom riadku zobrazí informácie o verzii." + +#: ../midori/midori-browser.c:4807 +msgid "" +"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." +msgstr "" +"Táto knižnica je slobodný softvér; môžete ju distribuovať alebo meniť podľa " +"práv GNU Lesser General Public License ako bola publikovaná Free Software " +"Foundation; či už verzie 2.1, alebo alebo (podľa uváženia) akejkoľvek " +"neskoršej verzie." -#: ../midori/midori-browser.c:4849 +#: ../midori/midori-browser.c:4828 msgid "translator-credits" -msgstr "Robert Hartl 2009" +msgstr "" +"Robert Hartl , 2009\n" +"Tomáš Vadina , 2011" -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:5214 msgid "_File" msgstr "_Súbor" -#: ../midori/midori-browser.c:5160 ../midori/sokoke.c:1299 -msgid "New _Window" -msgstr "Nové _okno" - -#: ../midori/midori-browser.c:5161 +#: ../midori/midori-browser.c:5217 msgid "Open a new window" msgstr "Otvoriť nové okno" -#: ../midori/midori-browser.c:5164 +#: ../midori/midori-browser.c:5220 msgid "Open a new tab" msgstr "Otvoriť novú kartu" -#: ../midori/midori-browser.c:5166 -msgid "P_rivate Browsing" -msgstr "_Súkromné prehliadanie" - -#: ../midori/midori-browser.c:5167 -msgid "Don't save any private data while browsing" -msgstr "Neukladať pri prehliadaní žiadne súkromné dáta" +#: ../midori/midori-browser.c:5222 +msgid "New P_rivate Browsing Window" +msgstr "Nové okno súk_romného prehliadania" -#: ../midori/midori-browser.c:5171 +#: ../midori/midori-browser.c:5226 msgid "Open a file" msgstr "Otvoriť súbor" -#: ../midori/midori-browser.c:5174 +#: ../midori/midori-browser.c:5228 +msgid "_Save Page As..." +msgstr "Uložiť _stránku ako..." + +#: ../midori/midori-browser.c:5229 msgid "Save to a file" msgstr "Uložiť do súboru" -#: ../midori/midori-browser.c:5176 +#: ../midori/midori-browser.c:5231 msgid "Add to Speed _dial" msgstr "Pridať do _Rýchleho prístupu" -#: ../midori/midori-browser.c:5177 -msgid "Add shortcut to speed dial" -msgstr "Pridať odkaz do rýchleho prístupu" - -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:5235 msgid "Add Shortcut to the _desktop" msgstr "Pridať záložku na _plochu" -#: ../midori/midori-browser.c:5180 -msgid "Add shortcut to the desktop" -msgstr "Pridá záložku na plochu" +#: ../midori/midori-browser.c:5237 +msgid "Create _Launcher" +msgstr "Vytvoriť _spúšťač" -#: ../midori/midori-browser.c:5182 +#: ../midori/midori-browser.c:5241 msgid "Subscribe to News _feed" msgstr "Pridať _kanál" -#: ../midori/midori-browser.c:5183 -msgid "Subscribe to this news feed" -msgstr "Pridá tento kanál do odoberaných kanálov" - -#: ../midori/midori-browser.c:5188 +#: ../midori/midori-browser.c:5247 msgid "_Close Tab" msgstr "_Zatvoriť kartu" -#: ../midori/midori-browser.c:5189 +#: ../midori/midori-browser.c:5248 msgid "Close the current tab" msgstr "Zatvoriť aktívnu kartu" -#: ../midori/midori-browser.c:5191 +#: ../midori/midori-browser.c:5250 msgid "C_lose Window" msgstr "_Zatvoriť okno" -#: ../midori/midori-browser.c:5192 -msgid "Close this window" -msgstr "Zatvoriť toto okno" - -#: ../midori/midori-browser.c:5195 +#: ../midori/midori-browser.c:5254 msgid "Print the current page" msgstr "Vytlačiť aktuálnu stránku" -#: ../midori/midori-browser.c:5198 -msgid "Quit the application" -msgstr "Ukončiť aplikáciu" +#: ../midori/midori-browser.c:5256 +msgid "Close a_ll Windows" +msgstr "Z_atvoriť všetky okná" -#: ../midori/midori-browser.c:5200 +#: ../midori/midori-browser.c:5259 msgid "_Edit" msgstr "_Upraviť" -#: ../midori/midori-browser.c:5204 -msgid "Undo the last modification" -msgstr "Vrátiť poslednú zmenu" - -#: ../midori/midori-browser.c:5207 -msgid "Redo the last modification" -msgstr "Znova použiť poslednú zmenu" - -#: ../midori/midori-browser.c:5211 -msgid "Cut the selected text" -msgstr "Vystrihnúť vybraný text" - -#: ../midori/midori-browser.c:5214 ../midori/midori-browser.c:5217 -msgid "Copy the selected text" -msgstr "Kopírovať vybraný text" - -#: ../midori/midori-browser.c:5220 -msgid "Paste text from the clipboard" -msgstr "Prilepiť vybraný text" - -#: ../midori/midori-browser.c:5223 -msgid "Delete the selected text" -msgstr "Odstrániť označený text" - -#: ../midori/midori-browser.c:5226 -msgid "Select all text" -msgstr "Vybrať všetok text" +#: ../midori/midori-browser.c:5282 +msgid "_Find..." +msgstr "_Nájsť..." -#: ../midori/midori-browser.c:5229 +#: ../midori/midori-browser.c:5283 msgid "Find a word or phrase in the page" msgstr "Hľadať slovo alebo frázu na stránke" -#: ../midori/midori-browser.c:5231 +#: ../midori/midori-browser.c:5285 msgid "Find _Next" msgstr "Hľadať _ďalšie" -#: ../midori/midori-browser.c:5232 -msgid "Find the next occurrence of a word or phrase" -msgstr "Hľadať ďalší výskyt slova alebo frázy" - -#: ../midori/midori-browser.c:5234 +#: ../midori/midori-browser.c:5288 msgid "Find _Previous" msgstr "Hľadať _predchádzajúce" -#: ../midori/midori-browser.c:5235 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Hľadať predchádzajúce slovo alebo frázu" - -#: ../midori/midori-browser.c:5239 +#: ../midori/midori-browser.c:5292 msgid "Configure the application preferences" msgstr "Nastaviť možnosti aplikácie" -#: ../midori/midori-browser.c:5241 +#: ../midori/midori-browser.c:5294 msgid "_View" msgstr "_Zobraziť" -#: ../midori/midori-browser.c:5242 +#: ../midori/midori-browser.c:5295 msgid "_Toolbars" msgstr "_Panely s nástrojmi" -#: ../midori/midori-browser.c:5254 +#: ../midori/midori-browser.c:5300 +msgid "Reload page without caching" +msgstr "Obnoviť stránku bez použitia vyrovnávacej pamäte" + +#: ../midori/midori-browser.c:5310 msgid "Increase the zoom level" msgstr "Priblížiť" -#: ../midori/midori-browser.c:5257 +#: ../midori/midori-browser.c:5313 msgid "Decrease the zoom level" msgstr "Oddialiť" -#: ../midori/midori-browser.c:5260 -msgid "Reset the zoom level" -msgstr "Nastaviť pôvodné priblíženie" - -#: ../midori/midori-browser.c:5261 +#: ../midori/midori-browser.c:5317 msgid "_Encoding" msgstr "_Kódovanie" -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:5319 msgid "View So_urce" msgstr "Zobraziť _zdrojový kód" -#: ../midori/midori-browser.c:5264 -msgid "View the source code of the page" -msgstr "Zobraziť zdrojový kód stránky" +#: ../midori/midori-browser.c:5322 +msgid "Ca_ret Browsing" +msgstr "Prehliadanie ku_rzorom" -#: ../midori/midori-browser.c:5267 +#: ../midori/midori-browser.c:5326 msgid "Toggle fullscreen view" msgstr "Prepnúť zobrazenie na celú obrazovku" -#: ../midori/midori-browser.c:5270 +#: ../midori/midori-browser.c:5328 msgid "Scroll _Left" msgstr "Rolovať _vľavo" -#: ../midori/midori-browser.c:5271 -msgid "Scroll to the left" -msgstr "" - -#: ../midori/midori-browser.c:5273 +#: ../midori/midori-browser.c:5331 msgid "Scroll _Down" msgstr "Rolovať _dole" -#: ../midori/midori-browser.c:5274 -msgid "Scroll down" -msgstr "" - -#: ../midori/midori-browser.c:5276 +#: ../midori/midori-browser.c:5334 msgid "Scroll _Up" msgstr "Rolovať na_hore" -#: ../midori/midori-browser.c:5277 -msgid "Scroll up" -msgstr "" - -#: ../midori/midori-browser.c:5279 +#: ../midori/midori-browser.c:5337 msgid "Scroll _Right" msgstr "Rolovať v_pravo" -#: ../midori/midori-browser.c:5280 -msgid "Scroll to the right" -msgstr "" - -#: ../midori/midori-browser.c:5283 +#: ../midori/midori-browser.c:5340 msgid "_Go" msgstr "P_rejsť" -#: ../midori/midori-browser.c:5286 +#: ../midori/midori-browser.c:5343 msgid "Go back to the previous page" msgstr "Späť na predchádzajúcu stránku" -#: ../midori/midori-browser.c:5289 +#: ../midori/midori-browser.c:5346 msgid "Go forward to the next page" msgstr "Dopredu na nasledujúcu stránku" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5293 -#, fuzzy +#: ../midori/midori-browser.c:5350 msgid "Go to the previous sub-page" -msgstr "Späť na predchádzajúcu stránku" +msgstr "Prejsť na predchádzajúcu podstránku" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5297 -#, fuzzy +#: ../midori/midori-browser.c:5354 msgid "Go to the next sub-page" -msgstr "Dopredu na nasledujúcu stránku" +msgstr "Prejsť na nasledujúcu podstránku" -#: ../midori/midori-browser.c:5300 +#: ../midori/midori-browser.c:5357 msgid "Go to your homepage" msgstr "Ísť na domovskú stránku" -#: ../midori/midori-browser.c:5302 +#: ../midori/midori-browser.c:5359 msgid "Empty Trash" msgstr "Vysypať kôš" -#: ../midori/midori-browser.c:5303 -msgid "Delete the contents of the trash" -msgstr "Zmaže zoznam zatvorených kariet" - -#: ../midori/midori-browser.c:5305 +#: ../midori/midori-browser.c:5362 msgid "Undo _Close Tab" msgstr "Obnoviť _zatvorenú kartu" -#: ../midori/midori-browser.c:5306 -msgid "Open the last closed tab" -msgstr "Otvoriť naposledy zatvorenú kartu" - -#: ../midori/midori-browser.c:5312 +#: ../midori/midori-browser.c:5369 msgid "Add a new _folder" msgstr "Pridať nový priečinok" -#: ../midori/midori-browser.c:5313 -msgid "Add a new bookmark folder" -msgstr "Pridať nový priečinok do záložiek" - -#: ../midori/midori-browser.c:5318 +#: ../midori/midori-browser.c:5375 msgid "_Export bookmarks" msgstr "_Exportovať záložky" -#: ../midori/midori-browser.c:5321 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Správca vyhľadávacích modulov" -#: ../midori/midori-browser.c:5322 -msgid "Add, edit and remove search engines..." -msgstr "Pridáva, upravuje a maže vyhľadávacie moduly..." - -#: ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:5381 msgid "_Clear Private Data" msgstr "_Odstrániť súkromné údaje" -#: ../midori/midori-browser.c:5326 -msgid "Clear private data..." -msgstr "Odstráni súkromné údaje..." - -#: ../midori/midori-browser.c:5330 +#: ../midori/midori-browser.c:5384 msgid "_Inspect Page" msgstr "_Preskúmať stránku" -#: ../midori/midori-browser.c:5331 -msgid "Inspect page details and access developer tools..." -msgstr "" - -#: ../midori/midori-browser.c:5336 +#: ../midori/midori-browser.c:5388 msgid "_Previous Tab" msgstr "_Predchádzajúca karta" -#: ../midori/midori-browser.c:5337 -msgid "Switch to the previous tab" -msgstr "Prepnúť na predchádzajúcu kartu" - -#: ../midori/midori-browser.c:5339 +#: ../midori/midori-browser.c:5391 msgid "_Next Tab" msgstr "_Ďalšia karta" -#: ../midori/midori-browser.c:5340 -msgid "Switch to the next tab" -msgstr "Prepnúť na nasledujúcu kartu" +#: ../midori/midori-browser.c:5393 +msgid "Move Tab _Backward" +msgstr "Presunúť kartu do_zadu" + +#: ../midori/midori-browser.c:5395 +msgid "_Move Tab Forward" +msgstr "Presunúť kartu do_predu" -#: ../midori/midori-browser.c:5342 +#: ../midori/midori-browser.c:5398 msgid "Focus _Current Tab" msgstr "Zamerať _aktuálnu kartu" -#: ../midori/midori-browser.c:5343 -msgid "Focus the current tab" -msgstr "Zameria aktuálnu kartu" +#: ../midori/midori-browser.c:5401 +msgid "Focus _Next view" +msgstr "Prepnúť _na ďalšiu" + +#: ../midori/midori-browser.c:5404 +msgid "Only show the Icon of the _Current Tab" +msgstr "Zobraziť iba ikonu a_ktuálnej karty" -#: ../midori/midori-browser.c:5345 +#: ../midori/midori-browser.c:5407 +msgid "_Duplicate Current Tab" +msgstr "Z_dvojiť aktuálnu kartu" + +#: ../midori/midori-browser.c:5410 +msgid "Close Ot_her Tabs" +msgstr "_Zatvoriť ostatné karty" + +#: ../midori/midori-browser.c:5413 msgid "Open last _session" msgstr "Otvoriť posledné _sedenie" -#: ../midori/midori-browser.c:5346 -msgid "Open the tabs saved in the last session" -msgstr "Otvorí karty uložené pri poslednom sedení" - -#: ../midori/midori-browser.c:5348 +#: ../midori/midori-browser.c:5416 msgid "_Help" msgstr "_Pomocník" -#: ../midori/midori-browser.c:5350 -msgid "_Contents" -msgstr "_Obsah pomocníka" - -#: ../midori/midori-browser.c:5351 -msgid "Show the documentation" -msgstr "Zobraziť dokumentáciu" - -#: ../midori/midori-browser.c:5353 +#: ../midori/midori-browser.c:5418 msgid "_Frequent Questions" msgstr "_Časté otázky" -#: ../midori/midori-browser.c:5354 -msgid "Show the Frequently Asked Questions" -msgstr "Zobraziť Často kladené otázky" - -#: ../midori/midori-browser.c:5356 -msgid "_Report a Bug" +#: ../midori/midori-browser.c:5421 +msgid "_Report a Problem..." msgstr "_Ohlásiť chybu" -#: ../midori/midori-browser.c:5357 -msgid "Open Midori's bug tracker" -msgstr "Otvorí stránku pre hlásenie chýb" - -#: ../midori/midori-browser.c:5360 -msgid "Show information about the program" -msgstr "Zobrazí informácie o programe" - -#: ../midori/midori-browser.c:5368 +#: ../midori/midori-browser.c:5433 msgid "_Menubar" msgstr "Panel _ponuky" -#: ../midori/midori-browser.c:5369 -msgid "Show menubar" -msgstr "Zobraziť panel ponuky" - -#: ../midori/midori-browser.c:5372 +#: ../midori/midori-browser.c:5437 msgid "_Navigationbar" msgstr "_Navigačný panel" -#: ../midori/midori-browser.c:5373 -msgid "Show navigationbar" -msgstr "Zobraziť navigačný panel" - -#: ../midori/midori-browser.c:5376 +#: ../midori/midori-browser.c:5441 msgid "Side_panel" msgstr "_Bočný panel" -#: ../midori/midori-browser.c:5377 -msgid "Show sidepanel" -msgstr "Zobraziť bočný panel" +#: ../midori/midori-browser.c:5442 +msgid "Sidepanel" +msgstr "Bočný panel" -#: ../midori/midori-browser.c:5380 +#: ../midori/midori-browser.c:5445 msgid "_Bookmarkbar" msgstr "Panel _záložiek" -#: ../midori/midori-browser.c:5381 -msgid "Show bookmarkbar" -msgstr "Zobraziť panel záložiek" - -#: ../midori/midori-browser.c:5384 -msgid "_Transferbar" -msgstr "Stav _prenosu" - -#: ../midori/midori-browser.c:5385 -msgid "Show transferbar" -msgstr "Zobraziť stav prenosu dát" - -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:5449 msgid "_Statusbar" msgstr "_Stavový riadok" -#: ../midori/midori-browser.c:5389 -msgid "Show statusbar" -msgstr "Zobraziť stavový riadok" - -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311 msgid "_Automatic" msgstr "_Automatické" -#: ../midori/midori-browser.c:5400 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236 msgid "Chinese (BIG5)" msgstr "Čínske (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5404 +#: ../midori/midori-browser.c:5465 msgid "Japanese (SHIFT__JIS)" msgstr "Japonské (SHIFT_JIS)" -#: ../midori/midori-browser.c:5407 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238 msgid "Korean (EUC-KR)" msgstr "Kórejské (EUC-KR)" -#: ../midori/midori-browser.c:5410 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239 msgid "Russian (KOI8-R)" msgstr "Ruské (KOI8-R)" -#: ../midori/midori-browser.c:5413 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5416 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241 msgid "Western (ISO-8859-1)" msgstr "Západné (ISO-8859-1)" -#: ../midori/midori-browser.c:5950 -msgid "_Separator" +#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "Vlastné..." + +#: ../midori/midori-browser.c:5985 +msgid "_Separator" msgstr "_Oddeľovač" -#: ../midori/midori-browser.c:5957 +#: ../midori/midori-browser.c:5992 msgid "_Location..." msgstr "_Umiestnenie..." -#: ../midori/midori-browser.c:5959 +#: ../midori/midori-browser.c:5994 msgid "Open a particular location" msgstr "Otvoriť umiestnenie" -#: ../midori/midori-browser.c:5983 +#: ../midori/midori-browser.c:6016 msgid "_Web Search..." msgstr "_Hľadať na webe..." -#: ../midori/midori-browser.c:5985 +#: ../midori/midori-browser.c:6018 msgid "Run a web search" msgstr "Spustí vyhľadávanie na webe" -#: ../midori/midori-browser.c:6006 +#: ../midori/midori-browser.c:6045 msgid "Reopen a previously closed tab or window" msgstr "Znovu otvoriť zatvorenú kartu alebo okno" -#: ../midori/midori-browser.c:6021 -msgid "_Recently visited pages" -msgstr "_Nedávno navštívené stránky" - -#: ../midori/midori-browser.c:6023 -msgid "Reopen pages that you visited earlier" -msgstr "Znovu otvorí stránky, ktoré ste už navštívili" - -#: ../midori/midori-browser.c:6038 ../midori/sokoke.c:1288 -msgid "_Bookmarks" -msgstr "_Záložky" - -#: ../midori/midori-browser.c:6040 +#: ../midori/midori-browser.c:6062 msgid "Show the saved bookmarks" msgstr "Zobrazí uložené záložky" -#: ../midori/midori-browser.c:6055 +#: ../midori/midori-browser.c:6079 msgid "_Tools" msgstr "_Nástroje" -#: ../midori/midori-browser.c:6068 +#: ../midori/midori-browser.c:6095 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:6070 +#: ../midori/midori-browser.c:6097 msgid "Show a list of all open tabs" msgstr "Zobraziť zoznam všetkých otvorených kariet" -#: ../midori/midori-browser.c:6084 +#: ../midori/midori-browser.c:6111 msgid "_Menu" msgstr "_Ponuka" -#: ../midori/midori-browser.c:6086 +#: ../midori/midori-browser.c:6113 msgid "Menu" msgstr "_Ponuka" -#: ../midori/midori-browser.c:6667 +#: ../midori/midori-browser.c:6927 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočakávané nastavenie '%s'" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-extension.c:329 #, c-format -msgid "Failed to select from history\n" -msgstr "Nepodarilo sa vybrať z histórie\n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "Nastavenie rozšírenia '%s' nemôže byť načítané: %s\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "Hľadať %s" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Nastavenie rozšírenia '%s' nemôže byť uložené: %s\n" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "Hľadať s %s" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Hľadať pomocou..." + +#: ../midori/midori-locationaction.c:537 +#, c-format +msgid "Failed to select from history\n" +msgstr "Nepodarilo sa vybrať z histórie\n" + +#: ../midori/midori-locationaction.c:624 #, c-format -msgid "Failed to execute database statement\n" -msgstr "Nepodarilo sa spustiť databázový príkaz\n" +msgid "Search for %s" +msgstr "Hľadať %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1398 msgid "Paste and p_roceed" msgstr "Vložiť a s_pustiť" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 -msgid "Detach chosen panel from the window" -msgstr "Oddeliť vybraný panel od okna" +#: ../midori/midori-locationaction.c:1739 +msgid "Not verified" +msgstr "Neoverené" + +#: ../midori/midori-locationaction.c:1759 +msgid "Verified and encrypted connection" +msgstr "Overené a zabezpečené spojenie" + +#: ../midori/midori-locationaction.c:1771 +msgid "Open, unencrypted connection" +msgstr "Otvorené a nezabezpečené spojenie" -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" msgstr "Umiestnenie bočného panelu vpravo" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Zatvoriť panel" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Umiestnenie bočného panelu vľavo" -#: ../midori/midori-panel.c:802 -msgid "Hide operating controls" -msgstr "Schovať ovládacie prvky" - -#: ../midori/midori-websettings.c:204 -msgid "Show Blank page" -msgstr "Zobraziť prázdnu stránku" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "Zobraziť rýchly prístup" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" msgstr "Zobraziť domovskú stránku" -#: ../midori/midori-websettings.c:206 -msgid "Show last open tabs" -msgstr "Zobraziť naposledy otvorené karty" - -#: ../midori/midori-websettings.c:207 -msgid "Show last tabs without loading" -msgstr "Zobraziť naposledy otvorené karty bez načítania" - -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:237 msgid "Japanese (SHIFT_JIS)" msgstr "Japonské (SHIFT_JIS)" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:257 msgid "New tab" -msgstr "na novú kartu" +msgstr "novej karte" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:258 msgid "New window" -msgstr "v novom okne" +msgstr "novom okne" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:259 msgid "Current tab" -msgstr "na otvorenej karte" +msgstr "aktuálnej karte" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:274 msgid "Default" msgstr "Predvolený" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:275 msgid "Icons" msgstr "Ikony" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:276 msgid "Small icons" msgstr "Malé ikony" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:277 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:278 msgid "Icons and text" msgstr "Ikony a text" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:279 msgid "Text beside icons" msgstr "Text pod ikonami" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:294 msgid "Automatic (GNOME or environment)" msgstr "Automaticky (GNOME alebo iné prostredie)" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:295 msgid "HTTP proxy server" msgstr "HTTTP proxy server" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:296 msgid "No proxy server" msgstr "Žiadny" -#: ../midori/midori-websettings.c:297 -msgid "All cookies" -msgstr "Všetky cookies" - -#: ../midori/midori-websettings.c:298 -msgid "Session cookies" -msgstr "Cookies sedenia" - -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 -msgid "None" -msgstr "Žiadne" - -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:400 msgid "Remember last window size" msgstr "Zapamätať si poslednú veľkosť okna" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:401 msgid "Whether to save the last window size" -msgstr "Prajete si ukladať poslednú veľkosť okna?" +msgstr "Či ukladať poslednú veľkosť okna" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:409 msgid "Last window width" msgstr "Posledná šírka okna" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:410 msgid "The last saved window width" msgstr "Naposledy uložená šírka okna" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:418 msgid "Last window height" msgstr "Posledná výška okna" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:419 msgid "The last saved window height" msgstr "Naposledy uložená výška okna" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:444 msgid "Last panel position" msgstr "Posledná pozícia panela" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:445 msgid "The last saved panel position" msgstr "Uložená posledná pozícia panela" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:454 msgid "Last panel page" msgstr "Posledná stránka panelu" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:455 msgid "The last saved panel page" msgstr "Posledná uložená stránka panala" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:463 msgid "Last Web search" msgstr "Rýchle hľadanie na webe" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:464 msgid "The last saved Web search" -msgstr "" +msgstr "Uložené posledné vyhľadávanie na webe" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:473 msgid "Show Menubar" msgstr "Zobraziť panel pouky" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:474 msgid "Whether to show the menubar" -msgstr "Zobrazovať ponuku?" +msgstr "Či Zobrazovať ponuku" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:482 msgid "Show Navigationbar" msgstr "Zobraziť vyhľadávaciu lištu" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:483 msgid "Whether to show the navigationbar" -msgstr "Zobrazovať vyhľadávaciu lištu?" +msgstr "Či zobrazovať vyhľadávaciu lištu" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:491 msgid "Show Bookmarkbar" msgstr "Zobraziť záložky" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:492 msgid "Whether to show the bookmarkbar" -msgstr "Zobrazovať panel záložiek?" +msgstr "Či zobrazovať panel záložiek" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:500 msgid "Show Panel" msgstr "Zobraziť panel" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:501 msgid "Whether to show the panel" -msgstr "Má sa zobrazovať panel?" - -#: ../midori/midori-websettings.c:487 -msgid "Show Transferbar" -msgstr "Zobraziť stav prenosu" - -#: ../midori/midori-websettings.c:488 -msgid "Whether to show the transferbar" -msgstr "" +msgstr "Či zobrazovať panel" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:509 msgid "Show Statusbar" msgstr "Zobraziť stavový riadok" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:510 msgid "Whether to show the statusbar" -msgstr "" +msgstr "Či zobraziť stavový riadok" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:519 msgid "Toolbar Style:" msgstr "Štýl panelu s nástrojmi:" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:520 msgid "The style of the toolbar" -msgstr "" +msgstr "Štýl panelu s nástrojmi" -#: ../midori/midori-websettings.c:523 -msgid "Show progress in location entry" -msgstr "Zobraziť priebeh v riadku adresy" - -#: ../midori/midori-websettings.c:524 -msgid "Whether to show loading progress in the location entry" -msgstr "" - -#: ../midori/midori-websettings.c:539 -msgid "Search engines in location completion" -msgstr "Zobrazovať výsledky hľadania pri zadávaní adresy" - -#: ../midori/midori-websettings.c:540 -msgid "Whether to show search engines in the location completion" -msgstr "Zobrazovanie výsledkov vyhľadávania pri zadávaní adresy" - -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:529 msgid "Toolbar Items" msgstr "Položky panelu nástrojov" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:530 msgid "The items to show on the toolbar" msgstr "Položky, ktoré sa budú zobrazovať na paneli nástrojov" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:538 msgid "Compact Sidepanel" msgstr "Kompaktný bočný panel" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:539 msgid "Whether to make the sidepanel compact" -msgstr "Má sa zobrazovať bočný panel kompaktne?" - -#: ../midori/midori-websettings.c:573 -msgid "Show operating controls of the panel" -msgstr "Zobraziť zoznam nástrojov" - -#: ../midori/midori-websettings.c:574 -msgid "Whether to show the operating controls of the panel" -msgstr "Má zobrazovať zoznam nástrojov?" +msgstr "Či zobrazovať bočný panel kompaktne" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:554 msgid "Align sidepanel on the right" msgstr "Umiestniť bočný panel vpravo" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:555 msgid "Whether to align the sidepanel on the right" -msgstr "Presunúť bočný panel na opačnú stranu" +msgstr "Či presunúť bočný panel na opačnú stranu" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:570 msgid "Open panels in separate windows" msgstr "Otvoriť panely v samostatných oknách" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:571 msgid "Whether to always open panels in separate windows" -msgstr "" +msgstr "Či otvoriť panel v samostatnom okne" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:580 msgid "When Midori starts:" msgstr "Pri spustení Midori:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:581 msgid "What to do when Midori starts" msgstr "Čo robiť pri spustení Midori?" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:590 msgid "Homepage:" msgstr "Domovská stránka:" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:591 msgid "The homepage" msgstr "Domovská stránka" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:606 msgid "Show crash dialog" msgstr "Zobraziť dialóg po spadnutí" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:607 msgid "Show a dialog after Midori crashed" msgstr "Zobrazí dialóg po spadnutí Midori" -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:658 -msgid "Show speed dial in new tabs" -msgstr "Zobraziť rýchly prístup na nových kartách" - -#: ../midori/midori-websettings.c:659 -msgid "Show speed dial in newly opened tabs" -msgstr "Zobrazí rýchly prístup v novo otvorených kartách" - -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:615 msgid "Save downloaded files to:" msgstr "Uložiť stiahnuté súbory do:" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:616 msgid "The folder downloaded files are saved to" msgstr "Priečinok, do ktorého sa búdu ukladať stiahnuté súbory" -#: ../midori/midori-websettings.c:689 -msgid "Ask for the destination folder" -msgstr "Spýtať sa na cieľový priečinok" - -#: ../midori/midori-websettings.c:690 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "" - -#: ../midori/midori-websettings.c:709 -msgid "Notify when a transfer has been completed" -msgstr "Upozorniť po dokončení prenosu" - -#: ../midori/midori-websettings.c:710 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "" - -#: ../midori/midori-websettings.c:722 -msgid "Download Manager" -msgstr "Správca sťahovania" - -#: ../midori/midori-websettings.c:723 -msgid "An external download manager" -msgstr "Externý správca sťahovania" - -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:624 msgid "Text Editor" msgstr "Textový editor" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:625 msgid "An external text editor" msgstr "Externý textový editor" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:640 msgid "News Aggregator" msgstr "Čítačka RSS" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:641 msgid "An external news aggregator" msgstr "Externá čítačka správ RSS" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:649 msgid "Location entry Search" msgstr "Vyhľadávanie v adresnom riadku" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:650 msgid "The search to perform inside the location entry" msgstr "Vyhľadávanie použité v riadku s adresou" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:658 msgid "Preferred Encoding" msgstr "Preferované kódovanie" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:659 msgid "The preferred character encoding" msgstr "Preferované kódovanie znakov" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:669 msgid "Always Show Tabbar" msgstr "Vždy zobrazovať karty" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:670 msgid "Always show the tabbar" msgstr "Vždy zobrazí panel kariet" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:683 msgid "Close Buttons on Tabs" msgstr "Zatváracie tlačidlá na kartách" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:684 msgid "Whether tabs have close buttons" -msgstr "Zobrazí zatváracie tlačidlá na kartách" +msgstr "Či zobraziť zatváracie tlačidlá na kartách" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:709 msgid "Open new pages in:" msgstr "Otvárať nové stránky v:" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:710 msgid "Where to open new pages" msgstr "Kde sa budú otvárať nové stránky" -#: ../midori/midori-websettings.c:804 -msgid "Open external pages in:" -msgstr "Otvárať externé stránky v:" - -#: ../midori/midori-websettings.c:805 -msgid "Where to open externally opened pages" -msgstr "Kde sa budú otvárať externé stránky" - -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:719 msgid "Middle click opens Selection" msgstr "Kliknutím prostredného. tlačítka otvoriť vybraný text" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:720 msgid "Load an address from the selection via middle click" msgstr "Prostredné tlačítko myši otvorí adresu, ktorá je vo vybranom texte" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:728 msgid "Open tabs in the background" msgstr "Otvárať karty na pozadí" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:729 msgid "Whether to open new tabs in the background" -msgstr "Otvorené karty sa otvárajú na pozadí" +msgstr "Či otvorené karty otvárať na pozadí" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:737 msgid "Open Tabs next to Current" msgstr "Otvoriť karty vedľa aktívnej" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:738 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Nová karta sa otvorí vedľa aktívnej" +msgstr "Či novú kartu otvárať vedľa aktívnej" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:746 msgid "Open popups in tabs" msgstr "Otvárať vyskakujúce okná na kartách" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:747 msgid "Whether to open popup windows in tabs" -msgstr "Vyskakovacie okno sa otvorí v novej karte" +msgstr "Či vyskakovacie okno otvárať v novej karte" -#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Automaticky načítať obrázky" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:758 msgid "Load and display images automatically" msgstr "Načíta a zobrazí obrázky automaticky" -#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 msgid "Enable scripts" msgstr "Povoliť skripty" -#: ../midori/midori-websettings.c:861 +#: ../midori/midori-websettings.c:766 msgid "Enable embedded scripting languages" msgstr "Povolí vložené skriptové jazyky" -#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" msgstr "Povoliť pluginy z Netscape (Mozilly)" -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:774 msgid "Enable embedded Netscape plugin objects" msgstr "Povolí pluginové objekty prehliadača Netscape (Mozilla)" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:789 +msgid "Enable Spell Checking" +msgstr "Povoliť kontrolu pravopisu" + +#: ../midori/midori-websettings.c:790 +msgid "Enable spell checking while typing" +msgstr "Povolí kontrolu pravopisu pri písaní" + +#: ../midori/midori-websettings.c:796 msgid "Enable HTML5 database support" msgstr "Povoliť podporu databázy HTML5" -#: ../midori/midori-websettings.c:886 +#: ../midori/midori-websettings.c:797 msgid "Whether to enable HTML5 database support" -msgstr "Či povoliť databázu HTML5" +msgstr "Či povoliť podporu databázy HTML5" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:803 msgid "Enable HTML5 local storage support" msgstr "Povoliť miestne úložisko pre HTML5" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:804 msgid "Whether to enable HTML5 local storage support" msgstr "Či povoliť miestne úložisko dát pre HTML5" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:810 msgid "Enable offline web application cache" msgstr "Povoliť cache pre offline aplikácie" -#: ../midori/midori-websettings.c:902 +#: ../midori/midori-websettings.c:811 msgid "Whether to enable offline web application cache" -msgstr "" +msgstr "Či povoliť používanie vyrovnávacej pamäte pre offline aplikácie" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:827 +msgid "Flash window on background tabs" +msgstr "Zablysnúť oknom prehliadača pri kartách na pozadí" + +#: ../midori/midori-websettings.c:828 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "Zablysnúť oknom prehliadača, ak je na pozadí otvorená nová karta" + +#: ../midori/midori-websettings.c:836 +msgid "Enable WebGL support" +msgstr "Povoliť podporu WebGL" + +#: ../midori/midori-websettings.c:837 +msgid "Allow websites to use OpenGL rendering" +msgstr "Povoliť webovým stránkam používať vykresľovanie pomocou OpenGL" + +#: ../midori/midori-websettings.c:863 msgid "Zoom Text and Images" msgstr "Zväčšovať text aj obrázky" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:864 msgid "Whether to zoom text and images" -msgstr "Upravovať text aj obrázky pri menení veľkosti?" +msgstr "Či upravovať text aj obrázky pri menení veľkosti" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:879 msgid "Find inline while typing" msgstr "Hľadať pri písaní" -#: ../midori/midori-websettings.c:944 +#: ../midori/midori-websettings.c:880 msgid "Whether to automatically find inline while typing" -msgstr "Hľadať text pri písaní?" +msgstr "Či hľadať text pri písaní" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:895 msgid "Kinetic scrolling" msgstr "Kinetické rolovanie" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:896 msgid "Whether scrolling should kinetically move according to speed" -msgstr "Má sa naklonením zariadenia rolovať?" - -#: ../midori/midori-websettings.c:968 -msgid "Accept cookies" -msgstr "Povoliť cookies" - -#: ../midori/midori-websettings.c:969 -msgid "What type of cookies to accept" -msgstr "Ktorý typ cookies prijímať" - -#: ../midori/midori-websettings.c:985 -msgid "Original cookies only" -msgstr "Len originálne cookies" +msgstr "Či naklonením zariadenia rolovať" -#: ../midori/midori-websettings.c:986 -msgid "Accept cookies from the original website only" -msgstr "" - -#: ../midori/midori-websettings.c:994 -msgid "Maximum cookie age" -msgstr "Uchovávať cookies maximálne" +#: ../midori/midori-websettings.c:904 +msgid "Delete old Cookies after:" +msgstr "Zmazať staré cookies po:" -#: ../midori/midori-websettings.c:995 +#: ../midori/midori-websettings.c:905 msgid "The maximum number of days to save cookies for" msgstr "Maximálny počet dní, pre ktoré sú cookies platné" -#: ../midori/midori-websettings.c:1012 -msgid "Remember last visited pages" -msgstr "Zapamätať si naposledy navštívené stránky" - -#: ../midori/midori-websettings.c:1013 -msgid "Whether the last visited pages are saved" -msgstr "" +#: ../midori/midori-websettings.c:921 +msgid "Only accept Cookies from sites you visit" +msgstr "Prijať cookies len z navštívených stránok" + +#: ../midori/midori-websettings.c:922 +msgid "Block cookies sent by third-party websites" +msgstr "Zablokovať cookies odoslané stránkami tretích strán" + +#: ../midori/midori-websettings.c:936 +msgid "Delete pages from history after:" +msgstr "Zmazať stránky z histórie po:" -#: ../midori/midori-websettings.c:1021 -msgid "Maximum history age" -msgstr "Maximálna dĺžka histórie" - -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:937 msgid "The maximum number of days to save the history for" -msgstr "" - -#: ../midori/midori-websettings.c:1030 -msgid "Remember last downloaded files" -msgstr "Pamätať si naposledy stiahnuté súbory" +msgstr "Maximálny počet dní, do ktorých sú cookies platné" -#: ../midori/midori-websettings.c:1031 -msgid "Whether the last downloaded files are saved" -msgstr "Poli pamätanie si zoznam súborov, ktoré boli naposledy stiahnuté" - -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:952 msgid "Proxy server" msgstr "Proxy server" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:953 msgid "The type of proxy server to use" msgstr "Typ proxy servera" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:962 msgid "HTTP Proxy Server" msgstr "HTTP proxy server" -#: ../midori/midori-websettings.c:1059 +#: ../midori/midori-websettings.c:963 msgid "The proxy server used for HTTP connections" msgstr "Nastavenie proxy serveru pre HTTP spojenie" -#: ../midori/midori-websettings.c:1074 -msgid "Detect proxy server automatically" -msgstr "Zistiť proxy server automaticky" - -#: ../midori/midori-websettings.c:1075 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Povolí automatické zisťovanie proxy servera" +#: ../midori/midori-websettings.c:978 +msgid "Port" +msgstr "Port" + +#: ../midori/midori-websettings.c:979 +msgid "The proxy server port used for HTTP connections" +msgstr "Nastavenie portu proxy servera pre HTTP spojenie" + +#: ../midori/midori-websettings.c:997 +msgid "The maximum size of cached pages on disk" +msgstr "Maximálna veľkosť vyrovnávacej pamäte stránok na disku" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1014 msgid "Identify as" msgstr "Identifikovať sa ako" -#: ../midori/midori-websettings.c:1092 +#: ../midori/midori-websettings.c:1015 msgid "What to identify as to web pages" msgstr "Ako sa hlási webovým stránkam" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1031 msgid "Identification string" msgstr "Identifikačný reťazec" -#: ../midori/midori-websettings.c:1109 +#: ../midori/midori-websettings.c:1032 msgid "The application identification string" msgstr "Identifikačný reťazec aplikácie" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1048 msgid "Preferred languages" msgstr "Uprednostňované jazyky" -#: ../midori/midori-websettings.c:1125 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +#: ../midori/midori-websettings.c:1049 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "" +"Čiarkou oddelený zoznam jazykov pre viacjazyčné weby, napríklad \"de\", \"ru," +"nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1064 msgid "Clear private data" msgstr "Odstrániť súkromné údaje" -#: ../midori/midori-websettings.c:1141 +#: ../midori/midori-websettings.c:1065 msgid "The private data selected for deletion" msgstr "Osobné dáta boli označené k vymazaniu" -#. 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:1261 ../midori/midori-view.c:4567 -#: ../midori/midori-view.c:4571 +#: ../midori/midori-websettings.c:1080 +msgid "Clear data" +msgstr "Vymazať dáta" + +#: ../midori/midori-websettings.c:1081 +msgid "The data selected for deletion" +msgstr "Dáta, ktoré budú vymazané" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1130 +msgid "Strip referrer details sent to websites" +msgstr "Odstrániť detaily z referrer pri odosielaní" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1132 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Či skrátiť položku \"Referer\" v hlavičke len na názov webu" + +#: ../midori/midori-websettings.c:1146 +msgid "Always use my font choices" +msgstr "Vždy použiť môj výber písma" + +#: ../midori/midori-websettings.c:1147 +msgid "Override fonts picked by websites with user preferences" +msgstr "" +"Prepísať písma vybrané webovými stránkami s písmom predvoleným používateľom" + +#: ../midori/midori-view.c:1360 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s požaduje uloženie dát do HTML5 databázy." + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Deny" +msgstr "_Zakázať" + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Allow" +msgstr "_Povoliť" + +#: ../midori/midori-view.c:1392 +#, c-format +msgid "%s wants to know your location." +msgstr "%s požaduje zistenie Vašej polohy." + +#: ../midori/midori-view.c:1485 #, c-format msgid "Error - %s" msgstr "Chyba - %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1486 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Stránka '%s' sa nedá načítať." -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1488 msgid "Try again" msgstr "Skúsiť znovu" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 -#, c-format -msgid "Not found - %s" -msgstr "Nenašlo sa - %s" - -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598 #, c-format msgid "Send a message to %s" msgstr "Poslať %s správu" -#: ../midori/midori-view.c:2147 ../midori/midori-view.c:2532 +#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747 msgid "Inspect _Element" msgstr "Preskúmať _prvok" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2269 +#: ../midori/midori-view.c:2480 msgid "Open Link in New _Tab" msgstr "Otvoriť odkaz na novej _karte" -#: ../midori/midori-view.c:2203 -#, fuzzy +#: ../midori/midori-view.c:2484 msgid "Open Link in _Foreground Tab" -msgstr "Otvoriť odkaz na novej _karte" +msgstr "Otvoriť odkaz v novej _karte" -#: ../midori/midori-view.c:2204 +#: ../midori/midori-view.c:2485 msgid "Open Link in _Background Tab" msgstr "Otvoriť odkaz v novej karte na pozadí" -#: ../midori/midori-view.c:2207 ../midori/midori-view.c:2276 +#: ../midori/midori-view.c:2488 msgid "Open Link in New _Window" msgstr "Otvoriť odkaz v novom _okne" -#: ../midori/midori-view.c:2210 +#: ../midori/midori-view.c:2491 msgid "Open Link as Web A_pplication" msgstr "Otvoriť odkaz ako _webovú aplikáciu" -#: ../midori/midori-view.c:2213 +#: ../midori/midori-view.c:2496 msgid "Copy Link de_stination" msgstr "Kopírovať _cieľ odkazu" -#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2288 -msgid "_Save Link destination" -msgstr "_Uložiť cieľ odkazu" - -#: ../midori/midori-view.c:2217 ../midori/midori-view.c:2282 -msgid "_Download Link destination" -msgstr "_Stiahnuť cieľ odkazu" - -#: ../midori/midori-view.c:2221 ../midori/midori-view.c:2251 -#: ../midori/midori-view.c:2293 -msgid "Download with Download _Manager" -msgstr "Stiahnuť pomocou _správcu sťahovania" - -#: ../midori/midori-view.c:2230 +#: ../midori/midori-view.c:2512 msgid "Open _Image in New Tab" msgstr "Otvoriť _obrázok na novej karte" -#: ../midori/midori-view.c:2233 +#: ../midori/midori-view.c:2515 msgid "Copy Image _Address" msgstr "Kopírovať _adresu obrázka" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2518 msgid "Save I_mage" msgstr "Uložiť _obrázok" -#: ../midori/midori-view.c:2237 -msgid "Download I_mage" -msgstr "Stiahnuť o_brázok" +#: ../midori/midori-view.c:2521 +msgid "Open in Image _Viewer" +msgstr "Otvoriť obrázok v prehliadači _obrázkov" -#: ../midori/midori-view.c:2244 +#: ../midori/midori-view.c:2528 msgid "Copy Video _Address" msgstr "Kopírovať _adresu videa" -#: ../midori/midori-view.c:2247 +#: ../midori/midori-view.c:2531 msgid "Save _Video" msgstr "Uložiť _video" -#: ../midori/midori-view.c:2247 +#: ../midori/midori-view.c:2531 msgid "Download _Video" msgstr "Stiahnuť v_ideo" -#: ../midori/midori-view.c:2310 +#: ../midori/midori-view.c:2557 msgid "Search _with" msgstr "Hľadať _pomocou" -#: ../midori/midori-view.c:2345 ../midori/midori-view.c:2352 +#: ../midori/midori-view.c:2589 msgid "_Search the Web" msgstr "_Hľadať na webe" -#: ../midori/midori-view.c:2373 +#: ../midori/midori-view.c:2606 msgid "Open Address in New _Tab" msgstr "Otvoriť adresu v novej karte" -#: ../midori/midori-view.c:2674 +#: ../midori/midori-view.c:2909 msgid "Open or download file" msgstr "Otvoriť alebo stiahnuť súbor" -#: ../midori/midori-view.c:2693 +#: ../midori/midori-view.c:2929 #, c-format msgid "File Type: '%s'" msgstr "Typ súboru: '%s'" -#: ../midori/midori-view.c:2696 +#: ../midori/midori-view.c:2931 #, c-format msgid "File Type: %s ('%s')" msgstr "Typ súboru: %s ('%s')" -#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2700 +#: ../midori/midori-view.c:2935 +#, c-format +msgid "File Name: %s" +msgstr "Typ súboru: %s" + +#: ../midori/midori-view.c:2955 #, c-format msgid "Open %s" msgstr "Otvoriť %s" -#: ../midori/midori-view.c:3244 +#: ../midori/midori-view.c:3576 #, c-format msgid "Inspect page - %s" msgstr "Inšpekcia stránky - %s" -#: ../midori/midori-view.c:3526 -msgid "Speed dial" +#: ../midori/midori-view.c:3923 +msgid "Speed Dial" msgstr "Rýchly prístup" -#: ../midori/midori-view.c:3527 +#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020 msgid "Click to add a shortcut" msgstr "Kliknite pre pridanie odkazu" -#: ../midori/midori-view.c:3528 +#: ../midori/midori-view.c:3925 msgid "Enter shortcut address" msgstr "Zadajte adresu skratky" -#: ../midori/midori-view.c:3529 +#: ../midori/midori-view.c:3926 msgid "Enter shortcut title" msgstr "Zadajte titulok skratky" -#: ../midori/midori-view.c:3530 +#: ../midori/midori-view.c:3927 msgid "Are you sure you want to delete this shortcut?" msgstr "Naozaj chcete zmazať túto záložku?" -#: ../midori/midori-view.c:3531 -msgid "Set number of columns and rows" -msgstr "Zmeniť počet stĺpcov a riadkov" +#: ../midori/midori-view.c:4089 +#, c-format +msgid "No documentation installed" +msgstr "Dokumentácia nie je nainštalovaná" -#: ../midori/midori-view.c:3532 -msgid "Enter number of columns and rows:" -msgstr "Vložte počet stĺpcov a riadkov" +#: ../midori/midori-view.c:4165 +msgid "Midori doesn't store any personal data:" +msgstr "Midori neukladá žiadne osobné dáta:" -#: ../midori/midori-view.c:3533 -msgid "Invalid input for the size of the speed dial" +#: ../midori/midori-view.c:4166 +msgid "No history or web cookies are being saved." +msgstr "Neukladá sa história ani cookies." + +#: ../midori/midori-view.c:4167 +msgid "Extensions are disabled." +msgstr "Rozšírenia sú vypnuté." + +#: ../midori/midori-view.c:4168 +msgid "HTML5 storage, local database and application caches are disabled." msgstr "" +"Úložisko HTML5, miestna databáza a dočasná pamäť aplikácie sú zakázané." -#: ../midori/midori-view.c:3534 -msgid "Thumb size:" -msgstr "Veľkosť náhľadov:" +#: ../midori/midori-view.c:4169 +msgid "Midori prevents websites from tracking the user:" +msgstr "Midori odmieta sledovanie používateľa zo stránok:" -#: ../midori/midori-view.c:3535 -msgid "Small" -msgstr "Malá" +#: ../midori/midori-view.c:4170 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "Z URL sú odstránené údaje o odkazoch." -#: ../midori/midori-view.c:3536 -msgid "Medium" -msgstr "Stredná" +#: ../midori/midori-view.c:4171 +msgid "DNS prefetching is disabled." +msgstr "Prednačítanie DNS záznamov je zakázané." -#: ../midori/midori-view.c:3537 -msgid "Big" -msgstr "Veľká" +#: ../midori/midori-view.c:4172 +msgid "The language and timezone are not revealed to websites." +msgstr "Stránkam nie sú poskytované údaje o jazyku a časovom pásme." -#: ../midori/midori-view.c:3563 -#, c-format -msgid "Document cannot be displayed" -msgstr "Dokument nemôže byť zobrazený" +#: ../midori/midori-view.c:4173 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "Stránky nemôžu získať zoznam zásuvných modulov." -#: ../midori/midori-view.c:3586 -#, c-format -msgid "No documentation installed" -msgstr "Dokumentácia nie je nainštalovaná" +#: ../midori/midori-view.c:4222 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "Čísla verzií v zátvorke sú verzie použité pri behu programu." -#: ../midori/midori-view.c:3707 +#: ../midori/midori-view.c:4278 msgid "Page loading delayed" -msgstr "" +msgstr "Načítanie stránky oneskorené" -#: ../midori/midori-view.c:3708 +#: ../midori/midori-view.c:4279 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" +"Načítanie stránky bolo oneskorené kvôli pádu aplikácie, alebo preto, že je " +"to tak nastavené-" -#: ../midori/midori-view.c:3709 +#: ../midori/midori-view.c:4280 msgid "Load Page" -msgstr "" +msgstr "Načítať stránku" -#: ../midori/midori-view.c:3853 +#: ../midori/midori-view.c:4446 msgid "Blank page" msgstr "Prázdnu stránku" -#: ../midori/midori-view.c:4107 +#: ../midori/midori-view.c:4708 msgid "_Duplicate Tab" msgstr "Z_dvojiť kartu" -#: ../midori/midori-view.c:4112 -msgid "_Restore Tab" -msgstr "_Obnoviť kartu" - -#: ../midori/midori-view.c:4112 -msgid "_Minimize Tab" -msgstr "_Minimalizovať kartu" +#: ../midori/midori-view.c:4713 +msgid "Show Tab _Label" +msgstr "Zobraziť _popisok karty" + +#: ../midori/midori-view.c:4713 +msgid "Show Tab _Icon Only" +msgstr "Zobraziť len _ikonu karty" -#: ../midori/midori-view.c:4118 +#: ../midori/midori-view.c:4719 msgid "Close ot_her Tabs" msgstr "_Zatvorí ostatné karty" -#: ../midori/midori-view.c:4804 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5532 +msgid "previous" +msgstr "predchádzajúce" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5551 +msgid "next" +msgstr "nasledujúce" + +#: ../midori/midori-view.c:5564 msgid "Print background images" msgstr "Tlačiť obrázky na pozadí" -#: ../midori/midori-view.c:4805 +#: ../midori/midori-view.c:5565 msgid "Whether background images should be printed" -msgstr "Povolí tlačenie obrázkov na pozadí" +msgstr "Či tlačiť obrázky na pozadí" -#: ../midori/midori-view.c:4857 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:5597 msgid "Features" msgstr "Funkcie" -#. Page "General" -#: ../midori/midori-preferences.c:298 -msgid "General" -msgstr "Hlavné" - -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Spustenie" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Použiť _aktívnu stránku" + +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Použiť aktuálnu ako domovskú stránku" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Prenosy" - #. Page "Appearance" -#: ../midori/midori-preferences.c:349 -msgid "Appearance" -msgstr "Vzhľad" - -#: ../midori/midori-preferences.c:350 -msgid "Font settings" -msgstr "Nastavenia písma" - -#: ../midori/midori-preferences.c:352 -msgid "Default Font Family" -msgstr "Štandardná rodina písma" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Písma" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Proporcionálne písmo" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "Predvolená rodina písma použitá pre zobrazenie textu" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "Predvolená veľkosť písma použitá pre zobrazenie textu" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Rodina neproporciálneho písma" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "Písmo použité pri zobrazovaní písma z rovnakou šírkou písmen" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" msgstr "Veľkosť písma použitá pre zobrazovanie písma s rovnakou šírkou písmen" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Minimálna veľkosť písma" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "Minimálna veľkosť písma použitá na zobrazenie textu" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Správanie" -#: ../midori/midori-preferences.c:393 -msgid "Enforce 96 dots per inch" -msgstr "Vynútiť 96 bodov na palec" - -#: ../midori/midori-preferences.c:394 -msgid "Enforce a video dot density of 96 DPI" -msgstr "Vnúti rozlíšenie obrazu 96 bodov na palec" - -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Povoliť skriptom otvárať vyskakovacie okná" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Či skripty môžu otvárať vyskakovacie okná automaticky" -#: ../midori/midori-preferences.c:419 -msgid "Spell Checking" -msgstr "Kontrola pravopisu" - -#: ../midori/midori-preferences.c:422 -msgid "Enable Spell Checking" -msgstr "Povoliť kontrolu pravopisu" - -#: ../midori/midori-preferences.c:423 -msgid "Enable spell checking while typing" -msgstr "Povoliť kontrolu pravopisu pri písaní" - -#: ../midori/midori-preferences.c:425 -msgid "Spelling dictionaries:" -msgstr "Slovníky pre kontrolu pravopisu:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "Čiarkou oddelený zoznam jazykov použitých pre kontrolu pravopisu, napr. \"sk_SK, en_GB\"" - #. Page "Interface" -#: ../midori/midori-preferences.c:435 -msgid "Interface" -msgstr "Rozhranie" - -#: ../midori/midori-preferences.c:436 -msgid "Navigationbar" -msgstr "Navigačný panel" - -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Prehliadanie" -#. Page "Applications" -#: ../midori/midori-preferences.c:468 -msgid "Applications" -msgstr "Aplikácie" - -#: ../midori/midori-preferences.c:469 -msgid "External applications" -msgstr "Externé aplikácie" - #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "Sieť" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:463 msgid "Hostname" msgstr "Počítač" -#. Page "Privacy" -#: ../midori/midori-preferences.c:511 -msgid "Privacy" -msgstr "Súkromie" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "MB" -#: ../midori/midori-preferences.c:512 -msgid "Web Cookies" -msgstr "Webové Cookies" - -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 -msgid "days" -msgstr "dní" - -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Pridať vyhľadávací modul" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Upraviť vyhľadávací modul" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Názov:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Poznámka:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "_Ikona:" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "_Token:" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "Správca vyhľadávacích modulov" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "Použiť ako _predvolený" -#: ../midori/sokoke.c:1287 -msgid "_Bookmark" -msgstr "_Záložka" - -#: ../midori/sokoke.c:1289 -msgid "Add Boo_kmark" -msgstr "Pridať záložku" - -#: ../midori/sokoke.c:1290 -msgid "_Console" -msgstr "_Konzola" - -#: ../midori/sokoke.c:1291 -msgid "_Extensions" -msgstr "_Rozšírenia" - -#: ../midori/sokoke.c:1292 -msgid "_History" -msgstr "_História" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "Otvoriť pomocou" -#: ../midori/sokoke.c:1293 -msgid "_Homepage" -msgstr "_Domovská stránka" +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Vyberte aplikáciu alebo príkaz pre otvorenie \"%s\":" -#: ../midori/sokoke.c:1294 -msgid "_Userscripts" -msgstr "_Užívateľské skripty" +#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "Nie je možné spustiť externý program" -#: ../midori/sokoke.c:1295 -msgid "New _Tab" -msgstr "Nová _karta" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d hodín" +msgstr[1] "%d hodina" +msgstr[2] "%d hodiny" + +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minút" +msgstr[1] "%d minúta" +msgstr[2] "%d minúty" + +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d sekúnd" +msgstr[1] "%d sekunda" +msgstr[2] "%d sekundy" -#: ../midori/sokoke.c:1296 -msgid "_Transfers" -msgstr "_Prenosy" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s z %s" -#: ../midori/sokoke.c:1297 -msgid "Netscape p_lugins" -msgstr "Pluginy _Netscape" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/sokoke.c:1300 -msgid "New _Folder" -msgstr "Nový _priečinok" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr " - %s ostáva" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:201 +#: ../toolbars/midori-findbar.c:291 msgid "_Inline Find:" msgstr "_Rýchle hľadanie" -#: ../toolbars/midori-findbar.c:233 +#: ../toolbars/midori-findbar.c:317 msgid "Previous" msgstr "Predchádzajúce" -#: ../toolbars/midori-findbar.c:239 +#: ../toolbars/midori-findbar.c:323 msgid "Next" msgstr "Ďalšie" -#: ../toolbars/midori-findbar.c:243 +#: ../toolbars/midori-findbar.c:327 msgid "Match Case" msgstr "Rozlišovať veľkosť písma" -#: ../toolbars/midori-findbar.c:252 +#: ../toolbars/midori-findbar.c:336 msgid "Highlight Matches" msgstr "Zvýrazniť" -#: ../toolbars/midori-findbar.c:263 +#: ../toolbars/midori-findbar.c:347 msgid "Close Findbar" msgstr "Zatvoriť vyhľadávaciu lištu" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s z %s" - -#: ../toolbars/midori-transferbar.c:123 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "Súbor '%s' bol stiahnutý." -#: ../toolbars/midori-transferbar.c:126 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Prenos dokončený" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "Stiahnutý súbor obsahuje chyby." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"Kontrolný súčet nie je zhodný s tým, ktorý bol priložený ku sťahovanému " +"súboru. To znamená, že stiahnutý súbor pravdepodobne nie je kompletný alebo " +"bol zmenený." + +#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Zmazať všetko" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 msgid "Some files are being downloaded" msgstr "Ešte sa sťahujú nejaké súbory" -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:377 msgid "_Quit Midori" msgstr "_Ukončiť Midori" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:379 msgid "The transfers will be cancelled if Midori quits." msgstr "Ukončením Midori budú prenosy zrušené." -#: ../panels/midori-bookmarks.c:109 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Záložky" -#: ../panels/midori-bookmarks.c:244 -#, fuzzy, c-format +#: ../panels/midori-bookmarks.c:257 +#, c-format msgid "Failed to add bookmark item: %s\n" -msgstr "Nepodarilo sa pridať položku do histórie: %s\n" +msgstr "Záložku sa nepodarilo pridať: %s\n" -#: ../panels/midori-bookmarks.c:430 +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "Upraviť vybranú záložku" -#: ../panels/midori-bookmarks.c:438 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "Vymazať označenú záložku" -#: ../panels/midori-bookmarks.c:451 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" msgstr "Pridať nový priečinok" -#: ../panels/midori-bookmarks.c:585 +#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 msgid "Separator" msgstr "Oddeľovač" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "Konzola" - -#: ../panels/midori-console.c:361 -msgid "Copy _All" -msgstr "Kopírovať _všetko" - -#: ../panels/midori-console.c:362 -msgid "Copy All" -msgstr "Kopírovať všetko" - -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Rozšírenia" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "História" -#: ../panels/midori-history.c:273 -msgid "Erroneous clock time" -msgstr "Chyba v nastavení času" - -#: ../panels/midori-history.c:274 -msgid "The clock time lies in the past. Please check the current date and time." -msgstr "Hodiny meškajú. Skon" +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "Dnes" -#: ../panels/midori-history.c:286 -msgid "A week ago" -msgstr "Pred týždňom" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "Včera" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -2199,211 +2180,291 @@ msgstr[1] "Pred %d dňami" msgstr[2] "Pred %d dňami" -#: ../panels/midori-history.c:291 -msgid "Today" -msgstr "Dnes" - -#: ../panels/midori-history.c:293 -msgid "Yesterday" -msgstr "Včera" +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "Pred týždňom" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" msgstr "Naozaj si želáte vymazať celú históriu?" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" msgstr "Pridať do záložiek vybranú položku histórie" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" msgstr "Odstrániť označenú položku v histórii" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "Zmazať celú históriu" -#: ../panels/midori-history.c:952 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Filter:" +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Prenosy" -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" msgstr "Otvoriť cieľový _priečinok" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" msgstr "Kopírovať _umiestnenie" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Vyžadovaná autentifikácia" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" msgstr "Pre otvorenie je požadované užívateľské meno a heslo" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "Meno" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "Heslo" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "Zapamätať _heslo" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Ikona „%s“ nemôže byť načítaná" -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Uložená ikona „%s“ nemôže byť načítaná" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "Snímky animácie sú porušené" -#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Vlastnosť '%s' nie je platná pre %s" -#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Vyberte súbor" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:506 msgid "Choose folder" msgstr "Vyberte priečinok" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "Žiadne" + +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "1 hodine" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "1 dni" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "1 týždni" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "1 mesiaci" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "1 roku" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Predvoľby pre %s" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:473 msgid "Configure Advertisement filters" msgstr "Nastaviť filtre na reklamu" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:504 #, 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." +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 dopredu pripravených filtrov do textového poľa a kliknutím na " +"\"Pridať\" ju pridáte do zoznamu. Viac pripravených filtrov nájdete na " +"adrese %s." -#: ../extensions/adblock.c:587 -msgid "Configure _Advertisement filters..." -msgstr "_Blokovanie reklamy" - -#: ../extensions/adblock.c:841 +#: ../extensions/adblock.c:882 msgid "Edit rule" msgstr "Upraviť pravidlo" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:896 msgid "_Rule:" msgstr "_Pravidlo:" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:950 msgid "Bl_ock image" msgstr "_Blokovať obrázok" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:955 msgid "Bl_ock link" msgstr "_Blokovať odkaz" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1670 msgid "Advertisement blocker" msgstr "Blokovač reklamy" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1671 msgid "Block advertisements according to a filter list" msgstr "Blokovať reklamy podľa zoznamu filtorv" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "" +"Zdá sa, že na práve prezeranej stránke je používateľský skript. Má sa " +"spustiť jeho inštalácia?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "_Inštalovať používateľský skript" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" msgstr "" +"Zdá sa, že na práve prezeranej stránke je používateľský štýl. Má sa spustiť " +"jeho inštalácia?" -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_Inštalovať používateľský štýl" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Neinštalovať" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Užívateľské skripty" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Užívateľské štýly" -#: ../extensions/addons.c:1085 -#, fuzzy, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "Nastavenie sa nepodarilo uložiť. %s" +#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Chyba" + +#: ../extensions/addons.c:421 +#, c-format +msgid "Do you want to delete '%s'?" +msgstr "Želáte si zmazať '%s'?" + +#: ../extensions/addons.c:427 +msgid "Delete user script" +msgstr "Zmazať používateľský skript" + +#: ../extensions/addons.c:428 +msgid "Delete user style" +msgstr "Zmazať používateľský skript" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:431 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "Súbor %s bude zmazaný." + +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "Otvoriť v textovom editore" + +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "Otvoriť cieľový priečinok" + +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "Pridať nový plugin" + +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "Odstrániť vybraný plugin" + +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" -msgstr "Užívateľove rozšírenia" +msgstr "Používateľove rozšírenia" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Nemôžem sledovať priečinok: '%s': %s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" -msgstr "" +msgstr "Podpora pre userscripts a userstyles" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "Ofarebné karty" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Ofarbiť každú kartu samostatne" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Správca cookies" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "Odstrániť všetky" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +#: ../extensions/cookie-manager/cookie-manager-page.c:105 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." msgstr "" +"Zmaže všetky zobrazené cookies. Ak je zapnutý filter, sú zmazané len tie " +"cookies, ktoré zodpovedajú podmienkam filtrovania." -#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "Rozbaliť všetko" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "Zbaliť všetko" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" msgstr "Naozaj si prajete odstrániť všetky cookies?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Otázka" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." msgstr "Iba cookies, ktoré zodpovedajú filtru budú zmazané" -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "Na konci sedenia" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2420,15 +2481,15 @@ "Bezpečný: %s\n" "Vyprší: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Áno" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "Nie" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" @@ -2437,43 +2498,45 @@ "Doména: %s\n" "Cookies: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Názov" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "_Rozbaliť všetko" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "_Zbaliť všetko" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "Vložte reťazec, podľa ktorého sa budú cookies filtrovať. Filtruje sa podľa názvu alebo domény" - -#: ../extensions/cookie-manager/main.c:40 -msgid "_Cookie Manager" -msgstr "Správca _cookies" +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +msgid "Filter:" +msgstr "Filter:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Vložte reťazec, podľa ktorého sa budú cookies filtrovať. Filtruje sa podľa " +"názvu alebo domény" -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Zoznam, detaily a mazanie cookies" -#: ../extensions/copy-tabs.c:39 -#, fuzzy +#: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" -msgstr "Kopírovať _adresu obrázka" +msgstr "Kopírovať _adresu karty" -#: ../extensions/copy-tabs.c:98 -#, fuzzy +#: ../extensions/copy-tabs.c:95 msgid "Copy Addresses of Tabs" -msgstr "Otvoriť adresu v novej karte" +msgstr "Kopírovať adresy z kariet" -#: ../extensions/copy-tabs.c:99 +#: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" -msgstr "" +msgstr "Kopíruje adresy všetkých kariet do schránky" #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." @@ -2484,39 +2547,39 @@ 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:398 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Posledná aktualizácia: %s" -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "Kanály" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "Pridať nový kanál" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "Odstrániť kanál" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "_Kanály" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Chyba pri hľadaní koreňového elementu v XML dátach." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Nepodporovaný formát kanálu." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Zlyhalo načítanie XML kanála: %s" @@ -2537,10 +2600,6 @@ msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Nepodarilo sa nájsť požadované prvky RSS \"channel\" v dátach XML." -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "Chyba" - #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" @@ -2551,153 +2610,676 @@ msgid "Error loading feed '%s'" msgstr "Chyba pri načítavaní kanálu \"%s\"" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "Panel kanálov" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Čítač Atom/RSS kanálov" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" msgstr "Nepodarilo sa pridať položku formulára: %s\n" -#: ../extensions/formhistory.c:510 -msgid "Stores history of entered form data" -msgstr "Ukladať históriu hodnôt vložených do formulára" +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "História formulára" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Pre otvorenie databázy hesiel je požadované \n" +"hlavné používateľské meno a heslo" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "Zapamätať si heslo pre túto stránku?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Zapamätať" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "Teraz nie" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Nikdy pre túto stránku" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "Stav prepnutia histórie formulárov" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "Aktivovať alebo deaktivovať históriu formulárov pre aktuálnu kartu." -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format -msgid "Not available: %s" -msgstr "Nie je k dispozícii: %s" +msgid "Failed to execute database statement: %s\n" +msgstr "Nepodarilo sa spustiť databázový príkaz: %s\n" -#: ../extensions/formhistory.c:515 -msgid "Resource files not installed" -msgstr "Nie sú nainštalované súbory so zdrojom" +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" +"Aktivovať len históriu formulárov cez horúcu klávesu (Ctrl+Shift+F) na karte" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory/formhistory.c:668 msgid "Form history filler" msgstr "Ukladanie hodnôt vo formulári" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/formhistory/formhistory.c:669 +msgid "Stores history of entered form data" +msgstr "Ukladať históriu hodnôt vložených do formulára" + +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#, c-format +msgid "Failed to select suggestions\n" +msgstr "Nepodarilo sa vybrať návrh\n" + +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Žiadne nenavštívené karty" + +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "Zoznam histórie" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Správanie zatvárania kariet" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Nerobiť nič" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Prepnúť na naposledy zobrazenú kartu" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Prepnúť na najnovšiu kartu" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Ďalšia nová karta (v histórii)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Zvolí ďalšiu novú kartu z histórie" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Predchádzajúca nová karta (v histórii)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Zvolí predchádzajúcu novu kartu z histórie" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Zobraziť kartu v pozadí (Zoznam histórie)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Zobraziť aktuálne zvolenú kartu v pozadí" + +#: ../extensions/history-list.vala:569 +msgid "History List" +msgstr "História" + +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "Pri prepínaní alebo zatváraní presunúť na naposledy použitú kartu" + +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Gesta myšou" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Ovládanie Midori pomocou myši" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 -msgid "Pageholder" -msgstr "Užívateľská stránka" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "_Užívateľská stránka" - -#: ../extensions/page-holder.c:178 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "Obnoviť stránku alebo zastaviť načítanie" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "Nastavenie klávesových skratiek" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "Nastavenie skratky..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Skratky" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "Zobraziť a upraviť klávesové skratky" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/status-clock.c:174 +msgid "Statusbar Clock" +msgstr "Hodiny v stavovom riadku" + +#: ../extensions/status-clock.c:175 +msgid "Display date and time in the statusbar" +msgstr "Zobrazuje dátum a čas v stavovom riadku" + +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Obrázky" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Skritpy" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Pluginy Netscape" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "Rožšírenie stavového riadka" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" msgstr "Jednoducho zapína a vypína rozšírenia webových stránok" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Panel záložiek" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "Panel _záložiek" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Zobraziť karty vo vertikálnom panely" -#: ../extensions/tab-switcher.c:402 -msgid "Tab History List" -msgstr "Karta histórie" - -#: ../extensions/tab-switcher.c:403 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "" +#: ../extensions/tabs-minimized.c:76 +msgid "Only Icons on Tabs by default" +msgstr "Na kartách zobrazovať len ikony" + +#: ../extensions/tabs-minimized.c:77 +msgid "New tabs have no label by default" +msgstr "Nové karty nebudú mať popisok" -#: ../extensions/tabs-minimized.c:79 -msgid "Minimize new Tabs" -msgstr "Minimalizovať otvorené karty" - -#: ../extensions/tabs-minimized.c:80 -msgid "New tabs open minimized" -msgstr "" - -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Upraviť panel" -#: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." msgstr "" +"Vybrané položky sa zobrazia na lište. Zmenu poradia vykonáte spôsobom " +"\"potiahni a pusť\"." -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Dostupné položky" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Zobrazené položky" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "Upraviť _panel..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Vlastný..." + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" msgstr "Editor panelu nástrojov" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" msgstr "Umožňuje jednoducho zmeniť panel" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "Kešuje (ukladá) HTTP komunikáciu na disk" +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "Vybraný konfiguračný priečinok nie je platný." + +#~ msgid "Cookies" +#~ msgstr "Cookies" + +#~ msgid "'Flash' Cookies" +#~ msgstr "Cookies z Flash" + +#~ msgid "HTML5 _Databases" +#~ msgstr "HTML5 _databázy" + +#~ msgid "Offline Application Cache" +#~ msgstr "Vyrovnávacia pamäť offline aplikácie" + +#~ msgid "Lightweight web browser" +#~ msgstr "Ľahký internetový prehliadač" + +#~ msgid "Not available: %s" +#~ msgstr "Nie je k dispozícii: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "Nie sú nainštalované súbory so zdrojom" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "Neukladať pri prehliadaní žiadne súkromné dáta" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Pridať odkaz do rýchleho prístupu" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Pridá záložku na plochu" + +#~ msgid "Create a launcher" +#~ msgstr "Vytvoriť spúšťač" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "Pridá tento kanál do odoberaných kanálov" + +#~ msgid "Close this window" +#~ msgstr "Zatvoriť toto okno" + +#~ msgid "Close all open windows" +#~ msgstr "Zatvoriť všetky otvorené okná" + +#~ msgid "Undo the last modification" +#~ msgstr "Vrátiť poslednú zmenu" + +#~ msgid "Redo the last modification" +#~ msgstr "Znova použiť poslednú zmenu" + +#~ msgid "Cut the selected text" +#~ msgstr "Vystrihnúť vybraný text" + +#~ msgid "Copy the selected text" +#~ msgstr "Kopírovať vybraný text" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "Prilepiť vybraný text" + +#~ msgid "Delete the selected text" +#~ msgstr "Odstrániť označený text" + +#~ msgid "Select all text" +#~ msgstr "Vybrať všetok text" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Hľadať ďalší výskyt slova alebo frázy" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Hľadať predchádzajúce slovo alebo frázu" + +#~ msgid "Reset the zoom level" +#~ msgstr "Nastaviť pôvodné priblíženie" + +#~ msgid "View the source code of the page" +#~ msgstr "Zobraziť zdrojový kód stránky" + +#~ msgid "Scroll to the left" +#~ msgstr "Posunúť pohľad vľavo" + +#~ msgid "Scroll down" +#~ msgstr "Posunúť pohľad dole" + +#~ msgid "Scroll up" +#~ msgstr "Posunúť pohľad hore" + +#~ msgid "Scroll to the right" +#~ msgstr "Posunúť pohľad vpravo" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "Zmaže zoznam zatvorených kariet" + +#~ msgid "Open the last closed tab" +#~ msgstr "Otvoriť naposledy zatvorenú kartu" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Pridať nový priečinok do záložiek" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Pridáva, upravuje a maže vyhľadávacie moduly..." + +#~ msgid "Clear private data..." +#~ msgstr "Odstráni súkromné údaje..." + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "Zobrazí stránku vo vývojárskom nástroji..." + +#~ msgid "Switch to the previous tab" +#~ msgstr "Prepnúť na predchádzajúcu kartu" + +#~ msgid "Switch to the next tab" +#~ msgstr "Prepnúť na nasledujúcu kartu" + +#~ msgid "Move tab behind the previous tab" +#~ msgstr "Presunie kartu za predchádzajúcu" + +#~ msgid "Move tab in front of the next tab" +#~ msgstr "Presunie kartu pred nasledujúcu" + +#~ msgid "Focus the current tab" +#~ msgstr "Zameria aktuálnu kartu" + +#~ msgid "Cycle focus between views" +#~ msgstr "Prepnúť na ďalší pohľad v poradí" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Zobraziť iba ikonu aktuálnej karty" + +#~ msgid "Duplicate the current tab" +#~ msgstr "Obsah aktuálnej karty otvorí v novej karte" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Zatvorí všetky karty okrem aktuálnej" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Otvorí karty uložené pri poslednom sedení" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Zobraziť Často kladené otázky" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Otvorí stránku pre hlásenie chýb" + +#~ msgid "Show information about the program" +#~ msgstr "Zobrazí informácie o programe" + +#~ msgid "Show menubar" +#~ msgstr "Zobraziť panel ponuky" + +#~ msgid "Show navigationbar" +#~ msgstr "Zobraziť navigačný panel" + +#~ msgid "Show sidepanel" +#~ msgstr "Zobraziť bočný panel" + +#~ msgid "Show bookmarkbar" +#~ msgstr "Zobraziť panel záložiek" + +#~ msgid "Show statusbar" +#~ msgstr "Zobraziť stavový riadok" + +#~ msgid "MD5-Checksum:" +#~ msgstr "Kontrolný súčet MD5:" + +#~ msgid "SHA1-Checksum:" +#~ msgstr "Kontrolný súčet SHA1" + +#~ msgid "No filename specified" +#~ msgstr "Nebol zadaný názov súboru" + +#~ msgid "Set number of columns and rows" +#~ msgstr "Zmeniť počet stĺpcov a riadkov" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Vložte počet stĺpcov a riadkov" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "Nesprávna hodnota veľkosti rýchleho prístupu" + +#~ msgid "Thumb size:" +#~ msgstr "Veľkosť náhľadov:" + +#~ msgid "Small" +#~ msgstr "Malá" + +#~ msgid "Medium" +#~ msgstr "Stredná" + +#~ msgid "Big" +#~ msgstr "Veľká" + +#~ msgid "Reset the last _session" +#~ msgstr "Vymazať posledne _sedenie" + +#~ msgid "Not found - %s" +#~ msgstr "Nenašlo sa - %s" + +#~ msgid "Document cannot be displayed" +#~ msgstr "Dokument nemôže byť zobrazený" + +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "Vynútiť 96 bodov na palec" + +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "Vnúti rozlíšenie obrazu 96 bodov na palec" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "_Blokovanie reklamy" + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "Prepnúť karty zoradené podľa posledného použitia pomocou Ctrl+Tab" + +#~ msgid "Web Cookies" +#~ msgstr "Webové Cookies" + +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "Odstrániť súkromné údaje pri _ukončení Midori" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "Nepodarilo sa spustiť databázový príkaz\n" + +#~ msgid "All cookies" +#~ msgstr "Všetky cookies" + +#~ msgid "Session cookies" +#~ msgstr "Cookies sedenia" + +#~ msgid "Show Transferbar" +#~ msgstr "Zobraziť stav prenosu" + +#~ msgid "Search engines in location completion" +#~ msgstr "Zobrazovať výsledky hľadania pri zadávaní adresy" + +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "Zobrazovanie výsledkov vyhľadávania pri zadávaní adresy" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "Zobraziť zoznam nástrojov" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "Má zobrazovať zoznam nástrojov?" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Zobraziť rýchly prístup na nových kartách" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Zobrazí rýchly prístup v novo otvorených kartách" + +#~ msgid "Download Manager" +#~ msgstr "Správca sťahovania" + +#~ msgid "An external download manager" +#~ msgstr "Externý správca sťahovania" + +#~ msgid "Open external pages in:" +#~ msgstr "Otvárať externé stránky v:" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "Kde sa budú otvárať externé stránky" + +#~ msgid "Accept cookies" +#~ msgstr "Povoliť cookies" + +#~ msgid "What type of cookies to accept" +#~ msgstr "Ktorý typ cookies prijímať" + +#~ msgid "Maximum cookie age" +#~ msgstr "Uchovávať cookies maximálne" + +#~ msgid "Maximum history age" +#~ msgstr "Maximálna dĺžka histórie" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Pamätať si naposledy stiahnuté súbory" + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "Poli pamätanie si zoznam súborov, ktoré boli naposledy stiahnuté" + +#~ msgid "General" +#~ msgstr "Hlavné" + +#~ msgid "Appearance" +#~ msgstr "Vzhľad" + +#~ msgid "Font settings" +#~ msgstr "Nastavenia písma" + +#~ msgid "Interface" +#~ msgstr "Rozhranie" + +#~ msgid "Navigationbar" +#~ msgstr "Navigačný panel" + +#~ msgid "%s of %s, %s/s" +#~ msgstr "%s z %s" + +#~ msgid "Next Tab (History List)" +#~ msgstr "Karta histórie" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "Karta histórie" + +#~ msgid "Previous tab from history" +#~ msgstr "Nepodarilo sa vybrať z histórie\n" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% načítaný" + +#~ msgid "Quit the application" +#~ msgstr "Ukončiť aplikáciu" + +#~ msgid "_Contents" +#~ msgstr "_Obsah pomocníka" + +#~ msgid "Show the documentation" +#~ msgstr "Zobraziť dokumentáciu" + +#~ msgid "_Transferbar" +#~ msgstr "Stav _prenosu" + +#~ msgid "Show transferbar" +#~ msgstr "Zobraziť stav prenosu dát" + +#~ msgid "_Recently visited pages" +#~ msgstr "_Nedávno navštívené stránky" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Znovu otvorí stránky, ktoré ste už navštívili" + +#~ msgid "Detach chosen panel from the window" +#~ msgstr "Oddeliť vybraný panel od okna" + +#~ msgid "Hide operating controls" +#~ msgstr "Schovať ovládacie prvky" + +#~ msgid "Show Blank page" +#~ msgstr "Zobraziť prázdnu stránku" + +#~ msgid "Show progress in location entry" +#~ msgstr "Zobraziť priebeh v riadku adresy" + +#~ msgid "Ask for the destination folder" +#~ msgstr "Spýtať sa na cieľový priečinok" + +#~ msgid "Original cookies only" +#~ msgstr "Len originálne cookies" + +#~ msgid "Remember last visited pages" +#~ msgstr "Zapamätať si naposledy navštívené stránky" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "Zistiť proxy server automaticky" + +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" +#~ msgstr "Povolí automatické zisťovanie proxy servera" + +#~ msgid "_Save Link destination" +#~ msgstr "_Uložiť cieľ odkazu" + +#~ msgid "_Download Link destination" +#~ msgstr "_Stiahnuť cieľ odkazu" + +#~ msgid "Download with Download _Manager" +#~ msgstr "Stiahnuť pomocou _správcu sťahovania" + +#~ msgid "Download I_mage" +#~ msgstr "Stiahnuť o_brázok" + +#~ msgid "_Restore Tab" +#~ msgstr "_Obnoviť kartu" + +#~ msgid "_Minimize Tab" +#~ msgstr "_Minimalizovať kartu" + +#~ msgid "Spell Checking" +#~ msgstr "Kontrola pravopisu" + +#~ msgid "Spelling dictionaries:" +#~ msgstr "Slovníky pre kontrolu pravopisu:" + +#~ msgid "" +#~ "A comma separated list of languages to be used for spell checking, for " +#~ "example \"en_GB,de_DE\"" +#~ msgstr "" +#~ "Čiarkou oddelený zoznam jazykov použitých pre kontrolu pravopisu, napr. " +#~ "\"sk_SK, en_GB\"" + +#~ msgid "Applications" +#~ msgstr "Aplikácie" + +#~ msgid "External applications" +#~ msgstr "Externé aplikácie" + +#~ msgid "Console" +#~ msgstr "Konzola" + +#~ msgid "Copy _All" +#~ msgstr "Kopírovať _všetko" + +#~ msgid "Copy All" +#~ msgstr "Kopírovať všetko" + +#~ msgid "Erroneous clock time" +#~ msgstr "Chyba v nastavení času" + +#~ msgid "" +#~ "The clock time lies in the past. Please check the current date and time." +#~ msgstr "Hodiny meškajú. Skon" + +#~ msgid "_Cookie Manager" +#~ msgstr "Správca _cookies" + +#~ msgid "Pageholder" +#~ msgstr "Užívateľská stránka" + +#~ msgid "_Pageholder" +#~ msgstr "_Užívateľská stránka" + +#~ msgid "Minimize new Tabs" +#~ msgstr "Minimalizovať otvorené karty" + #~ msgid "Set number of shortcuts" #~ msgstr "Zmeniť počet záložiek" @@ -2710,8 +3292,11 @@ #~ msgid "Open Image in New Wi_ndow" #~ msgstr "Otvoriť obrázok v novom o_kne" -#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "Skopíruje užívateľské skripty do priečinka %s a užívateľské štýly do priečinka %s" +#~ msgid "" +#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "" +#~ "Skopíruje užívateľské skripty do priečinka %s a užívateľské štýly do " +#~ "priečinka %s" #~ msgid "Failed to get current time: %s\n" #~ msgstr "Nepodarilo sa zistiť aktuálny čas: %s\n" @@ -2767,21 +3352,12 @@ #~ msgid "Enable special extensions for developers" #~ msgstr "Povoliť špeciálne rozšírenia pre vývojárov" -#~ msgid "MB" -#~ msgstr "MB" - #~ msgid "User_styles" #~ msgstr "_Užívateľské štýly" #~ msgid "Tint tabs distinctly" #~ msgstr "Ofarbiť karty" -#~ msgid "_Closed Tabs and Windows" -#~ msgstr "_Zatvorené karty a okná" - -#~ msgid "Last open pages" -#~ msgstr "Naposledy otvorené stránky" - #~ msgid "Both" #~ msgstr "Oboje" diff -Nru midori-0.2.8/po/sr.po midori-0.4.6/po/sr.po --- midori-0.2.8/po/sr.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/sr.po 2012-05-14 22:13:42.000000000 +0000 @@ -2,28 +2,27 @@ # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Милош Поповић 2009 -# +# msgid "" msgstr "" "Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-08 11:15+0000\n" +"POT-Creation-Date: 2011-05-11 16:16+0000\n" "PO-Revision-Date: 2009-06-30 00:00+100\n" "Last-Translator: Милош Поповић \n" "Language-Team: Serbian (sr) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Једноставан Интернет прегледник" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1315 ../midori/main.c:1449 -#: ../midori/main.c:1457 ../midori/main.c:1468 -#: ../midori/midori-websettings.c:277 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1510 ../midori/main.c:2020 +#: ../midori/main.c:2045 ../midori/main.c:2061 +#: ../midori/midori-websettings.c:326 msgid "Midori" msgstr "Мидори" @@ -31,1779 +30,2441 @@ msgid "Web Browser" msgstr "Интернет прегледник" -#: ../midori/main.c:96 +#: ../midori/main.c:100 ../midori/main.c:106 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Не могу да учитам подешавања: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:154 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Вредност „%s“ је неисправна за %s" -#: ../midori/main.c:158 ../midori/main.c:238 +#: ../midori/main.c:159 ../midori/main.c:252 #, c-format msgid "Invalid configuration value '%s'" msgstr "Неисправна је вредност „%s“ у подешавањима" -#: ../midori/main.c:350 -#, c-format -msgid "Failed to open database: %s\n" -msgstr "Не могу да отворим базу података: %s\n" - -#: ../midori/main.c:382 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Не могу да покренем тврдњу из базе података: %s\n" - -#: ../midori/main.c:436 +#: ../midori/main.c:357 #, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Не могу да уклоним ставку из историјата: %s\n" +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Не могу да учитам претраживаче. %s\n" -#: ../midori/main.c:460 +#: ../midori/main.c:411 #, 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:433 ../midori/main.c:554 ../extensions/formhistory.c:443 #, c-format -msgid "Failed to add history item: %s\n" -msgstr "Не могу да додам ставку у историјат: %s\n" +msgid "Failed to open database: %s\n" +msgstr "Не могу да отворим базу података: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:712 +#: ../midori/main.c:497 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Не могу да уклоним старе ставке из историјата: %s\n" -#: ../midori/main.c:741 +#: ../midori/main.c:537 ../panels/midori-history.c:190 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Не могу да уклоним ставку из историјата: %s\n" + +#: ../midori/main.c:584 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Не могу да сачувам обележиваче. %s" + +#: ../midori/main.c:615 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Не могу да сачувам подешавања. %s" -#: ../midori/main.c:770 +#: ../midori/main.c:650 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не могу да сачувам претраживаче. %s" -#: ../midori/main.c:789 ../midori/main.c:817 ../midori/main.c:846 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Не могу да сачувам обележиваче. %s" - #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:869 ../midori/main.c:892 +#: ../midori/main.c:676 ../midori/main.c:696 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не могу да сачувам документ. %s" -#: ../midori/main.c:965 +#: ../midori/main.c:716 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Проширења" + +#: ../midori/main.c:751 +msgid "Privacy" +msgstr "Приватност" + +#: ../midori/main.c:756 +msgid "Delete old cookies after 1 hour" +msgstr "" + +#: ../midori/main.c:757 +msgid "Delete old cookies after 1 day" +msgstr "" + +#: ../midori/main.c:758 +msgid "Delete old cookies after 1 week" +msgstr "" + +#: ../midori/main.c:759 +msgid "Delete old cookies after 1 month" +msgstr "" + +#: ../midori/main.c:760 +msgid "Delete old cookies after 1 year" +msgstr "" + +#: ../midori/main.c:778 +msgid "Cookies store login data, saved games, or user profiles for advertisement purposes." +msgstr "" + +#: ../midori/main.c:804 +msgid "days" +msgstr "дана" + +#: ../midori/main.c:853 ../midori/main.c:1108 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не могу да сачувам сесију. %s" -#: ../midori/main.c:1092 -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." +#: ../midori/main.c:1059 +msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "" -"Изгледа да је Мидори неисправно завршио рад приликом последњег покретања. " -"Уколико се ово често понавља покушајте неки од понуђених предлога." -#: ../midori/main.c:1107 +#: ../midori/main.c:1143 +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:1159 msgid "Modify _preferences" msgstr "Измени пос_тавке" -#: ../midori/main.c:1111 +#: ../midori/main.c:1163 msgid "Reset the last _session" msgstr "Врати последњу сесију" -#: ../midori/main.c:1116 +#: ../midori/main.c:1168 msgid "Disable all _extensions" msgstr "Искључи сва п_роширења" -#: ../midori/main.c:1315 +#: ../midori/main.c:1388 ../midori/main.c:2379 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Не могу да учитам сесију: %s\n" + +#: ../midori/main.c:1510 msgid "No filename specified" msgstr "Није изабрано име датотеке" -#: ../midori/main.c:1338 +#: ../midori/main.c:1529 msgid "An unknown error occured." msgstr "Непозната грешка." -#: ../midori/main.c:1370 +#: ../midori/main.c:1559 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Снимак је сачуван у: %s\n" -#: ../midori/main.c:1391 +#: ../midori/main.c:1905 msgid "Run ADDRESS as a web application" msgstr "Покреће АДРЕСУ као веб програм" -#: ../midori/main.c:1391 +#: ../midori/main.c:1905 msgid "ADDRESS" msgstr "АДРЕСА" -#: ../midori/main.c:1393 +#: ../midori/main.c:1908 msgid "Use FOLDER as configuration folder" msgstr "Користи ФАСЦИКЛУ за чување подешавања" -#: ../midori/main.c:1393 +#: ../midori/main.c:1908 msgid "FOLDER" msgstr "ФАСЦИКЛА" -#: ../midori/main.c:1395 +#: ../midori/main.c:1911 +msgid "Private browsing, no changes are saved" +msgstr "" + +#: ../midori/main.c:1913 +#, fuzzy +msgid "Show a diagnostic dialog" +msgstr "Прикажи прозорче приликом пада програма" + +#: ../midori/main.c:1915 msgid "Run the specified filename as javascript" msgstr "Покреће изабрану датотеку као јава скрипту" -#: ../midori/main.c:1398 +#: ../midori/main.c:1918 msgid "Take a snapshot of the specified URI" msgstr "Прави снимак изабране адресе" -#: ../midori/main.c:1401 +#: ../midori/main.c:1921 +msgid "Execute the specified command" +msgstr "" + +#: ../midori/main.c:1923 +msgid "List available commands to execute with -e/ --execute" +msgstr "" + +#: ../midori/main.c:1925 msgid "Display program version" msgstr "Исписује издање програма" -#: ../midori/main.c:1403 +#: ../midori/main.c:1927 msgid "Addresses" msgstr "Адресе" -#: ../midori/main.c:1446 +#: ../midori/main.c:1929 +msgid "Block URIs according to regular expression PATTERN" +msgstr "" + +#: ../midori/main.c:1929 +msgid "PATTERN" +msgstr "" + +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:1933 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "" + +#: ../midori/main.c:1933 +msgid "SECONDS" +msgstr "" + +#: ../midori/main.c:2017 msgid "[Addresses]" msgstr "[Адресе]" -#: ../midori/main.c:1469 +#: ../midori/main.c:2031 +msgid "The specified configuration folder is invalid." +msgstr "Изабрана фасцикла са подешавањима је неисправна." + +#: ../midori/main.c:2038 +#, fuzzy +msgid "Midori (Private Browsing)" +msgstr "Чување прива_тности" + +#: ../midori/main.c:2062 msgid "Please report comments, suggestions and bugs to:" msgstr "Пошаљите коментар, преглог и извештај грешке на:" -#: ../midori/main.c:1471 +#: ../midori/main.c:2064 msgid "Check for new versions at:" msgstr "Преузмите новије издање са:" -#: ../midori/main.c:1548 -msgid "The specified configuration folder is invalid." -msgstr "Изабрана фасцикла са подешавањима је неисправна." +#: ../midori/main.c:2128 +msgid "Website icons" +msgstr "Иконице веб страница" + +#: ../midori/main.c:2130 +msgid "Cookies" +msgstr "Колачићи" + +#: ../midori/main.c:2133 +msgid "'Flash' Cookies" +msgstr "Флеш колачићи" -#: ../midori/main.c:1583 +#: ../midori/main.c:2137 +msgid "HTML5 _Databases" +msgstr "" + +#: ../midori/main.c:2141 ../midori/midori-websettings.c:1058 +#: ../extensions/web-cache.c:478 ../extensions/web-cache.c:487 +#, fuzzy +msgid "Web Cache" +msgstr "П_ретражи Интернет..." + +#: ../midori/main.c:2145 +msgid "Offline Application Cache" +msgstr "" + +#: ../midori/main.c:2308 msgid "An instance of Midori is already running but not responding.\n" msgstr "Већ је покренут један Мидори прозор, али не даје одзив.\n" -#: ../midori/main.c:1633 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "Не могу да учитам претраживаче. %s\n" - -#: ../midori/main.c:1645 -#, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +#: ../midori/main.c:2346 +#, fuzzy, c-format +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Не могу да учитам обележиваче: %s\n" -#: ../midori/main.c:1660 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "Не могу да учитам сесију: %s\n" - -#: ../midori/main.c:1673 +#: ../midori/main.c:2394 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не могу да учитам смеће: %s\n" -#: ../midori/main.c:1686 +#: ../midori/main.c:2407 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не могу да учитам историјат: %s\n" -#: ../midori/main.c:1698 +#: ../midori/main.c:2422 msgid "The following errors occured:" msgstr "Јавиле су се следеће грешке:" -#: ../midori/main.c:1714 +#: ../midori/main.c:2438 msgid "_Ignore" msgstr "_Занемари" -#: ../midori/midori-array.c:195 +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "Није нађена датотека." -#: ../midori/midori-array.c:203 ../midori/midori-array.c:212 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Документ је лошег форматиран." -#: ../midori/midori-array.c:338 ../midori/sokoke.c:716 -#, c-format +#: ../midori/midori-array.c:628 +msgid "Unrecognized bookmark format." +msgstr "" + +#: ../midori/midori-array.c:916 msgid "Writing failed." msgstr "Неуспешан упис." -#: ../midori/midori-browser.c:287 ../midori/midori-browser.c:3819 -#: ../midori/midori-browser.c:3825 +#: ../midori/midori-browser.c:328 ../midori/midori-browser.c:5122 +#: ../midori/midori-browser.c:5131 msgid "Reload the current page" msgstr "Освежава страницу коју сте отворили" -#: ../midori/midori-browser.c:298 ../midori/midori-browser.c:3822 +#: ../midori/midori-browser.c:339 ../midori/midori-browser.c:5128 msgid "Stop loading the current page" msgstr "Прекида странице на којој се налазите" -#: ../midori/midori-browser.c:360 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% учитано" +#: ../midori/midori-browser.c:466 +#, fuzzy, c-format +msgid "Failed to update title: %s\n" +msgstr "Не могу да отворим базу података: %s\n" -#: ../midori/midori-browser.c:385 +#: ../midori/midori-browser.c:479 #, c-format msgid "Unexpected action '%s'." msgstr "Неочекивана радња „%s“." -#: ../midori/midori-browser.c:603 +#: ../midori/midori-browser.c:734 msgid "New folder" msgstr "Нова фасцикла" -#: ../midori/midori-browser.c:603 +#: ../midori/midori-browser.c:734 msgid "Edit folder" msgstr "Уреди фасциклу" -#: ../midori/midori-browser.c:605 +#: ../midori/midori-browser.c:736 msgid "New bookmark" msgstr "Нови обележивач" -#: ../midori/midori-browser.c:605 +#: ../midori/midori-browser.c:736 msgid "Edit bookmark" msgstr "Уреди обележивач" -#: ../midori/midori-browser.c:635 +#: ../midori/midori-browser.c:767 msgid "_Title:" msgstr "_Наслов:" -#: ../midori/midori-browser.c:648 ../midori/midori-searchaction.c:948 +#: ../midori/midori-browser.c:784 ../midori/midori-searchaction.c:953 msgid "_Description:" msgstr "_Опис:" -#: ../midori/midori-browser.c:667 ../midori/midori-searchaction.c:962 -#: ../extensions/feed-panel/main.c:343 +#: ../midori/midori-browser.c:803 ../midori/midori-searchaction.c:967 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Адреса:" -#: ../midori/midori-browser.c:686 +#: ../midori/midori-browser.c:835 ../midori/midori-browser.c:4184 msgid "_Folder:" msgstr "_Фасцикла:" -#: ../midori/midori-browser.c:691 ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:845 ../midori/midori-browser.c:935 +#: ../midori/midori-browser.c:4189 ../midori/midori-browser.c:4217 msgid "Toplevel folder" msgstr "Највиша фасцикла" -#: ../midori/midori-browser.c:808 +#: ../midori/midori-browser.c:876 +#, fuzzy +msgid "Add to _Speed Dial" +msgstr "Додај у _брзе посете" + +#: ../midori/midori-browser.c:889 +#, fuzzy +msgid "Show in the tool_bar" +msgstr "Ставке приказане у траци са алаткама" + +#: ../midori/midori-browser.c:904 +#, fuzzy +msgid "Run as _web application" +msgstr "Покреће АДРЕСУ као веб програм" + +#: ../midori/midori-browser.c:980 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "" + +#: ../midori/midori-browser.c:982 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "" + +#: ../midori/midori-browser.c:989 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "" + +#: ../midori/midori-browser.c:992 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "" + +#: ../midori/midori-browser.c:1054 ../midori/midori-browser.c:4268 msgid "Save file as" msgstr "Сачувај датотеку као" -#: ../midori/midori-browser.c:1119 -#, c-format -msgid "The file %s has been downloaded." -msgstr "Датотека %s је преузета." +#: ../midori/midori-browser.c:1357 +#, fuzzy +msgid "New Window" +msgstr "_Нови прозор" -#: ../midori/midori-browser.c:1123 -msgid "Transfer completed" -msgstr "Преузимање је завршено" +#: ../midori/midori-browser.c:1357 +msgid "A new window has been opened" +msgstr "" + +#: ../midori/midori-browser.c:1360 +#, fuzzy +msgid "New Tab" +msgstr "Нови _лист" + +#: ../midori/midori-browser.c:1360 +#, fuzzy +msgid "A new tab has been opened" +msgstr "Обавести ме по завршеном преносу" + +#: ../midori/midori-browser.c:1399 +#, fuzzy +msgid "Save file" +msgstr "Сачувај датотеку као" -#: ../midori/midori-browser.c:1820 +#: ../midori/midori-browser.c:2233 msgid "Open file" msgstr "Отвори датотеку" -#: ../midori/midori-browser.c:3152 ../panels/midori-bookmarks.c:778 -#: ../panels/midori-history.c:808 +#: ../midori/midori-browser.c:2350 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "" + +#: ../midori/midori-browser.c:2356 ../extensions/feed-panel/main.c:365 +msgid "New feed" +msgstr "Нови довод" + +#: ../midori/midori-browser.c:2399 ../midori/midori-browser.c:5195 +#: ../panels/midori-bookmarks.c:454 +msgid "Add a new bookmark" +msgstr "Додај обележивач" + +#: ../midori/midori-browser.c:2963 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "Празно" + +#: ../midori/midori-browser.c:3446 ../midori/sokoke.c:501 +#: ../midori/sokoke.c:511 ../midori/sokoke.c:539 ../midori/sokoke.c:568 +#: ../midori/sokoke.c:582 +msgid "Could not run external program." +msgstr "Не могу да покренем спољни програм." + +#: ../midori/midori-browser.c:3686 ../midori/midori-browser.c:5611 +#, fuzzy, c-format +msgid "Failed to insert new history item: %s\n" +msgstr "Не могу да уклоним ставку из историјата: %s\n" + +#: ../midori/midori-browser.c:4017 ../panels/midori-bookmarks.c:770 +#: ../panels/midori-history.c:740 msgid "Open all in _Tabs" msgstr "Отвори с_ве у листовима" # bug: no plural-forms -#: ../midori/midori-browser.c:3159 ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:542 +#: ../midori/midori-browser.c:4024 ../panels/midori-bookmarks.c:776 +#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:533 msgid "Open in New _Tab" msgstr "Отвору у новом _листу" -#: ../midori/midori-browser.c:3162 ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4027 ../midori/midori-view.c:2733 +#: ../midori/midori-view.c:4698 ../panels/midori-bookmarks.c:778 +#: ../panels/midori-history.c:748 ../extensions/feed-panel/feed-panel.c:535 msgid "Open in New _Window" msgstr "Отвори у _новом прозору" -#: ../midori/midori-browser.c:3425 +#: ../midori/midori-browser.c:4106 +#, fuzzy +msgid "Arora" +msgstr "Грешка" + +#: ../midori/midori-browser.c:4107 +msgid "Kazehakase" +msgstr "" + +#: ../midori/midori-browser.c:4108 +msgid "Opera" +msgstr "" + +#: ../midori/midori-browser.c:4109 +msgid "Konqueror" +msgstr "" + +#: ../midori/midori-browser.c:4110 +msgid "Epiphany" +msgstr "" + +#: ../midori/midori-browser.c:4135 +#, fuzzy +msgid "Import bookmarks..." +msgstr "Уреди обележивач" + +#: ../midori/midori-browser.c:4138 ../midori/midori-browser.c:5200 +#, fuzzy +msgid "_Import bookmarks" +msgstr "Уреди обележивач" + +#: ../midori/midori-browser.c:4149 +#, fuzzy +msgid "_Application:" +msgstr "Програми" + +#: ../midori/midori-browser.c:4176 +msgid "Import from XBEL or HTML file" +msgstr "" + +#: ../midori/midori-browser.c:4225 +msgid "Import from a file" +msgstr "" + +#: ../midori/midori-browser.c:4237 +#, fuzzy +msgid "Failed to import bookmarks" +msgstr "Уреди обележивач" + +#: ../midori/midori-browser.c:4273 +#, fuzzy +msgid "XBEL Bookmarks" +msgstr "Обележивачи" + +#: ../midori/midori-browser.c:4278 +#, fuzzy +msgid "Netscape Bookmarks" +msgstr "Нови обележивач" + +#: ../midori/midori-browser.c:4292 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "" + +#: ../midori/midori-browser.c:4308 +msgid "Failed to export bookmarks" +msgstr "" + +#. i18n: Dialog: Clear Private Data, in the Tools menu +#: ../midori/midori-browser.c:4425 msgid "Clear Private Data" msgstr "Очисти личне податке" -#: ../midori/midori-browser.c:3428 +#: ../midori/midori-browser.c:4429 msgid "_Clear private data" msgstr "О_чисти личне податке" -#: ../midori/midori-browser.c:3441 +#: ../midori/midori-browser.c:4442 msgid "Clear the following data:" msgstr "Чишћење следећих података:" -#: ../midori/midori-browser.c:3449 ../midori/midori-preferences.c:669 -#: ../panels/midori-history.c:108 -msgid "History" -msgstr "Историјат" - -#: ../midori/midori-browser.c:3452 -msgid "Cookies" -msgstr "Колачићи" +#. i18n: Browsing history, visited web pages +#: ../midori/midori-browser.c:4453 ../midori/sokoke.c:1514 +msgid "_History" +msgstr "_Историјат" -#: ../midori/midori-browser.c:3455 -msgid "'Flash' Cookies" -msgstr "Флеш колачићи" +#: ../midori/midori-browser.c:4458 ../midori/sokoke.c:1520 +#, fuzzy +msgid "_Closed Tabs" +msgstr "З_атвори лист" -#: ../midori/midori-browser.c:3458 -msgid "Website icons" -msgstr "Иконице веб страница" +#: ../midori/midori-browser.c:4478 +#, fuzzy +msgid "Clear private data when _quitting Midori" +msgstr "О_чисти личне податке" -#: ../midori/midori-browser.c:3538 +#: ../midori/midori-browser.c:4654 msgid "A lightweight web browser." msgstr "Једноставан Интернет прегледник." -#: ../midori/midori-browser.c:3546 +#: ../midori/midori-browser.c:4655 +msgid "See about:version for version info." +msgstr "" + +#: ../midori/midori-browser.c:4657 +msgid "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." +msgstr "" + +#: ../midori/midori-browser.c:4676 msgid "translator-credits" msgstr "" "Милош Поповић \n" "\n" "http://prevod.org — превод на српски језик." -#: ../midori/midori-browser.c:3750 +#: ../midori/midori-browser.c:5033 msgid "_File" msgstr "_Датотека" -#: ../midori/midori-browser.c:3753 +#: ../midori/midori-browser.c:5035 ../midori/sokoke.c:1521 +msgid "New _Window" +msgstr "_Нови прозор" + +#: ../midori/midori-browser.c:5036 msgid "Open a new window" msgstr "Отвори нови прозор" -#: ../midori/midori-browser.c:3756 +#: ../midori/midori-browser.c:5039 msgid "Open a new tab" msgstr "Отвара нови лист" -#: ../midori/midori-browser.c:3759 +#: ../midori/midori-browser.c:5041 +msgid "P_rivate Browsing" +msgstr "Чување прива_тности" + +#: ../midori/midori-browser.c:5042 +msgid "Don't save any private data while browsing" +msgstr "Не чува никакве личне податке током разгледања Интернета" + +#: ../midori/midori-browser.c:5046 msgid "Open a file" msgstr "Отвори датотеку" -#: ../midori/midori-browser.c:3762 +#: ../midori/midori-browser.c:5049 msgid "Save to a file" msgstr "Сачувај у датотеку" -#: ../midori/midori-browser.c:3764 ../midori/midori-view.c:1256 +#: ../midori/midori-browser.c:5051 msgid "Add to Speed _dial" msgstr "Додај у _брзе посете" -#: ../midori/midori-browser.c:3765 +#: ../midori/midori-browser.c:5052 msgid "Add shortcut to speed dial" msgstr "Додаје ову адресу у брзе посете" -#: ../midori/midori-browser.c:3767 +#: ../midori/midori-browser.c:5055 +#, fuzzy +msgid "Add Shortcut to the _desktop" +msgstr "Додаје ову адресу у брзе посете" + +#: ../midori/midori-browser.c:5056 +#, fuzzy +msgid "Add shortcut to the desktop" +msgstr "Додаје ову адресу у брзе посете" + +#: ../midori/midori-browser.c:5058 +msgid "Create _Launcher" +msgstr "" + +#: ../midori/midori-browser.c:5059 +msgid "Create a launcher" +msgstr "" + +#: ../midori/midori-browser.c:5062 +msgid "Subscribe to News _feed" +msgstr "" + +#: ../midori/midori-browser.c:5063 +msgid "Subscribe to this news feed" +msgstr "" + +#: ../midori/midori-browser.c:5068 msgid "_Close Tab" msgstr "З_атвори лист" -#: ../midori/midori-browser.c:3768 +#: ../midori/midori-browser.c:5069 msgid "Close the current tab" msgstr "Затвара овај лист" -#: ../midori/midori-browser.c:3770 +#: ../midori/midori-browser.c:5071 msgid "C_lose Window" msgstr "_Затвори прозор" -#: ../midori/midori-browser.c:3771 +#: ../midori/midori-browser.c:5072 msgid "Close this window" msgstr "Затвара овај прозор" -#: ../midori/midori-browser.c:3774 +#: ../midori/midori-browser.c:5075 msgid "Print the current page" msgstr "Штампај текућу страницу" -#: ../midori/midori-browser.c:3777 -msgid "Quit the application" -msgstr "Затвори програм" +#: ../midori/midori-browser.c:5077 +#, fuzzy +msgid "Close a_ll Windows" +msgstr "_Затвори прозор" + +#: ../midori/midori-browser.c:5078 +#, fuzzy +msgid "Close all open windows" +msgstr "_Затворени листови и прозори" -#: ../midori/midori-browser.c:3779 +#: ../midori/midori-browser.c:5080 msgid "_Edit" msgstr "_Уређивање" -#: ../midori/midori-browser.c:3782 +#: ../midori/midori-browser.c:5084 +msgid "Undo the last modification" +msgstr "" + +#: ../midori/midori-browser.c:5087 +#, fuzzy +msgid "Redo the last modification" +msgstr "Врати последњу сесију" + +#: ../midori/midori-browser.c:5091 msgid "Cut the selected text" msgstr "Исеца изабрани текст и смешта га списак исечака" -#: ../midori/midori-browser.c:3785 ../midori/midori-browser.c:3788 +#: ../midori/midori-browser.c:5094 msgid "Copy the selected text" msgstr "Умножава изабрани текст у списак исечака" -#: ../midori/midori-browser.c:3791 +#: ../midori/midori-browser.c:5097 msgid "Paste text from the clipboard" msgstr "Убацује текст из списка исечака" -#: ../midori/midori-browser.c:3794 +#: ../midori/midori-browser.c:5100 msgid "Delete the selected text" msgstr "Брише изабрани текст" -#: ../midori/midori-browser.c:3797 +#: ../midori/midori-browser.c:5103 msgid "Select all text" msgstr "Изабире сав текст" -#: ../midori/midori-browser.c:3800 +#: ../midori/midori-browser.c:5106 msgid "Find a word or phrase in the page" msgstr "Тражи жељену реч или израз унутар страници" -#: ../midori/midori-browser.c:3802 +#: ../midori/midori-browser.c:5108 msgid "Find _Next" msgstr "Тражи _следеће" -#: ../midori/midori-browser.c:3803 +#: ../midori/midori-browser.c:5109 msgid "Find the next occurrence of a word or phrase" msgstr "Проналази следећу појаву речи или израза" -#: ../midori/midori-browser.c:3805 +#: ../midori/midori-browser.c:5111 msgid "Find _Previous" msgstr "Тражи _претходно" -#: ../midori/midori-browser.c:3806 +#: ../midori/midori-browser.c:5112 msgid "Find the previous occurrence of a word or phrase" msgstr "Проналази претходну појаву речи или израза" -#: ../midori/midori-browser.c:3809 -msgid "_Quick Find" -msgstr "Брзо _нађи" - -#: ../midori/midori-browser.c:3810 -msgid "Quickly jump to a word or phrase" -msgstr "Брзо проналази реч или израз" - -#: ../midori/midori-browser.c:3813 +#: ../midori/midori-browser.c:5116 msgid "Configure the application preferences" msgstr "Подесите поставке програма" -#: ../midori/midori-browser.c:3815 +#: ../midori/midori-browser.c:5118 msgid "_View" msgstr "П_реглед" -#: ../midori/midori-browser.c:3816 +#: ../midori/midori-browser.c:5119 msgid "_Toolbars" msgstr "Палете а_лата" -#: ../midori/midori-browser.c:3828 +#: ../midori/midori-browser.c:5124 ../midori/midori-browser.c:5125 +msgid "Reload page without caching" +msgstr "" + +#: ../midori/midori-browser.c:5134 msgid "Increase the zoom level" msgstr "Увећај приказ" -#: ../midori/midori-browser.c:3831 +#: ../midori/midori-browser.c:5137 msgid "Decrease the zoom level" msgstr "Умањи приказ" -#: ../midori/midori-browser.c:3834 +#: ../midori/midori-browser.c:5140 msgid "Reset the zoom level" msgstr "Врати величину приказа" -#: ../midori/midori-browser.c:3835 +#: ../midori/midori-browser.c:5141 msgid "_Encoding" msgstr "_Кодирање" -#: ../midori/midori-browser.c:3837 -msgid "_Automatic" -msgstr "_Сам одреди" +#: ../midori/midori-browser.c:5143 +#, fuzzy +msgid "View So_urce" +msgstr "_Изворно издање странице" -#: ../midori/midori-browser.c:3840 ../midori/midori-websettings.c:204 -msgid "Chinese (BIG5)" -msgstr "Кинески (BIG5)" +#: ../midori/midori-browser.c:5144 +msgid "View the source code of the page" +msgstr "Приказује изворни код странице" -#: ../midori/midori-browser.c:3843 ../midori/midori-websettings.c:205 -msgid "Japanese (SHIFT_JIS)" -msgstr "Јапански (_Shift_JIS)" +#: ../midori/midori-browser.c:5147 +#, fuzzy +msgid "Ca_ret Browsing" +msgstr "Чување прива_тности" -#: ../midori/midori-browser.c:3846 ../midori/midori-websettings.c:206 -msgid "Russian (KOI8-R)" -msgstr "Руски (KOI8-R)" +#: ../midori/midori-browser.c:5148 +msgid "Toggle text cursor navigation" +msgstr "" -#: ../midori/midori-browser.c:3849 ../midori/midori-websettings.c:207 -msgid "Unicode (UTF-8)" -msgstr "Уникод (UTF-_8)" +#: ../midori/midori-browser.c:5152 +msgid "Toggle fullscreen view" +msgstr "Приказује програм преко целог екрана" -#: ../midori/midori-browser.c:3852 ../midori/midori-websettings.c:208 -msgid "Western (ISO-8859-1)" -msgstr "Западни (I_SO-8859-1)" +#: ../midori/midori-browser.c:5155 +msgid "Scroll _Left" +msgstr "" -#: ../midori/midori-browser.c:3855 ../midori/midori-websettings.c:209 -#: ../midori/midori-websettings.c:281 -msgid "Custom..." -msgstr "Произвољно..." +#: ../midori/midori-browser.c:5156 +#, fuzzy +msgid "Scroll to the left" +msgstr "Иде на наредни лист" -#: ../midori/midori-browser.c:3858 ../midori/midori-view.c:1275 -msgid "View _Source" -msgstr "_Изворно издање странице" +#: ../midori/midori-browser.c:5158 +msgid "Scroll _Down" +msgstr "" -#: ../midori/midori-browser.c:3859 -msgid "View the source code of the page" -msgstr "Приказује изворни код странице" +#: ../midori/midori-browser.c:5159 +msgid "Scroll down" +msgstr "" + +#: ../midori/midori-browser.c:5161 +msgid "Scroll _Up" +msgstr "" -#: ../midori/midori-browser.c:3861 -msgid "View Selection Source" -msgstr "И_зворно издање изабраног" - -#: ../midori/midori-browser.c:3862 -msgid "View the source code of the selection" -msgstr "Приказује изворни код изабраног дела странице" +#: ../midori/midori-browser.c:5162 +msgid "Scroll up" +msgstr "" -#: ../midori/midori-browser.c:3866 -msgid "Toggle fullscreen view" -msgstr "Приказује програм преко целог екрана" +#: ../midori/midori-browser.c:5164 +msgid "Scroll _Right" +msgstr "" + +#: ../midori/midori-browser.c:5165 +msgid "Scroll to the right" +msgstr "" -#: ../midori/midori-browser.c:3868 +#: ../midori/midori-browser.c:5168 msgid "_Go" msgstr "_Иди" -#: ../midori/midori-browser.c:3871 +#: ../midori/midori-browser.c:5171 msgid "Go back to the previous page" msgstr "Иде на претходну страницу" -#: ../midori/midori-browser.c:3874 +#: ../midori/midori-browser.c:5174 msgid "Go forward to the next page" msgstr "Иде на следећу страницу" -#: ../midori/midori-browser.c:3877 +#. i18n: Visit the previous logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5178 +#, fuzzy +msgid "Go to the previous sub-page" +msgstr "Иде на претходну страницу" + +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5182 +#, fuzzy +msgid "Go to the next sub-page" +msgstr "Иде на следећу страницу" + +#: ../midori/midori-browser.c:5185 msgid "Go to your homepage" msgstr "Иде на почетну страну" -#: ../midori/midori-browser.c:3879 +#: ../midori/midori-browser.c:5187 msgid "Empty Trash" msgstr "Испразни смеће" -#: ../midori/midori-browser.c:3880 +#: ../midori/midori-browser.c:5188 msgid "Delete the contents of the trash" msgstr "Брише сав садржај из смећа" -#: ../midori/midori-browser.c:3882 ../midori/midori-view.c:1233 -msgid "Undo Close Tab" +#: ../midori/midori-browser.c:5190 +#, fuzzy +msgid "Undo _Close Tab" msgstr "Врати лист" -#: ../midori/midori-browser.c:3883 +#: ../midori/midori-browser.c:5191 msgid "Open the last closed tab" msgstr "Отвара лист који сте последњи затворили" -#: ../midori/midori-browser.c:3887 ../panels/midori-bookmarks.c:230 -msgid "Add a new bookmark" -msgstr "Додај обележивач" - -#: ../midori/midori-browser.c:3889 ../panels/midori-bookmarks.c:259 -msgid "Add a new folder" +#: ../midori/midori-browser.c:5197 +#, fuzzy +msgid "Add a new _folder" msgstr "Додај нову фасциклу" -#: ../midori/midori-browser.c:3890 +#: ../midori/midori-browser.c:5198 msgid "Add a new bookmark folder" msgstr "Додаје нову фасциклу за обележиваче" -#: ../midori/midori-browser.c:3891 -msgid "_Tools" -msgstr "_Алати" +#: ../midori/midori-browser.c:5203 +#, fuzzy +msgid "_Export bookmarks" +msgstr "Уреди обележивач" -#: ../midori/midori-browser.c:3893 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5206 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "По_деси претраживаче" -#: ../midori/midori-browser.c:3894 +#: ../midori/midori-browser.c:5207 msgid "Add, edit and remove search engines..." msgstr "Отвара прозорче за додавање, уређивање или уклањање претраживача." -#: ../midori/midori-browser.c:3897 +#: ../midori/midori-browser.c:5210 msgid "_Clear Private Data" msgstr "Очисти _личне податке" -#: ../midori/midori-browser.c:3898 +#: ../midori/midori-browser.c:5211 msgid "Clear private data..." msgstr "Брише све личне податке." -#: ../midori/midori-browser.c:3902 +#: ../midori/midori-browser.c:5215 +#, fuzzy +msgid "_Inspect Page" +msgstr "Инспекција странице — %s" + +#: ../midori/midori-browser.c:5216 +msgid "Inspect page details and access developer tools..." +msgstr "" + +#: ../midori/midori-browser.c:5221 msgid "_Previous Tab" msgstr "_Претходни лист" -#: ../midori/midori-browser.c:3903 +#: ../midori/midori-browser.c:5222 msgid "Switch to the previous tab" msgstr "Иде на претходни лист" -#: ../midori/midori-browser.c:3905 +#: ../midori/midori-browser.c:5224 msgid "_Next Tab" msgstr "_Следећи лист" -#: ../midori/midori-browser.c:3906 +#: ../midori/midori-browser.c:5225 msgid "Switch to the next tab" msgstr "Иде на наредни лист" -#: ../midori/midori-browser.c:3908 +#: ../midori/midori-browser.c:5226 +msgid "Move Tab _Backward" +msgstr "" + +#: ../midori/midori-browser.c:5227 +#, fuzzy +msgid "Move tab behind the previous tab" +msgstr "Иде на претходни лист" + +#: ../midori/midori-browser.c:5228 +msgid "_Move Tab Forward" +msgstr "" + +#: ../midori/midori-browser.c:5229 +#, fuzzy +msgid "Move tab in front of the next tab" +msgstr "Иде на наредни лист" + +#: ../midori/midori-browser.c:5231 +#, fuzzy +msgid "Focus _Current Tab" +msgstr "тренутном листу" + +#: ../midori/midori-browser.c:5232 +#, fuzzy +msgid "Focus the current tab" +msgstr "Затвара овај лист" + +#: ../midori/midori-browser.c:5234 +msgid "Focus _Next view" +msgstr "" + +#: ../midori/midori-browser.c:5235 +msgid "Cycle focus between views" +msgstr "" + +#: ../midori/midori-browser.c:5237 +msgid "Only show the Icon of the _Current Tab" +msgstr "" + +#: ../midori/midori-browser.c:5238 +#, fuzzy +msgid "Only show the icon of the current tab" +msgstr "Затвара овај лист" + +#: ../midori/midori-browser.c:5240 +#, fuzzy +msgid "_Duplicate Current Tab" +msgstr "тренутном листу" + +#: ../midori/midori-browser.c:5241 +#, fuzzy +msgid "Duplicate the current tab" +msgstr "Затвара овај лист" + +#: ../midori/midori-browser.c:5243 +#, fuzzy +msgid "Close Ot_her Tabs" +msgstr "Затвара овај лист" + +#: ../midori/midori-browser.c:5244 +#, fuzzy +msgid "Close all tabs except the current tab" +msgstr "Затвара овај лист" + +#: ../midori/midori-browser.c:5246 +#, fuzzy +msgid "Open last _session" +msgstr "Врати последњу сесију" + +#: ../midori/midori-browser.c:5247 +#, fuzzy +msgid "Open the tabs saved in the last session" +msgstr "Врати последњу сесију" + +#: ../midori/midori-browser.c:5249 msgid "_Help" msgstr "_Помоћ" -#: ../midori/midori-browser.c:3910 -msgid "_Contents" -msgstr "_Садржај" - -#: ../midori/midori-browser.c:3911 -msgid "Show the documentation" -msgstr "Приказује помоћ за употребу програма" - -#: ../midori/midori-browser.c:3913 +#: ../midori/midori-browser.c:5251 msgid "_Frequent Questions" msgstr "_Честа питања" -#: ../midori/midori-browser.c:3914 +#: ../midori/midori-browser.c:5252 msgid "Show the Frequently Asked Questions" msgstr "Приказује често постављена питања" -#: ../midori/midori-browser.c:3916 -msgid "_Report a Bug" +#: ../midori/midori-browser.c:5254 +#, fuzzy +msgid "_Report a Problem..." msgstr "Пријави _грешку" -#: ../midori/midori-browser.c:3917 +#: ../midori/midori-browser.c:5255 msgid "Open Midori's bug tracker" msgstr "Отвара Мидоријеву страницу за пријаву грешки" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:5258 msgid "Show information about the program" msgstr "Приказује податке о програму" -#: ../midori/midori-browser.c:3927 -msgid "P_rivate Browsing" -msgstr "Чување прива_тности" - -#: ../midori/midori-browser.c:3928 -msgid "Don't save any private data while browsing" -msgstr "Не чува никакве личне податке током разгледања Интернета" - -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:5266 msgid "_Menubar" msgstr "Трака са _менијем" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:5267 msgid "Show menubar" msgstr "Приказује мени програма" -#: ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:5270 msgid "_Navigationbar" msgstr "_Главна трака" -#: ../midori/midori-browser.c:3938 +#: ../midori/midori-browser.c:5271 msgid "Show navigationbar" msgstr "Приказује површ за кретање кроз веб странице" -#: ../midori/midori-browser.c:3941 +#: ../midori/midori-browser.c:5274 msgid "Side_panel" msgstr "Бочна _површ" -#: ../midori/midori-browser.c:3942 +#: ../midori/midori-browser.c:5275 msgid "Show sidepanel" msgstr "Приказује бочну површ" -#: ../midori/midori-browser.c:3945 +#: ../midori/midori-browser.c:5278 msgid "_Bookmarkbar" msgstr "_Обележивачи" -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:5279 msgid "Show bookmarkbar" msgstr "Приказује површ са обележивачима" -#: ../midori/midori-browser.c:3949 -msgid "_Transferbar" -msgstr "Преноси" - -#: ../midori/midori-browser.c:3950 -msgid "Show transferbar" -msgstr "Приказује траку са преносима датотека" - -#: ../midori/midori-browser.c:3953 +#: ../midori/midori-browser.c:5282 msgid "_Statusbar" msgstr "Трака са ста_њем" -#: ../midori/midori-browser.c:3954 +#: ../midori/midori-browser.c:5283 msgid "Show statusbar" msgstr "Приказује или сакрива траку са стањем" -#: ../midori/midori-browser.c:4389 +#: ../midori/midori-browser.c:5291 +msgid "_Automatic" +msgstr "_Сам одреди" + +#: ../midori/midori-browser.c:5294 ../midori/midori-websettings.c:234 +msgid "Chinese (BIG5)" +msgstr "Кинески (BIG5)" + +#. i18n: A double underscore "__" is used to prevent the mnemonic +#: ../midori/midori-browser.c:5298 +#, fuzzy +msgid "Japanese (SHIFT__JIS)" +msgstr "Јапански (_Shift_JIS)" + +#: ../midori/midori-browser.c:5301 ../midori/midori-websettings.c:236 +msgid "Korean (EUC-KR)" +msgstr "" + +#: ../midori/midori-browser.c:5304 ../midori/midori-websettings.c:237 +msgid "Russian (KOI8-R)" +msgstr "Руски (KOI8-R)" + +#: ../midori/midori-browser.c:5307 ../midori/midori-websettings.c:238 +msgid "Unicode (UTF-8)" +msgstr "Уникод (UTF-_8)" + +#: ../midori/midori-browser.c:5310 ../midori/midori-websettings.c:239 +msgid "Western (ISO-8859-1)" +msgstr "Западни (I_SO-8859-1)" + +#: ../midori/midori-browser.c:5313 ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:331 ../katze/katze-utils.c:706 +msgid "Custom..." +msgstr "Произвољно..." + +#: ../midori/midori-browser.c:5848 msgid "_Separator" msgstr "_Раздвајач" -#: ../midori/midori-browser.c:4396 +#: ../midori/midori-browser.c:5855 msgid "_Location..." msgstr "На _адресу..." -#: ../midori/midori-browser.c:4398 +#: ../midori/midori-browser.c:5857 msgid "Open a particular location" msgstr "Отвара изабрану адресу" -#: ../midori/midori-browser.c:4420 +#: ../midori/midori-browser.c:5879 msgid "_Web Search..." msgstr "П_ретражи Интернет..." -#: ../midori/midori-browser.c:4422 +#: ../midori/midori-browser.c:5881 msgid "Run a web search" msgstr "Иде на страницу за претрагу Интернета" -#: ../midori/midori-browser.c:4443 +#: ../midori/midori-browser.c:5902 msgid "Reopen a previously closed tab or window" msgstr "Врати претходне прозоре и листове читача" -#: ../midori/midori-browser.c:4458 -msgid "_Recently visited pages" -msgstr "_Скорашње странице" - -#: ../midori/midori-browser.c:4460 -msgid "Reopen pages that you visited earlier" -msgstr "Отвара странице које сте раније посетили" - -#: ../midori/midori-browser.c:4475 ../midori/sokoke.c:872 +#: ../midori/midori-browser.c:5915 ../midori/sokoke.c:1510 msgid "_Bookmarks" msgstr "_Обележивачи" -#: ../midori/midori-browser.c:4477 +#: ../midori/midori-browser.c:5917 msgid "Show the saved bookmarks" msgstr "Приказује сачуване обележиваче" -#: ../midori/midori-browser.c:4492 +#: ../midori/midori-browser.c:5931 +msgid "_Tools" +msgstr "_Алати" + +#: ../midori/midori-browser.c:5946 msgid "_Window" msgstr "_Прозор" -#: ../midori/midori-browser.c:4494 +#: ../midori/midori-browser.c:5948 msgid "Show a list of all open tabs" msgstr "Приказује списак свих отворених листова" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4674 -msgid "_Inline Find:" -msgstr "_Тражи израз:" +#: ../midori/midori-browser.c:5962 +#, fuzzy +msgid "_Menu" +msgstr "Трака са _менијем" -#: ../midori/midori-browser.c:4699 -msgid "Previous" -msgstr "Претходно" +#: ../midori/midori-browser.c:5964 +#, fuzzy +msgid "Menu" +msgstr "Трака са _менијем" -#: ../midori/midori-browser.c:4704 -msgid "Next" -msgstr "Следеће" +#: ../midori/midori-browser.c:6537 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Неочекивана поставка „%s“" -#: ../midori/midori-browser.c:4709 -msgid "Match Case" -msgstr "Упореди велчину слова" +#: ../midori/midori-extension.c:286 +#, fuzzy, c-format +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "Не могу да учитам подешавања: %s\n" -#: ../midori/midori-browser.c:4717 -msgid "Highlight Matches" -msgstr "Истакни нађено" +#: ../midori/midori-extension.c:668 ../midori/midori-extension.c:765 +#: ../midori/midori-extension.c:862 ../midori/midori-extension.c:974 +#: ../extensions/addons.c:1636 +#, fuzzy, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Не могу да сачувам подешавања. %s" -#: ../midori/midori-browser.c:4727 -msgid "Close Findbar" -msgstr "Затвара траку за претрагу странице" +#: ../midori/midori-locationaction.c:396 +#, fuzzy, c-format +msgid "Failed to select from history\n" +msgstr "Не могу да очистим историјат: %s\n" -#: ../midori/midori-browser.c:4762 ../extensions/cookie-manager.c:821 -msgid "Delete All" -msgstr "Обриши _све" +#: ../midori/midori-locationaction.c:480 +#, fuzzy, c-format +msgid "Search for %s" +msgstr "Поставке за %s" -#: ../midori/midori-browser.c:5084 -#, c-format -msgid "Unexpected setting '%s'" -msgstr "Неочекивана поставка „%s“" +#: ../midori/midori-locationaction.c:506 +#, fuzzy, c-format +msgid "Search with %s" +msgstr "Пре_тражи са" -#: ../midori/midori-panel.c:333 -msgid "Detach chosen panel from the window" -msgstr "Откачи површ из прозора" +#. i18n: Right-click on Location, Open an URL from the clipboard +#: ../midori/midori-locationaction.c:1254 +msgid "Paste and p_roceed" +msgstr "" -#: ../midori/midori-panel.c:335 -msgid "Whether to detach the chosen panel from the window" -msgstr "Откачује изабрану површ из прозора" +#: ../midori/midori-locationaction.c:1649 +msgid "Not verified" +msgstr "" -#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:535 -msgid "Align sidepanel on the right" -msgstr "Постави бочну површ десно" +#: ../midori/midori-locationaction.c:1664 +msgid "Verified and encrypted connection" +msgstr "" -#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:536 -msgid "Whether to align the sidepanel on the right" -msgstr "Одређује да ли да се бочна површ равна са десном страном" +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 +#, fuzzy +msgid "Align sidepanel to the right" +msgstr "Постави бочну површ десно" -#: ../midori/midori-panel.c:357 ../midori/midori-panel.c:358 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Затвори површ" -#: ../midori/midori-websettings.c:187 ../midori/midori-view.c:1999 -#: ../midori/midori-view.c:2176 -msgid "Blank page" -msgstr "Празна страна" +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 +#, fuzzy +msgid "Align sidepanel to the left" +msgstr "Постави бочну површ десно" + +#: ../midori/midori-websettings.c:214 +#, fuzzy +msgid "Show Speed Dial" +msgstr "Додај у _брзе посете" -#: ../midori/midori-websettings.c:188 ../midori/midori-websettings.c:555 -msgid "Homepage" +#: ../midori/midori-websettings.c:215 +#, fuzzy +msgid "Show Homepage" msgstr "Почетна страница" -#: ../midori/midori-websettings.c:189 -msgid "Last open pages" -msgstr "Последње странице" +#: ../midori/midori-websettings.c:216 +#, fuzzy +msgid "Show last open tabs" +msgstr "Приказује списак свих отворених листова" + +#: ../midori/midori-websettings.c:218 +msgid "Show last tabs without loading" +msgstr "" + +#: ../midori/midori-websettings.c:235 +msgid "Japanese (SHIFT_JIS)" +msgstr "Јапански (_Shift_JIS)" -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:255 msgid "New tab" msgstr "новом листу" -#: ../midori/midori-websettings.c:225 +#: ../midori/midori-websettings.c:256 msgid "New window" msgstr "новом прозору" -#: ../midori/midori-websettings.c:226 +#: ../midori/midori-websettings.c:257 msgid "Current tab" msgstr "тренутном листу" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:272 msgid "Default" msgstr "Уобичајено" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:273 msgid "Icons" msgstr "Иконице" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:274 +msgid "Small icons" +msgstr "" + +#: ../midori/midori-websettings.c:275 msgid "Text" msgstr "Текст" -#: ../midori/midori-websettings.c:244 -msgid "Both" -msgstr "Текст испод иконица" - -#: ../midori/midori-websettings.c:245 -msgid "Both horizontal" -msgstr "Текст поред иконица" +#: ../midori/midori-websettings.c:276 +msgid "Icons and text" +msgstr "" + +#: ../midori/midori-websettings.c:277 +#, fuzzy +msgid "Text beside icons" +msgstr "Иконице веб страница" + +#: ../midori/midori-websettings.c:292 +msgid "Automatic (GNOME or environment)" +msgstr "" + +#: ../midori/midori-websettings.c:293 +#, fuzzy +msgid "HTTP proxy server" +msgstr "Прокси сервер" + +#: ../midori/midori-websettings.c:294 +#, fuzzy +msgid "No proxy server" +msgstr "Прокси сервер" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:309 msgid "All cookies" msgstr "Све колачиће" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:310 msgid "Session cookies" msgstr "Колачиће сесије" -#: ../midori/midori-websettings.c:262 ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:311 ../katze/katze-utils.c:675 msgid "None" msgstr "Ништа" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:327 msgid "Safari" msgstr "Сафари" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:328 +#, fuzzy +msgid "iPhone" +msgstr "Ништа" + +#: ../midori/midori-websettings.c:329 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:330 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:333 +#: ../midori/midori-websettings.c:383 msgid "Remember last window size" msgstr "Запамти величину прозора" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:384 msgid "Whether to save the last window size" msgstr "Да ли да сачувам последњу величину прозора" -#: ../midori/midori-websettings.c:342 +#: ../midori/midori-websettings.c:392 msgid "Last window width" msgstr "Ширина прозора" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:393 msgid "The last saved window width" msgstr "Последња сачувана ширина прозора" -#: ../midori/midori-websettings.c:351 +#: ../midori/midori-websettings.c:401 msgid "Last window height" msgstr "Висина прозора" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:402 msgid "The last saved window height" msgstr "Последња сачувана висина прозора" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:427 msgid "Last panel position" msgstr "Место панела" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:428 msgid "The last saved panel position" msgstr "Последње сачувано место панела" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:437 msgid "Last panel page" msgstr "Последња станица панела" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:438 msgid "The last saved panel page" msgstr "Последња сачувана страница у панелу" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:446 msgid "Last Web search" msgstr "Последња претрага" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:447 msgid "The last saved Web search" msgstr "Последња сачувана Интернет претрага" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:456 msgid "Show Menubar" msgstr "Прикажи мени" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:457 msgid "Whether to show the menubar" msgstr "Одређује да ли је приказана трака са менијем" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:465 msgid "Show Navigationbar" msgstr "Прикажи главну траку" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:466 msgid "Whether to show the navigationbar" msgstr "Одређује да ли је приказана главна трака" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:474 msgid "Show Bookmarkbar" msgstr "Прикажи обележиваче" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:475 msgid "Whether to show the bookmarkbar" msgstr "Одређује да ли су приказани обележивачи" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:483 msgid "Show Panel" msgstr "Прикажи бочну површ" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:484 msgid "Whether to show the panel" msgstr "Одређује да ли је приказана бочна површ" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:501 msgid "Show Transferbar" msgstr "Прикажи преносе" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:502 msgid "Whether to show the transferbar" msgstr "Одређује да ли је приказана трака са преносима" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:510 msgid "Show Statusbar" msgstr "Прикажи траку са стањем" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:511 msgid "Whether to show the statusbar" msgstr "Одређује да ли је приказана трака са стањем" -#: ../midori/midori-websettings.c:468 -msgid "Toolbar Style" +#: ../midori/midori-websettings.c:520 +#, fuzzy +msgid "Toolbar Style:" msgstr "Изглед траке са алаткама" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:521 msgid "The style of the toolbar" msgstr "Одређује изглед траке са алаткама" -#: ../midori/midori-websettings.c:485 -msgid "Show progress in location entry" -msgstr "Прикажи напредак у поље за адресе" - -#: ../midori/midori-websettings.c:486 -msgid "Whether to show loading progress in the location entry" -msgstr "Приказује напредак учитавања странице у поље за унос адреса" - -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:539 msgid "Search engines in location completion" msgstr "Прикажи претраживаче у поље за адресу" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:540 msgid "Whether to show search engines in the location completion" msgstr "Приказује претраживаче у поље за унос адреса" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:548 msgid "Toolbar Items" msgstr "Ставке у траци са алаткама" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:549 msgid "The items to show on the toolbar" msgstr "Ставке приказане у траци са алаткама" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:557 msgid "Compact Sidepanel" msgstr "Сабиј бочну површ" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" msgstr "Збија неке ставке у бочној површи" -#: ../midori/midori-websettings.c:545 -msgid "Load on Startup" -msgstr "Учитај по покретању" +#: ../midori/midori-websettings.c:575 +#, fuzzy +msgid "Show operating controls of the panel" +msgstr "Приказује податке о програму" + +#: ../midori/midori-websettings.c:576 +#, fuzzy +msgid "Whether to show the operating controls of the panel" +msgstr "Одређује да ли је приказана трака са преносима" + +#: ../midori/midori-websettings.c:591 +msgid "Align sidepanel on the right" +msgstr "Постави бочну површ десно" + +#: ../midori/midori-websettings.c:592 +msgid "Whether to align the sidepanel on the right" +msgstr "Одређује да ли да се бочна површ равна са десном страном" + +#: ../midori/midori-websettings.c:607 +#, fuzzy +msgid "Open panels in separate windows" +msgstr "Отвори нови прозор" + +#: ../midori/midori-websettings.c:608 +#, fuzzy +msgid "Whether to always open panels in separate windows" +msgstr "Откачује изабрану површ из прозора" + +#: ../midori/midori-websettings.c:617 +msgid "When Midori starts:" +msgstr "" -#: ../midori/midori-websettings.c:546 -msgid "What to load on startup" +#: ../midori/midori-websettings.c:618 +#, fuzzy +msgid "What to do when Midori starts" msgstr "Одређује шта се учитава по покретању" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:627 +#, fuzzy +msgid "Homepage:" +msgstr "Почетна страница" + +#: ../midori/midori-websettings.c:628 msgid "The homepage" msgstr "Почетна страница" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:643 msgid "Show crash dialog" msgstr "Прикажи прозорче приликом пада програма" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:644 msgid "Show a dialog after Midori crashed" msgstr "Прикажи прозорче при паду Мидорија" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:662 msgid "Show speed dial in new tabs" msgstr "Прикажи брзе посете у новим листовима" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:663 msgid "Show speed dial in newly opened tabs" msgstr "Укључује приказ брзих адреса у новим листовима" -#: ../midori/midori-websettings.c:597 -msgid "Download Folder" -msgstr "Фасцикла за преузето" +#: ../midori/midori-websettings.c:671 +#, fuzzy +msgid "Save downloaded files to:" +msgstr "Запамти последње преузете датотеке" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:672 msgid "The folder downloaded files are saved to" msgstr "Фасцикле у коју се смештају преузете датотеке" -#: ../midori/midori-websettings.c:617 -msgid "Ask for the destination folder" -msgstr "Питај за одредишну фасциклу" - -#: ../midori/midori-websettings.c:618 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "Пита за одредишну фасциклу приликом преузимања датотеке" - -#: ../midori/midori-websettings.c:637 -msgid "Notify when a transfer has been completed" -msgstr "Обавести ме по завршеном преносу" - -#: ../midori/midori-websettings.c:638 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "Приказује обавештење када се заврши преузимање датотеке" - -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:691 msgid "Download Manager" msgstr "Преузимач датотека" -#: ../midori/midori-websettings.c:651 +#: ../midori/midori-websettings.c:692 msgid "An external download manager" msgstr "Спољни програм за преузимање датотека" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:700 msgid "Text Editor" msgstr "Уређивач текста" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:701 msgid "An external text editor" msgstr "Спољни програм за уређивање текста" -#: ../midori/midori-websettings.c:675 +#: ../midori/midori-websettings.c:716 msgid "News Aggregator" msgstr "Читач вести" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:717 msgid "An external news aggregator" msgstr "Спољни програм за читање вести" -#: ../midori/midori-websettings.c:684 +#: ../midori/midori-websettings.c:725 msgid "Location entry Search" msgstr "Претрага у поље за адресе" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:726 msgid "The search to perform inside the location entry" msgstr "Додаје могућност претраге из поља за унос адреса" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:734 msgid "Preferred Encoding" msgstr "Предност кодирању" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:735 msgid "The preferred character encoding" msgstr "Кодирање знакова које ће бити у предности" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:745 msgid "Always Show Tabbar" msgstr "Увек прикажи језичке" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:746 msgid "Always show the tabbar" msgstr "Увек приказује траку са језичцима" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:754 msgid "Close Buttons on Tabs" msgstr "Прикажи дугме за затварање листова" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:755 msgid "Whether tabs have close buttons" msgstr "Приказује дугме за затварање на сваком листу" # bug(slobo): једноставно разлистај? -#: ../midori/midori-websettings.c:722 -msgid "Open new pages in" +#: ../midori/midori-websettings.c:780 +#, fuzzy +msgid "Open new pages in:" msgstr "Отвори нове странице у" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:781 msgid "Where to open new pages" msgstr "Одређује где да се отварају нове странице" -#: ../midori/midori-websettings.c:732 -msgid "Open external pages in" +#: ../midori/midori-websettings.c:797 +#, fuzzy +msgid "Open external pages in:" msgstr "Отвори спољне странице у" -#: ../midori/midori-websettings.c:733 +#: ../midori/midori-websettings.c:798 msgid "Where to open externally opened pages" msgstr "Одређује где се отварају спољне странице" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:807 msgid "Middle click opens Selection" msgstr "Отвори изабрано на средњи клик" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:808 msgid "Load an address from the selection via middle click" msgstr "Учитава адресу из изабраног на средњи клик мишем" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:816 msgid "Open tabs in the background" msgstr "Отвори листове у позадини" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:817 msgid "Whether to open new tabs in the background" msgstr "Не прелази на нови лист већ га отвара у позадини" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:825 msgid "Open Tabs next to Current" msgstr "Отвори лист поред тренутног" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:826 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Одређује да ли се нови лист отвара поред текућег или поред последњег листа" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:834 msgid "Open popups in tabs" msgstr "Смести искачуће прозоре у лист" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:835 msgid "Whether to open popup windows in tabs" msgstr "Отвара искачуће прозоре у новим листовима" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:845 ../extensions/statusbar-features.c:132 +msgid "Load images automatically" +msgstr "Сам учитај слике" + +#: ../midori/midori-websettings.c:846 +msgid "Load and display images automatically" +msgstr "Учитава и аутоматски приказује слике" + +#: ../midori/midori-websettings.c:853 ../extensions/statusbar-features.c:141 +msgid "Enable scripts" +msgstr "Укључи скрипте" + +#: ../midori/midori-websettings.c:854 +msgid "Enable embedded scripting languages" +msgstr "укључује уметнуте језике за скрипте" + +#: ../midori/midori-websettings.c:861 ../extensions/statusbar-features.c:150 +msgid "Enable Netscape plugins" +msgstr "Укључи Netscape додатке" + +#: ../midori/midori-websettings.c:862 +msgid "Enable embedded Netscape plugin objects" +msgstr "Омогућава објекте са угнежђеним Netscape додацима" + +#: ../midori/midori-websettings.c:878 +msgid "Enable Spell Checking" +msgstr "Укључи проверу писања" + +#: ../midori/midori-websettings.c:879 +msgid "Enable spell checking while typing" +msgstr "Укључи проверу писања док куцам" + +#: ../midori/midori-websettings.c:887 +msgid "Enable HTML5 database support" +msgstr "" + +#: ../midori/midori-websettings.c:888 +msgid "Whether to enable HTML5 database support" +msgstr "" + +#: ../midori/midori-websettings.c:894 +msgid "Enable HTML5 local storage support" +msgstr "" + +#: ../midori/midori-websettings.c:895 +msgid "Whether to enable HTML5 local storage support" +msgstr "" + +#: ../midori/midori-websettings.c:903 +msgid "Enable offline web application cache" +msgstr "" + +#: ../midori/midori-websettings.c:904 +msgid "Whether to enable offline web application cache" +msgstr "" + +#: ../midori/midori-websettings.c:929 msgid "Zoom Text and Images" msgstr "Увећај текст и слике" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:930 msgid "Whether to zoom text and images" msgstr "Повећај текст и слике" -#: ../midori/midori-websettings.c:806 +#: ../midori/midori-websettings.c:945 msgid "Find inline while typing" msgstr "Нађи док куцам" -#: ../midori/midori-websettings.c:807 +#: ../midori/midori-websettings.c:946 msgid "Whether to automatically find inline while typing" msgstr "Аутоматски проверава писање док куцате текст" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:961 +msgid "Kinetic scrolling" +msgstr "" + +#: ../midori/midori-websettings.c:962 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "" + +#: ../midori/midori-websettings.c:977 msgid "Accept cookies" msgstr "Прихвати колачиће" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:978 msgid "What type of cookies to accept" msgstr "Које колачиће да прихватим" -#: ../midori/midori-websettings.c:825 -msgid "Original cookies only" -msgstr "Само оригиналне колачиће" - -#: ../midori/midori-websettings.c:826 -msgid "Accept cookies from the original website only" -msgstr "Прихвата колачиће само са оригиналних веб страница" - -#: ../midori/midori-websettings.c:834 +#: ../midori/midori-websettings.c:987 msgid "Maximum cookie age" msgstr "Старост колачића" -#: ../midori/midori-websettings.c:835 +#: ../midori/midori-websettings.c:988 msgid "The maximum number of days to save cookies for" msgstr "Број дана након чега се уклањају колачићи са рачунара" -#: ../midori/midori-websettings.c:845 -msgid "Remember last visited pages" -msgstr "Запамти последње посећене странице" - -#: ../midori/midori-websettings.c:846 -msgid "Whether the last visited pages are saved" -msgstr "Чува странице које сте последње посетили" - -#: ../midori/midori-websettings.c:854 +#: ../midori/midori-websettings.c:997 msgid "Maximum history age" msgstr "Старост историјата" -#: ../midori/midori-websettings.c:855 +#: ../midori/midori-websettings.c:998 msgid "The maximum number of days to save the history for" msgstr "Број дана након којих се уклања историјат посета страница" -#: ../midori/midori-websettings.c:863 -msgid "Remember last form inputs" -msgstr "Запамти последње уносе у поља" - -#: ../midori/midori-websettings.c:864 -msgid "Whether the last form inputs are saved" -msgstr "Чува последње уносе у поља веб страница" - -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:1013 msgid "Remember last downloaded files" msgstr "Запамти последње преузете датотеке" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:1014 msgid "Whether the last downloaded files are saved" msgstr "Чува датотеке које сте последње преузели" -#: ../midori/midori-websettings.c:883 -msgid "Proxy Server" +#: ../midori/midori-websettings.c:1031 +#, fuzzy +msgid "Proxy server" +msgstr "Прокси сервер" + +#: ../midori/midori-websettings.c:1032 +msgid "The type of proxy server to use" +msgstr "" + +#: ../midori/midori-websettings.c:1041 +#, fuzzy +msgid "HTTP Proxy Server" msgstr "Прокси сервер" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:1042 msgid "The proxy server used for HTTP connections" msgstr "Прокси сервер за ХТТП везе" -#: ../midori/midori-websettings.c:899 -msgid "Detect proxy server automatically" -msgstr "Сам одреди прокси сервер" - -#: ../midori/midori-websettings.c:900 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Покушава да сам одреди прокси сервер на основу окружења" +#: ../midori/midori-websettings.c:1059 +msgid "The maximum size of cached pages on disk" +msgstr "" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:916 +#: ../midori/midori-websettings.c:1076 msgid "Identify as" msgstr "Представи се као" -#: ../midori/midori-websettings.c:917 +#: ../midori/midori-websettings.c:1077 msgid "What to identify as to web pages" msgstr "Одређује како се програм представља веб страницама" -#: ../midori/midori-websettings.c:933 +#: ../midori/midori-websettings.c:1093 msgid "Identification string" msgstr "Реченица за представање" -#: ../midori/midori-websettings.c:934 +#: ../midori/midori-websettings.c:1094 msgid "The application identification string" msgstr "Реченица која одређује како веб странице препознају програм" -#: ../midori/midori-websettings.c:942 -msgid "Cache size" -msgstr "Величина оставе" - -#: ../midori/midori-websettings.c:943 -msgid "The allowed size of the cache" -msgstr "Дозвољена величина оставе" +#: ../midori/midori-websettings.c:1110 +#, fuzzy +msgid "Preferred languages" +msgstr "Предност кодирању" + +#: ../midori/midori-websettings.c:1111 +msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" + +#: ../midori/midori-websettings.c:1126 +#, fuzzy +msgid "Clear private data" +msgstr "О_чисти личне податке" + +#: ../midori/midori-websettings.c:1127 +msgid "The private data selected for deletion" +msgstr "" + +#: ../midori/midori-websettings.c:1142 +#, fuzzy +msgid "Clear data" +msgstr "О_чисти личне податке" + +#: ../midori/midori-websettings.c:1143 +msgid "The data selected for deletion" +msgstr "" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1176 +msgid "Strip referrer details sent to external sites" +msgstr "" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1178 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "" -#: ../midori/midori-view.c:686 +#: ../midori/midori-view.c:1374 #, c-format -msgid "The page '%s' couldn't be loaded." -msgstr "Не могу да учитам страницу „%s“." +msgid "%s wants to save an HTML5 database." +msgstr "" + +#: ../midori/midori-view.c:1378 ../midori/midori-view.c:1408 +msgid "_Deny" +msgstr "" + +#: ../midori/midori-view.c:1378 ../midori/midori-view.c:1408 +msgid "_Allow" +msgstr "" + +#: ../midori/midori-view.c:1404 +#, c-format +msgid "%s wants to know your location." +msgstr "" #. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, #. so reloading via Javascript works but not via API calls. -#: ../midori/midori-view.c:688 ../midori/midori-view.c:2701 -#: ../extensions/feed-panel/main.c:112 -msgid "Error" +#. 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:1519 ../midori/midori-view.c:5161 +#: ../midori/midori-view.c:5165 +#, fuzzy, c-format +msgid "Error - %s" msgstr "Грешка" -#: ../midori/midori-view.c:691 +#: ../midori/midori-view.c:1520 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "Не могу да учитам страницу „%s“." + +#: ../midori/midori-view.c:1522 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:721 ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:1540 #, c-format msgid "Not found - %s" msgstr "Није пронађено - %s" -#: ../midori/midori-view.c:1095 -msgid "Open _Link" -msgstr "_Отвори везу" +#: ../midori/midori-view.c:1730 ../midori/midori-view.c:2674 +#, fuzzy, c-format +msgid "Send a message to %s" +msgstr "Снимак је сачуван у: %s\n" + +#: ../midori/midori-view.c:2465 ../midori/midori-view.c:2841 +msgid "Inspect _Element" +msgstr "" -#: ../midori/midori-view.c:1097 +#: ../midori/midori-view.c:2517 ../midori/midori-view.c:2577 msgid "Open Link in New _Tab" msgstr "Отвори везу у новом _листу" -#: ../midori/midori-view.c:1114 +#: ../midori/midori-view.c:2521 +#, fuzzy +msgid "Open Link in _Foreground Tab" +msgstr "Отвори везу у новом _листу" + +#: ../midori/midori-view.c:2522 +#, fuzzy +msgid "Open Link in _Background Tab" +msgstr "Отвори везу у новом _листу" + +#: ../midori/midori-view.c:2525 ../midori/midori-view.c:2584 msgid "Open Link in New _Window" msgstr "Отвори везу у _новом прозору" -#: ../midori/midori-view.c:1123 -msgid "_Download Link destination" -msgstr "Преузми _циљну датотеку" +#: ../midori/midori-view.c:2528 +#, fuzzy +msgid "Open Link as Web A_pplication" +msgstr "Покреће АДРЕСУ као веб програм" -#: ../midori/midori-view.c:1129 -msgid "_Save Link destination" +#: ../midori/midori-view.c:2531 +#, fuzzy +msgid "Copy Link de_stination" msgstr "Сачувај ци_љну датотеку" -#: ../midori/midori-view.c:1138 -msgid "Download with Download _Manager" -msgstr "Пре_узми помоћу спољашњег програма" +# bug: no plural-forms +#: ../midori/midori-view.c:2543 +#, fuzzy +msgid "Open _Image in New Tab" +msgstr "Отвору у новом _листу" + +#: ../midori/midori-view.c:2546 +msgid "Copy Image _Address" +msgstr "" + +#: ../midori/midori-view.c:2549 +msgid "Save I_mage" +msgstr "" + +#: ../midori/midori-view.c:2556 +msgid "Copy Video _Address" +msgstr "" + +#: ../midori/midori-view.c:2559 +#, fuzzy +msgid "Save _Video" +msgstr "Сачувај датотеку као" + +#: ../midori/midori-view.c:2559 +#, fuzzy +msgid "Download _Video" +msgstr "Фасцикла за преузето" -#: ../midori/midori-view.c:1167 +#: ../midori/midori-view.c:2619 msgid "Search _with" msgstr "Пре_тражи са" -#: ../midori/midori-view.c:1195 +#: ../midori/midori-view.c:2654 ../midori/midori-view.c:2661 msgid "_Search the Web" msgstr "П_ретражи Интернет" # bug: no plural-forms -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:2682 msgid "Open Address in New _Tab" msgstr "Отвору адресу у новом _листу" -#: ../midori/midori-view.c:1372 +#: ../midori/midori-view.c:2990 msgid "Open or download file" msgstr "Отвори или преузми датотеку" -#: ../midori/midori-view.c:1389 +#: ../midori/midori-view.c:3009 #, c-format msgid "File Type: '%s'" msgstr "Врста датотеке: „%s“" -#: ../midori/midori-view.c:1392 +#: ../midori/midori-view.c:3011 #, c-format msgid "File Type: %s ('%s')" msgstr "Врста датотеке: %s („%s“)" +#: ../midori/midori-view.c:3026 +msgid "MD5-Checksum:" +msgstr "" + +#: ../midori/midori-view.c:3033 +msgid "SHA1-Checksum:" +msgstr "" + #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1396 +#: ../midori/midori-view.c:3043 #, c-format msgid "Open %s" msgstr "Отвори %s" -#: ../midori/midori-view.c:1816 +#: ../midori/midori-view.c:3646 #, c-format msgid "Inspect page - %s" msgstr "Инспекција странице — %s" -#: ../midori/midori-view.c:2001 ../midori/midori-view.c:2002 -msgid "Search" -msgstr "Нађи" +#: ../midori/midori-view.c:4130 +#, fuzzy +msgid "Speed Dial" +msgstr "Додај у _брзе посете" -#: ../midori/midori-view.c:2003 +#: ../midori/midori-view.c:4131 msgid "Click to add a shortcut" msgstr "Кликните за додавање пречице" -#: ../midori/midori-view.c:2004 +#: ../midori/midori-view.c:4132 msgid "Enter shortcut address" msgstr "Унесите адресу за пречицу" -#: ../midori/midori-view.c:2005 +#: ../midori/midori-view.c:4133 msgid "Enter shortcut title" msgstr "Унесите наслов за пречицу" -#: ../midori/midori-view.c:2006 +#: ../midori/midori-view.c:4134 msgid "Are you sure you want to delete this shortcut?" msgstr "Да ли заиста желите да обришете ову пречицу?" -#: ../midori/midori-view.c:2038 +#: ../midori/midori-view.c:4135 +msgid "Set number of columns and rows" +msgstr "" + +#: ../midori/midori-view.c:4136 +msgid "Enter number of columns and rows:" +msgstr "" + +#: ../midori/midori-view.c:4137 +msgid "Invalid input for the size of the speed dial" +msgstr "" + +#: ../midori/midori-view.c:4138 +msgid "Thumb size:" +msgstr "" + +#: ../midori/midori-view.c:4139 +msgid "Small" +msgstr "" + +#: ../midori/midori-view.c:4140 +msgid "Medium" +msgstr "" + +#: ../midori/midori-view.c:4141 +msgid "Big" +msgstr "" + +#: ../midori/midori-view.c:4177 #, c-format msgid "Document cannot be displayed" msgstr "Не могу да прикажем докумант" -#: ../midori/midori-view.c:2055 +#: ../midori/midori-view.c:4200 #, c-format msgid "No documentation installed" msgstr "Није инсталирана помоћ" -#: ../midori/midori-preferences.c:91 -#, c-format -msgid "Preferences for %s" -msgstr "Поставке за %s" +#: ../midori/midori-view.c:4269 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "" -#. Page "General" -#: ../midori/midori-preferences.c:398 -msgid "General" -msgstr "Опште" +#: ../midori/midori-view.c:4319 +msgid "Page loading delayed" +msgstr "" + +#: ../midori/midori-view.c:4320 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "" + +#: ../midori/midori-view.c:4321 +msgid "Load Page" +msgstr "" + +#: ../midori/midori-view.c:4462 +msgid "Blank page" +msgstr "Празна страна" + +#: ../midori/midori-view.c:4702 +msgid "_Duplicate Tab" +msgstr "" + +#: ../midori/midori-view.c:4707 +#, fuzzy +msgid "Show Tab _Label" +msgstr "Прикажи бочну површ" + +#: ../midori/midori-view.c:4707 +msgid "Show Tab _Icon Only" +msgstr "" + +#: ../midori/midori-view.c:4713 +#, fuzzy +msgid "Close ot_her Tabs" +msgstr "Затвара овај лист" + +#: ../midori/midori-view.c:5348 +msgid "Print background images" +msgstr "Прикажи позадинске слике" + +#: ../midori/midori-view.c:5349 +msgid "Whether background images should be printed" +msgstr "Одређује да ли треба приказати слике за позадину" + +#: ../midori/midori-view.c:5385 +msgid "Features" +msgstr "Могућности" -#: ../midori/midori-preferences.c:399 +#. Page "General" +#: ../midori/midori-preferences.c:302 msgid "Startup" msgstr "Покретање" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:318 ../midori/midori-preferences.c:325 msgid "Use current page as homepage" msgstr "Искористи тренутну страницу" -#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88 -msgid "Transfers" -msgstr "Преноси" - #. Page "Appearance" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:333 msgid "Appearance" msgstr "Изглед" -#: ../midori/midori-preferences.c:441 -msgid "Font settings" -msgstr "Подешавање фонтова" - -#: ../midori/midori-preferences.c:443 +#: ../midori/midori-preferences.c:336 msgid "Default Font Family" msgstr "Уобичајени фонтови" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:339 msgid "The default font family used to display text" msgstr "Подразумевани фонтови за приказ текста" -#: ../midori/midori-preferences.c:450 +#: ../midori/midori-preferences.c:342 msgid "The default font size used to display text" msgstr "Подразумевани величина фонтова за приказ текста" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:344 msgid "Fixed-width Font Family" msgstr "Фонтови задате ширине" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:347 msgid "The font family used to display fixed-width text" msgstr "Подразумевани фонтови задате ширине за приказ текста" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:350 +#, fuzzy +msgid "The font size used to display fixed-width text" +msgstr "Подразумевани фонтови задате ширине за приказ текста" + +#: ../midori/midori-preferences.c:352 msgid "Minimum Font Size" msgstr "Најмања величина фонта" -#: ../midori/midori-preferences.c:461 +#: ../midori/midori-preferences.c:355 msgid "The minimum font size used to display text" msgstr "најмања величина фонтова за приказ текста" -#: ../midori/midori-preferences.c:468 -msgid "Encoding" -msgstr "Кодирање" - -#: ../midori/midori-preferences.c:471 -msgid "The character encoding to use by default" -msgstr "Подразумевано кодирање текста" - #. Page "Behavior" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:364 msgid "Behavior" msgstr "Понашање" -#: ../midori/midori-preferences.c:479 -msgid "Features" -msgstr "Могућности" - -#: ../midori/midori-preferences.c:482 ../extensions/statusbar-features.c:54 -msgid "Load images automatically" -msgstr "Сам учитај слике" - -#: ../midori/midori-preferences.c:483 -msgid "Load and display images automatically" -msgstr "Учитава и аутоматски приказује слике" - -#: ../midori/midori-preferences.c:486 -msgid "Shrink images automatically" -msgstr "Сам умањи слике" - -#: ../midori/midori-preferences.c:487 -msgid "Automatically shrink standalone images to fit" -msgstr "Сам умањи слике како би се уклопиле у страницу" - -#: ../midori/midori-preferences.c:490 -msgid "Print background images" -msgstr "Прикажи позадинске слике" - -#: ../midori/midori-preferences.c:491 -msgid "Whether background images should be printed" -msgstr "Одређује да ли треба приказати слике за позадину" - -#: ../midori/midori-preferences.c:494 -msgid "Resizable text areas" -msgstr "Омогући промену величине текста" - -#: ../midori/midori-preferences.c:495 -msgid "Whether text areas are resizable" -msgstr "Омогућава промену величине области са текстом" - -#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:63 -msgid "Enable scripts" -msgstr "Укључи скрипте" - -#: ../midori/midori-preferences.c:499 -msgid "Enable embedded scripting languages" -msgstr "укључује уметнуте језике за скрипте" - -#: ../midori/midori-preferences.c:502 ../extensions/statusbar-features.c:72 -msgid "Enable Netscape plugins" -msgstr "Укључи Netscape додатке" - -#: ../midori/midori-preferences.c:503 -msgid "Enable embedded Netscape plugin objects" -msgstr "Омогућава објекте са угнежђеним Netscape додацима" - -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:373 msgid "Enforce 96 dots per inch" msgstr "Приморај 96 тачака по инчу" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:374 msgid "Enforce a video dot density of 96 DPI" msgstr "Приморава густину тачака екрана од 96 ТПИ" -#: ../midori/midori-preferences.c:510 -msgid "Enable developer tools" -msgstr "Укључи алате за развој" - -#: ../midori/midori-preferences.c:511 -msgid "Enable special extensions for developers" -msgstr "Укључи додатна проширења за развој" - -#: ../midori/midori-preferences.c:518 -msgid "Spell Checking" -msgstr "Провера писања" - -#: ../midori/midori-preferences.c:521 -msgid "Enable Spell Checking" -msgstr "Укључи проверу писања" - -#: ../midori/midori-preferences.c:522 -msgid "Enable spell checking while typing" -msgstr "Укључи проверу писања док куцам" - -#: ../midori/midori-preferences.c:525 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" +#: ../midori/midori-preferences.c:386 +msgid "Allow scripts to open popups" msgstr "" -"Списак језика језика за проверу писања раздвојени зарезом " -"(нpr. en_GB,sh_YU,sr_YU)" -#. Page "Interface" -#: ../midori/midori-preferences.c:530 -msgid "Interface" -msgstr "Сучеље" - -#: ../midori/midori-preferences.c:531 -msgid "Navigationbar" -msgstr "Главна трака" +#: ../midori/midori-preferences.c:387 +#, fuzzy +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "Отвара искачуће прозоре у новим листовима" -#: ../midori/midori-preferences.c:542 +#. Page "Interface" +#: ../midori/midori-preferences.c:412 msgid "Browsing" msgstr "Разгледање" -#. Page "Applications" -#: ../midori/midori-preferences.c:572 +#: ../midori/midori-preferences.c:440 msgid "Applications" msgstr "Програми" -#: ../midori/midori-preferences.c:573 -msgid "External applications" -msgstr "Спољни програми" - #. Page "Network" -#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:620 +#: ../midori/midori-preferences.c:453 msgid "Network" msgstr "Мрежа" -#: ../midori/midori-preferences.c:647 +#: ../midori/midori-preferences.c:460 +#, fuzzy +msgid "Hostname" +msgstr "Корисничко име" + +#: ../midori/midori-preferences.c:473 msgid "MB" msgstr "МБ" -#. Page "Privacy" -#: ../midori/midori-preferences.c:652 -msgid "Privacy" -msgstr "Приватност" - -#: ../midori/midori-preferences.c:653 -msgid "Web Cookies" -msgstr "Колачићи" - -#: ../midori/midori-preferences.c:666 ../midori/midori-preferences.c:676 -msgid "days" -msgstr "дана" - -#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:314 -msgid "Empty" -msgstr "Празно" - -#: ../midori/midori-searchaction.c:904 +#: ../midori/midori-searchaction.c:908 msgid "Add search engine" msgstr "Додај претраживач" -#: ../midori/midori-searchaction.c:904 +#: ../midori/midori-searchaction.c:908 msgid "Edit search engine" msgstr "Уреди претрачивач" -#: ../midori/midori-searchaction.c:932 +#: ../midori/midori-searchaction.c:937 msgid "_Name:" msgstr "_Име:" -#: ../midori/midori-searchaction.c:976 +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "И_коница:" -#: ../midori/midori-searchaction.c:990 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "_Фраза:" -#: ../midori/midori-searchaction.c:1195 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "Подеси претраживаче" -#: ../midori/midori-searchaction.c:1292 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "_Постави као подразумевани" -#: ../midori/sokoke.c:162 ../midori/sokoke.c:174 -msgid "Could not run external program." -msgstr "Не могу да покренем спољни програм." +#: ../midori/sokoke.c:452 +#, fuzzy +msgid "Open with" +msgstr "Отвори датотеку" -#. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:520 -msgid "Warning: You are using a superuser account!" -msgstr "Упозорење: Користите администраторски налог!" +#: ../midori/sokoke.c:460 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "" -#: ../midori/sokoke.c:871 +#: ../midori/sokoke.c:1509 msgid "_Bookmark" msgstr "_Обележивач" -#: ../midori/sokoke.c:873 -msgid "_Add Bookmark" +#: ../midori/sokoke.c:1511 +#, fuzzy +msgid "Add Boo_kmark" msgstr "_Додај обележивач" -#: ../midori/sokoke.c:874 +#: ../midori/sokoke.c:1512 msgid "_Console" msgstr "_Конзола" -#: ../midori/sokoke.c:875 +#: ../midori/sokoke.c:1513 msgid "_Extensions" msgstr "П_роширења" -#: ../midori/sokoke.c:876 -msgid "_History" -msgstr "_Историјат" - -#: ../midori/sokoke.c:877 +#: ../midori/sokoke.c:1515 msgid "_Homepage" msgstr "На по_четну страницу" -#: ../midori/sokoke.c:878 +#: ../midori/sokoke.c:1516 msgid "_Userscripts" msgstr "Личне _скрипте" -#: ../midori/sokoke.c:879 -msgid "User_styles" -msgstr "Лични с_тилови" - -#: ../midori/sokoke.c:880 +#: ../midori/sokoke.c:1517 msgid "New _Tab" msgstr "Нови _лист" -#: ../midori/sokoke.c:881 +#: ../midori/sokoke.c:1518 msgid "_Transfers" msgstr "Пр_еноиси" -#: ../midori/sokoke.c:882 +#: ../midori/sokoke.c:1519 msgid "Netscape p_lugins" msgstr "Netscape _додаци" -#: ../midori/sokoke.c:883 -msgid "_Closed Tabs and Windows" -msgstr "_Затворени листови и прозори" +#: ../midori/sokoke.c:1522 +#, fuzzy +msgid "New _Folder" +msgstr "Нова фасцикла" -#: ../midori/sokoke.c:884 -msgid "New _Window" -msgstr "_Нови прозор" +#: ../midori/sokoke.c:2262 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../midori/sokoke.c:2263 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../midori/sokoke.c:2264 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 -msgid "Userscripts" -msgstr "Личне скрипте" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:2272 ../panels/midori-transfers.c:273 +#, c-format +msgid "%s of %s" +msgstr "%s од %s" -#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 -msgid "Userstyles" -msgstr "Лични стилови" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:2281 +msgid "?B" +msgstr "" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:2284 +#, c-format +msgid " (%s/s)" +msgstr "" + +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:2301 +#, c-format +msgid " - %s remaining" +msgstr "" + +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:231 +msgid "_Inline Find:" +msgstr "_Тражи израз:" + +#: ../toolbars/midori-findbar.c:265 +msgid "Previous" +msgstr "Претходно" + +#: ../toolbars/midori-findbar.c:271 +msgid "Next" +msgstr "Следеће" -#: ../panels/midori-addons.c:927 ../panels/midori-extensions.c:144 -msgid "_Enable" -msgstr "_Укључи" - -#: ../panels/midori-addons.c:928 ../panels/midori-extensions.c:145 -msgid "Enable" -msgstr "Укључи" - -#: ../panels/midori-addons.c:937 ../panels/midori-extensions.c:154 -msgid "_Disable" -msgstr "_Искључи" - -#: ../panels/midori-addons.c:938 ../panels/midori-extensions.c:155 -msgid "Disable" -msgstr "Искључи" +#: ../toolbars/midori-findbar.c:275 +msgid "Match Case" +msgstr "Упореди велчину слова" + +#: ../toolbars/midori-findbar.c:284 +msgid "Highlight Matches" +msgstr "Истакни нађено" + +#: ../toolbars/midori-findbar.c:295 +msgid "Close Findbar" +msgstr "Затвара траку за претрагу странице" + +#: ../toolbars/midori-transferbar.c:132 +#, fuzzy, c-format +msgid "The file '%s' has been downloaded." +msgstr "Датотека %s је преузета." + +#: ../toolbars/midori-transferbar.c:135 +msgid "Transfer completed" +msgstr "Преузимање је завршено" -#: ../panels/midori-bookmarks.c:107 +#: ../toolbars/midori-transferbar.c:217 +#, fuzzy +msgid "The downloaded file is erroneous." +msgstr "Фасцикле у коју се смештају преузете датотеке" + +#: ../toolbars/midori-transferbar.c:218 +msgid "The checksum provided with the link did not match. This means the file is probably incomplete or was modified afterwards." +msgstr "" + +#: ../toolbars/midori-transferbar.c:327 ../panels/midori-transfers.c:144 +#, fuzzy +msgid "Clear All" +msgstr "Сакупи све" + +#: ../toolbars/midori-transferbar.c:370 ../toolbars/midori-transferbar.c:372 +#, fuzzy +msgid "Some files are being downloaded" +msgstr "Датотека %s је преузета." + +#: ../toolbars/midori-transferbar.c:376 +#, fuzzy +msgid "_Quit Midori" +msgstr "Мидори" + +#: ../toolbars/midori-transferbar.c:378 +msgid "The transfers will be cancelled if Midori quits." +msgstr "" + +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Обележивачи" -#: ../panels/midori-bookmarks.c:238 +#: ../panels/midori-bookmarks.c:282 +#, fuzzy, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Не могу да додам ставку у историјат: %s\n" + +#: ../panels/midori-bookmarks.c:462 msgid "Edit the selected bookmark" msgstr "Уреди изабрани обележивач" -#: ../panels/midori-bookmarks.c:246 +#: ../panels/midori-bookmarks.c:470 msgid "Delete the selected bookmark" msgstr "Уклони изабрани обележивач" -#: ../panels/midori-bookmarks.c:591 +#: ../panels/midori-bookmarks.c:485 +msgid "Add a new folder" +msgstr "Додај нову фасциклу" + +#: ../panels/midori-bookmarks.c:619 ../panels/midori-history.c:576 msgid "Separator" msgstr "Раздвајач" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "Конзола" +#: ../panels/midori-history.c:114 +msgid "History" +msgstr "Историјат" -#: ../panels/midori-extensions.c:87 -msgid "Extensions" -msgstr "Проширења" +#: ../panels/midori-history.c:146 +msgid "A week ago" +msgstr "Пре недељу дана" + +#: ../panels/midori-history.c:148 +#, fuzzy, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "Пре %d дан" +msgstr[1] "Пре %d дан" +msgstr[2] "Пре %d дан" + +#: ../panels/midori-history.c:151 +msgid "Today" +msgstr "Данас" -#: ../panels/midori-history.c:162 +#: ../panels/midori-history.c:153 +msgid "Yesterday" +msgstr "Јуче" + +#: ../panels/midori-history.c:315 msgid "Are you sure you want to remove all history items?" msgstr "Да ли заиста желите да уклоните све ставке из историјата?" -#: ../panels/midori-history.c:217 +#: ../panels/midori-history.c:360 msgid "Bookmark the selected history item" msgstr "Постави изабрани из историјата у обележиваче" -#: ../panels/midori-history.c:226 +#: ../panels/midori-history.c:369 msgid "Delete the selected history item" msgstr "Уклони изабрану ставку из историјата" -#: ../panels/midori-history.c:234 +#: ../panels/midori-history.c:377 msgid "Clear the entire history" msgstr "Очисти историјат" -#: ../panels/midori-history.c:599 -msgid "A week ago" -msgstr "Пре недељу дана" - -#: ../panels/midori-history.c:604 -#, c-format -msgid "%d day ago" -msgstr "Пре %d дан" - -#: ../panels/midori-history.c:605 -#, c-format -msgid "%d days ago" -msgstr "Пре %d дана" - -#: ../panels/midori-history.c:612 -msgid "Today" -msgstr "Данас" - -#: ../panels/midori-history.c:614 -msgid "Yesterday" -msgstr "Јуче" +#: ../panels/midori-transfers.c:87 +msgid "Transfers" +msgstr "Преноси" -#: ../panels/midori-plugins.c:87 -msgid "Netscape plugins" -msgstr "Netscape додаци" +#: ../panels/midori-transfers.c:481 +#, fuzzy +msgid "Open Destination _Folder" +msgstr "Питај за одредишну фасциклу" -#: ../panels/midori-transfers.c:256 -#, c-format -msgid "%s of %s" -msgstr "%s од %s" +#: ../panels/midori-transfers.c:484 +msgid "Copy Link Loc_ation" +msgstr "" -#: ../katze/katze-http-auth.c:97 +#: ../katze/katze-http-auth.c:213 msgid "Authentication Required" msgstr "Потребна је пријава" -#: ../katze/katze-http-auth.c:113 +#: ../katze/katze-http-auth.c:229 msgid "" "A username and a password are required\n" "to open this location:" @@ -1811,60 +2472,226 @@ "Потребно су корисничко име и лозинка за\n" "отварање ове странице:" -#: ../katze/katze-http-auth.c:127 +#: ../katze/katze-http-auth.c:243 msgid "Username" msgstr "Корисничко име" -#: ../katze/katze-http-auth.c:138 +#: ../katze/katze-http-auth.c:256 msgid "Password" msgstr "Лозинка" -#: ../katze/katze-throbber.c:828 -#, c-format +#: ../katze/katze-http-auth.c:270 #, fuzzy +msgid "_Remember password" +msgstr "Запамти величину прозора" + +#: ../katze/katze-throbber.c:879 +#, fuzzy, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Не могу да именовану учитам иконицу „%s“" -#: ../katze/katze-throbber.c:841 -#, c-format -#, fuzzy +#: ../katze/katze-throbber.c:892 +#, fuzzy, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Не могу да учитам сток иконицу „%s“" -#: ../katze/katze-throbber.c:907 +#: ../katze/katze-throbber.c:964 msgid "Animation frames are broken" msgstr "Оквири са анимацијама су неисправни" -#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:385 +#: ../katze/katze-utils.c:510 ../katze/katze-utils.c:918 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Вредност „%s“ није исправна за %s" -#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:244 +#: ../katze/katze-utils.c:556 ../katze/katze-utils.c:585 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Изаберите датотеку" -#: ../katze/katze-utils.c:230 +#: ../katze/katze-utils.c:571 msgid "Choose folder" msgstr "Изаберите фасциклу" -#: ../extensions/colorful-tabs.c:115 -msgid "Tint tabs distinctly" -msgstr "Другачије обоји листове" +#: ../katze/katze-preferences.c:95 +#, c-format +msgid "Preferences for %s" +msgstr "Поставке за %s" + +#: ../extensions/adblock.c:415 +msgid "Configure Advertisement filters" +msgstr "" + +#: ../extensions/adblock.c:447 +#, 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:587 +msgid "Configure _Advertisement filters..." +msgstr "" + +#: ../extensions/adblock.c:847 +#, fuzzy +msgid "Edit rule" +msgstr "Уреди фасциклу" + +#: ../extensions/adblock.c:860 +#, fuzzy +msgid "_Rule:" +msgstr "_Наслов:" + +#: ../extensions/adblock.c:914 +#, fuzzy +msgid "Bl_ock image" +msgstr "Празна страна" + +#: ../extensions/adblock.c:919 +msgid "Bl_ock link" +msgstr "" + +#: ../extensions/adblock.c:1498 +msgid "Advertisement blocker" +msgstr "" + +#: ../extensions/adblock.c:1499 +msgid "Block advertisements according to a filter list" +msgstr "" + +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:218 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "" + +#: ../extensions/addons.c:219 +#, fuzzy +msgid "_Install user script" +msgstr "Укључи скрипте" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:224 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "" + +#: ../extensions/addons.c:225 +msgid "_Install user style" +msgstr "" + +#: ../extensions/addons.c:233 +msgid "Don't install" +msgstr "" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 +msgid "Userscripts" +msgstr "Личне скрипте" -#: ../extensions/colorful-tabs.c:151 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 +msgid "Userstyles" +msgstr "Лични стилови" + +#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Грешка" + +#: ../extensions/addons.c:421 +#, fuzzy, c-format +msgid "Do you want to delete '%s'?" +msgstr "Да ли желите да обришете све колачиће" + +#: ../extensions/addons.c:427 +#, fuzzy +msgid "Delete user script" +msgstr "Личне скрипте" + +#: ../extensions/addons.c:428 +#, fuzzy +msgid "Delete user style" +msgstr "Обричи довод" + +#: ../extensions/addons.c:431 +#, fuzzy, c-format +msgid "The file %s will be permanently deleted." +msgstr "Датотека %s је преузета." + +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +#, fuzzy +msgid "Open in Text Editor" +msgstr "Уређивач текста" + +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +#, fuzzy +msgid "Open Target Folder" +msgstr "Отвори датотеку" + +#: ../extensions/addons.c:638 +#, fuzzy +msgid "Add new addon" +msgstr "Додај нови довод" + +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "" + +#: ../extensions/addons.c:1637 ../extensions/addons.c:1799 +msgid "User addons" +msgstr "" + +#: ../extensions/addons.c:1758 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "" + +#: ../extensions/addons.c:1800 +msgid "Support for userscripts and userstyles" +msgstr "" + +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "Листови у боји" -#: ../extensions/colorful-tabs.c:152 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Боји сваку картицу другачије" -#: ../extensions/cookie-manager.c:201 +#: ../extensions/cookie-manager/cookie-manager-page.c:82 +#: ../extensions/cookie-manager/main.c:35 +msgid "Cookie Manager" +msgstr "Управник колачићима" + +#: ../extensions/cookie-manager/cookie-manager-page.c:112 +msgid "Delete All" +msgstr "Обриши _све" + +#: ../extensions/cookie-manager/cookie-manager-page.c:114 +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:129 +msgid "Expand All" +msgstr "Прошири све" + +#: ../extensions/cookie-manager/cookie-manager-page.c:136 +msgid "Collapse All" +msgstr "Сакупи све" + +#: ../extensions/cookie-manager/cookie-manager-page.c:578 +msgid "Do you really want to delete all cookies?" +msgstr "Да ли желите да обришете све колачиће" + +#: ../extensions/cookie-manager/cookie-manager-page.c:580 +msgid "Question" +msgstr "Питање" + +#: ../extensions/cookie-manager/cookie-manager-page.c:589 +msgid "Only cookies which match the filter will be deleted." +msgstr "Биће обрисани само колачићи који се поклапају са задатим филтером." + +#: ../extensions/cookie-manager/cookie-manager-page.c:677 msgid "At the end of the session" msgstr "На крају сесије" -#: ../extensions/cookie-manager.c:204 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 #, c-format msgid "" "Host: %s\n" @@ -1881,120 +2708,102 @@ "Сигурност: %s\n" "Истиче: %s" -#: ../extensions/cookie-manager.c:210 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "Yes" msgstr "Да" -#: ../extensions/cookie-manager.c:210 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "No" msgstr "Не" -#: ../extensions/cookie-manager.c:493 -msgid "Do you really want to delete all cookies?" -msgstr "Да ли желите да обришете све колачиће" - -#: ../extensions/cookie-manager.c:495 -msgid "Question" -msgstr "Питање" - -#: ../extensions/cookie-manager.c:504 -msgid "Only cookies which match the filter will be deleted." -msgstr "Биће обрисани само колачићи који се поклапају са задатим филтером." +#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#, c-format +msgid "" +"Domain: %s\n" +"Cookies: %d" +msgstr "" -#: ../extensions/cookie-manager.c:682 +#: ../extensions/cookie-manager/cookie-manager-page.c:1030 msgid "Name" msgstr "Име" -#: ../extensions/cookie-manager.c:742 +#: ../extensions/cookie-manager/cookie-manager-page.c:1083 msgid "_Expand All" msgstr "_Прошири све" -#: ../extensions/cookie-manager.c:750 +#: ../extensions/cookie-manager/cookie-manager-page.c:1091 msgid "_Collapse All" msgstr "_Сакупи све" -#: ../extensions/cookie-manager.c:823 -msgid "" -"Deletes all shown cookies. If a filter is set, only those cookies are " -"deleted which match the filter." -msgstr "" -"Брише све приказане колачиће. Уколико је постављен филтер обрисаће само " -"колачиће који се поклапају са филтером." - -#: ../extensions/cookie-manager.c:838 -msgid "Expand All" -msgstr "Прошири све" - -#: ../extensions/cookie-manager.c:845 -msgid "Collapse All" -msgstr "Сакупи све" - -#: ../extensions/cookie-manager.c:876 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Филтер:" -#: ../extensions/cookie-manager.c:881 -msgid "" -"Enter a filter string to show only cookies whose name or domain field match " -"the entered filter" -msgstr "" -"Унесите реч за филтрирање колачића чији се називи или адресе поклапају са " -"филтером" - -#: ../extensions/cookie-manager.c:916 ../extensions/cookie-manager.c:964 -msgid "Cookie Manager" -msgstr "Управник колачићима" - -#: ../extensions/cookie-manager.c:948 -msgid "_Cookie Manager" -msgstr "_Управник колачићима" +#: ../extensions/cookie-manager/cookie-manager-page.c:1149 +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "Унесите реч за филтрирање колачића чији се називи или адресе поклапају са филтером" -#: ../extensions/cookie-manager.c:965 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Исписује, уређује и уклања колачиће" -#: ../extensions/feed-panel/feed-atom.c:242 +#: ../extensions/copy-tabs.c:39 +#, fuzzy +msgid "Copy Tab _Addresses" +msgstr "Адресе" + +# bug: no plural-forms +#: ../extensions/copy-tabs.c:96 +#, fuzzy +msgid "Copy Addresses of Tabs" +msgstr "Отвору адресу у новом _листу" + +#: ../extensions/copy-tabs.c:97 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "" + +#: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Не могу да нађем потребни Атом „entry“ међу XML подацима." -#: ../extensions/feed-panel/feed-atom.c:348 +#: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Не могу да нађем потребни Атом „fees“ међу XML подацима." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:392 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Задњи пит ажуриран: %s." -#: ../extensions/feed-panel/feed-panel.c:664 +#: ../extensions/feed-panel/feed-panel.c:658 msgid "Feeds" msgstr "Доводи" -#: ../extensions/feed-panel/feed-panel.c:717 +#: ../extensions/feed-panel/feed-panel.c:711 msgid "Add new feed" msgstr "Додај нови довод" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:718 msgid "Delete feed" msgstr "Обричи довод" -#: ../extensions/feed-panel/feed-panel.c:807 +#: ../extensions/feed-panel/feed-panel.c:800 msgid "_Feeds" msgstr "_Доводи" -#: ../extensions/feed-panel/feed-parse.c:175 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Не могу да нађем изворне податке међу XML подацима." -#: ../extensions/feed-panel/feed-parse.c:215 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Није подржан формат довода." -#: ../extensions/feed-panel/feed-parse.c:245 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Не могу да обрадим XML довод: %s" @@ -2007,57 +2816,401 @@ msgid "Unsupported RSS version found." msgstr "Пронађено је неподржано издање вести." -#: ../extensions/feed-panel/feed-rss.c:144 +#: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." msgstr "Не могу да нађем потребни „item“ елемент вести међу XML подацима." -#: ../extensions/feed-panel/feed-rss.c:229 +#: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Не могу да нађем потребни „channel“ елемент вести међу XML подацима." -#: ../extensions/feed-panel/main.c:114 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "Довод „%s“ већ постоји" -#: ../extensions/feed-panel/main.c:191 +#: ../extensions/feed-panel/main.c:208 #, 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:518 msgid "Feed Panel" msgstr "Површ са доводима" -#: ../extensions/feed-panel/main.c:490 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Чита Атоме / доводе са вестима" -#: ../extensions/mouse-gestures/main.c:216 +#: ../extensions/formhistory.c:146 +#, fuzzy, c-format +msgid "Failed to add form value: %s\n" +msgstr "Не могу да додам ставку у историјат: %s\n" + +#: ../extensions/formhistory.c:458 ../extensions/formhistory.c:462 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Не могу да покренем тврдњу из базе података: %s\n" + +#: ../extensions/formhistory.c:520 +msgid "Stores history of entered form data" +msgstr "" + +#: ../extensions/formhistory.c:524 +#, c-format +msgid "Not available: %s" +msgstr "" + +#: ../extensions/formhistory.c:525 +msgid "Resource files not installed" +msgstr "" + +#: ../extensions/formhistory.c:531 +msgid "Form history filler" +msgstr "" + +#. i18n: Data entered into web forms by the user +#: ../extensions/formhistory.c:543 +#, fuzzy +msgid "_Form History" +msgstr "_Историјат" + +#: ../extensions/history-list.vala:149 +msgid "There are no unvisited tabs" +msgstr "" + +#: ../extensions/history-list.vala:249 +msgid "Next new Tab (History List)" +msgstr "" + +#: ../extensions/history-list.vala:250 +msgid "Next new tab from history" +msgstr "" + +#: ../extensions/history-list.vala:259 +msgid "Previous new Tab (History List)" +msgstr "" + +#: ../extensions/history-list.vala:260 +msgid "Previous new tab from history" +msgstr "" + +#: ../extensions/history-list.vala:359 +#, fuzzy +msgid "History List" +msgstr "Историјат" + +#: ../extensions/history-list.vala:360 +msgid "Switch tabs with Ctrl+Tab sorted by last usage" +msgstr "" + +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Гестови миша" -#: ../extensions/mouse-gestures/main.c:217 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Управља Мидоријем помоћу миша" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 -msgid "Pageholder" -msgstr "Уметнута страница" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "_Уметнута страница" +#: ../extensions/shortcuts.c:110 +msgid "Reload page or stop loading" +msgstr "" + +#: ../extensions/shortcuts.c:176 +msgid "Customize Keyboard shortcuts" +msgstr "" + +#: ../extensions/shortcuts.c:282 +msgid "Customize Sh_ortcuts..." +msgstr "" + +#: ../extensions/shortcuts.c:319 +msgid "Shortcuts" +msgstr "" + +#: ../extensions/shortcuts.c:320 +msgid "View and edit keyboard shortcuts" +msgstr "" + +#: ../extensions/status-clock.c:174 +#, fuzzy +msgid "Statusbar Clock" +msgstr "Трака са ста_њем" + +#: ../extensions/status-clock.c:175 +msgid "Display date and time in the statusbar" +msgstr "" + +#: ../extensions/statusbar-features.c:129 +msgid "Images" +msgstr "" -#: ../extensions/statusbar-features.c:104 +#: ../extensions/statusbar-features.c:138 +#, fuzzy +msgid "Scripts" +msgstr "Личне скрипте" + +#: ../extensions/statusbar-features.c:147 +msgid "Netscape plugins" +msgstr "Netscape додаци" + +#: ../extensions/statusbar-features.c:193 msgid "Statusbar Features" msgstr "Могућности линије са стањем" -#: ../extensions/statusbar-features.c:105 +#: ../extensions/statusbar-features.c:194 msgid "Easily toggle features on web pages on and off" msgstr "Једноставно укључује и искључује опције на веб страницама" + +#: ../extensions/tab-panel.c:597 ../extensions/tab-panel.c:684 +#, fuzzy +msgid "Tab Panel" +msgstr "Прикажи бочну површ" + +#: ../extensions/tab-panel.c:667 +#, fuzzy +msgid "T_ab Panel" +msgstr "Прикажи бочну површ" + +#: ../extensions/tab-panel.c:685 +#, fuzzy +msgid "Show tabs in a vertical panel" +msgstr "Приказује бочну површ" + +#: ../extensions/tabs-minimized.c:77 +msgid "Only Icons on Tabs by default" +msgstr "" + +#: ../extensions/tabs-minimized.c:78 +msgid "New tabs have no label by default" +msgstr "Нове картице првобитно немају ознаку" + +#: ../extensions/toolbar-editor.c:391 +#, fuzzy +msgid "Customize Toolbar" +msgstr "Прилагођавање траке са алаткама" + +#: ../extensions/toolbar-editor.c:407 +msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop." +msgstr "Изаберите ставке да буду приказане на траци са алаткама. Ставке могу бити аранжиране превлачењем и увацивањем." + +#: ../extensions/toolbar-editor.c:423 +#, fuzzy +msgid "Available Items" +msgstr "Доступно ставке" + +#: ../extensions/toolbar-editor.c:444 +#, fuzzy +msgid "Displayed Items" +msgstr "Приказане ставке" + +#: ../extensions/toolbar-editor.c:579 +#, fuzzy +msgid "Customize _Toolbar..." +msgstr "Произвољно..." + +#: ../extensions/toolbar-editor.c:595 +#, fuzzy +msgid "_Customize..." +msgstr "Произвољно..." + +#: ../extensions/toolbar-editor.c:625 +msgid "Toolbar Editor" +msgstr "" + +#: ../extensions/toolbar-editor.c:626 +msgid "Easily edit the toolbar layout" +msgstr "Лако мењајте распоред траке са алаткама" + +#: ../extensions/web-cache.c:479 +msgid "Cache HTTP communication on disk" +msgstr "" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% учитано" + +#~ msgid "Quit the application" +#~ msgstr "Затвори програм" + +#~ msgid "_Quick Find" +#~ msgstr "Брзо _нађи" + +#~ msgid "Quickly jump to a word or phrase" +#~ msgstr "Брзо проналази реч или израз" + +#~ msgid "View Selection Source" +#~ msgstr "И_зворно издање изабраног" + +#~ msgid "View the source code of the selection" +#~ msgstr "Приказује изворни код изабраног дела странице" + +#~ msgid "_Contents" +#~ msgstr "_Садржај" + +#~ msgid "Show the documentation" +#~ msgstr "Приказује помоћ за употребу програма" + +#~ msgid "_Transferbar" +#~ msgstr "Преноси" + +#~ msgid "Show transferbar" +#~ msgstr "Приказује траку са преносима датотека" + +#~ msgid "_Recently visited pages" +#~ msgstr "_Скорашње странице" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Отвара странице које сте раније посетили" + +#~ msgid "Detach chosen panel from the window" +#~ msgstr "Откачи површ из прозора" + +#~ msgid "Last open pages" +#~ msgstr "Последње странице" + +#~ msgid "Both" +#~ msgstr "Текст испод иконица" + +#~ msgid "Both horizontal" +#~ msgstr "Текст поред иконица" + +#~ msgid "Show progress in location entry" +#~ msgstr "Прикажи напредак у поље за адресе" + +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "Приказује напредак учитавања странице у поље за унос адреса" + +#~ msgid "Load on Startup" +#~ msgstr "Учитај по покретању" + +#~ msgid "Whether to ask for the destination folder when downloading a file" +#~ msgstr "Пита за одредишну фасциклу приликом преузимања датотеке" + +#~ msgid "Whether to show a notification when a transfer has been completed" +#~ msgstr "Приказује обавештење када се заврши преузимање датотеке" + +#~ msgid "Original cookies only" +#~ msgstr "Само оригиналне колачиће" + +#~ msgid "Accept cookies from the original website only" +#~ msgstr "Прихвата колачиће само са оригиналних веб страница" + +#~ msgid "Remember last visited pages" +#~ msgstr "Запамти последње посећене странице" + +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "Чува странице које сте последње посетили" + +#~ msgid "Remember last form inputs" +#~ msgstr "Запамти последње уносе у поља" + +#~ msgid "Whether the last form inputs are saved" +#~ msgstr "Чува последње уносе у поља веб страница" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "Сам одреди прокси сервер" + +#~ msgid "Whether to detect the proxy server automatically from the environment" +#~ msgstr "Покушава да сам одреди прокси сервер на основу окружења" + +#~ msgid "Cache size" +#~ msgstr "Величина оставе" + +#~ msgid "The allowed size of the cache" +#~ msgstr "Дозвољена величина оставе" + +#~ msgid "Open _Link" +#~ msgstr "_Отвори везу" + +#~ msgid "_Download Link destination" +#~ msgstr "Преузми _циљну датотеку" + +#~ msgid "Download with Download _Manager" +#~ msgstr "Пре_узми помоћу спољашњег програма" + +#~ msgid "Search" +#~ msgstr "Нађи" + +#~ msgid "General" +#~ msgstr "Опште" + +#~ msgid "Font settings" +#~ msgstr "Подешавање фонтова" + +#~ msgid "Encoding" +#~ msgstr "Кодирање" + +#~ msgid "The character encoding to use by default" +#~ msgstr "Подразумевано кодирање текста" + +#~ msgid "Shrink images automatically" +#~ msgstr "Сам умањи слике" + +#~ msgid "Automatically shrink standalone images to fit" +#~ msgstr "Сам умањи слике како би се уклопиле у страницу" + +#~ msgid "Resizable text areas" +#~ msgstr "Омогући промену величине текста" + +#~ msgid "Whether text areas are resizable" +#~ msgstr "Омогућава промену величине области са текстом" + +#~ msgid "Enable developer tools" +#~ msgstr "Укључи алате за развој" + +#~ msgid "Enable special extensions for developers" +#~ msgstr "Укључи додатна проширења за развој" + +#~ msgid "Spell Checking" +#~ msgstr "Провера писања" + +#~ msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +#~ msgstr "Списак језика језика за проверу писања раздвојени зарезом (нpr. en_GB,sh_YU,sr_YU)" + +#~ msgid "Interface" +#~ msgstr "Сучеље" + +#~ msgid "Navigationbar" +#~ msgstr "Главна трака" + +#~ msgid "External applications" +#~ msgstr "Спољни програми" + +#~ msgid "Web Cookies" +#~ msgstr "Колачићи" + +#~ msgid "Warning: You are using a superuser account!" +#~ msgstr "Упозорење: Користите администраторски налог!" + +#~ msgid "User_styles" +#~ msgstr "Лични с_тилови" + +#~ msgid "_Enable" +#~ msgstr "_Укључи" + +#~ msgid "Enable" +#~ msgstr "Укључи" + +#~ msgid "_Disable" +#~ msgstr "_Искључи" + +#~ msgid "Disable" +#~ msgstr "Искључи" + +#~ msgid "Console" +#~ msgstr "Конзола" + +#~ msgid "%d days ago" +#~ msgstr "Пре %d дана" + +#~ msgid "Tint tabs distinctly" +#~ msgstr "Другачије обоји листове" + +#~ msgid "_Cookie Manager" +#~ msgstr "_Управник колачићима" + +#~ msgid "Pageholder" +#~ msgstr "Уметнута страница" + +#~ msgid "_Pageholder" +#~ msgstr "_Уметнута страница" diff -Nru midori-0.2.8/po/sv.po midori-0.4.6/po/sv.po --- midori-0.2.8/po/sv.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/sv.po 2012-05-14 22:13:42.000000000 +0000 @@ -64,7 +64,7 @@ #: ../midori/main.c:436 #, c-format msgid "Failed to remove history item: %s\n" -msgstr "" +msgstr "Borttagning av historikpost misslyckades: %s\n" #: ../midori/main.c:460 #, c-format @@ -82,7 +82,7 @@ #: ../midori/main.c:712 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "" +msgstr "Borttagning av gamla historikobjekt misslyckades: %s\n" #: ../midori/main.c:741 #, c-format @@ -92,7 +92,7 @@ #: ../midori/main.c:779 #, c-format msgid "The search engines couldn't be saved. %s" -msgstr "Sökmotorer kunde inte sparad. %s" +msgstr "Sökmotorer kunde inte sparas. %s" #: ../midori/main.c:798 #: ../midori/main.c:826 @@ -111,7 +111,7 @@ #: ../midori/main.c:974 #, c-format msgid "The session couldn't be saved. %s" -msgstr "Sessionen kunde inte sparad. %s" +msgstr "Sessionen kunde inte sparas. %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." @@ -122,9 +122,8 @@ msgstr "Redigera _inställningar" #: ../midori/main.c:1120 -#, fuzzy msgid "Reset the last _session" -msgstr "Gör om senaste ändringen" +msgstr "Återställ senaste _sessionen" #: ../midori/main.c:1125 msgid "Disable all _extensions" @@ -132,7 +131,7 @@ #: ../midori/main.c:1343 msgid "No filename specified" -msgstr "" +msgstr "Inget filnamn valt" #: ../midori/main.c:1366 msgid "An unknown error occured." @@ -145,7 +144,7 @@ #: ../midori/main.c:1447 msgid "Run ADDRESS as a web application" -msgstr "" +msgstr "Kör ADRESS som en webapp" #: ../midori/main.c:1447 msgid "ADDRESS" @@ -153,7 +152,7 @@ #: ../midori/main.c:1449 msgid "Use FOLDER as configuration folder" -msgstr "" +msgstr "Använd MAPP som konfigurationsmapp" #: ../midori/main.c:1449 msgid "FOLDER" @@ -161,7 +160,7 @@ #: ../midori/main.c:1451 msgid "Run the specified filename as javascript" -msgstr "" +msgstr "Kör det valda filnamnet som javaskript" #: ../midori/main.c:1454 msgid "Take a snapshot of the specified URI" @@ -192,18 +191,16 @@ msgstr "Leta efter nya verioner på:" #: ../midori/main.c:1619 -#, fuzzy msgid "The specified configuration folder is invalid." msgstr "Den valda konfigurationsmappen är ogiltig." #: ../midori/main.c:1655 msgid "An instance of Midori is already running but not responding.\n" -msgstr "" +msgstr "En instans av Midori körs redan, men svarar inte.\n" #: ../midori/main.c:1715 -#, fuzzy, c-format msgid "The search engines couldn't be loaded. %s\n" -msgstr "Sökmotorer kunde inte läsas in. %s" +msgstr "Sökmotorerna kunde inte läsas in. %s\n" #: ../midori/main.c:1727 #, c-format @@ -316,7 +313,7 @@ #: ../midori/midori-browser.c:1172 #, c-format msgid "The file '%s' has been downloaded." -msgstr "Filen '%s' har laddats ner." +msgstr "Filen '%s' har hämtats." #: ../midori/midori-browser.c:1176 msgid "Transfer completed" @@ -373,9 +370,8 @@ msgstr "Kakor" #: ../midori/midori-browser.c:3787 -#, fuzzy msgid "'Flash' Cookies" -msgstr "Alla kakor" +msgstr "Flashkakor" #: ../midori/midori-browser.c:3792 msgid "Website icons" @@ -392,12 +388,14 @@ #: ../midori/midori-browser.c:3889 msgid "A lightweight web browser." -msgstr "En liten webbläsare." +msgstr "En resurssnål webbläsare." #: ../midori/midori-browser.c:3897 msgid "translator-credits" -msgstr "Mikael Magnusson , Daniel Nylander , Oscar Rentzhog " -## Needs formatting +msgstr "" +"Mikael Magnusson \n" +"Daniel Nylander \n" +"Oscar Rentzhog " #: ../midori/midori-browser.c:4163 msgid "_File" @@ -430,7 +428,7 @@ #: ../midori/midori-browser.c:4178 msgid "Add shortcut to speed dial" -msgstr "" +msgstr "Lägg till genväg i Webbgenvägar" #: ../midori/midori-browser.c:4180 msgid "_Close Tab" @@ -605,7 +603,7 @@ #: ../midori/midori-browser.c:4285 msgid "_Clear Private Data" -msgstr "_Rensa Privat Data" +msgstr "_Rensa privat data" #: ../midori/midori-browser.c:4286 msgid "Clear private data..." @@ -641,7 +639,7 @@ #: ../midori/midori-browser.c:4301 msgid "_Frequent Questions" -msgstr "Vanliga Frågor" +msgstr "_Vanliga Frågor" #: ../midori/midori-browser.c:4302 msgid "Show the Frequently Asked Questions" @@ -653,7 +651,7 @@ #: ../midori/midori-browser.c:4305 msgid "Open Midori's bug tracker" -msgstr "" +msgstr "Öppna Midoris bugghanterare" #: ../midori/midori-browser.c:4308 msgid "Show information about the program" @@ -669,7 +667,7 @@ #: ../midori/midori-browser.c:4321 msgid "_Menubar" -msgstr "Menyrad" +msgstr "_Menyrad" #: ../midori/midori-browser.c:4322 msgid "Show menubar" @@ -751,7 +749,6 @@ msgstr "Anpassad..." #: ../midori/midori-browser.c:4806 -#, fuzzy msgid "_Separator" msgstr "_Avskiljare" @@ -789,9 +786,8 @@ msgstr "_Bokmärken" #: ../midori/midori-browser.c:4896 -#, fuzzy msgid "Show the saved bookmarks" -msgstr "Kopiera markerad bokmärke" +msgstr "Visa sparade bokmärken" #: ../midori/midori-browser.c:4911 msgid "_Tools" @@ -815,9 +811,8 @@ #. i18n: A panel at the bottom, to search text in pages #: ../midori/midori-browser.c:5127 -#, fuzzy msgid "_Inline Find:" -msgstr "_Snabbsökning:" +msgstr "_Sök på sidan:" #: ../midori/midori-browser.c:5152 msgid "Previous" @@ -877,9 +872,8 @@ msgstr "" #: ../midori/midori-panel.c:704 -#, fuzzy msgid "Show panel _titles" -msgstr "Visa Sidopanel" +msgstr "Visa panel_titlar" #: ../midori/midori-panel.c:712 msgid "Show operating _controls" @@ -989,11 +983,11 @@ #: ../midori/midori-websettings.c:387 msgid "Last panel position" -msgstr "" +msgstr "Senaste panelpositionen" #: ../midori/midori-websettings.c:388 msgid "The last saved panel position" -msgstr "" +msgstr "Senast sparade panelposition" #. i18n: The internal index of the last opened panel #: ../midori/midori-websettings.c:397 @@ -1045,12 +1039,10 @@ msgstr "Ifall sidopanelen ska visas" #: ../midori/midori-websettings.c:459 -#, fuzzy msgid "Show Transferbar" msgstr "Visa överföringsrad" #: ../midori/midori-websettings.c:460 -#, fuzzy msgid "Whether to show the transferbar" msgstr "Ifall överföringsraden ska visas" @@ -1063,13 +1055,12 @@ msgstr "Ifall statusraden ska visas" #: ../midori/midori-websettings.c:478 -#, fuzzy msgid "Toolbar Style:" -msgstr "Stil för verktygsfält" +msgstr "Stil för verktygsfält:" #: ../midori/midori-websettings.c:479 msgid "The style of the toolbar" -msgstr "" +msgstr "Stil för verktygsfält" #: ../midori/midori-websettings.c:495 msgid "Show progress in location entry" @@ -1088,9 +1079,8 @@ msgstr "" #: ../midori/midori-websettings.c:520 -#, fuzzy msgid "Toolbar Items" -msgstr "Föremål i Verktygsrad" +msgstr "Föremål i verktygsfält" #: ../midori/midori-websettings.c:521 msgid "The items to show on the toolbar" @@ -1101,9 +1091,8 @@ msgstr "Kompakt sidopanel" #: ../midori/midori-websettings.c:530 -#, fuzzy msgid "Whether to make the sidepanel compact" -msgstr "Ifall aktivitetssymbolen ska animeras" +msgstr "Ifall sidopaneles ska göras kompakt" #: ../midori/midori-websettings.c:545 msgid "Show operating controls of the panel" @@ -1118,9 +1107,8 @@ msgstr "" #: ../midori/midori-websettings.c:562 -#, fuzzy msgid "Whether to align the sidepanel on the right" -msgstr "Ifall aktivitetssymbolen ska animeras" +msgstr "Ifall sidopanelen ska justeras till höger" #: ../midori/midori-websettings.c:571 msgid "When Midori starts:" @@ -1131,16 +1119,14 @@ msgstr "Vad som ska göras när Midori startar" #: ../midori/midori-websettings.c:581 -#, fuzzy msgid "Homepage:" -msgstr "Hemsida" +msgstr "Startsida:" #: ../midori/midori-websettings.c:582 msgid "The homepage" -msgstr "Hemsidan" +msgstr "Startsidan" #: ../midori/midori-websettings.c:597 -#, fuzzy msgid "Show crash dialog" msgstr "Visa krashdialogen" @@ -1151,11 +1137,11 @@ #. i18n: Speed dial, webpage shortcuts, named for the phone function #: ../midori/midori-websettings.c:614 msgid "Show speed dial in new tabs" -msgstr "" +msgstr "Visa Webbgenvägar i nya flikar" #: ../midori/midori-websettings.c:615 msgid "Show speed dial in newly opened tabs" -msgstr "" +msgstr "Visa Webbgenvägar i nyligen öppnade flikar" #: ../midori/midori-websettings.c:623 msgid "Save downloaded files to:" @@ -1167,7 +1153,7 @@ #: ../midori/midori-websettings.c:643 msgid "Ask for the destination folder" -msgstr "Fråga vart filer ska hämtas till" +msgstr "Fråga vart filer ska sparas" #: ../midori/midori-websettings.c:644 msgid "Whether to ask for the destination folder when downloading a file" @@ -1175,11 +1161,11 @@ #: ../midori/midori-websettings.c:663 msgid "Notify when a transfer has been completed" -msgstr "Säg till när en överföring är klar" +msgstr "Underrätta när en överföring är klar" #: ../midori/midori-websettings.c:664 msgid "Whether to show a notification when a transfer has been completed" -msgstr "" +msgstr "Ifall en underrättelse ska visas när en överföring är klar" #: ../midori/midori-websettings.c:676 msgid "Download Manager" @@ -1223,7 +1209,7 @@ #: ../midori/midori-websettings.c:730 msgid "Always Show Tabbar" -msgstr "Visa Alltid Flikrad" +msgstr "Visa alltid flikrad" #: ../midori/midori-websettings.c:731 msgid "Always show the tabbar" @@ -1235,7 +1221,7 @@ #: ../midori/midori-websettings.c:740 msgid "Whether tabs have close buttons" -msgstr "Huruvida flikar har stängknappar" +msgstr "Om flikar har stängknappar" #: ../midori/midori-websettings.c:748 msgid "Open new pages in:" @@ -1243,7 +1229,7 @@ #: ../midori/midori-websettings.c:749 msgid "Where to open new pages" -msgstr "" +msgstr "Hur nya sidor ska öppnas" #: ../midori/midori-websettings.c:758 msgid "Open external pages in:" @@ -1251,7 +1237,7 @@ #: ../midori/midori-websettings.c:759 msgid "Where to open externally opened pages" -msgstr "" +msgstr "Hur externt öppnade sidor ska öppnas" #: ../midori/midori-websettings.c:768 msgid "Middle click opens Selection" @@ -1267,7 +1253,7 @@ #: ../midori/midori-websettings.c:778 msgid "Whether to open new tabs in the background" -msgstr "" +msgstr "Ifall nya flikar ska öppnas i bakgrunden" #: ../midori/midori-websettings.c:786 msgid "Open Tabs next to Current" @@ -1275,7 +1261,7 @@ #: ../midori/midori-websettings.c:787 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" +msgstr "Ifall nya flikar ska öppnas efter den nuvarande eller den sista" #: ../midori/midori-websettings.c:795 msgid "Open popups in tabs" @@ -1283,24 +1269,23 @@ #: ../midori/midori-websettings.c:796 msgid "Whether to open popup windows in tabs" -msgstr "" +msgstr "Ifall popup-rutor ska öppnas i flikar" #: ../midori/midori-websettings.c:812 msgid "Zoom Text and Images" -msgstr "Zooma Text och Bilder" +msgstr "Zooma text och bilder" #: ../midori/midori-websettings.c:813 -#, fuzzy msgid "Whether to zoom text and images" -msgstr "Ifall aktivitetssymbolen ska animeras" +msgstr "Iffall text och bilder ska zoomas" #: ../midori/midori-websettings.c:828 msgid "Find inline while typing" -msgstr "Sök på sidan" +msgstr "Sök automatiskt på sidan" #: ../midori/midori-websettings.c:829 msgid "Whether to automatically find inline while typing" -msgstr "" +msgstr "Om en sökning på sidan automatiskt ska ske när du skriver" #: ../midori/midori-websettings.c:837 msgid "Accept cookies" @@ -1324,7 +1309,7 @@ #: ../midori/midori-websettings.c:857 msgid "The maximum number of days to save cookies for" -msgstr "Maximalt antal dagar att spara kakor" +msgstr "Maximalt antal dagar kakor sparas" #: ../midori/midori-websettings.c:867 msgid "Remember last visited pages" @@ -1332,7 +1317,7 @@ #: ../midori/midori-websettings.c:868 msgid "Whether the last visited pages are saved" -msgstr "" +msgstr "Ifall de senast besökta sidorna ska sparas" #: ../midori/midori-websettings.c:876 msgid "Maximum history age" @@ -1364,15 +1349,15 @@ #: ../midori/midori-websettings.c:906 msgid "The proxy server used for HTTP connections" -msgstr "" +msgstr "Proxyserver för HTTP-anslutningar" #: ../midori/midori-websettings.c:921 msgid "Detect proxy server automatically" -msgstr "" +msgstr "Upptäck proxiserver automatiskt" #: ../midori/midori-websettings.c:922 msgid "Whether to detect the proxy server automatically from the environment" -msgstr "" +msgstr "Ifall en global proxyserver ska upptäckas automatiskt" #. i18n: This refers to an application, not the 'user agent' string #: ../midori/midori-websettings.c:938 @@ -1381,11 +1366,11 @@ #: ../midori/midori-websettings.c:939 msgid "What to identify as to web pages" -msgstr "" +msgstr "Vad Midori ska identifiera sig som" #: ../midori/midori-websettings.c:955 msgid "Identification string" -msgstr "" +msgstr "Identifikationssträng" #: ../midori/midori-websettings.c:956 msgid "The application identification string" @@ -1405,7 +1390,7 @@ #: ../midori/midori-websettings.c:981 msgid "The private data selected for deletion" -msgstr "" +msgstr "Privat data vald för borttagning" #: ../midori/midori-view.c:781 #, c-format @@ -1470,9 +1455,8 @@ msgstr "Öppna adress i ny fli_k" #: ../midori/midori-view.c:1494 -#, fuzzy msgid "Open or download file" -msgstr "Öppna en fil" +msgstr "Öppna eller hämta fil" #: ../midori/midori-view.c:1511 #, c-format @@ -1496,8 +1480,8 @@ msgstr "Inspektera sida - %s" #: ../midori/midori-view.c:2147 -msgid "Speed dial" -msgstr "" +msgid "Speed Dial" +msgstr "Webbgenvägar" #: ../midori/midori-view.c:2148 msgid "Click to add a shortcut" @@ -1580,19 +1564,19 @@ #: ../midori/midori-preferences.c:443 msgid "Default Font Family" -msgstr "" +msgstr "Standardtypsnittsfamilj" #: ../midori/midori-preferences.c:447 msgid "The default font family used to display text" -msgstr "" +msgstr "Typsnittsfamilj som används för att visa text" #: ../midori/midori-preferences.c:450 msgid "The default font size used to display text" -msgstr "" +msgstr "Standardstorlek för typsnitt som används för att visa text" #: ../midori/midori-preferences.c:453 msgid "Fixed-width Font Family" -msgstr "" +msgstr "Typsnittsfamilj med fast bredd" #: ../midori/midori-preferences.c:457 msgid "The font family used to display fixed-width text" @@ -1608,7 +1592,7 @@ #: ../midori/midori-preferences.c:466 msgid "The minimum font size used to display text" -msgstr "" +msgstr "Den minimala typsnittsstorleken för text" #: ../midori/midori-preferences.c:473 msgid "Encoding" @@ -1616,7 +1600,7 @@ #: ../midori/midori-preferences.c:476 msgid "The character encoding to use by default" -msgstr "" +msgstr "Teckenkodning som ska användas som standard" #. Page "Behavior" #: ../midori/midori-preferences.c:483 @@ -1833,12 +1817,12 @@ #: ../midori/sokoke.c:867 msgid "Netscape p_lugins" -msgstr "Netscape-_Tillägg" +msgstr "Netscape-_tillägg" #: ../panels/midori-addons.c:95 #: ../panels/midori-addons.c:141 msgid "Userscripts" -msgstr "" +msgstr "Användarskript" #: ../panels/midori-addons.c:96 #: ../panels/midori-addons.c:143 @@ -1851,11 +1835,11 @@ #: ../panels/midori-bookmarks.c:239 msgid "Edit the selected bookmark" -msgstr "Redigera valda bokmärke" +msgstr "Redigera det valda bokmärket" #: ../panels/midori-bookmarks.c:247 msgid "Delete the selected bookmark" -msgstr "Ta bort markerat bokmärke" +msgstr "Ta bort det markerade bokmärket" #: ../panels/midori-bookmarks.c:260 msgid "Add a new folder" @@ -1878,12 +1862,10 @@ msgstr "Är du säker på att du vill radera hela historiken?" #: ../panels/midori-history.c:217 -#, fuzzy msgid "Bookmark the selected history item" msgstr "Lägg till bokmärke för den valda historikposten" #: ../panels/midori-history.c:226 -#, fuzzy msgid "Delete the selected history item" msgstr "Ta bort den valda historikposten" @@ -1913,7 +1895,7 @@ #: ../panels/midori-plugins.c:87 #: ../extensions/statusbar-features.c:108 msgid "Netscape plugins" -msgstr "" +msgstr "Netscapetillägg" #: ../panels/midori-transfers.c:271 #, c-format @@ -1921,24 +1903,23 @@ msgstr "%s av %s" #: ../panels/midori-transfers.c:479 -#, fuzzy msgid "Open Destination _Folder" -msgstr "Visa i sid_hållare..." +msgstr "Öppna mål_mapp" #: ../panels/midori-transfers.c:482 msgid "Copy Link Loc_ation" -msgstr "Kopiera länkplats" +msgstr "Kopiera länk_plats" #: ../katze/katze-http-auth.c:97 msgid "Authentication Required" -msgstr "" +msgstr "Autentisering krävs" #: ../katze/katze-http-auth.c:113 msgid "" "A username and a password are required\n" "to open this location:" msgstr "Användarnamn och lösenord behövs\n" -"för att öppna den här platsen" +"för att öppna den här platsen:" #: ../katze/katze-http-auth.c:127 msgid "Username" @@ -1960,7 +1941,7 @@ #: ../katze/katze-throbber.c:907 msgid "Animation frames are broken" -msgstr "" +msgstr "Animeringsramar är trasiga" #: ../katze/katze-utils.c:200 #: ../katze/katze-utils.c:407 @@ -1979,11 +1960,11 @@ #: ../extensions/adblock.c:167 msgid "Configure Advertisement filters" -msgstr "Redigera Reklamblockeringsfilter" +msgstr "Redigera reklamblockeringsfilter" #: ../extensions/adblock.c:304 msgid "Configure _Advertisement filters..." -msgstr "Redigera _Reklamblockeringsfilter" +msgstr "Redigera _reklamblockeringsfilter..." #: ../extensions/adblock.c:562 msgid "Advertisement blocker" @@ -2008,19 +1989,19 @@ #: ../extensions/cookie-manager/cookie-manager-page.c:79 #: ../extensions/cookie-manager/main.c:56 msgid "Cookie Manager" -msgstr "" +msgstr "Kakhanterare" #: ../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 "" +msgstr "Tar bort alla visade kakor. Om ett filter är konfigurerat kommer bara matchande kakor att tas bort." #: ../extensions/cookie-manager/cookie-manager-page.c:126 msgid "Expand All" -msgstr "Expandera Alla" +msgstr "Expandera alla" #: ../extensions/cookie-manager/cookie-manager-page.c:133 msgid "Collapse All" -msgstr "Kollapsa Alla" +msgstr "Fäll ihop alla" #: ../extensions/cookie-manager/cookie-manager-page.c:460 msgid "Do you really want to delete all cookies?" @@ -2032,11 +2013,11 @@ #: ../extensions/cookie-manager/cookie-manager-page.c:471 msgid "Only cookies which match the filter will be deleted." -msgstr "" +msgstr "Endast kakor som matchar filtret kommer att tas bort." #: ../extensions/cookie-manager/cookie-manager-page.c:539 msgid "At the end of the session" -msgstr "" +msgstr "Vid slutet av en session." #: ../extensions/cookie-manager/cookie-manager-page.c:542 #, c-format @@ -2048,6 +2029,12 @@ "Secure: %s\n" "Expires: %s" msgstr "" +"Värd/b>: %s\n" +"Namn: %s\n" +"Värde: %s\n" +"Sökväg: %s\n" +"Säker: %s\n" +"Förfaller: %s" #: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "Yes" @@ -2063,16 +2050,15 @@ #: ../extensions/cookie-manager/cookie-manager-page.c:862 msgid "_Expand All" -msgstr "" +msgstr "_Expandera alla" #: ../extensions/cookie-manager/cookie-manager-page.c:870 msgid "_Collapse All" -msgstr "" +msgstr "_Fäll ihop alla" #: ../extensions/cookie-manager/cookie-manager-page.c:923 -#, fuzzy msgid "Filter:" -msgstr "_Mapp:" +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" @@ -2080,7 +2066,7 @@ #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" -msgstr "" +msgstr "_Kakhanterare" #: ../extensions/cookie-manager/main.c:57 msgid "List, view and delete cookies" @@ -2099,10 +2085,9 @@ #, c-format msgctxt "Feed" msgid "Last updated: %s." -msgstr "" +msgstr "Senast uppdaterad: %s." #: ../extensions/feed-panel/feed-panel.c:664 -#, fuzzy msgid "Feeds" msgstr "Flöden" @@ -2126,7 +2111,7 @@ #: ../extensions/feed-panel/feed-parse.c:225 #, c-format msgid "Unsupported feed format." -msgstr "" +msgstr "Formatet för flödet stöds inte." #: ../extensions/feed-panel/feed-parse.c:255 #, c-format @@ -2152,7 +2137,7 @@ #: ../extensions/feed-panel/main.c:114 #, c-format msgid "Feed '%s' already exists" -msgstr "" +msgstr "Flödet '%s' finns redan" #: ../extensions/feed-panel/main.c:191 #, c-format @@ -2164,9 +2149,8 @@ msgstr "Nytt flöde" #: ../extensions/feed-panel/main.c:489 -#, fuzzy msgid "Feed Panel" -msgstr "Visa Sidopanel" +msgstr "Flödespanel" #: ../extensions/feed-panel/main.c:490 msgid "Read Atom/ RSS feeds" @@ -2196,7 +2180,7 @@ #: ../extensions/shortcuts.c:264 msgid "Customize Sh_ortcuts..." -msgstr "Ställ in Gen_vägar..." +msgstr "Ställ in gen_vägar..." #: ../extensions/shortcuts.c:303 msgid "Shortcuts" @@ -2215,9 +2199,8 @@ msgstr "Skript" #: ../extensions/statusbar-features.c:149 -#, fuzzy msgid "Statusbar Features" -msgstr "Statusrad" +msgstr "Statusradsfunktioner" #: ../extensions/statusbar-features.c:150 msgid "Easily toggle features on web pages on and off" @@ -2225,26 +2208,23 @@ #: ../extensions/tab-panel.c:383 #: ../extensions/tab-panel.c:443 -#, fuzzy msgid "Tab Panel" -msgstr "Visa Sidopanel" +msgstr "Flikrad" #: ../extensions/tab-panel.c:427 -#, fuzzy msgid "T_ab Panel" -msgstr "Visa Sidopanel" +msgstr "Visa f_likraden" #: ../extensions/tab-panel.c:444 -#, fuzzy msgid "Show tabs in a vertical panel" -msgstr "Visa sido_panel" +msgstr "Visa flikar i en vertikal panel" #: ../extensions/toolbar-editor.c:391 msgid "Customize Toolbar" -msgstr "Redigera Verktygsrad" +msgstr "Redigera verktygsrad" #: ../extensions/toolbar-editor.c:407 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop." msgstr "Välj föremål att visa i verktygsraden. Föremål kan omarrangeras genom att dra och släppa." #: ../extensions/toolbar-editor.c:423 @@ -2257,21 +2237,19 @@ #: ../extensions/toolbar-editor.c:579 msgid "Customize _Toolbar..." -msgstr "Redigera _Verktygsrad..." +msgstr "Redigera _verktygsrad..." #: ../extensions/toolbar-editor.c:611 -#, fuzzy msgid "Toolbar Editor" -msgstr "Stil för verktygsrad" +msgstr "Verktygsradseditor" #: ../extensions/toolbar-editor.c:612 msgid "Easily edit the toolbar layout" -msgstr "" +msgstr "Redigera verktygsradens layout enkelt" -#~ msgid "_Closed Tabs and Windows" -#~ msgstr "_Stängda tabbar och fönster" +msgid "_Closed Tabs and Windows" +msgstr "_Stängda tabbar och fönster" -#, fuzzy #~ msgid "[URIs]" #~ msgstr "[URL]" #~ msgid "_URL:" @@ -2287,7 +2265,7 @@ #~ msgid "Load on Startup" #~ msgstr "Ladda vid uppstart" #~ msgid "Open URL in New _Tab" -#~ msgstr "Öppna URL i ny _tabb" +#~ msgstr "Öppna URL i ny _flik" #~ msgid "Source" #~ msgstr "Källkod" #~ msgid "_Icon (name or file):" @@ -2297,7 +2275,6 @@ #~ msgid "Warning: You are using a superuser account!" #~ msgstr "Varning: Du använder ett administratörskonto!" -#, fuzzy #~ msgid "_Disable" #~ msgstr "_Inaktivera" #~ msgid "_Fullscreen" @@ -2311,7 +2288,7 @@ #~ msgid "Trash" #~ msgstr "Papperskorgen" #~ msgid "The trash, collecting recently closed tabs and windows" -#~ msgstr "Soptunnan, samlar senast stängda tabbar och fönster" +#~ msgstr "Papperkorgen, samlar senast stängda tabbar och fönster" #~ msgid "Browser" #~ msgstr "Webbläsare" #~ msgid "The text that is displayed in the statusbar" @@ -2325,7 +2302,7 @@ #~ msgid "Add, edit and remove bookmarks..." #~ msgstr "Lägg till, ändra och ta bort bokmärken..." #~ msgid "Tab _Overview" -#~ msgstr "Tabbö_versikt" +#~ msgstr "Flikö_versikt" #~ msgid "_Work Offline" #~ msgstr "_Arbeta offline" #~ msgid "Appearance of the shadow around each panel" @@ -2335,13 +2312,13 @@ #~ msgid "The index of the current page" #~ msgstr "Indexet för nuvarande sida" #~ msgid "Show New Tab" -#~ msgstr "Visa Ny tabb" +#~ msgstr "Visa Ny flik" #~ msgid "Show Web search" #~ msgstr "Visa Webbsökning" #~ msgid "Tab Label Size" -#~ msgstr "Tabbstorlek" +#~ msgstr "Flikstorlek" #~ msgid "The desired tab label size" -#~ msgstr "Önskad storlek på tabbetikett" +#~ msgstr "Önskad storlek på fliketikett" #~ msgid "The URI of the currently loaded page" #~ msgstr "URIn för den laddade sidan" #~ msgid "The title of the currently loaded page" @@ -2358,4 +2335,3 @@ #~ msgstr "En GdkPixbuf att använda som statisk bild" #~ msgid "The stock ID of an icon to be used as the static image" #~ msgstr "Katalog-ID för en ikon att använda som statisk bild" - diff -Nru midori-0.2.8/po/tr.po midori-0.4.6/po/tr.po --- midori-0.2.8/po/tr.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/tr.po 2012-05-14 22:13:42.000000000 +0000 @@ -8,2235 +8,2233 @@ msgstr "" "Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-02 16:08+0000\n" +"POT-Creation-Date: 2012-03-25 11:18+0000\n" "PO-Revision-Date: 2010-05-10 09:45+0300\n" "Last-Translator: Ayhan YALÇINSOY \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: tr\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.0\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Hafif web tarayıcı " +#, fuzzy +msgid "Browse the Web" +msgstr "Web ara" + +#: ../data/midori.desktop.in.h:2 +#, fuzzy +msgid "Internet;WWW;Explorer" +msgstr "Internet Explorer" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1353 ../midori/main.c:1683 -#: ../midori/main.c:1691 ../midori/main.c:1707 -#: ../midori/midori-websettings.c:314 +#: ../data/midori.desktop.in.h:3 ../midori/main.c:1989 ../midori/main.c:2009 +#: ../midori/main.c:2023 ../midori/midori-websettings.c:308 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Web Tarayıcı" -#: ../midori/main.c:102 +#: ../data/midori-private.desktop.in.h:1 +#, fuzzy +msgid "Midori Private Browsing" +msgstr "%s (Gizli Gezinme)" + +#: ../data/midori-private.desktop.in.h:2 +#, fuzzy +msgid "Open a new private browsing window" +msgstr "Yeni _Gizli Gezinme Penceresi" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4117 +#, fuzzy +msgid "Private Browsing" +msgstr "%s (Gizli Gezinme)" + +#: ../midori/main.c:96 ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Ayarlar yüklenemedi: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "'%s' değeri şunun için yanlış : %s" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr "Geçersiz yapılandırma değeri '%s'" -#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#: ../midori/main.c:364 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Arama motorları yüklenemedi. %s\n" + +#: ../midori/main.c:418 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Geçmiş silinemedi: %s\n" + +#: ../midori/main.c:438 ../midori/main.c:562 +#: ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" msgstr "Şu veri tabanı açılamadı: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:505 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Eski geçmiş ögeleri silinemedi: %s\n" -#: ../midori/main.c:457 +#: ../midori/main.c:545 ../panels/midori-history.c:232 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Şu geçmiş öğesi silinemedi: %s\n" + +#: ../midori/main.c:592 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Yer imleri kaydedilemedi. %s" + +#: ../midori/main.c:614 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Ayarlar kaydedilemedi. %s" -#: ../midori/main.c:495 +#: ../midori/main.c:649 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Arama motorları kaydedilemedi. %s" -#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Yer imleri kaydedilemedi. %s" - #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:614 ../midori/main.c:637 +#: ../midori/main.c:686 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Çöp kutusu kaydedilemedi. %s" -#: ../midori/main.c:696 ../midori/main.c:936 +#: ../midori/main.c:727 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Ek Özellikler" + +#: ../midori/main.c:741 +msgid "Privacy" +msgstr "Gizlilik" + +#: ../midori/main.c:753 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"Çerezler giriç verilerini, kayıtı oyunları veya reklam amaçlı kullanıcı " +"profillerini saklar." + +#: ../midori/main.c:809 #, c-format msgid "The session couldn't be saved. %s" msgstr "Oturum kaydedilemedi. %s" -#: ../midori/main.c:880 -msgid "No root certificate file is available. SSL certificates cannot be verified." +#: ../midori/main.c:1027 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." msgstr "Root yetki dosyası kullanılabilir değil. SSL yetkileri doğrulanamadı." -#: ../midori/main.c:970 -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 son açıldığında çökmüş görünüyor. Bu devam ederse sorunu çözmek için aşağıdaki seçeneklerden biri deneyin." +#: ../midori/main.c:1096 +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 son açıldığında çökmüş görünüyor. Bu devam ederse sorunu çözmek için " +"aşağıdaki seçeneklerden biri deneyin." -#: ../midori/main.c:985 +#: ../midori/main.c:1115 msgid "Modify _preferences" msgstr "_Tercihleri Değiştir" -#: ../midori/main.c:989 -msgid "Reset the last _session" -msgstr "Son _oturumu yeniden başlat" - -#: ../midori/main.c:994 +#: ../midori/main.c:1119 msgid "Disable all _extensions" msgstr "Tüm _eklentiler kapalı" -#: ../midori/main.c:1229 ../midori/main.c:1956 +#: ../midori/main.c:1132 +msgid "Discard old tabs" +msgstr "Eski sekmeleri çıkar" + +#: ../midori/main.c:1133 ../midori/midori-websettings.c:217 +msgid "Show last tabs without loading" +msgstr "Yüklemeden son sekmeyi göster" + +#: ../midori/main.c:1134 ../midori/midori-websettings.c:216 +msgid "Show last open tabs" +msgstr "Son açılan sekmeleri göster" + +#: ../midori/main.c:1342 ../midori/main.c:2400 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Oturum yüklenemedi: %s\n" -#: ../midori/main.c:1353 -msgid "No filename specified" -msgstr "Dosya ismi belirtilmedi" - -#: ../midori/main.c:1372 -msgid "An unknown error occured." -msgstr "Bilinmeyen bir sorun oluştu." - -#: ../midori/main.c:1403 +#: ../midori/main.c:1480 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Ekran görüntüsünü kaydet: %s\n" -#: ../midori/main.c:1575 +#: ../midori/main.c:1892 msgid "Run ADDRESS as a web application" msgstr "ADRES'i web uygulaması gibi çalıştır" -#: ../midori/main.c:1575 +#: ../midori/main.c:1892 msgid "ADDRESS" msgstr "ADRES" -#: ../midori/main.c:1578 +#: ../midori/main.c:1895 msgid "Use FOLDER as configuration folder" msgstr "KLASÖR'ü yapılandırma klasörü olarak kullan" -#: ../midori/main.c:1578 +#: ../midori/main.c:1895 msgid "FOLDER" msgstr "KLASÖR" -#: ../midori/main.c:1581 +#: ../midori/main.c:1898 +msgid "Private browsing, no changes are saved" +msgstr "Özel tarama, değişiklikler kaydedilmez." + +#: ../midori/main.c:1900 msgid "Show a diagnostic dialog" msgstr "Bir tanılama diyaloğu göster" -#: ../midori/main.c:1583 +#: ../midori/main.c:1902 msgid "Run the specified filename as javascript" msgstr "Belirtilen dosya ismini javascript olarak çalıştır" -#: ../midori/main.c:1586 +#: ../midori/main.c:1904 msgid "Take a snapshot of the specified URI" msgstr "Belirtilen URI'nin bir ekran görüntüsünü al" -#: ../midori/main.c:1589 +#: ../midori/main.c:1906 msgid "Execute the specified command" msgstr "Belirtilen komutu çalıştır" -#: ../midori/main.c:1591 +#: ../midori/main.c:1908 +msgid "List available commands to execute with -e/ --execute" +msgstr "Çalıştırmak için kullanılabilir komutları -e/ --execute ile listele" + +#: ../midori/main.c:1910 msgid "Display program version" msgstr "Uygulama sürümünü göster" -#: ../midori/main.c:1593 +#: ../midori/main.c:1912 msgid "Addresses" msgstr "Adresler" -#: ../midori/main.c:1595 +#: ../midori/main.c:1914 msgid "Block URIs according to regular expression PATTERN" msgstr "ÖRNEK düzenli ifadeye göre URI engele" -#: ../midori/main.c:1595 +#: ../midori/main.c:1914 msgid "PATTERN" msgstr "ÖRNEK" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1599 +#: ../midori/main.c:1918 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Kullanılmayan süre SANİYELER 'den sonra Midori'yi yeniden başlat" -#: ../midori/main.c:1599 +#: ../midori/main.c:1918 msgid "SECONDS" msgstr "SANİYELER" -#: ../midori/main.c:1680 +#: ../midori/main.c:1921 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Konsol uyarılarını belirtilen DOSYAADI'ne yönlendirir" + +#: ../midori/main.c:1921 +msgid "FILENAME" +msgstr "DOSYAADI" + +#: ../midori/main.c:1986 msgid "[Addresses]" msgstr "[Adresler]" -#: ../midori/main.c:1708 +#: ../midori/main.c:1996 +msgid "The specified configuration folder is invalid." +msgstr "Belirtilen yapılandırma dizini geçersiz." + +#: ../midori/main.c:2024 msgid "Please report comments, suggestions and bugs to:" -msgstr "Lütfen yorumlarınızı, isteklerinizi ve yakaladığınız hataları şuraya raporlayın:" +msgstr "" +"Lütfen yorumlarınızı, isteklerinizi ve yakaladığınız hataları şuraya " +"raporlayın:" -#: ../midori/main.c:1710 +#: ../midori/main.c:2026 msgid "Check for new versions at:" msgstr "Yeni sürümler için şuraya bakın:" -#: ../midori/main.c:1807 -msgid "The specified configuration folder is invalid." -msgstr "Belirtilen yapılandırma dizini geçersiz." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2110 +msgid "Saved logins and _passwords" +msgstr "Kayıtlı girişler ve _parolalar" + +#: ../midori/main.c:2112 +#, fuzzy +msgid "Cookies and Website data" +msgstr "Website bilgisi ve çerezler" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2116 ../midori/midori-websettings.c:984 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Web Önbelleği" + +#: ../midori/main.c:2119 +msgid "Website icons" +msgstr "Websitesi simgeleri" -#: ../midori/main.c:1855 +#: ../midori/main.c:2225 +#, fuzzy +msgid "An unknown error occured" +msgstr "Bilinmeyen bir sorun oluştu." + +#: ../midori/main.c:2331 msgid "An instance of Midori is already running but not responding.\n" msgstr "Şu anda Midori'nin başka bir örneği çalışıyor; ama cevap vermiyor.\n" -#: ../midori/main.c:1910 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "Arama motorları yüklenemedi. %s\n" - -#: ../midori/main.c:1939 +#: ../midori/main.c:2367 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Yer imleri yüklenemedi: %s\n" -#: ../midori/main.c:1971 +#: ../midori/main.c:2415 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Çöp kutusu yüklenemedi: %s\n" -#: ../midori/main.c:1985 +#: ../midori/main.c:2428 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Geçmiş yüklenemedi: %s\n" -#: ../midori/main.c:1999 +#: ../midori/main.c:2444 msgid "The following errors occured:" msgstr "Şu hatalar ortaya çıktı:" -#: ../midori/main.c:2015 +#: ../midori/main.c:2460 msgid "_Ignore" msgstr "_Yoksay" -#: ../midori/midori-array.c:428 +#: ../midori/midori-app.c:1334 +msgid "_Bookmark" +msgstr "_Yer imi" + +#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6039 +msgid "_Bookmarks" +msgstr "_Yer İmleri" + +#: ../midori/midori-app.c:1336 +msgid "Add Boo_kmark" +msgstr "_Yerimi Ekle" + +#: ../midori/midori-app.c:1337 +msgid "_Console" +msgstr "_Uçbirim" + +#: ../midori/midori-app.c:1338 +msgid "_Extensions" +msgstr "_Ek Özellikler" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4566 +msgid "_History" +msgstr "_Geçmiş" + +#: ../midori/midori-app.c:1340 +msgid "_Homepage" +msgstr "_Anasayfa" + +#: ../midori/midori-app.c:1341 +msgid "_Userscripts" +msgstr "_Kullanıcı betikleri" + +#: ../midori/midori-app.c:1342 +msgid "New _Tab" +msgstr "Yeni _Sekme" + +#: ../midori/midori-app.c:1343 +msgid "_Transfers" +msgstr "_Aktarımlar" + +#: ../midori/midori-app.c:1344 +msgid "Netscape p_lugins" +msgstr "Netscape eklentileri" + +#: ../midori/midori-app.c:1345 +msgid "_Closed Tabs" +msgstr "Sekmeleri _kapat" + +#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5195 +msgid "New _Window" +msgstr "Yeni _Pencere" + +#: ../midori/midori-app.c:1347 +msgid "New _Folder" +msgstr "Yeni _Dizin" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "Dosya bulunamadı." -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Kötü biçimlendirilmiş belge." -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "Tanımlanmayan yer imi biçimi." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 -#, c-format +#: ../midori/midori-array.c:915 msgid "Writing failed." msgstr "Yazma işlemi gerçekleştirilemedi." -#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5277 +#: ../midori/midori-browser.c:5286 msgid "Reload the current page" msgstr "Bu sayfayı yeniden yükle" -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:5283 msgid "Stop loading the current page" msgstr "Bu sayfayı yüklemeyi durdur" -#: ../midori/midori-browser.c:458 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% yüklendi" - -#: ../midori/midori-browser.c:496 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" msgstr "İsim güncelleme hatası: %s\n" -#: ../midori/midori-browser.c:510 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." msgstr "Beklenmedik eylem '%s'." -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:579 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Gizli Gezinme)" + +#: ../midori/midori-browser.c:693 ../midori/midori-browser.c:726 +msgid "Toplevel folder" +msgstr "Üst Seviye Dizin" + +#: ../midori/midori-browser.c:784 msgid "New folder" msgstr "Yeni Dizin" -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:784 msgid "Edit folder" msgstr "Klasörü düzenle" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:786 msgid "New bookmark" msgstr "Yeni yer imi" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:786 msgid "Edit bookmark" msgstr "Yer imini düzenle" -#: ../midori/midori-browser.c:759 +#: ../midori/midori-browser.c:828 msgid "_Title:" msgstr "_Başlık:" -#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "_Açıklama:" - -#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:848 ../midori/midori-searchaction.c:961 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "Adres:" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 +#: ../midori/midori-browser.c:871 ../midori/midori-browser.c:4303 msgid "_Folder:" msgstr "_Dizin:" -#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 -#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 -msgid "Toplevel folder" -msgstr "Üst Seviye Dizin" - -#: ../midori/midori-browser.c:862 +#: ../midori/midori-browser.c:887 msgid "Add to _Speed Dial" msgstr "_Hızlı aramaya Ekle" -#: ../midori/midori-browser.c:875 +#: ../midori/midori-browser.c:900 msgid "Show in the tool_bar" msgstr "Araç_çubuğunda göster" -#: ../midori/midori-browser.c:890 +#: ../midori/midori-browser.c:915 msgid "Run as _web application" msgstr "_Web uygulaması olarak çalıştır" -#: ../midori/midori-browser.c:984 +#: ../midori/midori-browser.c:986 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr " \"%s\" Dosyası bu dizine kaydedilemedi." + +#: ../midori/midori-browser.c:988 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Bu konuma yazmak için yetkiniz bulunmuyor." + +#: ../midori/midori-browser.c:995 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "\"%s\" indirmek için yeterli boş disk alanı yok." -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:998 #, c-format msgid "The file needs %s but only %s are left." msgstr "Dosya %s ihtiyaç duyuyor ancak %s kaldı." -#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4372 msgid "Save file as" msgstr "Dosyayı kaydet" -#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s nin %s" - -#: ../midori/midori-browser.c:1454 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "Dosya '%s' indirildi." +#: ../midori/midori-browser.c:1330 +msgid "New Window" +msgstr "Yeni Pencere" + +#: ../midori/midori-browser.c:1330 +msgid "A new window has been opened" +msgstr "Yeni bir pencere açıldı" + +#: ../midori/midori-browser.c:1333 +msgid "New Tab" +msgstr "Yeni Sekme" + +#: ../midori/midori-browser.c:1333 +msgid "A new tab has been opened" +msgstr "Yeni bir sekme açıldı" + +#: ../midori/midori-browser.c:1368 +#, fuzzy +msgid "Error opening the image!" +msgstr "Resmi açmada hata!" + +#: ../midori/midori-browser.c:1369 +#, fuzzy +msgid "Can not open selected image in a default viewer." +msgstr "Seçili resim varsayılan göstericide açılamıyor." + +#: ../midori/midori-browser.c:1375 +#, fuzzy +msgid "Error downloading the image!" +msgstr "Kaynak '%s' yükleme hatası" -#: ../midori/midori-browser.c:1458 -msgid "Transfer completed" -msgstr "Aktarım tamamlandı" +#: ../midori/midori-browser.c:1376 +#, fuzzy +msgid "Can not download selected image." +msgstr "Seçilen resim indirilemiyor." -#: ../midori/midori-browser.c:1598 +#: ../midori/midori-browser.c:1479 msgid "Save file" msgstr "Dosyayı kaydet" -#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 -msgid "Some files are being downloaded" -msgstr "Bazı dosyalar indiriliyor" - -#: ../midori/midori-browser.c:1921 -msgid "_Quit Midori" -msgstr "Midori'den _çık" - -#: ../midori/midori-browser.c:1923 -msgid "The transfers will be cancelled if Midori quits." -msgstr "Midori kapatılırsa aktarmalar iptal edilecek." - -#: ../midori/midori-browser.c:2384 +#: ../midori/midori-browser.c:2346 msgid "Open file" msgstr "Dosya aç" -#: ../midori/midori-browser.c:2462 +#: ../midori/midori-browser.c:2478 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." msgstr "" +"Yukarıdaki URI'yi kullanmak için bir haber toplayıcı açın. Genellikle bir " +"menü veya \"Yeni Abonelik\", \"Yeni Haber Kaynağı\" ya da benzer bir düğme " +"bulunur.\n" +"Alternatif olarak Midori'de Tercihler,Gözden Geçiriliyor'a gidin ve bir " +"haber toplayıcı seçin. Haber kaynağı simgesine tekrar tıkladığınızda " +"otomatik olarak eklenecektir." -#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2484 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Yeni kaynak" -#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 -#: ../panels/midori-bookmarks.c:233 +#: ../midori/midori-browser.c:2527 ../midori/midori-browser.c:5346 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "Yeni bir yer imi ekle" -#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Veri tabanı ifadesi çalışma hatası: %s\n" - -#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3026 ../midori/midori-searchaction.c:488 msgid "Empty" msgstr "Boş" -#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "Harici uygulama çalıştırılamadı." +#: ../midori/midori-browser.c:3446 +msgid "Toggle text cursor navigation" +msgstr "Metin imleci navigasyonunu değiştir" -#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 +#: ../midori/midori-browser.c:3762 ../midori/midori-browser.c:5732 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Yeni geçmiş ögesi ekleme hatası: %s\n" -#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:4091 ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 msgid "Open all in _Tabs" msgstr "Hepsini _Sekmelerde aç" -#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4098 ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Yeni _Sekmede Aç" -#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4101 ../midori/midori-view.c:2648 +#: ../midori/midori-view.c:4646 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Yeni _Pencerede aç" -#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:4190 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4666 +#: ../midori/midori-browser.c:4191 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:4192 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4668 +#: ../midori/midori-browser.c:4193 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:4194 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4690 +#: ../midori/midori-browser.c:4195 +#, fuzzy, c-format +msgid "Firefox (%s)" +msgstr "Firefox" + +#: ../midori/midori-browser.c:4216 msgid "Import bookmarks..." msgstr "Yerimleri içe aktarılıyor..." -#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:4219 ../midori/midori-browser.c:5351 msgid "_Import bookmarks" msgstr "Yerimlerini içe aktar" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:4230 msgid "_Application:" msgstr "_Uygulamadan:" -#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 -#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 -#: ../katze/katze-utils.c:691 -msgid "Custom..." -msgstr "Özel..." +#: ../midori/midori-browser.c:4295 +msgid "Import from XBEL or HTML file" +msgstr "XBEL ya da HTML dosyasından içeri aktar" + +#: ../midori/midori-browser.c:4330 +msgid "Import from a file" +msgstr "Dosyadan yükle" -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4342 msgid "Failed to import bookmarks" msgstr "Yerimlerini içe aktarma hatası" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4377 +msgid "XBEL Bookmarks" +msgstr "XBEL yer imleri" + +#: ../midori/midori-browser.c:4382 +msgid "Netscape Bookmarks" +msgstr "Netscape yer imleri" + +#: ../midori/midori-browser.c:4396 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "Midori sadece XBEL (*. xbel) ve Netscape (*. html) dışarı aktarabilir." + +#: ../midori/midori-browser.c:4411 msgid "Failed to export bookmarks" msgstr "Yer imlerini dışarı aktarma hatası" -#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Şu geçmiş öğesi silinemedi: %s\n" - #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4533 msgid "Clear Private Data" msgstr "Kişisel Verileri Temizle" -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:4537 msgid "_Clear private data" msgstr "_Kişisel verileri temizle" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:4550 msgid "Clear the following data:" msgstr "Aşağıdaki verileri temizle:" -#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 -msgid "History" -msgstr "Geçmiş" - -#: ../midori/midori-browser.c:5037 -msgid "Cookies" -msgstr "Çerezler" - -#: ../midori/midori-browser.c:5042 -msgid "'Flash' Cookies" -msgstr "'Flash' çerezleri" - -#: ../midori/midori-browser.c:5047 -msgid "Website icons" -msgstr "Websitesi simgeleri" - -#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 -msgid "_Closed Tabs" -msgstr "Sekmeleri _kapat" - -#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "Web Önbelleği" +#: ../midori/midori-browser.c:4560 +msgid "Last open _tabs" +msgstr "Son açılmış sekmeler" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:4586 msgid "Clear private data when _quitting Midori" msgstr "Midori'den çıkıldığında kişisel verileri temizle" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:4781 msgid "A lightweight web browser." msgstr "Hafif bir web tarayıcı." -#: ../midori/midori-browser.c:5168 -msgid "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." -msgstr "Bu kütüphane özgür yazılımdır; GNU'nun -Özgür Yazılım Vakfı tarafından yayımlanan Genel Kamu Lisansı sürüm 2.1 veya (seçiminize bağlı) daha eski bir sürüm- şartları altında yeniden dağıtılabilir ve/veya değiştirilebilir. " +#: ../midori/midori-browser.c:4782 +msgid "See about:version for version info." +msgstr "Sürüm bilgisi için bakınız: about:version." -#: ../midori/midori-browser.c:5187 +#: ../midori/midori-browser.c:4784 +msgid "" +"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." +msgstr "" +"Bu kütüphane özgür yazılımdır; GNU'nun -Özgür Yazılım Vakfı tarafından " +"yayımlanan Genel Kamu Lisansı sürüm 2.1 veya (seçiminize bağlı) daha eski " +"bir sürüm- şartları altında yeniden dağıtılabilir ve/veya değiştirilebilir. " + +#: ../midori/midori-browser.c:4805 msgid "translator-credits" msgstr "" "Mirat Can Bayrak \n" "Gökmen Görgen \n" "Ayhan YALÇINSOY " -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5193 msgid "_File" msgstr "_Dosya" -#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 -msgid "New _Window" -msgstr "Yeni _Pencere" - -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5196 msgid "Open a new window" msgstr "Yeni bir pencerede aç" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:5199 msgid "Open a new tab" msgstr "Yeni bir sekmede aç" -#: ../midori/midori-browser.c:5504 -msgid "P_rivate Browsing" -msgstr "G_izli Gezinme" - -#: ../midori/midori-browser.c:5505 -msgid "Don't save any private data while browsing" -msgstr "Gezinirken hiç bir özel veriyi kaydetme" +#: ../midori/midori-browser.c:5201 +msgid "New P_rivate Browsing Window" +msgstr "Yeni _Gizli Gezinme Penceresi" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5205 msgid "Open a file" msgstr "Bir dosya aç" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5207 +msgid "_Save Page As..." +msgstr "Sayfayı Farklı _Kaydet..." + +#: ../midori/midori-browser.c:5208 msgid "Save to a file" msgstr "Bir dosyaya kaydet" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5210 msgid "Add to Speed _dial" msgstr "Hızlı aramaya _ekle" -#: ../midori/midori-browser.c:5515 -msgid "Add shortcut to speed dial" -msgstr "Hızlı aramaya kısayol ekle" - -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:5214 msgid "Add Shortcut to the _desktop" msgstr "_Masaüstüne Kısayol ekle" -#: ../midori/midori-browser.c:5518 -msgid "Add shortcut to the desktop" -msgstr "Masaüstüne kısayol ekle" +#: ../midori/midori-browser.c:5216 +msgid "Create _Launcher" +msgstr "_Başlatıcı Oluştur" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5220 msgid "Subscribe to News _feed" msgstr "Haber _kaynaksine üye ol" -#: ../midori/midori-browser.c:5521 -msgid "Subscribe to this news feed" -msgstr "Bu haber kaynaksine üye ol" - -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5226 msgid "_Close Tab" msgstr "Sekmeyi _kapat" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5227 msgid "Close the current tab" msgstr "Geçerli sekmeyi kapat" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5229 msgid "C_lose Window" msgstr "Pen_cereyi Kapat" -#: ../midori/midori-browser.c:5530 -msgid "Close this window" -msgstr "Bu pencereyi kapat" - -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5233 msgid "Print the current page" msgstr "Geçerli sayfayı yazdır" -#: ../midori/midori-browser.c:5536 -msgid "Quit the application" -msgstr "Uygulamadan çık" +#: ../midori/midori-browser.c:5235 +msgid "Close a_ll Windows" +msgstr "Bütün Pen_cereleri Kapat" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5238 msgid "_Edit" msgstr "_Düzenle" -#: ../midori/midori-browser.c:5542 -msgid "Undo the last modification" -msgstr "Son değişikliği geri al" - -#: ../midori/midori-browser.c:5545 -msgid "Redo the last modification" -msgstr "Son değişikliği yeniden yap" - -#: ../midori/midori-browser.c:5549 -msgid "Cut the selected text" -msgstr "Seçili metni kes" - -#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 -msgid "Copy the selected text" -msgstr "Seçili metni kopyala" - -#: ../midori/midori-browser.c:5558 -msgid "Paste text from the clipboard" -msgstr "Metni panodan yapıştır" - -#: ../midori/midori-browser.c:5561 -msgid "Delete the selected text" -msgstr "Seçili metni sil" - -#: ../midori/midori-browser.c:5564 -msgid "Select all text" -msgstr "Bütün metni seç" +#: ../midori/midori-browser.c:5261 +msgid "_Find..." +msgstr "_Bul,.." -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5262 msgid "Find a word or phrase in the page" msgstr "Bir kelime yada ibareyi geçerli sayfada ara" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5264 msgid "Find _Next" msgstr "So_nrakini Bul" -#: ../midori/midori-browser.c:5570 -msgid "Find the next occurrence of a word or phrase" -msgstr "Kelime ya da ibarenin sonraki örneğini bul" - -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5267 msgid "Find _Previous" msgstr "Öncekini Bu_l" -#: ../midori/midori-browser.c:5573 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Kelime ya da ibarenin sonraki örneğini bul" - -#: ../midori/midori-browser.c:5577 +#: ../midori/midori-browser.c:5271 msgid "Configure the application preferences" msgstr "Uygulama tercihlerini yapılandır" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5273 msgid "_View" msgstr "_Görünüm" -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:5274 msgid "_Toolbars" msgstr "_Araç Çubukları" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5279 +msgid "Reload page without caching" +msgstr "Önbellek kullanmadan sayfayı yeniden yükle" + +#: ../midori/midori-browser.c:5289 msgid "Increase the zoom level" msgstr "Yakınlaştırma seviyesini arttır" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5292 msgid "Decrease the zoom level" msgstr "Yakınlaştırma seviyesini azalt" -#: ../midori/midori-browser.c:5598 -msgid "Reset the zoom level" -msgstr "Yakınlaştırma oranını sıfırla" - -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5296 msgid "_Encoding" msgstr "_Kodlama" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5298 msgid "View So_urce" msgstr "Kaynağını görüntüle" -#: ../midori/midori-browser.c:5602 -msgid "View the source code of the page" -msgstr "Geçerli sayfanın kaynak kodunu görüntüle" +#: ../midori/midori-browser.c:5301 +msgid "Ca_ret Browsing" +msgstr "Düzenleme İşaretçisini Kullanarak Gezinme" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5305 msgid "Toggle fullscreen view" msgstr "Tam ekran modunu aç / kapat" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5307 msgid "Scroll _Left" msgstr "So_l Kaydırma" -#: ../midori/midori-browser.c:5609 -msgid "Scroll to the left" -msgstr "Sola kaydır" - -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5310 msgid "Scroll _Down" msgstr "Aşağı Kay_dırma" -#: ../midori/midori-browser.c:5612 -msgid "Scroll down" -msgstr "Aşağı kaydır" - -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5313 msgid "Scroll _Up" msgstr "Y_ukarı kaydırma" -#: ../midori/midori-browser.c:5615 -msgid "Scroll up" -msgstr "Yukarı kaydır" - -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5316 msgid "Scroll _Right" msgstr "Sağa Kaydı_rma" -#: ../midori/midori-browser.c:5618 -msgid "Scroll to the right" -msgstr "Sağa kaydır" - -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:5319 msgid "_Go" msgstr "_Git" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5322 msgid "Go back to the previous page" msgstr "Önceki sayfaya geri dön" -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5325 msgid "Go forward to the next page" msgstr "Sonraki sayfaya git" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5329 msgid "Go to the previous sub-page" msgstr "Önceki sayfaya geri dön" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5333 msgid "Go to the next sub-page" msgstr "Sonraki sayfaya git" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5336 msgid "Go to your homepage" msgstr "Anasayfaya git" -#: ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:5338 msgid "Empty Trash" msgstr "Çöp Kutusunu Boşalt" -#: ../midori/midori-browser.c:5641 -msgid "Delete the contents of the trash" -msgstr "Çöp Kutusu içerisindeki bütün içeriği sil" - -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5341 msgid "Undo _Close Tab" msgstr "Sekme kapatmayı geri al" -#: ../midori/midori-browser.c:5644 -msgid "Open the last closed tab" -msgstr "Son kapatılan sekmeyi aç" - -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5348 msgid "Add a new _folder" msgstr "Yeni bir _dizin ekle" -#: ../midori/midori-browser.c:5651 -msgid "Add a new bookmark folder" -msgstr "Yeni bir yerimi dizini ekle" - -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5354 msgid "_Export bookmarks" msgstr "Yerimlerini _dışa aktar" -#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5357 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "Arama _Motorlarını Yönet" -#: ../midori/midori-browser.c:5660 -msgid "Add, edit and remove search engines..." -msgstr "Arama motorlarını ekle, sil ve düzenle..." - -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5360 msgid "_Clear Private Data" msgstr "Kişisel Verileri Temizle" -#: ../midori/midori-browser.c:5664 -msgid "Clear private data..." -msgstr "Kişisel verileri temizle..." - -#: ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:5363 msgid "_Inspect Page" msgstr "Sayfayı _incele" -#: ../midori/midori-browser.c:5669 -msgid "Inspect page details and access developer tools..." -msgstr "Sayfa detaylarını kontrol et ve geliştirici araçlarına bağlan..." - -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5367 msgid "_Previous Tab" msgstr "Ön_ceki Sekme" -#: ../midori/midori-browser.c:5675 -msgid "Switch to the previous tab" -msgstr "Önceki sekmeye geç" - -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5370 msgid "_Next Tab" msgstr "So_nraki Sekme" -#: ../midori/midori-browser.c:5678 -msgid "Switch to the next tab" -msgstr "Sonraki sekmeye geç" +#: ../midori/midori-browser.c:5372 +msgid "Move Tab _Backward" +msgstr "Sekmeyi _Geri Taşı" + +#: ../midori/midori-browser.c:5374 +msgid "_Move Tab Forward" +msgstr "Sekmeyi İleri _Taaşı" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5377 msgid "Focus _Current Tab" msgstr "Geçerli Sekmeye Odaklan" -#: ../midori/midori-browser.c:5681 -msgid "Focus the current tab" -msgstr "Geçerli sekmeye odaklan" +#: ../midori/midori-browser.c:5380 +msgid "Focus _Next view" +msgstr "_Sonraki görünüme odaklan" + +#: ../midori/midori-browser.c:5383 +msgid "Only show the Icon of the _Current Tab" +msgstr "Sadece şuan ki sekmenin simgesini göster" + +#: ../midori/midori-browser.c:5386 +msgid "_Duplicate Current Tab" +msgstr "Şuan ki sekmeyi Çoğalt" + +#: ../midori/midori-browser.c:5389 +msgid "Close Ot_her Tabs" +msgstr "_Diğer Sekmeleri Kapat" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5392 msgid "Open last _session" msgstr "_Son oturumu aç" -#: ../midori/midori-browser.c:5684 -msgid "Open the tabs saved in the last session" -msgstr "Son oturumda kaydedilmiş sekmeleri aç" - -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5395 msgid "_Help" msgstr "_Yardım" -#: ../midori/midori-browser.c:5688 -msgid "_Contents" -msgstr "_İçerik" - -#: ../midori/midori-browser.c:5689 -msgid "Show the documentation" -msgstr "Belgelendirmeyi göster" - -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5397 msgid "_Frequent Questions" msgstr "_Sık Sorulan Sorular" -#: ../midori/midori-browser.c:5692 -msgid "Show the Frequently Asked Questions" -msgstr "Sık Sorulan Soruları Göster" - -#: ../midori/midori-browser.c:5694 -msgid "_Report a Bug" -msgstr "Bir Hata _Raporla" - -#: ../midori/midori-browser.c:5695 -msgid "Open Midori's bug tracker" -msgstr "Midori'nin hata takip sistemini aç" - -#: ../midori/midori-browser.c:5698 -msgid "Show information about the program" -msgstr "Uygulama hakkında bilgi göster" +#: ../midori/midori-browser.c:5400 +msgid "_Report a Problem..." +msgstr "Bir Hata _Raporla..." -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5412 msgid "_Menubar" msgstr "_Menü Çubuğu" -#: ../midori/midori-browser.c:5707 -msgid "Show menubar" -msgstr "Menü çubuğunu göster" - -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5416 msgid "_Navigationbar" msgstr "Gezi_nti araç Çubuğu" -#: ../midori/midori-browser.c:5711 -msgid "Show navigationbar" -msgstr "Gezinti araç çubuğunu göster" - -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5420 msgid "Side_panel" msgstr "Yan _panel" -#: ../midori/midori-browser.c:5715 -msgid "Show sidepanel" -msgstr "Yan paneli göster" +#: ../midori/midori-browser.c:5421 +#, fuzzy +msgid "Sidepanel" +msgstr "Yan _panel" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5424 msgid "_Bookmarkbar" msgstr "Yer imi araç çu_buğu" -#: ../midori/midori-browser.c:5719 -msgid "Show bookmarkbar" -msgstr "Yer imi araç çubuğunu göster" - -#: ../midori/midori-browser.c:5722 -msgid "_Transferbar" -msgstr "Ak_tarım çubuğu" - -#: ../midori/midori-browser.c:5723 -msgid "Show transferbar" -msgstr "Aktarım çubuğunu göster" - -#: ../midori/midori-browser.c:5726 +#: ../midori/midori-browser.c:5428 msgid "_Statusbar" msgstr "_Durum Çubuğu" -#: ../midori/midori-browser.c:5727 -msgid "Show statusbar" -msgstr "Durum çubuğunu göster" - -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5437 ../midori/midori-websettings.c:307 msgid "_Automatic" msgstr "Otom_atik" -#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5440 ../midori/midori-websettings.c:232 msgid "Chinese (BIG5)" msgstr "Çince (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5444 msgid "Japanese (SHIFT__JIS)" msgstr "Japonca (SHIFT__JIS)" -#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5447 ../midori/midori-websettings.c:234 msgid "Korean (EUC-KR)" msgstr "Korece (EUC-KR)" -#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5450 ../midori/midori-websettings.c:235 msgid "Russian (KOI8-R)" msgstr "Rusça (KOI8-R)" -#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5453 ../midori/midori-websettings.c:236 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5456 ../midori/midori-websettings.c:237 msgid "Western (ISO-8859-1)" msgstr "Batı Avrupa (ISO-8859-1)" -#: ../midori/midori-browser.c:6300 +#: ../midori/midori-browser.c:5459 ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:313 ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "Özel..." + +#: ../midori/midori-browser.c:5964 msgid "_Separator" msgstr "Ayraç" -#: ../midori/midori-browser.c:6307 +#: ../midori/midori-browser.c:5971 msgid "_Location..." msgstr "Kon_um..." -#: ../midori/midori-browser.c:6309 +#: ../midori/midori-browser.c:5973 msgid "Open a particular location" msgstr "Belirli bir konumu aç" -#: ../midori/midori-browser.c:6333 +#: ../midori/midori-browser.c:5995 msgid "_Web Search..." msgstr "_Web Arama..." -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:5997 msgid "Run a web search" msgstr "Bir web arama gerçekleştir" -#: ../midori/midori-browser.c:6356 +#: ../midori/midori-browser.c:6024 msgid "Reopen a previously closed tab or window" msgstr "Daha önce kapatılmış pencereyi ya da sekmeyi yeniden aç" -#: ../midori/midori-browser.c:6371 -msgid "_Recently visited pages" -msgstr "_Yeni ziyaret edilmiş sayfalar" - -#: ../midori/midori-browser.c:6373 -msgid "Reopen pages that you visited earlier" -msgstr "Daha önce ziyaret edilmiş sayfaları yeniden aç" - -#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 -msgid "_Bookmarks" -msgstr "_Yer İmleri" - -#: ../midori/midori-browser.c:6390 +#: ../midori/midori-browser.c:6041 msgid "Show the saved bookmarks" msgstr "Kaydedilmiş yer imlerini göster" -#: ../midori/midori-browser.c:6405 +#: ../midori/midori-browser.c:6058 msgid "_Tools" msgstr "_Araçlar" -#: ../midori/midori-browser.c:6418 +#: ../midori/midori-browser.c:6074 msgid "_Window" msgstr "_Pencere" -#: ../midori/midori-browser.c:6420 +#: ../midori/midori-browser.c:6076 msgid "Show a list of all open tabs" msgstr "Açık sekmelerin bir listesini göster" -#: ../midori/midori-browser.c:6434 +#: ../midori/midori-browser.c:6090 msgid "_Menu" msgstr "_Menü" -#: ../midori/midori-browser.c:6436 +#: ../midori/midori-browser.c:6092 msgid "Menu" msgstr "Menü" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6640 -msgid "_Inline Find:" -msgstr "Sat_ıriçi Bul:" - -#: ../midori/midori-browser.c:6671 -msgid "Previous" -msgstr "Önceki Sekme" - -#: ../midori/midori-browser.c:6676 -msgid "Next" -msgstr "Sonraki" - -#: ../midori/midori-browser.c:6681 -msgid "Match Case" -msgstr "Büyük - Küçük Harf Duyarlı" - -#: ../midori/midori-browser.c:6690 -msgid "Highlight Matches" -msgstr "Eşleşenleri Vurgula" - -#: ../midori/midori-browser.c:6702 -msgid "Close Findbar" -msgstr "Arama Çubuğunu Kapat" - -#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 -msgid "Clear All" -msgstr "Hepsini Temizle" - -#: ../midori/midori-browser.c:7104 +#: ../midori/midori-browser.c:6904 #, c-format msgid "Unexpected setting '%s'" msgstr "Beklenmedik ayar '%s'" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-extension.c:310 #, c-format -msgid "Failed to select from history\n" -msgstr "Geçmişten seçme hatası\n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "'%s' ayarları yüklenemedi: %s\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "%s için ara" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Uzantı yapılandırması '%s' kaydedilemedi: %s\n" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "%s ile ara" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:412 +#, fuzzy +msgid "Search with..." +msgstr "_ile ara" + +#: ../midori/midori-locationaction.c:537 #, c-format -msgid "Failed to execute database statement\n" -msgstr "Veritabanı ifadesi çalıştırma hatası\n" +msgid "Failed to select from history\n" +msgstr "Geçmişten seçme hatası\n" + +#: ../midori/midori-locationaction.c:624 +#, c-format +msgid "Search for %s" +msgstr "%s için ara" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1400 msgid "Paste and p_roceed" msgstr "Ya_pıştır ve ilerle" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 -msgid "Detach chosen panel from the window" -msgstr "Pencereden seçilmiş paneli ayır" +#: ../midori/midori-locationaction.c:1768 +msgid "Not verified" +msgstr "Doğrulanmadı" + +#: ../midori/midori-locationaction.c:1788 +msgid "Verified and encrypted connection" +msgstr "Doğrulanmış ve şifrelenmiş bağlantı" -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" msgstr "Kenar panelini sağa hizala" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Paneli kapat" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Kenar panelini sola hizala" -#: ../midori/midori-panel.c:797 -msgid "Hide operating controls" -msgstr "İşlem kontrollerini gizle" - -#: ../midori/midori-websettings.c:204 -msgid "Show Blank page" -msgstr "Boş sayfa göster" +#: ../midori/midori-websettings.c:214 +msgid "Show Speed Dial" +msgstr "Hızlı Aramayı Göster" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:215 msgid "Show Homepage" msgstr "Anasayfa göster" -#: ../midori/midori-websettings.c:206 -msgid "Show last open tabs" -msgstr "Son açılan sekmeleri göster" - -#: ../midori/midori-websettings.c:207 -msgid "Show last tabs without loading" -msgstr "Yüklemeden son sekmeyi göster" - -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:233 msgid "Japanese (SHIFT_JIS)" msgstr "Japonca (Shift_JIS)" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:253 msgid "New tab" msgstr "Yeni sekme" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:254 msgid "New window" msgstr "Yeni pencere" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:255 msgid "Current tab" msgstr "Geçerli sekme" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:270 msgid "Default" msgstr "Öntanımlı" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:271 msgid "Icons" msgstr "Simgeler" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:272 msgid "Small icons" msgstr "Küçük simgeler" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:273 msgid "Text" msgstr "Metin" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:274 msgid "Icons and text" msgstr "Simgeler ve metin" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:275 msgid "Text beside icons" msgstr "Simgelerin yanında metin" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:290 msgid "Automatic (GNOME or environment)" msgstr "Otomatik (GNOME veya çevre)" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:291 msgid "HTTP proxy server" msgstr "HTTP vekil sunucu" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:292 msgid "No proxy server" msgstr "Vekil sunucu yok" -#: ../midori/midori-websettings.c:297 -msgid "All cookies" -msgstr "Bütün çerezler" - -#: ../midori/midori-websettings.c:298 -msgid "Session cookies" -msgstr "Oturum çerezleri" - -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 -msgid "None" -msgstr "Yok" - -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:309 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:310 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:311 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:312 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:388 msgid "Remember last window size" msgstr "Son pencerenin ölçülerini hatırla" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:389 msgid "Whether to save the last window size" msgstr "Son pencere boyu kaydedilsin" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:397 msgid "Last window width" msgstr "Son pencerenin eni" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:398 msgid "The last saved window width" msgstr "Son kaydedilmiş pencere eni" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:406 msgid "Last window height" msgstr "Son pencere yüksekliği" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:407 msgid "The last saved window height" msgstr "Son kaydedilmiş pencere yüksekliği" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:432 msgid "Last panel position" msgstr "Son panel pozisyonu" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:433 msgid "The last saved panel position" msgstr "Son kaydedilen panel pozisyonu" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:442 msgid "Last panel page" msgstr "Son panel sayfası" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:443 msgid "The last saved panel page" msgstr "Son kaydedilmiş panel sayfası" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:451 msgid "Last Web search" msgstr "Son Web Arama" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:452 msgid "The last saved Web search" msgstr "Kaydedilmiş son web arama" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:461 msgid "Show Menubar" msgstr "Menü Çubuğunu Göster" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:462 msgid "Whether to show the menubar" msgstr "Menü çubuğu gösterilsin" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:470 msgid "Show Navigationbar" msgstr "Gezinti Araç Çubuğunu Göster" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:471 msgid "Whether to show the navigationbar" msgstr "Navigasyon çubuğu gösterilsin" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:479 msgid "Show Bookmarkbar" msgstr "Yer İmi Araç Çubuğunu Göster" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:480 msgid "Whether to show the bookmarkbar" msgstr "Yer imi araç çubuğu gösterilsin" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:488 msgid "Show Panel" msgstr "Paneli Göster" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:489 msgid "Whether to show the panel" msgstr "Panel çubuğu gösterilsin" -#: ../midori/midori-websettings.c:487 -msgid "Show Transferbar" -msgstr "Aktarım çubuğunu göster" - -#: ../midori/midori-websettings.c:488 -msgid "Whether to show the transferbar" -msgstr "Aktarım çubuğu göster açık/kapalı" - -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:497 msgid "Show Statusbar" msgstr "Durum Çubuğunu Göster" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:498 msgid "Whether to show the statusbar" msgstr "Durum çubuğu gösterilsin" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:507 msgid "Toolbar Style:" msgstr "Araç Çubuğu Biçimi:" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:508 msgid "The style of the toolbar" msgstr "Araç çubuğunun biçimi" -#: ../midori/midori-websettings.c:523 -msgid "Show progress in location entry" -msgstr "Yerel girdideki ilerlemeyi göster" - -#: ../midori/midori-websettings.c:524 -msgid "Whether to show loading progress in the location entry" -msgstr "Yerel girdideki yükleme ilerleyişini göster açık/kapalı" - -#: ../midori/midori-websettings.c:539 -msgid "Search engines in location completion" -msgstr "Konum tamamlamada arama motorları" - -#: ../midori/midori-websettings.c:540 -msgid "Whether to show search engines in the location completion" -msgstr "Konum tamamlamada arama motorlarını göster açık/kapalı" - -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:517 msgid "Toolbar Items" msgstr "Araç Çubuğu Öğeleri" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:518 msgid "The items to show on the toolbar" msgstr "Araç çubuğunun üzerinde gösterilecek ögeler" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:526 msgid "Compact Sidepanel" msgstr "Küçük Yan Panel" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:527 msgid "Whether to make the sidepanel compact" msgstr "Yan panel küçük gösterilsin" -#: ../midori/midori-websettings.c:573 -msgid "Show operating controls of the panel" -msgstr "Panelin işletme kontrollerini göster" - -#: ../midori/midori-websettings.c:574 -msgid "Whether to show the operating controls of the panel" -msgstr "Panelin işletme kontrollerini göster açık/kapalı" - -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:542 msgid "Align sidepanel on the right" msgstr "Kenar panelini sağda hizala" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:543 msgid "Whether to align the sidepanel on the right" msgstr "Kenar panelini sağa hizala açık/kapalı" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:558 msgid "Open panels in separate windows" msgstr "Panelleri ayrı pencerelerde aç" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:559 msgid "Whether to always open panels in separate windows" msgstr "Her zaman panelleri ayrı pencerelerde aç açık/kapalı" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:568 msgid "When Midori starts:" msgstr "Midori başlarken:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:569 msgid "What to do when Midori starts" msgstr "Midori başlatılırken ne yapılacak" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:578 msgid "Homepage:" msgstr "Anasayfa:" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:579 msgid "The homepage" msgstr "Anasayfa" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:594 msgid "Show crash dialog" msgstr "Çökme diyaloğunu göster" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:595 msgid "Show a dialog after Midori crashed" msgstr "Midori çöktükten sonra bir diyalog göster" -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:658 -msgid "Show speed dial in new tabs" -msgstr "Yeni sekmede hızlı aramayı göster" - -#: ../midori/midori-websettings.c:659 -msgid "Show speed dial in newly opened tabs" -msgstr "Yeni açılan sekmelerde hızlı aramayı göster" - -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:603 msgid "Save downloaded files to:" msgstr "İndirilen dosyaları kaydet:" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:604 msgid "The folder downloaded files are saved to" msgstr "İndirilen dosyaların kaydedileceği dizin" -#: ../midori/midori-websettings.c:689 -msgid "Ask for the destination folder" -msgstr "Hedef klasörü sor" - -#: ../midori/midori-websettings.c:690 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "Bir dosyayı indirirken hedef dizini sor açık/kapalı" - -#: ../midori/midori-websettings.c:709 -msgid "Notify when a transfer has been completed" -msgstr "Bir aktarım bittiğinde uyar" - -#: ../midori/midori-websettings.c:710 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "Bir aktarım bittiğinde bir uyarı göster açık/kapalı" - -#: ../midori/midori-websettings.c:722 -msgid "Download Manager" -msgstr "İndirme Yöneticisi" - -#: ../midori/midori-websettings.c:723 -msgid "An external download manager" -msgstr "Harici indirme yöneticisi" - -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:612 msgid "Text Editor" msgstr "Metin Düzenleyici" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:613 msgid "An external text editor" msgstr "Harici metin düzenleyici" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:628 msgid "News Aggregator" msgstr "Haber Toplayıcı" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:629 msgid "An external news aggregator" msgstr "Harici bir haber toplayıcıda" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:637 msgid "Location entry Search" msgstr "Konum Girişi Arama" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:638 msgid "The search to perform inside the location entry" msgstr "Konum girişi içinde yapılacak arama" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:646 msgid "Preferred Encoding" msgstr "Tercih Edilen Kodlama" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:647 msgid "The preferred character encoding" msgstr "Tercih edilen karakter kodlaması" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:657 msgid "Always Show Tabbar" msgstr "Sekme Çubuğunu Her Zaman Göster" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:658 msgid "Always show the tabbar" msgstr "Sekme çubuğunu her zaman göster" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:671 msgid "Close Buttons on Tabs" msgstr "Sekmelerde kapatma düğmesi" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:672 msgid "Whether tabs have close buttons" msgstr "Sekmelerde kapatma düğmesi olsun" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:697 msgid "Open new pages in:" msgstr "Yeni sayfaları aç:" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:698 msgid "Where to open new pages" msgstr "Yeni sayfaların açılacağı yer" -#: ../midori/midori-websettings.c:804 -msgid "Open external pages in:" -msgstr "Harici sayfaları aç:" - -#: ../midori/midori-websettings.c:805 -msgid "Where to open externally opened pages" -msgstr "Harici açılmış sayfaların açılacağı yer" - -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:707 msgid "Middle click opens Selection" msgstr "Orta tuşla seçimi aç" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:708 msgid "Load an address from the selection via middle click" msgstr "Orta tuşla tıklamasıyla bir adres yükle" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:716 msgid "Open tabs in the background" msgstr "Sekmeleri arkaplanda aç" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:717 msgid "Whether to open new tabs in the background" msgstr "Sekmeler arka planda açılsın" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:725 msgid "Open Tabs next to Current" msgstr "Sekmeleri geçerli sekmeden sonrakine aç" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:726 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Yeni sekmelerin hangi sekmeden sonra açılacağını belirle" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:734 msgid "Open popups in tabs" msgstr "Açılır pencereleri sekmelerde aç" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:735 msgid "Whether to open popup windows in tabs" msgstr "Açılır pencereler sekmelerde açılsın" -#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:745 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Resimleri otomatik yükle" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:746 msgid "Load and display images automatically" msgstr "Resimleri otomatik yükle ve görüntüle" -#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:753 ../extensions/statusbar-features.c:143 msgid "Enable scripts" msgstr "Betiklere izin ver" -#: ../midori/midori-websettings.c:861 +#: ../midori/midori-websettings.c:754 msgid "Enable embedded scripting languages" msgstr "Kodlama dilleri yerleştirmesi açık" -#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:761 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" msgstr "Netscape eklentileri açık" -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:762 msgid "Enable embedded Netscape plugin objects" msgstr "Gömülü Netscape eklenti nesneleri açık" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:777 +msgid "Enable Spell Checking" +msgstr "Yazım Denetimi Açık" + +#: ../midori/midori-websettings.c:778 +msgid "Enable spell checking while typing" +msgstr "Yazarken yazım denetimi açık/kapalı" + +#: ../midori/midori-websettings.c:784 msgid "Enable HTML5 database support" msgstr "HTML5 veritabanı desteği açık" -#: ../midori/midori-websettings.c:886 +#: ../midori/midori-websettings.c:785 msgid "Whether to enable HTML5 database support" msgstr "HTML5 veritabanı desteği açık/kapalı" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:791 msgid "Enable HTML5 local storage support" msgstr "HTML5 yerel depolama desteği açık" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:792 msgid "Whether to enable HTML5 local storage support" msgstr "HTML5 yerel depolama desteği açık/kapalı" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:798 msgid "Enable offline web application cache" msgstr "Çevrim dışı web uygulama önbelleği açık" -#: ../midori/midori-websettings.c:902 +#: ../midori/midori-websettings.c:799 msgid "Whether to enable offline web application cache" msgstr "Çevrim dışı web uygulama önbelleği açık/kapalı" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:815 +#, fuzzy +msgid "Flash window on background tabs" +msgstr "Flash penceresi arka plan sekmeler" + +#: ../midori/midori-websettings.c:816 +#, fuzzy +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "Sekmeler arka planda açılsın" + +#: ../midori/midori-websettings.c:824 +#, fuzzy +msgid "Enable WebGL support" +msgstr "HTML5 veritabanı desteği açık" + +#: ../midori/midori-websettings.c:825 +#, fuzzy +msgid "Allow websites to use OpenGL rendering" +msgstr "Websitelerine OpenGL işlemesini kullanmaları için izin ver." + +#: ../midori/midori-websettings.c:851 msgid "Zoom Text and Images" msgstr "Metni ve Resimleri yakınlaştır" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:852 msgid "Whether to zoom text and images" msgstr "Metni ve Resimleri yakınlaştır açık/kapalı" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:867 msgid "Find inline while typing" msgstr "Yazarken satır içinde ara" -#: ../midori/midori-websettings.c:944 +#: ../midori/midori-websettings.c:868 msgid "Whether to automatically find inline while typing" msgstr "Yazarken otomatik satır içinde ara açık/kapalı" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:883 msgid "Kinetic scrolling" msgstr "Hareketli kaydırma" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:884 msgid "Whether scrolling should kinetically move according to speed" msgstr "Kaydırma hıza göre hareketli olarak taşınacak açık/kapalı" -#: ../midori/midori-websettings.c:968 -msgid "Accept cookies" -msgstr "Çerezleri kabul et" - -#: ../midori/midori-websettings.c:969 -msgid "What type of cookies to accept" -msgstr "Kabul edilecek çerez türleri" - -#: ../midori/midori-websettings.c:985 -msgid "Original cookies only" -msgstr "Sadece gerçek çerezler" - -#: ../midori/midori-websettings.c:986 -msgid "Accept cookies from the original website only" -msgstr "Sadece asıl internet sitelerinden gelen çerezleri kabul et" - -#: ../midori/midori-websettings.c:994 -msgid "Maximum cookie age" -msgstr "En çok çerez süresi" +#: ../midori/midori-websettings.c:892 +msgid "Delete old Cookies after:" +msgstr "Şu süreden eski Çerezleri sil:" -#: ../midori/midori-websettings.c:995 +#: ../midori/midori-websettings.c:893 msgid "The maximum number of days to save cookies for" msgstr "Çerezlerin saklanacağı en çok gün sayısı" -#: ../midori/midori-websettings.c:1012 -msgid "Remember last visited pages" -msgstr "Son ziyaret edilen sayfaları hatırla" - -#: ../midori/midori-websettings.c:1013 -msgid "Whether the last visited pages are saved" -msgstr "Eğer son ziyaret edilen sayfalar kaydedilmişse" - -#: ../midori/midori-websettings.c:1021 -msgid "Maximum history age" -msgstr "En çok geçmiş süresi" +#: ../midori/midori-websettings.c:909 +#, fuzzy +msgid "Only accept Cookies from sites you visit" +msgstr "Sadece asıl internet sitelerinden gelen çerezleri kabul et" + +#: ../midori/midori-websettings.c:910 +#, fuzzy +msgid "Block cookies sent by third-party websites" +msgstr "Üçüncü parti websitelerinden gelen çerezleri engelle" + +#: ../midori/midori-websettings.c:924 +msgid "Delete pages from history after:" +msgstr "Şu süreden eski sayfaları geçmişten sil:" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:925 msgid "The maximum number of days to save the history for" msgstr "Geçmişin saklanacağı en çok gün sayısı" -#: ../midori/midori-websettings.c:1030 -msgid "Remember last downloaded files" -msgstr "Son indirilmiş dosyaları hatırla" - -#: ../midori/midori-websettings.c:1031 -msgid "Whether the last downloaded files are saved" -msgstr "Eğer son indirilmiş dosyalar kaydedilmişse" - -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:940 msgid "Proxy server" msgstr "Vekil sunucu" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:941 msgid "The type of proxy server to use" msgstr "Kullanılacak vekil sunucunun türü" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:950 msgid "HTTP Proxy Server" msgstr "HTTP Vekil Sunucu" -#: ../midori/midori-websettings.c:1059 +#: ../midori/midori-websettings.c:951 msgid "The proxy server used for HTTP connections" msgstr "HTTP bağlantıları için kullanılan vekil sunucu" -#: ../midori/midori-websettings.c:1074 -msgid "Detect proxy server automatically" -msgstr "Vekil sunucuyu otomatik olarak belirle" - -#: ../midori/midori-websettings.c:1075 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Vekil sunucuyu ortamdan otomatik olarak belirle açık/kapalı" +#: ../midori/midori-websettings.c:966 +msgid "Port" +msgstr "" + +#: ../midori/midori-websettings.c:967 +#, fuzzy +msgid "The proxy server port used for HTTP connections" +msgstr "HTTP bağlantıları için kullanılan vekil sunucu" + +#: ../midori/midori-websettings.c:985 +msgid "The maximum size of cached pages on disk" +msgstr "Diskteki önbelleklenmiş sayfaların en fazla boyutu" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1002 msgid "Identify as" msgstr "Belirle" -#: ../midori/midori-websettings.c:1092 +#: ../midori/midori-websettings.c:1003 msgid "What to identify as to web pages" msgstr "Web sayfasını belirle" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1019 msgid "Identification string" msgstr "Tanımlama dizesi" -#: ../midori/midori-websettings.c:1109 +#: ../midori/midori-websettings.c:1020 msgid "The application identification string" msgstr "Uygulama tanımlama dizesi" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1036 msgid "Preferred languages" msgstr "Tercih diller" -#: ../midori/midori-websettings.c:1125 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "Çok dilli web sayfalarını taramak için önerilen dillerin listesi bir virgül ile ayrılır, örneğin \"de\",\"ru,nl\" veya \"en-us;q=1.0, fr-fr;q=0.667\"" +#: ../midori/midori-websettings.c:1037 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"Çok dilli web sayfalarını taramak için önerilen dillerin listesi bir virgül " +"ile ayrılır, örneğin \"de\",\"ru,nl\" veya \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1052 msgid "Clear private data" msgstr "Kişisel veri temizle" -#: ../midori/midori-websettings.c:1141 +#: ../midori/midori-websettings.c:1053 msgid "The private data selected for deletion" msgstr "Silmek için kişisel veri seçildi" -#. 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:1261 ../midori/midori-view.c:4560 -#: ../midori/midori-view.c:4564 +#: ../midori/midori-websettings.c:1068 +msgid "Clear data" +msgstr "Kişisel verileri temizle" + +#: ../midori/midori-websettings.c:1069 +msgid "The data selected for deletion" +msgstr "Silmek için kişisel veri seçildi" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1118 +msgid "Strip referrer details sent to websites" +msgstr "İnternet sitelerine gönderilen başvurucu detaylarını sıyır" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1120 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "\"Referer\" başlığı ana makineye göre kısaltılmalı mı" + +#: ../midori/midori-websettings.c:1134 +#, fuzzy +msgid "Always use my font choices" +msgstr "Her zaman benim seçtiğim yazıtipini kullan" + +#: ../midori/midori-websettings.c:1135 +msgid "Override fonts picked by websites with user preferences" +msgstr "" + +#: ../midori/midori-view.c:1353 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s HTML5 veri tabanına kaydetmek istiyor" + +#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1389 +msgid "_Deny" +msgstr "_Reddet" + +#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1389 +msgid "_Allow" +msgstr "İzin ver" + +#: ../midori/midori-view.c:1385 +#, c-format +msgid "%s wants to know your location." +msgstr "%s Konumunuzu öğrenmek istiyor." + +#: ../midori/midori-view.c:1476 #, c-format msgid "Error - %s" msgstr "Hata - %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1477 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Sayfa '%s' yüklenemedi." -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1479 msgid "Try again" msgstr "Tekrar deneyin" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 -#, c-format -msgid "Not found - %s" -msgstr "Bulunamadı - %s" - -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1676 ../midori/midori-view.c:2589 #, c-format msgid "Send a message to %s" msgstr "%s bir mesaj gönder" -#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2419 ../midori/midori-view.c:2738 msgid "Inspect _Element" msgstr "Unsurları Kontrol _et" -#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2471 msgid "Open Link in New _Tab" msgstr "Bağlantıyı Yeni _Sekmede Aç" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2475 msgid "Open Link in _Foreground Tab" msgstr "Bağlantıyı _Önalan Sekmede Aç" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2476 msgid "Open Link in _Background Tab" msgstr "Bağlantıyı _Arka Alan Sekmede Aç" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2479 msgid "Open Link in New _Window" msgstr "Bağlantıyı Yeni _Pencerede aç" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2482 msgid "Open Link as Web A_pplication" msgstr "Bağlantıyı Web Uygulaması Olarak Aç" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2487 msgid "Copy Link de_stination" msgstr "Bağlantı konumunu _kopyala" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 -msgid "_Save Link destination" -msgstr "Bağlantı konumunu kay_det" - -#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 -msgid "_Download Link destination" -msgstr "Bağlantı konumunu İnd_ir" - -#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 -msgid "Download with Download _Manager" -msgstr "İndirme _Yöneticisi ile indir" - -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2503 msgid "Open _Image in New Tab" msgstr "Resm_i Yeni Sekmede Aç" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2506 msgid "Copy Image _Address" msgstr "Resim _Adresini Kopyala" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2509 msgid "Save I_mage" msgstr "Res_mi Kaydet" -#: ../midori/midori-view.c:2229 -msgid "Download I_mage" -msgstr "Resm_i İndir" +#: ../midori/midori-view.c:2512 +#, fuzzy +msgid "Open in Image _Viewer" +msgstr "Resm_i Yeni Sekmede Aç" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2519 msgid "Copy Video _Address" msgstr "Video _Adresini Kopyala" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2522 msgid "Save _Video" msgstr "_Video kaydet" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2522 msgid "Download _Video" msgstr "_Video İndir" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2548 msgid "Search _with" msgstr "_ile ara" -#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2580 msgid "_Search the Web" msgstr "Web ara" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2597 msgid "Open Address in New _Tab" msgstr "Adresi Yeni _Sekmede Aç" -#: ../midori/midori-view.c:2661 +#: ../midori/midori-view.c:2886 msgid "Open or download file" msgstr "Dosyayı aç veya indir" -#: ../midori/midori-view.c:2680 +#: ../midori/midori-view.c:2905 #, c-format msgid "File Type: '%s'" msgstr "Dosya Türü: '%s'" -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:2907 #, c-format msgid "File Type: %s ('%s')" msgstr "Dosya Türü: %s ('%s')" +#: ../midori/midori-view.c:2911 +#, fuzzy, c-format +msgid "File Name: %s" +msgstr "Dosya Türü: '%s'" + #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2687 +#: ../midori/midori-view.c:2930 #, c-format msgid "Open %s" msgstr "%s aç" -#: ../midori/midori-view.c:3231 +#: ../midori/midori-view.c:3575 #, c-format msgid "Inspect page - %s" msgstr "Sayfayı incele - %s" -#: ../midori/midori-view.c:3513 -msgid "Speed dial" +#: ../midori/midori-view.c:3876 +msgid "Speed Dial" msgstr "Hızlı arama" -#: ../midori/midori-view.c:3514 +#: ../midori/midori-view.c:3877 ../midori/midori-view.c:3973 msgid "Click to add a shortcut" msgstr "Bir kısayol eklemek için tıklayın" -#: ../midori/midori-view.c:3515 +#: ../midori/midori-view.c:3878 msgid "Enter shortcut address" msgstr "Kısayol adresi girin" -#: ../midori/midori-view.c:3516 +#: ../midori/midori-view.c:3879 msgid "Enter shortcut title" msgstr "Kısayol başlığını girin" -#: ../midori/midori-view.c:3517 +#: ../midori/midori-view.c:3880 msgid "Are you sure you want to delete this shortcut?" msgstr "Bu kısayolu silmek istediğinizden emin misiniz?" -#: ../midori/midori-view.c:3518 -msgid "Set number of columns and rows" -msgstr "Satır ve sütun sayısını ayarla" +#: ../midori/midori-view.c:4042 +#, c-format +msgid "No documentation installed" +msgstr "Kurulmuş belgelendirme yok" -#: ../midori/midori-view.c:3519 -msgid "Enter number of columns and rows:" -msgstr "Satır ve sütun sayısını gir" +#: ../midori/midori-view.c:4118 +#, fuzzy +msgid "Midori doesn't store any personal data:" +msgstr "Midori, hiçbir kişisel bilgiyi depolamıyor." -#: ../midori/midori-view.c:3520 -msgid "Invalid input for the size of the speed dial" +#: ../midori/midori-view.c:4119 +msgid "No history or web cookies are being saved." msgstr "" -#: ../midori/midori-view.c:3521 -msgid "Thumb size:" -msgstr "Küçük resim boyutu:" +#: ../midori/midori-view.c:4120 +#, fuzzy +msgid "Extensions are disabled." +msgstr "Eklentiler etkisizleştirildi." -#: ../midori/midori-view.c:3522 -msgid "Small" -msgstr "Küçük" +#: ../midori/midori-view.c:4121 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "" -#: ../midori/midori-view.c:3523 -msgid "Medium" -msgstr "Orta" +#: ../midori/midori-view.c:4122 +msgid "Midori prevents websites from tracking the user:" +msgstr "" -#: ../midori/midori-view.c:3524 -msgid "Big" -msgstr "Büyük" +#: ../midori/midori-view.c:4123 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "" -#: ../midori/midori-view.c:3550 -#, c-format -msgid "Document cannot be displayed" -msgstr "Belge görüntülenemedi" +#: ../midori/midori-view.c:4124 +msgid "DNS prefetching is disabled." +msgstr "" -#: ../midori/midori-view.c:3573 -#, c-format -msgid "No documentation installed" -msgstr "Kurulmuş belgelendirme yok" +#: ../midori/midori-view.c:4125 +msgid "The language and timezone are not revealed to websites." +msgstr "" -#: ../midori/midori-view.c:3694 +#: ../midori/midori-view.c:4126 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "" + +#: ../midori/midori-view.c:4164 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "" +"Parantez içerisindeki sürüm numaraları, çalışma zamanında kullanılan sürümü " +"göstermektedir." + +#: ../midori/midori-view.c:4220 msgid "Page loading delayed" msgstr "Sayfa yükleme gecikmesi" -#: ../midori/midori-view.c:3695 +#: ../midori/midori-view.c:4221 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "" +msgstr "Yükleme yakın bir çökme veya başlangıç ayarları yüzünden gecikti." -#: ../midori/midori-view.c:3696 +#: ../midori/midori-view.c:4222 msgid "Load Page" msgstr "Sayfa Yükle" -#: ../midori/midori-view.c:3840 +#: ../midori/midori-view.c:4388 msgid "Blank page" msgstr "Boş sayfa" -#: ../midori/midori-view.c:4100 +#: ../midori/midori-view.c:4650 msgid "_Duplicate Tab" msgstr "Sekmeyi Çoğalt" -#: ../midori/midori-view.c:4105 -msgid "_Restore Tab" -msgstr "Sekmeyi Ye_rleştir" - -#: ../midori/midori-view.c:4105 -msgid "_Minimize Tab" -msgstr "Sekmeyi küçült" +#: ../midori/midori-view.c:4655 +msgid "Show Tab _Label" +msgstr "Sekme etiketini göster" + +#: ../midori/midori-view.c:4655 +msgid "Show Tab _Icon Only" +msgstr "Sadece sekme ikonunu göster" -#: ../midori/midori-view.c:4111 +#: ../midori/midori-view.c:4661 msgid "Close ot_her Tabs" msgstr "_Diğer Sekmeleri Kapat" -#: ../midori/midori-view.c:4783 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5474 +#, fuzzy +msgid "previous" +msgstr "Önceki Sekme" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5493 +msgid "next" +msgstr "" + +#: ../midori/midori-view.c:5506 msgid "Print background images" msgstr "Arkaplan resimlerini yazdır" -#: ../midori/midori-view.c:4784 +#: ../midori/midori-view.c:5507 msgid "Whether background images should be printed" msgstr "Arka fon resimlerini yaz açık/kapalı" -#: ../midori/midori-view.c:4836 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:5539 msgid "Features" msgstr "Özellikler" -#. Page "General" -#: ../midori/midori-preferences.c:298 -msgid "General" -msgstr "Genel" - -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Açılış" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "_Geçerli sayfayı kullan" + +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Geçerli sayfayı ana sayfa olarak kullan " -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Aktarımlar" - #. Page "Appearance" -#: ../midori/midori-preferences.c:349 -msgid "Appearance" -msgstr "Görünüm" - -#: ../midori/midori-preferences.c:350 -msgid "Font settings" -msgstr "Yazıtipi seçenekleri" - -#: ../midori/midori-preferences.c:352 -msgid "Default Font Family" -msgstr "Öntanımlı Yazıtipi Ailesi" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Yazıtipleri" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Uygun Yazıtipi Ailesi" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "Görüntülenecek metin için kullanılacak öntanımlı biçim kümesi" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "Görüntülenecek metin için kullanılacak öntanımlı biçim boyutu" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Sabit Yazıtipi Genişliği Ailesi" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "Sabit genişlikte metin görüntülemek için kullanılacak yazıtipi ailesi" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" -msgstr "Sabit genişlikte görüntülenecek metin için kullanılacak yazıtipi boyutu" +msgstr "" +"Sabit genişlikte görüntülenecek metin için kullanılacak yazıtipi boyutu" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "En Küçük Yazıtipi Boyutu" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "Görüntülenecek metin için kullanılacak en küçük biçim boyutu" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Davranış" -#: ../midori/midori-preferences.c:393 -msgid "Enforce 96 dots per inch" -msgstr "96 dpi zorla" - -#: ../midori/midori-preferences.c:394 -msgid "Enforce a video dot density of 96 DPI" -msgstr "Video yoğunluğunu 96 DPI'ye zorla" - -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Açılır pencere açmak için scriptlere izin ver" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "Scriptlerin otomatik olarak açılır pencere açmasına izin verilmesi açık/kapalı" - -#: ../midori/midori-preferences.c:419 -msgid "Spell Checking" -msgstr "Yazım Denetimi" - -#: ../midori/midori-preferences.c:422 -msgid "Enable Spell Checking" -msgstr "Yazım Denetimi Açık" - -#: ../midori/midori-preferences.c:423 -msgid "Enable spell checking while typing" -msgstr "Yazarken yazım denetimi açık/kapalı" - -#: ../midori/midori-preferences.c:425 -msgid "Spelling dictionaries:" -msgstr "Yazım sözlükleri:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "Bir virgül yazım denetimi için kullanılacak dillerin listesini ayırır, örneğin \"en_GB, de_DE\"" +msgstr "" +"Scriptlerin otomatik olarak açılır pencere açmasına izin verilmesi açık/" +"kapalı" #. Page "Interface" -#: ../midori/midori-preferences.c:435 -msgid "Interface" -msgstr "Arayüz" - -#: ../midori/midori-preferences.c:436 -msgid "Navigationbar" -msgstr "Gezinti Araç Çubuğu" - -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Gözden Geçiriliyor" -#. Page "Applications" -#: ../midori/midori-preferences.c:468 -msgid "Applications" -msgstr "Uygulamalar" - -#: ../midori/midori-preferences.c:469 -msgid "External applications" -msgstr "Harici Uygulamadan" - #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "Ağ" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:463 msgid "Hostname" msgstr "Bilgisayar adı" -#. Page "Privacy" -#: ../midori/midori-preferences.c:511 -msgid "Privacy" -msgstr "Gizlilik" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "MB" -#: ../midori/midori-preferences.c:512 -msgid "Web Cookies" -msgstr "Web Çerezleri" - -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 -msgid "days" -msgstr "gün" - -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Arama motoru ekle" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Arama motoru düzenle" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_İsim:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Açıklama:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "Simgeler:" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "İşare_t:" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "Arama Motorlarını Yönet" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "Öntanımlı olarak kullan" -#: ../midori/sokoke.c:1294 -msgid "_Bookmark" -msgstr "_Yer imi" +#: ../midori/sokoke.c:412 +msgid "Open with" +msgstr "Birlikte aç" -#: ../midori/sokoke.c:1296 -msgid "Add Boo_kmark" -msgstr "_Yerimi Ekle" +#: ../midori/sokoke.c:420 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "\"%s\" 'ı açmak için bir uygulama seçin." -#: ../midori/sokoke.c:1297 -msgid "_Console" -msgstr "_Uçbirim" +#: ../midori/sokoke.c:461 ../midori/sokoke.c:471 ../midori/sokoke.c:499 +#: ../midori/sokoke.c:528 ../midori/sokoke.c:542 +msgid "Could not run external program." +msgstr "Harici uygulama çalıştırılamadı." -#: ../midori/sokoke.c:1298 -msgid "_Extensions" -msgstr "_Ek Özellikler" +#: ../midori/sokoke.c:1653 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d saat" +msgstr[1] "%d saat" -#: ../midori/sokoke.c:1299 -msgid "_History" -msgstr "_Geçmiş" +#: ../midori/sokoke.c:1654 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d dakika" +msgstr[1] "%d dakika" -#: ../midori/sokoke.c:1300 -msgid "_Homepage" -msgstr "_Anasayfa" +#: ../midori/sokoke.c:1655 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d saniye" +msgstr[1] "%d saniye" -#: ../midori/sokoke.c:1301 -msgid "_Userscripts" -msgstr "_Kullanıcı betikleri" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1663 ../panels/midori-transfers.c:267 +#, c-format +msgid "%s of %s" +msgstr "%s nin %s" -#: ../midori/sokoke.c:1302 -msgid "New _Tab" -msgstr "Yeni _Sekme" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1672 +msgid "?B" +msgstr "?B" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1675 +#, c-format +msgid " (%s/s)" +msgstr "(%s/s)" -#: ../midori/sokoke.c:1303 -msgid "_Transfers" -msgstr "_Aktarımlar" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1692 +#, c-format +msgid " - %s remaining" +msgstr "-%s kalan" -#: ../midori/sokoke.c:1304 -msgid "Netscape p_lugins" -msgstr "Netscape eklentileri" +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:264 +msgid "_Inline Find:" +msgstr "Sat_ıriçi Bul:" -#: ../midori/sokoke.c:1307 -msgid "New _Folder" -msgstr "Yeni _Dizin" +#: ../toolbars/midori-findbar.c:290 +msgid "Previous" +msgstr "Önceki Sekme" -#: ../panels/midori-bookmarks.c:111 +#: ../toolbars/midori-findbar.c:296 +msgid "Next" +msgstr "Sonraki" + +#: ../toolbars/midori-findbar.c:300 +msgid "Match Case" +msgstr "Büyük - Küçük Harf Duyarlı" + +#: ../toolbars/midori-findbar.c:309 +msgid "Highlight Matches" +msgstr "Eşleşenleri Vurgula" + +#: ../toolbars/midori-findbar.c:320 +msgid "Close Findbar" +msgstr "Arama Çubuğunu Kapat" + +#: ../toolbars/midori-transferbar.c:122 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "Dosya '%s' indirildi." + +#: ../toolbars/midori-transferbar.c:125 +msgid "Transfer completed" +msgstr "Aktarım tamamlandı" + +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "İndirilen dosya hatalı." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"Bağlantı ile sağlanan checksum uyuşmuyor. Bu dosyada, muhtemelen eksik veya " +"sonradan güncellenmiştir anlamına gelir." + +#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "Hepsini Temizle" + +#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370 +msgid "Some files are being downloaded" +msgstr "Bazı dosyalar indiriliyor" + +#: ../toolbars/midori-transferbar.c:374 +msgid "_Quit Midori" +msgstr "Midori'den _çık" + +#: ../toolbars/midori-transferbar.c:376 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Midori kapatılırsa aktarmalar iptal edilecek." + +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Yer imleri" -#: ../panels/midori-bookmarks.c:241 +#: ../panels/midori-bookmarks.c:257 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Yerimi ekleme hatası: %s\n" + +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "Seçili yer imini düzenle" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "Seçili yer imini sil" -#: ../panels/midori-bookmarks.c:262 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" msgstr "Yeni bir dizin ekle" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 msgid "Separator" msgstr "Ayraç" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "Uçbirim" - -#: ../panels/midori-console.c:361 -msgid "Copy _All" -msgstr "_Hepsini Kopyala" - -#: ../panels/midori-console.c:362 -msgid "Copy All" -msgstr "Hepsini Kopyala" - -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Ek Özellikler" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "Geçmiş" -#: ../panels/midori-history.c:273 -msgid "Erroneous clock time" -msgstr "Saat zamanı hatalı" - -#: ../panels/midori-history.c:274 -msgid "The clock time lies in the past. Please check the current date and time." -msgstr "Saat geri kalmış. Lütfen mevcut saat ve tarihi kontrol edin" +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "Bugün" -#: ../panels/midori-history.c:286 -msgid "A week ago" -msgstr "Bir hafta önce" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "Dün" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d gün önce" msgstr[1] "%d gün önce" -#: ../panels/midori-history.c:291 -msgid "Today" -msgstr "Bugün" - -#: ../panels/midori-history.c:293 -msgid "Yesterday" -msgstr "Dün" +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "Bir hafta önce" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" msgstr "Bütün geçmiş ögelerini silmek istediğinizden emin misiniz?" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" msgstr "Seçili geçmiş ögesini yer imlerine ekle" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" msgstr "Seçili geçmiş öğesini sil" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "Bütün geçmişi sil" -#: ../panels/midori-history.c:952 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Filtre:" +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Aktarımlar" -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:467 msgid "Open Destination _Folder" msgstr "Hedef _Dizini Aç" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:470 msgid "Copy Link Loc_ation" msgstr "Konum Bağlantısını Kopyala" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Yetki Doğrulaması" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" @@ -2244,164 +2242,244 @@ "Bu konuma girmek için\n" "kullanıcı adı ve şifre gerekli:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "Kullanıcı adı" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "Şifre" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "Şifreyi _hatırla" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "'%s' olarak isimlendirilmiş simge yüklenemiyor" -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "'%s' stok simgesi yüklenemedi" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "Animasyon kareleri kırık" -#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873 #, c-format msgid "Property '%s' is invalid for %s" msgstr "'%s' özelliği %s için geçersiz" -#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Dosya seç" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "Dizin seç" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:604 +msgid "None" +msgstr "Yok" + +#: ../katze/katze-utils.c:719 +msgid "1 hour" +msgstr "1 saat" + +#: ../katze/katze-utils.c:720 +msgid "1 day" +msgstr "1 gün" + +#: ../katze/katze-utils.c:721 +msgid "1 week" +msgstr "1 hafta" + +#: ../katze/katze-utils.c:722 +msgid "1 month" +msgstr "1 ay" + +#: ../katze/katze-utils.c:723 +msgid "1 year" +msgstr "1 yıl" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "%s için tercihler" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:467 msgid "Configure Advertisement filters" msgstr "Reklam filtresini yapılandır" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:498 #, 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 "Metin girdisindeki ön yapılandırmalı filtre listesinin adresini yaz ve listeye eklemek için \"Ekle\"'yi tıkla. %s daha fazla liste bulabilirsin." - -#: ../extensions/adblock.c:587 -msgid "Configure _Advertisement filters..." -msgstr "Rekl_am filtresini yapılandı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 "" +"Metin girdisindeki ön yapılandırmalı filtre listesinin adresini yaz ve " +"listeye eklemek için \"Ekle\"'yi tıkla. %s daha fazla liste bulabilirsin." -#: ../extensions/adblock.c:841 +#: ../extensions/adblock.c:846 msgid "Edit rule" msgstr "Kuralı düzenle" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:860 msgid "_Rule:" msgstr "_Kural:" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:914 msgid "Bl_ock image" msgstr "Resim _Engelle" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:919 msgid "Bl_ock link" msgstr "Bağlantıyı engelle" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1620 msgid "Advertisement blocker" msgstr "Reklam engelleyici" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1621 msgid "Block advertisements according to a filter list" msgstr "Filtre listesine göre reklamları engelle" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "%s %s dizinine kopyala." +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "Bu sayfa betik içeriyor. Yüklenmesine izin veriyor musunuz?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "Betiklere izin ver" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "Bu sayfa kullanıcı stili içermektedir. Yüklemek ister misiniz?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "Kullanıcı stillerini yükle" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Yükleme" -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Kullanıcı Betikleri" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Kullanıcı Biçimleri" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Hata" + +#: ../extensions/addons.c:421 #, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "Uzantı yapılandırması '%s' kaydedilemedi: %s\n" +msgid "Do you want to delete '%s'?" +msgstr "'%s' i silmek istediğinizden eminmisiniz." + +#: ../extensions/addons.c:427 +msgid "Delete user script" +msgstr "Kullanıcı betiklerini sil" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:428 +msgid "Delete user style" +msgstr "Kullanıcı stillerini sil" + +#: ../extensions/addons.c:431 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "'%s' dosyası kalıcı olarak silindi" + +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "Metin düzenleyici ile aç" + +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "Hedef _Dizini Aç" + +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "Yeni eklenti ekle" + +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "Seçilmiş eklentiyi kaldır" + +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" msgstr "Kullanıcı eklentileri" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Dizin '%s' izlenemedi: %s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" msgstr "Kullanıcı scripts ve sitil desteği" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "Renkli Sekmeler" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Her sekmeyi farklı biçimde renklendir" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Çerez Yöneticisi" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "Hepsini Sil" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "Görünen çerezlerin hepsini sil. Eğer filtre ayarlanmışsa sadece bu filtrelenen bu çerezler silinecek." +#: ../extensions/cookie-manager/cookie-manager-page.c:105 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"Görünen çerezlerin hepsini sil. Eğer filtre ayarlanmışsa sadece bu " +"filtrelenen bu çerezler silinecek." -#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "Hepsini Genişlet" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "Hepsini Kapat" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" msgstr "Bütün çerezleri silmek istediğinizden gerçekten emin misiniz?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Soru" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." msgstr "Sadece filtrelenen çerezler silinecek." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "Oturumun sonunda" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2418,15 +2496,15 @@ "Güvenlik: %s\n" "Bitiş süresi: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Evet" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "Hayır" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" @@ -2435,30 +2513,46 @@ "Alan: %s\n" "Çerezler: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "İsim" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "Hepsini G_enişlet" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "Hepsini _Kapat" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "Girilmiş filtrenin, sadece çerezlerin adını veya alan adını takip ettiğini gösterecek bir filtre dizisi girin." - -#: ../extensions/cookie-manager/main.c:40 -msgid "_Cookie Manager" -msgstr "_Çerez Yöneticisi" +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +msgid "Filter:" +msgstr "Filtre:" -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Girilmiş filtrenin, sadece çerezlerin adını veya alan adını takip ettiğini " +"gösterecek bir filtre dizisi girin." + +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Çerezleri listele, görüntüle ve sil" +#: ../extensions/copy-tabs.c:38 +msgid "Copy Tab _Addresses" +msgstr "Sekme _Adresini Kopyala" + +#: ../extensions/copy-tabs.c:95 +msgid "Copy Addresses of Tabs" +msgstr "Sekme _Adresini Kopyala" + +#: ../extensions/copy-tabs.c:96 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Tüm sekmelerde ki adresleri panoya kopyala" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "XML verisindeki gerekli Atom \"girdi\" elementi bulma hatası." @@ -2468,39 +2562,39 @@ msgstr "XML verisindeki gerekli Atom \"kaynak\" elementi bulma hatası." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Son güncelleme: %s." -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "Kaynaklar" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "Yeni kaynak ekle" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "kaynak sil" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "_Kaynak" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "XML veri kaynağında kök element bulma hatası." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Desteklenmeyen kaynak biçimi." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "XML kaynağı biçim hatası: %s" @@ -2521,10 +2615,6 @@ msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "XML verisindeki gerekli RSS \"kanal\" elementi bulma hatası." -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "Hata" - #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" @@ -2535,145 +2625,714 @@ msgid "Error loading feed '%s'" msgstr "Kaynak '%s' yükleme hatası" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "Kaynak Paneli" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Atom/RSS kaynaklarını oku" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" msgstr "Biçim değeri ekleme hatası: %s\n" -#: ../extensions/formhistory.c:510 -msgid "Stores history of entered form data" -msgstr "Girilen biçim verilerinin geçmişini kaydeder" +#: ../extensions/formhistory/formhistory.c:95 +#, fuzzy +msgid "Form history" +msgstr "_Form Geçmişi" + +#: ../extensions/formhistory/formhistory.c:112 +#, fuzzy +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Bu konuma girmek için\n" +"kullanıcı adı ve şifre gerekli:" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory/formhistory.c:294 +#, fuzzy +msgid "Remember password on this page?" +msgstr "Şifreyi _hatırla" + +#: ../extensions/formhistory/formhistory.c:299 +#, fuzzy +msgid "Remember" +msgstr "Şifreyi _hatırla" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:437 +#, fuzzy +msgid "Toggle form history state" +msgstr "Form geçmişi durumunu değiştir." + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "Geçerli sekme için form geçmişi etkinleştirin veya devre dışı bırakın." + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format -msgid "Not available: %s" -msgstr "Kullanılamaz: %s" +msgid "Failed to execute database statement: %s\n" +msgstr "Veri tabanı ifadesi çalışma hatası: %s\n" -#: ../extensions/formhistory.c:515 -msgid "Resource files not installed" -msgstr "Kaynak dosyalar yüklenmedi" +#: ../extensions/formhistory/formhistory.c:629 +#, fuzzy +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" +"her sekme için form geçmişini sadece kısayol tuşu (Ctrl + Shift + F) ile " +"etkinleştir" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory/formhistory.c:668 msgid "Form history filler" msgstr "Tarih doldurucu biçimi" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/formhistory/formhistory.c:669 +msgid "Stores history of entered form data" +msgstr "Girilen biçim verilerinin geçmişini kaydeder" + +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#, fuzzy, c-format +msgid "Failed to select suggestions\n" +msgstr "Geçmişten seçme hatası\n" + +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Ziyaret edilmemiş sekme bulunmuyor" + +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "Geçmiş-Listesi" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Sekme kapatma davranışı" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Hiçbirş ey yapma" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Son bakılan sekmeye geç" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "En yeni sekmeye geç" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Bir sonraki yeni Sekme (Geçmiş Listesi)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Geçmişten bir sonraki yeni sekme" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Bir önceki yeni Sekme (Geçmiş Listesi)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Geçmişten bir önceki yeni sekme" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Sekmeyi arkaplanda göster Geçmiş Listesi()" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Yeni seçilen sekmeyi arkaplanda göster" + +#: ../extensions/history-list.vala:569 +msgid "History List" +msgstr "Geçmiş Listesi" + +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "Sekmeleri kapatırken veya değiştirirken son kullanılan sekmeye taşı" + +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Fare İşaretleri" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Hareketli fare tarafından Midori kontrolü" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 -msgid "Pageholder" -msgstr "Sayfa Tutucu" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "_Sayfa tutucu" - -#: ../extensions/page-holder.c:178 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "Bir veya birden fazla sayfayı sekmelerinizde paralel olarak açık tutun" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "Sayfayı Yeniden yükle ya da yüklemeyi durdur" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "Klavye kısayolunu özelleştir" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "Kısayollar özelleştiriliyor..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Kısayollar" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "Klavye kısayollarını görüntüle ve düzenle" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/status-clock.c:174 +msgid "Statusbar Clock" +msgstr "_Durum Çubuğu Saati" + +#: ../extensions/status-clock.c:175 +msgid "Display date and time in the statusbar" +msgstr "Durum çubuğunda tarihi ve saati göster" + +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Resimler" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Betikler" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Netscape eklentileri" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "Durum Çubuğu Özellikleri" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" -msgstr "Web sayfasının açılmasında ve kapanmasında özellikleri kolayca kilitler" +msgstr "" +"Web sayfasının açılmasında ve kapanmasında özellikleri kolayca kilitler" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Sekme Paneli" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "Sekme P_aneli" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Sekmeleri bir dikey panelde göster" -#: ../extensions/tab-switcher.c:402 -msgid "Tab History List" -msgstr "Sekme Geçmiş Listesi" - -#: ../extensions/tab-switcher.c:403 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Son kullanım tarafından seçilmiş bir listeden seçilerek sekmelerin değişmesine izin verir" +#: ../extensions/tabs-minimized.c:76 +msgid "Only Icons on Tabs by default" +msgstr "Ön tanımlı olarak sadece sekme ikonlarını göster" + +#: ../extensions/tabs-minimized.c:77 +msgid "New tabs have no label by default" +msgstr "Yeni sekmelere etiket verme" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Araç Çubuğunu Özelleştir" -#: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "Araç çubuğunda görüntülenecek ögeleri seç. Ögeler sürükle bırak yöntemiyle yerleştirilebilir." +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"Araç çubuğunda görüntülenecek ögeleri seç. Ögeler sürükle bırak yöntemiyle " +"yerleştirilebilir." -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Kullanılabilir ögeler" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Görüntülenen Ögeler" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "_Araç Çubuğu Özelleştiriliyor..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Düzenle..." + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" msgstr "Araç Çubuğu Düzenleyici" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" msgstr "Araç çubuğunu kolayca düzenler" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "Diskteki HTTP iletişimi önbelleği" +#~ msgid "Lightweight web browser" +#~ msgstr "Hafif web tarayıcı " + +#~ msgid "No filename specified" +#~ msgstr "Dosya ismi belirtilmedi" + +#~ msgid "Cookies" +#~ msgstr "Çerezler" + +#~ msgid "'Flash' Cookies" +#~ msgstr "'Flash' çerezleri" + +#~ msgid "HTML5 _Databases" +#~ msgstr "HTML5 veritabanı" + +#~ msgid "Offline Application Cache" +#~ msgstr "Çevrimdışı Uygulama Önbelleği " + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "Gezinirken hiç bir özel veriyi kaydetme" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Hızlı aramaya kısayol ekle" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Masaüstüne kısayol ekle" + +#~ msgid "Create a launcher" +#~ msgstr "Bir başlatıcı oluştur" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "Bu haber kaynaksine üye ol" + +#~ msgid "Close this window" +#~ msgstr "Bu pencereyi kapat" + +#~ msgid "Close all open windows" +#~ msgstr "Bütün açık pencereleri kapat" + +#~ msgid "Undo the last modification" +#~ msgstr "Son değişikliği geri al" + +#~ msgid "Redo the last modification" +#~ msgstr "Son değişikliği yeniden yap" + +#~ msgid "Cut the selected text" +#~ msgstr "Seçili metni kes" + +#~ msgid "Copy the selected text" +#~ msgstr "Seçili metni kopyala" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "Metni panodan yapıştır" + +#~ msgid "Delete the selected text" +#~ msgstr "Seçili metni sil" + +#~ msgid "Select all text" +#~ msgstr "Bütün metni seç" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Kelime ya da ibarenin sonraki örneğini bul" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Kelime ya da ibarenin sonraki örneğini bul" + +#~ msgid "Reset the zoom level" +#~ msgstr "Yakınlaştırma oranını sıfırla" + +#~ msgid "View the source code of the page" +#~ msgstr "Geçerli sayfanın kaynak kodunu görüntüle" + +#~ msgid "Scroll to the left" +#~ msgstr "Sola kaydır" + +#~ msgid "Scroll down" +#~ msgstr "Aşağı kaydır" + +#~ msgid "Scroll up" +#~ msgstr "Yukarı kaydır" + +#~ msgid "Scroll to the right" +#~ msgstr "Sağa kaydır" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "Çöp Kutusu içerisindeki bütün içeriği sil" + +#~ msgid "Open the last closed tab" +#~ msgstr "Son kapatılan sekmeyi aç" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Yeni bir yerimi dizini ekle" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Arama motorlarını ekle, sil ve düzenle..." + +#~ msgid "Clear private data..." +#~ msgstr "Kişisel verileri temizle..." + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "Sayfa detaylarını kontrol et ve geliştirici araçlarına bağlan..." + +#~ msgid "Switch to the previous tab" +#~ msgstr "Önceki sekmeye geç" + +#~ msgid "Switch to the next tab" +#~ msgstr "Sonraki sekmeye geç" + +#~ msgid "Move tab behind the previous tab" +#~ msgstr "Sekmeyi önceki sekmenin arkasına taşı" + +#~ msgid "Move tab in front of the next tab" +#~ msgstr "Sekmeyi sonraki sekmenin önüne taşı" + +#~ msgid "Focus the current tab" +#~ msgstr "Geçerli sekmeye odaklan" + +#~ msgid "Cycle focus between views" +#~ msgstr "Görünümler arasında dairesel odak" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Sadece şuan ki sekmenin simgesini göster" + +#~ msgid "Duplicate the current tab" +#~ msgstr "Geçerli sekmeyi çoğalt" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Diğer sekmeleri kapat" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Son oturumda kaydedilmiş sekmeleri aç" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Sık Sorulan Soruları Göster" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Midori'nin hata takip sistemini aç" + +#~ msgid "Show information about the program" +#~ msgstr "Uygulama hakkında bilgi göster" + +#~ msgid "Show menubar" +#~ msgstr "Menü çubuğunu göster" + +#~ msgid "Show navigationbar" +#~ msgstr "Gezinti araç çubuğunu göster" + +#~ msgid "Show sidepanel" +#~ msgstr "Yan paneli göster" + +#~ msgid "Show bookmarkbar" +#~ msgstr "Yer imi araç çubuğunu göster" + +#~ msgid "Show statusbar" +#~ msgstr "Durum çubuğunu göster" + +#~ msgid "MD5-Checksum:" +#~ msgstr "MD5-Checksum:" + +#~ msgid "SHA1-Checksum:" +#~ msgstr "SHA1-Checksum:" + +#~ msgid "Set number of columns and rows" +#~ msgstr "Satır ve sütun sayısını ayarla" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Satır ve sütun sayısını gir" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "Hızlı arama boyutu için geçersiz girdi" + +#~ msgid "Thumb size:" +#~ msgstr "Küçük resim boyutu:" + +#~ msgid "Small" +#~ msgstr "Küçük" + +#~ msgid "Medium" +#~ msgstr "Orta" + +#~ msgid "Big" +#~ msgstr "Büyük" + +#~ msgid "Not available: %s" +#~ msgstr "Kullanılamaz: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "Kaynak dosyalar yüklenmedi" + +#~ msgid "Reset the last _session" +#~ msgstr "Son _oturumu yeniden başlat" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% yüklendi" + +#~ msgid "Quit the application" +#~ msgstr "Uygulamadan çık" + +#~ msgid "_Contents" +#~ msgstr "_İçerik" + +#~ msgid "Show the documentation" +#~ msgstr "Belgelendirmeyi göster" + +#~ msgid "_Transferbar" +#~ msgstr "Ak_tarım çubuğu" + +#~ msgid "Show transferbar" +#~ msgstr "Aktarım çubuğunu göster" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "Veritabanı ifadesi çalıştırma hatası\n" + +#~ msgid "Show Blank page" +#~ msgstr "Boş sayfa göster" + +#~ msgid "All cookies" +#~ msgstr "Bütün çerezler" + +#~ msgid "Session cookies" +#~ msgstr "Oturum çerezleri" + +#~ msgid "Show Transferbar" +#~ msgstr "Aktarım çubuğunu göster" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "Aktarım çubuğu göster açık/kapalı" + +#~ msgid "Show progress in location entry" +#~ msgstr "Yerel girdideki ilerlemeyi göster" + +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "Yerel girdideki yükleme ilerleyişini göster açık/kapalı" + +#~ msgid "Search engines in location completion" +#~ msgstr "Konum tamamlamada arama motorları" + +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "Konum tamamlamada arama motorlarını göster açık/kapalı" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "Panelin işletme kontrollerini göster" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "Panelin işletme kontrollerini göster açık/kapalı" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Yeni sekmede hızlı aramayı göster" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Yeni açılan sekmelerde hızlı aramayı göster" + +#~ msgid "Ask for the destination folder" +#~ msgstr "Hedef klasörü sor" + +#~ msgid "Whether to ask for the destination folder when downloading a file" +#~ msgstr "Bir dosyayı indirirken hedef dizini sor açık/kapalı" + +#~ msgid "Whether to show a notification when a transfer has been completed" +#~ msgstr "Bir aktarım bittiğinde bir uyarı göster açık/kapalı" + +#~ msgid "Download Manager" +#~ msgstr "İndirme Yöneticisi" + +#~ msgid "An external download manager" +#~ msgstr "Harici indirme yöneticisi" + +#~ msgid "Open external pages in:" +#~ msgstr "Harici sayfaları aç:" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "Harici açılmış sayfaların açılacağı yer" + +#~ msgid "Accept cookies" +#~ msgstr "Çerezleri kabul et" + +#~ msgid "What type of cookies to accept" +#~ msgstr "Kabul edilecek çerez türleri" + +#~ msgid "Maximum cookie age" +#~ msgstr "En çok çerez süresi" + +#~ msgid "Maximum history age" +#~ msgstr "En çok geçmiş süresi" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Son indirilmiş dosyaları hatırla" + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "Eğer son indirilmiş dosyalar kaydedilmişse" + +#~ msgid "Not found - %s" +#~ msgstr "Bulunamadı - %s" + +#~ msgid "_Save Link destination" +#~ msgstr "Bağlantı konumunu kay_det" + +#~ msgid "_Download Link destination" +#~ msgstr "Bağlantı konumunu İnd_ir" + +#~ msgid "Download with Download _Manager" +#~ msgstr "İndirme _Yöneticisi ile indir" + +#~ msgid "Download I_mage" +#~ msgstr "Resm_i İndir" + +#~ msgid "Document cannot be displayed" +#~ msgstr "Belge görüntülenemedi" + +#~ msgid "General" +#~ msgstr "Genel" + +#~ msgid "Appearance" +#~ msgstr "Görünüm" + +#~ msgid "Font settings" +#~ msgstr "Yazıtipi seçenekleri" + +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "96 dpi zorla" + +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "Video yoğunluğunu 96 DPI'ye zorla" + +#~ msgid "Interface" +#~ msgstr "Arayüz" + +#~ msgid "Navigationbar" +#~ msgstr "Gezinti Araç Çubuğu" + +#~ msgid "Applications" +#~ msgstr "Uygulamalar" + +#~ msgid "External applications" +#~ msgstr "Harici Uygulamadan" + +#~ msgid "Web Cookies" +#~ msgstr "Web Çerezleri" + +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "Midori'den çıkıldığında çerezleri temizle" + +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "1 saatten daha eski çerezleri sil" + +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "1 haftadan daha eski çerezleri sil" + +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "1 aydan daha eski çerezleri sil" + +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "1 yıldan daha eski çerezleri sil" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Rekl_am filtresini yapılandır..." + +#~ msgid "Open target folder for selected addon" +#~ msgstr "Seçilmiş eklenti için hedef dizini aç" + +#~ msgid "Next Tab (History List)" +#~ msgstr "Sonraki Sekme (Geçmiş Listesi)" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "Önceki Sekme" + +#~ msgid "Previous tab from history" +#~ msgstr "Önceki Sekme" + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "" +#~ "Son kullanım tarafından seçilmiş bir listeden seçilerek sekmelerin " +#~ "değişmesine izin verir" + +#~ msgid "Pageholder" +#~ msgstr "Sayfa Tutucu" + +#~ msgid "_Pageholder" +#~ msgstr "_Sayfa tutucu" + +#~ msgid "Keep one or multiple pages open in parallel to your tabs" +#~ msgstr "" +#~ "Bir veya birden fazla sayfayı sekmelerinizde paralel olarak açık tutun" + +#~ msgid "_Recently visited pages" +#~ msgstr "_Yeni ziyaret edilmiş sayfalar" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Daha önce ziyaret edilmiş sayfaları yeniden aç" + +#~ msgid "Detach chosen panel from the window" +#~ msgstr "Pencereden seçilmiş paneli ayır" + +#~ msgid "Hide operating controls" +#~ msgstr "İşlem kontrollerini gizle" + +#~ msgid "Original cookies only" +#~ msgstr "Sadece gerçek çerezler" + +#~ msgid "Remember last visited pages" +#~ msgstr "Son ziyaret edilen sayfaları hatırla" + +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "Eğer son ziyaret edilen sayfalar kaydedilmişse" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "Vekil sunucuyu otomatik olarak belirle" + +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" +#~ msgstr "Vekil sunucuyu ortamdan otomatik olarak belirle açık/kapalı" + +#~ msgid "_Restore Tab" +#~ msgstr "Sekmeyi Ye_rleştir" + +#~ msgid "_Minimize Tab" +#~ msgstr "Sekmeyi küçült" + +#~ msgid "Spell Checking" +#~ msgstr "Yazım Denetimi" + +#~ msgid "Spelling dictionaries:" +#~ msgstr "Yazım sözlükleri:" + +#~ msgid "" +#~ "A comma separated list of languages to be used for spell checking, for " +#~ "example \"en_GB,de_DE\"" +#~ msgstr "" +#~ "Bir virgül yazım denetimi için kullanılacak dillerin listesini ayırır, " +#~ "örneğin \"en_GB, de_DE\"" + +#~ msgid "Console" +#~ msgstr "Uçbirim" + +#~ msgid "Copy _All" +#~ msgstr "_Hepsini Kopyala" + +#~ msgid "Copy All" +#~ msgstr "Hepsini Kopyala" + +#~ msgid "Erroneous clock time" +#~ msgstr "Saat zamanı hatalı" + +#~ msgid "" +#~ "The clock time lies in the past. Please check the current date and time." +#~ msgstr "Saat geri kalmış. Lütfen mevcut saat ve tarihi kontrol edin" + +#~ msgid "Copy %s to the folder %s." +#~ msgstr "%s %s dizinine kopyala." + +#~ msgid "_Cookie Manager" +#~ msgstr "_Çerez Yöneticisi" + #~ msgid "Set number of shortcuts" #~ msgstr "Kısayol sayısını ayarla" @@ -2683,9 +3342,6 @@ #~ msgid "User_styles" #~ msgstr "Kullanıcı _biçimleri" -#~ msgid "_Closed Tabs and Windows" -#~ msgstr "_Kapatılmış Pencereler ve Sekmeler" - #~ msgid "URIs" #~ msgstr "URIs" @@ -2707,9 +3363,6 @@ #~ msgid "View Selection Source" #~ msgstr "Seçim Kaynağını Görüntüle" -#~ msgid "Last open pages" -#~ msgstr "Son açılmış sayfalar" - #~ msgid "Both" #~ msgstr "Her ikisi de" @@ -2746,9 +3399,6 @@ #~ msgid "Enable developer tools" #~ msgstr "Geliştirici araçlarına izin ver" -#~ msgid "MB" -#~ msgstr "MB" - #~ msgid "_Icon (name or file):" #~ msgstr "S_imge (isim ya da dosya):" diff -Nru midori-0.2.8/po/ug.po midori-0.4.6/po/ug.po --- midori-0.2.8/po/ug.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/ug.po 2012-05-14 22:13:42.000000000 +0000 @@ -1896,7 +1896,7 @@ msgstr "بەتنى تەكشۈر - %s" #: ../midori/midori-view.c:3513 -msgid "Speed dial" +msgid "Speed Dial" msgstr "" #: ../midori/midori-view.c:3514 @@ -2814,7 +2814,7 @@ #: ../extensions/toolbar-editor.c:405 msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " +"Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "قورال بالدىقىدا كۆرسىتىلىدىغان تۈرلەرنى تاللا. ئۇلارنى ئۇنىڭ تەرتىپىنى تۇتۇپ تاشلاپ ئۆزگەرتىشكە بولىدۇ" diff -Nru midori-0.2.8/po/uk.po midori-0.4.6/po/uk.po --- midori-0.2.8/po/uk.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/uk.po 2012-05-14 22:13:42.000000000 +0000 @@ -8,2424 +8,2463 @@ msgstr "" "Project-Id-Version: midori svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-05 16:08+0000\n" +"POT-Creation-Date: 2012-05-13 04:45+0000\n" "PO-Revision-Date: 2010-02-16 22:53+0100\n" "Last-Translator: Yarema aka Knedlyk \n" "Language-Team: Ukrainian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: uk\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Легкий переглядач Веб" +msgid "Browse the Web" +msgstr "Переглянути Веб" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 -#: ../midori/main.c:1665 ../midori/main.c:1681 -#: ../midori/midori-websettings.c:312 +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "Internet;WWW;Explorer" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:1972 ../midori/main.c:1996 +#: ../midori/main.c:2010 ../midori/midori-websettings.c:313 msgid "Midori" msgstr "Мідорі" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "Переглядач Веб" -#: ../midori/main.c:99 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Мідорі перегляд в режимі приватності" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Відкрити нове вікно перегляду в режимі приватності" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4288 +msgid "Private Browsing" +msgstr "Режим приватності" + +#: ../midori/main.c:97 ../midori/main.c:103 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Неможливо завантажити конфігурацію: %s\n" -#: ../midori/main.c:148 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Значення '%s' є неправильним для %s" -#: ../midori/main.c:155 ../midori/main.c:241 +#: ../midori/main.c:156 ../midori/main.c:260 #, c-format msgid "Invalid configuration value '%s'" msgstr "Неправильне значення конфігурації '%s'" -#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 +#: ../midori/main.c:381 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Неможливо завантажити пошукову машину. %s\n" + +#: ../midori/main.c:435 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Невдача при очищенні історії: %s\n" + +#: ../midori/main.c:455 ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" msgstr "Не вдалось відкрити базу даних: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:424 +#: ../midori/main.c:525 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Невдача видалення старих об'єктів історії: %s\n" -#: ../midori/main.c:455 ../panels/midori-history.c:169 -#: ../panels/midori-history.c:199 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Невдача при видаленні об'єкту історії: %s\n" - -#: ../midori/main.c:500 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Неможливо зберегти закладки. %s" - -#: ../midori/main.c:528 +#: ../midori/main.c:547 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Неможливо зберегти конфігурацію. %s" -#: ../midori/main.c:566 +#: ../midori/main.c:582 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Неможливо зберегти пошукові машини. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:586 ../midori/main.c:609 +#: ../midori/main.c:619 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Неможливо зберегти смітник. %s" -#: ../midori/main.c:668 ../midori/main.c:908 +#: ../midori/main.c:660 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Розширення" + +#: ../midori/main.c:674 +msgid "Privacy" +msgstr "Приватність" + +#: ../midori/main.c:686 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"Тістечка зберігають дані входу, зберігають ігри або профілі користувачів для " +"рекламних цілей." + +#: ../midori/main.c:742 #, c-format msgid "The session couldn't be saved. %s" msgstr "Сесія не може бути збережена. %s" -#: ../midori/main.c:852 -msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "Немає доступних кореневих сертифікатів. Сертифікати SSL неможливо перевірити. " - -#: ../midori/main.c:942 -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:960 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" +"Немає доступних кореневих сертифікатів. Сертифікати SSL неможливо перевірити." + +#: ../midori/main.c:1036 +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:957 +#: ../midori/main.c:1055 msgid "Modify _preferences" msgstr "Змінити _налаштування" -#: ../midori/main.c:961 -msgid "Reset the last _session" -msgstr "Скинути останню _сесію" - -#: ../midori/main.c:966 +#: ../midori/main.c:1059 msgid "Disable all _extensions" msgstr "Заборонити всі розширення" -#: ../midori/main.c:1206 ../midori/main.c:1952 +#: ../midori/main.c:1072 +msgid "Discard old tabs" +msgstr "Видалити старі вкладки" + +#: ../midori/main.c:1073 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "Показати останні вкладки без завантаження" + +#: ../midori/main.c:1074 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "Показати останні відкриті вкладки" + +#: ../midori/main.c:1321 ../midori/main.c:2399 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Неможливо завантажити сесію: %s\n" -#: ../midori/main.c:1328 -msgid "No filename specified" -msgstr "Не вказано назви файлу" - -#: ../midori/main.c:1347 -msgid "An unknown error occured." -msgstr "Отримано невідому помилку." - -#: ../midori/main.c:1378 +#: ../midori/main.c:1459 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Знімок екрану збережено до: %s\n" -#: ../midori/main.c:1550 +#: ../midori/main.c:1875 msgid "Run ADDRESS as a web application" msgstr "Запустити АДРЕСУ як веб-додаток" -#: ../midori/main.c:1550 +#: ../midori/main.c:1875 msgid "ADDRESS" msgstr "АДРЕСА" -#: ../midori/main.c:1553 +#: ../midori/main.c:1878 msgid "Use FOLDER as configuration folder" msgstr "Використайте ТЕКУ як теку конфігурації" -#: ../midori/main.c:1553 +#: ../midori/main.c:1878 msgid "FOLDER" msgstr "ТЕКА" -#: ../midori/main.c:1556 +#: ../midori/main.c:1881 +msgid "Private browsing, no changes are saved" +msgstr "Захищений перегляд, жодні зміни не записуються" + +#: ../midori/main.c:1883 msgid "Show a diagnostic dialog" msgstr "Показати діалог діагностики" -#: ../midori/main.c:1558 +#: ../midori/main.c:1885 msgid "Run the specified filename as javascript" msgstr "Виконати визначений файл як джава-скрипт" -#: ../midori/main.c:1561 +#: ../midori/main.c:1887 msgid "Take a snapshot of the specified URI" msgstr "Зробити знімок вибраної сторінки/адреси" -#: ../midori/main.c:1564 +#: ../midori/main.c:1889 msgid "Execute the specified command" -msgstr "Виконати вибрану комнаду" +msgstr "Виконати вибрану команду" + +#: ../midori/main.c:1891 +msgid "List available commands to execute with -e/ --execute" +msgstr "Список можливих команд для запуску з -e/ --execute" -#: ../midori/main.c:1566 +#: ../midori/main.c:1893 msgid "Display program version" msgstr "Відобразити версію програми" -#: ../midori/main.c:1568 +#: ../midori/main.c:1895 msgid "Addresses" msgstr "Адреси" -#: ../midori/main.c:1570 +#: ../midori/main.c:1897 msgid "Block URIs according to regular expression PATTERN" msgstr "Блокувати URI згідно з регулярним виразом PATTERN" -#: ../midori/main.c:1570 +#: ../midori/main.c:1897 msgid "PATTERN" msgstr "PATTERN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1574 +#: ../midori/main.c:1901 msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "Зресетувати Midori після СЕКУНД неактивності" +msgstr "Зареєструвати Midori після СЕКУНД неактивності" -#: ../midori/main.c:1574 +#: ../midori/main.c:1901 msgid "SECONDS" msgstr "СЕКУНД" -#: ../midori/main.c:1654 +#: ../midori/main.c:1904 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "Перенаправити попередження консолі до вказаного ФАЙЛ" + +#: ../midori/main.c:1904 +msgid "FILENAME" +msgstr "ФАЙЛ" + +#: ../midori/main.c:1969 msgid "[Addresses]" msgstr "[Адреси]" -#: ../midori/main.c:1682 +#: ../midori/main.c:2011 msgid "Please report comments, suggestions and bugs to:" msgstr "Будь ласка надсилайте звіти, коментарі, пропозиції і помилки до:" -#: ../midori/main.c:1684 +#: ../midori/main.c:2013 msgid "Check for new versions at:" msgstr "Перевірити на наявність нової версії на:" -#: ../midori/main.c:1801 -msgid "The specified configuration folder is invalid." -msgstr "Це невластива тека конфігурації." +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2108 +msgid "Saved logins and _passwords" +msgstr "Збережені логіни і _паролі" + +#: ../midori/main.c:2110 +msgid "Cookies and Website data" +msgstr "Дані коржиків і веб-сторінки" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2114 ../midori/midori-websettings.c:997 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "Веб-кеш" -#: ../midori/main.c:1849 -msgid "An instance of Midori is already running but not responding.\n" -msgstr "Один із екземплярів програми Midori вже працює, але не відповідає на запити.\n" +#: ../midori/main.c:2117 +msgid "Website icons" +msgstr "Значки веб-сторінок" -#: ../midori/main.c:1904 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "Неможливо завантажити пошукову машину. %s\n" +#: ../midori/main.c:2223 +msgid "An unknown error occured" +msgstr "Сталася невідома помилка" + +#: ../midori/main.c:2330 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "" +"Один із екземплярів програми Midori вже працює, але не відповідає на " +"запити.\n" -#: ../midori/main.c:1925 +#: ../midori/main.c:2366 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Неможливо завантажити закладки: %s\n" -#: ../midori/main.c:1967 +#: ../midori/main.c:2414 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Неможливо завантажити смітник: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:2427 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Неможливо завантажити історію: %s\n" -#: ../midori/main.c:1994 +#: ../midori/main.c:2443 msgid "The following errors occured:" msgstr "Отримано наступні помилки:" -#: ../midori/main.c:2010 +#: ../midori/main.c:2459 msgid "_Ignore" msgstr "_Ігнорувати" -#: ../midori/midori-array.c:429 +#: ../midori/midori-app.c:1339 +msgid "_Bookmark" +msgstr "_Закладка" + +#: ../midori/midori-app.c:1340 ../midori/midori-browser.c:6066 +msgid "_Bookmarks" +msgstr "_Закладки" + +#: ../midori/midori-app.c:1341 +msgid "Add Boo_kmark" +msgstr "_Додати закладку" + +#: ../midori/midori-app.c:1342 +msgid "_Console" +msgstr "_Консоль" + +#: ../midori/midori-app.c:1343 +msgid "_Extensions" +msgstr "_Розширення" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1344 ../midori/midori-browser.c:4591 +msgid "_History" +msgstr "_Історія" + +#: ../midori/midori-app.c:1345 +msgid "_Homepage" +msgstr "Д_омашня сторінка" + +#: ../midori/midori-app.c:1346 +msgid "_Userscripts" +msgstr "_Скрипти користувача" + +#: ../midori/midori-app.c:1347 +msgid "New _Tab" +msgstr "Нова _вкладка" + +#: ../midori/midori-app.c:1348 +msgid "_Transfers" +msgstr "_Завантаження" + +#: ../midori/midori-app.c:1349 +msgid "Netscape p_lugins" +msgstr "Роз_ширення Netscape" + +#: ../midori/midori-app.c:1350 +msgid "_Closed Tabs" +msgstr "_Закриті вкладки" + +#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5218 +msgid "New _Window" +msgstr "_Нове вікно" + +#: ../midori/midori-app.c:1352 +msgid "New _Folder" +msgstr "Нова _тека" + +#: ../midori/midori-array.c:522 msgid "File not found." msgstr "Файл не знайдений." -#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 -#: ../midori/midori-array.c:496 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Неправильний документ." -#: ../midori/midori-array.c:505 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." msgstr "Нерозпізнаний формат закладки." -#: ../midori/midori-array.c:719 +#: ../midori/midori-array.c:915 msgid "Writing failed." msgstr "Невдача запису." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 -#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5300 +#: ../midori/midori-browser.c:5309 msgid "Reload the current page" msgstr "Оновити поточну сторінку" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 +#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5306 msgid "Stop loading the current page" msgstr "Зупинити завантаження поточної сторінки" -#: ../midori/midori-browser.c:453 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% завантажено" - -#: ../midori/midori-browser.c:491 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" msgstr "Невдача при оновленні назви: %s\n" -#: ../midori/midori-browser.c:504 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." msgstr "Несподівана дія '%s'." -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:569 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Режим приватності)" + +#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716 +msgid "Toplevel folder" +msgstr "Тека рівнем вище" + +#: ../midori/midori-browser.c:774 msgid "New folder" msgstr "Нова тека" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:774 msgid "Edit folder" msgstr "Редагувати теку" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "New bookmark" msgstr "Нова закладка" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:776 msgid "Edit bookmark" msgstr "Редагувати закладку" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:818 msgid "_Title:" msgstr "_Назва:" -#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "_Опис:" - -#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Адреса:" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4328 msgid "_Folder:" msgstr "_Тека:" -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 -#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 -msgid "Toplevel folder" -msgstr "Тека рівнем вище" - -#: ../midori/midori-browser.c:872 +#: ../midori/midori-browser.c:877 msgid "Add to _Speed Dial" msgstr "Додати до шви_дкого виклику" -#: ../midori/midori-browser.c:885 +#: ../midori/midori-browser.c:890 msgid "Show in the tool_bar" msgstr "Показати в панелі інструментів" -#: ../midori/midori-browser.c:900 +#: ../midori/midori-browser.c:905 msgid "Run as _web application" msgstr "Запустити як веб-додаток" -#: ../midori/midori-browser.c:979 +#: ../midori/midori-browser.c:976 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Файл \"%s\" неможливо зберегти в цій теці." + +#: ../midori/midori-browser.c:978 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "Ви не маєте прав доступу для запису." + +#: ../midori/midori-browser.c:985 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Немає достатньо вільного місця для завантаження \"%s\"." -#: ../midori/midori-browser.c:983 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." -msgstr "Файл потребує %s, але тільки %s залишилося. " +msgstr "Файл потребує %s, але тільки %s залишилося." -#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 -#: ../midori/midori-browser.c:4085 +#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4397 msgid "Save file as" msgstr "Зберегти файл як" -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1320 +msgid "New Window" +msgstr "Нове вікно" + +#: ../midori/midori-browser.c:1320 +msgid "A new window has been opened" +msgstr "Відкрито нове вікно" + +#: ../midori/midori-browser.c:1323 +msgid "New Tab" +msgstr "Нова вкладка" + +#: ../midori/midori-browser.c:1323 +msgid "A new tab has been opened" +msgstr "Відкрито нову вкладку" + +#: ../midori/midori-browser.c:1358 +msgid "Error opening the image!" +msgstr "Помилка відкривання малюнка!" + +#: ../midori/midori-browser.c:1359 +msgid "Can not open selected image in a default viewer." +msgstr "Неможливо відкрити вибраний малюнок в типовому переглядачі." + +#: ../midori/midori-browser.c:1365 +msgid "Error downloading the image!" +msgstr "Помилка звантаження малюнка!" + +#: ../midori/midori-browser.c:1366 +msgid "Can not download selected image." +msgstr "Неможливо звантажити вибраний малюнок." + +#: ../midori/midori-browser.c:1492 msgid "Save file" msgstr "Зберегти файл" -#: ../midori/midori-browser.c:2150 +#: ../midori/midori-browser.c:2367 msgid "Open file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:2228 +#: ../midori/midori-browser.c:2499 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." msgstr "" -"Для використання посилання вище, відкрийте переглядач новин. Звичайно віе є в меню або під кнопкою \"Нова підписка\", \"Новий виток новин\" або щось подібне.\n" -"Або Ви можете перейти до Налаштування, Програми в Мідорі, і виберіть Переглядач новин. Якщо наступного Ви натиснете на іконку витка новин, то вони будуть додані автоматично." +"Для використання посилання вище, відкрийте переглядач новин. Зазвичай він є " +"в меню або під кнопкою \"Нова підписка\", \"Новий виток новин\" або щось " +"подібне.\n" +"Або Ви можете перейти до Налаштування, Програми в Мідорі, і виберіть " +"Переглядач новин. Якщо наступного Ви натиснете на іконку витка новин, то " +"вони будуть додані автоматично." -#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Нова стрічка новин" -#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 -#: ../panels/midori-bookmarks.c:406 +#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5369 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "Додати нову закладку" -#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "Неможливо запустити зовнішню програму." +#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "Пусто" + +#: ../midori/midori-browser.c:3469 +msgid "Toggle text cursor navigation" +msgstr "Переключити текстовий курсор навігації" -#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:3784 ../midori/midori-browser.c:5759 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Неможливо вставити новий об'єкт історії: %s\n" -#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:734 +#: ../midori/midori-browser.c:4116 ../panels/midori-bookmarks.c:745 +#: ../panels/midori-history.c:803 msgid "Open all in _Tabs" msgstr "Відкрити все у в_кладках" -#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 -#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4123 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "Відкрити у новій _вкладці" -#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 -#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4126 ../midori/midori-view.c:2688 +#: ../midori/midori-view.c:4828 ../panels/midori-bookmarks.c:753 +#: ../panels/midori-history.c:811 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "Відкрити у новому _вікні" -#: ../midori/midori-browser.c:3931 +#: ../midori/midori-browser.c:4215 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3932 +#: ../midori/midori-browser.c:4216 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:4217 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:4218 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3935 +#: ../midori/midori-browser.c:4219 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3959 +#: ../midori/midori-browser.c:4220 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4241 msgid "Import bookmarks..." msgstr "Імпорт закладок..." -#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4244 ../midori/midori-browser.c:5374 msgid "_Import bookmarks" msgstr "_Імпорт закладок" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:4255 msgid "_Application:" msgstr "_Програма:" -#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 -#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 -#: ../katze/katze-utils.c:696 -msgid "Custom..." -msgstr "Інша..." +#: ../midori/midori-browser.c:4320 +msgid "Import from XBEL or HTML file" +msgstr "Імпорт з XBEL або HTML файлу" + +#: ../midori/midori-browser.c:4355 +msgid "Import from a file" +msgstr "Імпорт з файлу" -#: ../midori/midori-browser.c:4061 +#: ../midori/midori-browser.c:4367 msgid "Failed to import bookmarks" msgstr "Не вдалося імпортувати закладки" -#: ../midori/midori-browser.c:4102 +#: ../midori/midori-browser.c:4402 +msgid "XBEL Bookmarks" +msgstr "XBEL Закладки" + +#: ../midori/midori-browser.c:4407 +msgid "Netscape Bookmarks" +msgstr "Закладки Netscape" + +#: ../midori/midori-browser.c:4421 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "Мідорі може експортувати тільки до XBEL (*.xbel) і Netscape (*.html)" + +#: ../midori/midori-browser.c:4436 msgid "Failed to export bookmarks" msgstr "Не вдалося експортувати закладки" -#: ../midori/midori-browser.c:4155 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "Невдача при очищенні історії: %s\n" - -#: ../midori/midori-browser.c:4163 -#, c-format -msgid "Failed to clear search history: %s\n" -msgstr "Неможливо очистити історію пошуку: %s\n" - #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4270 +#: ../midori/midori-browser.c:4558 msgid "Clear Private Data" msgstr "Очистити приватні дані" -#: ../midori/midori-browser.c:4274 +#: ../midori/midori-browser.c:4562 msgid "_Clear private data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:4288 +#: ../midori/midori-browser.c:4575 msgid "Clear the following data:" msgstr "Очистити наступні дані:" -#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:114 -msgid "History" -msgstr "Історія" - -#: ../midori/midori-browser.c:4303 -msgid "Cookies" -msgstr "Тістечка" - -#: ../midori/midori-browser.c:4308 -msgid "'Flash' Cookies" -msgstr "'Очистити' тістечка" - -#: ../midori/midori-browser.c:4313 -msgid "Website icons" -msgstr "Значки веб-сторінок" - -#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 -msgid "_Closed Tabs" -msgstr "_Закриті вкладки" - -#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "Веб-кеш" +#: ../midori/midori-browser.c:4585 +msgid "Last open _tabs" +msgstr "Останні відкриті _вкладки" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4611 msgid "Clear private data when _quitting Midori" msgstr "Очистити приватні дані при _виході з Мідорі" -#: ../midori/midori-browser.c:4472 +#: ../midori/midori-browser.c:4806 msgid "A lightweight web browser." -msgstr "Легкий переглядач Веб" +msgstr "Легкий переглядач Веб." + +#: ../midori/midori-browser.c:4807 +msgid "See about:version for version info." +msgstr "Дивіться about:version для отримання інформації про версію." -#: ../midori/midori-browser.c:4474 -msgid "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." -msgstr "Ця бібліотека є вільним програмним забезпеченням; Ви можете розповсюджувати і/або модифікувати її згідно з GNU Lesser General Public License, яка опублікована Фундацією Вільного Програмного Забезпечення (Free Software Foundation), з версією 2.1 ліцензії, або (на Ваше побажання) будь-якою вищою версією." +#: ../midori/midori-browser.c:4809 +msgid "" +"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." +msgstr "" +"Ця бібліотека є вільним програмним забезпеченням; Ви можете розповсюджувати " +"і/або модифікувати її згідно з GNU Lesser General Public License, яка " +"опублікована Фундацією Вільного Програмного Забезпечення (Free Software " +"Foundation), з версією 2.1 ліцензії, або (на Ваше побажання) будь-якою вищою " +"версією." -#: ../midori/midori-browser.c:4493 +#: ../midori/midori-browser.c:4830 msgid "translator-credits" msgstr "Yarema aka Knedlyk " -#: ../midori/midori-browser.c:4802 +#: ../midori/midori-browser.c:5216 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 -msgid "New _Window" -msgstr "_Нове вікно" - -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:5219 msgid "Open a new window" msgstr "Відкрити нове вікно" -#: ../midori/midori-browser.c:4808 +#: ../midori/midori-browser.c:5222 msgid "Open a new tab" msgstr "Відкрити нову вкладку" -#: ../midori/midori-browser.c:4810 -msgid "P_rivate Browsing" -msgstr "_Режим приватності в Веб" - -#: ../midori/midori-browser.c:4811 -msgid "Don't save any private data while browsing" -msgstr "Не зберігати будь-яких даних під час перегляду Веб" +#: ../midori/midori-browser.c:5224 +msgid "New P_rivate Browsing Window" +msgstr "Нове _вікно в режимі приватності" -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:5228 msgid "Open a file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:5230 +msgid "_Save Page As..." +msgstr "_Зберегти сторінку як..." + +#: ../midori/midori-browser.c:5231 msgid "Save to a file" msgstr "Зберегти в файл" -#: ../midori/midori-browser.c:4820 +#: ../midori/midori-browser.c:5233 msgid "Add to Speed _dial" msgstr "Додати до шви_дкого виклику" -#: ../midori/midori-browser.c:4821 -msgid "Add shortcut to speed dial" -msgstr "Додати скорочення до швидкого виклику" - -#: ../midori/midori-browser.c:4823 +#: ../midori/midori-browser.c:5237 msgid "Add Shortcut to the _desktop" msgstr "Додати скорочення до _стільниці" -#: ../midori/midori-browser.c:4824 -msgid "Add shortcut to the desktop" -msgstr "Додати скорочення до стільниці" +#: ../midori/midori-browser.c:5239 +msgid "Create _Launcher" +msgstr "Створити _Запускач" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:5243 msgid "Subscribe to News _feed" msgstr "Підписатися на _стрічки новин" -#: ../midori/midori-browser.c:4827 -msgid "Subscribe to this news feed" -msgstr "Підписатися на цю стрічку новин" - -#: ../midori/midori-browser.c:4832 +#: ../midori/midori-browser.c:5249 msgid "_Close Tab" msgstr "_Закрити вкладку" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:5250 msgid "Close the current tab" msgstr "Закрити поточну вкладку" -#: ../midori/midori-browser.c:4835 +#: ../midori/midori-browser.c:5252 msgid "C_lose Window" msgstr "З_акрити вікно" -#: ../midori/midori-browser.c:4836 -msgid "Close this window" -msgstr "Закрити це вікно" - -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:5256 msgid "Print the current page" msgstr "Надрукувати поточну сторінку" -#: ../midori/midori-browser.c:4842 -msgid "Quit the application" -msgstr "Вийти з програми" +#: ../midori/midori-browser.c:5258 +msgid "Close a_ll Windows" +msgstr "З_акрити всі вікна" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:5261 msgid "_Edit" msgstr "_Редагувати" -#: ../midori/midori-browser.c:4848 -msgid "Undo the last modification" -msgstr "Скасувати останню зміну" - -#: ../midori/midori-browser.c:4851 -msgid "Redo the last modification" -msgstr "Повернутися до останньої зміни" - -#: ../midori/midori-browser.c:4855 -msgid "Cut the selected text" -msgstr "Вирізати вибраний текст" - -#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 -msgid "Copy the selected text" -msgstr "Копіювати вибраний текст" - -#: ../midori/midori-browser.c:4864 -msgid "Paste text from the clipboard" -msgstr "Вставити текст з буфера" - -#: ../midori/midori-browser.c:4867 -msgid "Delete the selected text" -msgstr "Видалити вибраний текст" - -#: ../midori/midori-browser.c:4870 -msgid "Select all text" -msgstr "Виділити весь текст" +#: ../midori/midori-browser.c:5284 +msgid "_Find..." +msgstr "_Знайти..." -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:5285 msgid "Find a word or phrase in the page" msgstr "Шукати слово чи фразу на сторінці" -#: ../midori/midori-browser.c:4875 +#: ../midori/midori-browser.c:5287 msgid "Find _Next" msgstr "Шукати _наступне" -#: ../midori/midori-browser.c:4876 -msgid "Find the next occurrence of a word or phrase" -msgstr "Шукати наступне входження слова або фрази" - -#: ../midori/midori-browser.c:4878 +#: ../midori/midori-browser.c:5290 msgid "Find _Previous" msgstr "Шукати _попереднє" -#: ../midori/midori-browser.c:4879 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Шукати попереднє входження слова або фрази" - -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:5294 msgid "Configure the application preferences" msgstr "Налаштувати властивості програми" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:5296 msgid "_View" msgstr "_Вигляд" -#: ../midori/midori-browser.c:4886 +#: ../midori/midori-browser.c:5297 msgid "_Toolbars" msgstr "Панелі _Інструментів" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:5302 +msgid "Reload page without caching" +msgstr "Перезавантажити сторінку без кешування" + +#: ../midori/midori-browser.c:5312 msgid "Increase the zoom level" msgstr "Збільшити розмір перегляду" -#: ../midori/midori-browser.c:4901 +#: ../midori/midori-browser.c:5315 msgid "Decrease the zoom level" msgstr "Зменшити розмір перегляду" -#: ../midori/midori-browser.c:4904 -msgid "Reset the zoom level" -msgstr "Відновити розмір перегляду" - -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:5319 msgid "_Encoding" msgstr "_Кодування" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:5321 msgid "View So_urce" msgstr "Перегляд _коду" -#: ../midori/midori-browser.c:4908 -msgid "View the source code of the page" -msgstr "Переглянути вихідний код сторінки" +#: ../midori/midori-browser.c:5324 +msgid "Ca_ret Browsing" +msgstr "_Перегляд вставками" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:5328 msgid "Toggle fullscreen view" msgstr "Перемкнути в повноекранний режим" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:5330 msgid "Scroll _Left" msgstr "Прокрутити _ліворуч" -#: ../midori/midori-browser.c:4915 -msgid "Scroll to the left" -msgstr "Прокрутити вліво" - -#: ../midori/midori-browser.c:4917 +#: ../midori/midori-browser.c:5333 msgid "Scroll _Down" msgstr "Прокрутити в_низ" -#: ../midori/midori-browser.c:4918 -msgid "Scroll down" -msgstr "Прокрутити вниз" - -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:5336 msgid "Scroll _Up" msgstr "Прокрутити в_верх" -#: ../midori/midori-browser.c:4921 -msgid "Scroll up" -msgstr "Прокрутити вверх" - -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:5339 msgid "Scroll _Right" msgstr "Прокрутити _праворуч" -#: ../midori/midori-browser.c:4924 -msgid "Scroll to the right" -msgstr "Прокрутити вправо" - -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:5342 msgid "_Go" msgstr "_Перейти" -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:5345 msgid "Go back to the previous page" msgstr "Повернутись на попередню сторінку" -#: ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:5348 msgid "Go forward to the next page" msgstr "Перейти до наступної сторінки" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4937 +#: ../midori/midori-browser.c:5352 msgid "Go to the previous sub-page" msgstr "Повернутись на попередню суб-сторінку" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:5356 msgid "Go to the next sub-page" msgstr "Перейти до наступної сторінки" -#: ../midori/midori-browser.c:4944 +#: ../midori/midori-browser.c:5359 msgid "Go to your homepage" msgstr "Перейти на домашню сторінку" -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:5361 msgid "Empty Trash" msgstr "Спорожнити смітник" -#: ../midori/midori-browser.c:4947 -msgid "Delete the contents of the trash" -msgstr "Видалити вміст смітника" - -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:5364 msgid "Undo _Close Tab" msgstr "Повернути закриту вкладку" -#: ../midori/midori-browser.c:4950 -msgid "Open the last closed tab" -msgstr "Відкрити останню закриту вкладку" - -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:5371 msgid "Add a new _folder" msgstr "Додати нову _теку" -#: ../midori/midori-browser.c:4957 -msgid "Add a new bookmark folder" -msgstr "Додати нову теку закладок" - -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:5377 msgid "_Export bookmarks" msgstr "_Експорт закладок" -#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Налаштувати пошукові машини" -#: ../midori/midori-browser.c:4966 -msgid "Add, edit and remove search engines..." -msgstr "Додати, редагувати чи видалити пошукові машини..." - -#: ../midori/midori-browser.c:4969 +#: ../midori/midori-browser.c:5383 msgid "_Clear Private Data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:4970 -msgid "Clear private data..." -msgstr "Очистити приватні дані..." - -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:5386 msgid "_Inspect Page" msgstr "Перевірити сторінку" -#: ../midori/midori-browser.c:4975 -msgid "Inspect page details and access developer tools..." -msgstr "Перевірити сторінку і доступні знаряддя розробника" - -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:5390 msgid "_Previous Tab" msgstr "_Попередня вкладка" -#: ../midori/midori-browser.c:4981 -msgid "Switch to the previous tab" -msgstr "Перейти до попередньої вкладки" - -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:5393 msgid "_Next Tab" msgstr "_Наступна вкладка" -#: ../midori/midori-browser.c:4984 -msgid "Switch to the next tab" -msgstr "Перейти до наступної вкладки" +#: ../midori/midori-browser.c:5395 +msgid "Move Tab _Backward" +msgstr "_Перенести вкладку назад" + +#: ../midori/midori-browser.c:5397 +msgid "_Move Tab Forward" +msgstr "_Перенести вкладку вперед" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:5400 msgid "Focus _Current Tab" msgstr "Фокусувати поточну вкладку" -#: ../midori/midori-browser.c:4987 -msgid "Focus the current tab" -msgstr "Фокусувати поточну вкладку" - -#: ../midori/midori-browser.c:4989 -msgid "Minimize _Current Tab" -msgstr "Мінімізувати _поточну вкладку" - -#: ../midori/midori-browser.c:4990 -msgid "Minimize the current tab" -msgstr "Мінімізувати поточну вкладку" +#: ../midori/midori-browser.c:5403 +msgid "Focus _Next view" +msgstr "Фокусувати перегляд _наступного" + +#: ../midori/midori-browser.c:5406 +msgid "Only show the Icon of the _Current Tab" +msgstr "Показувати тільки іконку _поточної вкладки" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:5409 msgid "_Duplicate Current Tab" msgstr "_Дублювати поточну вкладку" -#: ../midori/midori-browser.c:4993 -msgid "Duplicate the current tab" -msgstr "Дублювати поточну вкладку" - -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:5412 msgid "Close Ot_her Tabs" msgstr "_Закрити інші вкладки" -#: ../midori/midori-browser.c:4996 -msgid "Close all tabs except the current tab" -msgstr "Закрити всі вкладки окрім поточної вкладки" - -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5415 msgid "Open last _session" msgstr "Відкрити останню _сесію" -#: ../midori/midori-browser.c:4999 -msgid "Open the tabs saved in the last session" -msgstr "Відкрити вкладки, що збережені під час останньої сесії" - -#: ../midori/midori-browser.c:5001 +#: ../midori/midori-browser.c:5418 msgid "_Help" msgstr "_Допомога" -#: ../midori/midori-browser.c:5003 -msgid "_Contents" -msgstr "_Зміст" - -#: ../midori/midori-browser.c:5004 -msgid "Show the documentation" -msgstr "Показати документацію" - -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:5420 msgid "_Frequent Questions" msgstr "_Часті запитання" -#: ../midori/midori-browser.c:5007 -msgid "Show the Frequently Asked Questions" -msgstr "Показати найуживаніші запитання (FAQ)" - -#: ../midori/midori-browser.c:5009 -msgid "_Report a Bug" -msgstr "П_овідомити про помилку" - -#: ../midori/midori-browser.c:5010 -msgid "Open Midori's bug tracker" -msgstr "Відкрити баг-трекер Мідорі" - -#: ../midori/midori-browser.c:5013 -msgid "Show information about the program" -msgstr "Відобразити інформацію про програму" +#: ../midori/midori-browser.c:5423 +msgid "_Report a Problem..." +msgstr "П_овідомити про проблему..." -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:5435 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5022 -msgid "Show menubar" -msgstr "Показати панель меню" - -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:5439 msgid "_Navigationbar" msgstr "Панель _навігації" -#: ../midori/midori-browser.c:5026 -msgid "Show navigationbar" -msgstr "Показати панель навігації" - -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5443 msgid "Side_panel" msgstr "_Бічна панель" -#: ../midori/midori-browser.c:5030 -msgid "Show sidepanel" -msgstr "Показати бічну панель" +#: ../midori/midori-browser.c:5444 +msgid "Sidepanel" +msgstr "Бічна панель" -#: ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:5447 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5034 -msgid "Show bookmarkbar" -msgstr "Показати панель закладок" - -#: ../midori/midori-browser.c:5037 -msgid "_Transferbar" -msgstr "Панель за_вантажень" - -#: ../midori/midori-browser.c:5038 -msgid "Show transferbar" -msgstr "Показати панель завантажень" - -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:5451 msgid "_Statusbar" msgstr "Панель _стану" -#: ../midori/midori-browser.c:5042 -msgid "Show statusbar" -msgstr "Показати панель стану" - -#: ../midori/midori-browser.c:5050 +#: ../midori/midori-browser.c:5460 ../midori/midori-websettings.c:312 msgid "_Automatic" msgstr "_Автоматично" -#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 -msgid "Chinese (BIG5)" -msgstr "Китайська (BIG5)" +#: ../midori/midori-browser.c:5463 ../midori/midori-websettings.c:236 +msgid "Chinese Traditional (BIG5)" +msgstr "Китайська Традиційна (BIG5)" + +#: ../midori/midori-browser.c:5466 ../midori/midori-websettings.c:237 +msgid "Chinese Simplified (GB18030)" +msgstr "Китайська Спрощена (GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5470 msgid "Japanese (SHIFT__JIS)" msgstr "Японська (SHIFT_JIS)" -#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5473 ../midori/midori-websettings.c:239 msgid "Korean (EUC-KR)" msgstr "Корейська (EUC-KR)" -#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5476 ../midori/midori-websettings.c:240 msgid "Russian (KOI8-R)" msgstr "Російська (KOI8-R)" -#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5479 ../midori/midori-websettings.c:241 msgid "Unicode (UTF-8)" msgstr "Юнікод (UTF-8)" -#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5482 ../midori/midori-websettings.c:242 msgid "Western (ISO-8859-1)" msgstr "Західний (ISO-8859-1)" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5485 ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:318 ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "Інша..." + +#: ../midori/midori-browser.c:5991 msgid "_Separator" msgstr "_Роздільник" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5998 msgid "_Location..." msgstr "_Адреса..." -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:6000 msgid "Open a particular location" msgstr "Відкрити певну адресу" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:6022 msgid "_Web Search..." msgstr "_Пошук у Веб..." -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:6024 msgid "Run a web search" msgstr "Запустити пошук у Веб" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:6051 msgid "Reopen a previously closed tab or window" msgstr "Знову відкрити закриту вкладку чи вікно" -#: ../midori/midori-browser.c:5659 +#: ../midori/midori-browser.c:6068 +msgid "Show the saved bookmarks" +msgstr "Показати збережені закладки" + +#: ../midori/midori-browser.c:6085 msgid "_Tools" msgstr "_Інструменти" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:6101 msgid "_Window" msgstr "_Вікно" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:6103 msgid "Show a list of all open tabs" msgstr "Показати список відкритих вкладок" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:6117 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:6119 msgid "Menu" msgstr "Меню" -#: ../midori/midori-browser.c:6262 +#: ../midori/midori-browser.c:6933 #, c-format msgid "Unexpected setting '%s'" msgstr "Несподівані властивості '%s'" -#: ../midori/midori-locationaction.c:390 +#: ../midori/midori-extension.c:329 #, c-format -msgid "Failed to select from history\n" -msgstr "Невдача при виборі з історії\n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "Неможливо завантажити конфігурацію розширення '%s': %s\n" -#: ../midori/midori-locationaction.c:474 +#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "Шукати %s" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Неможливо зберегти конфігурацію розширення '%s': %s\n" -#: ../midori/midori-locationaction.c:497 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" msgstr "Шукати з %s" -#: ../midori/midori-locationaction.c:1307 +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "Шукати з..." + +#: ../midori/midori-locationaction.c:537 +#, c-format +msgid "Failed to select from history\n" +msgstr "Невдача при виборі з історії\n" + +#: ../midori/midori-locationaction.c:624 #, c-format -msgid "Failed to execute database statement\n" -msgstr "Не вдалось виконати запит бази даних\n" +msgid "Search for %s" +msgstr "Шукати %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1363 +#: ../midori/midori-locationaction.c:1398 msgid "Paste and p_roceed" msgstr "Вставити і про_довжити" -#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 -msgid "Detach chosen panel from the window" -msgstr "Від’єднати вибрану панель від вікна" +#: ../midori/midori-locationaction.c:1739 +msgid "Not verified" +msgstr "Не перевірено" + +#: ../midori/midori-locationaction.c:1759 +msgid "Verified and encrypted connection" +msgstr "Перевірене і захищене з'єднання" + +#: ../midori/midori-locationaction.c:1771 +msgid "Open, unencrypted connection" +msgstr "Відкрите, незахищене з'єднання" -#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 -#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" msgstr "Рівняти бічну панель по правому краю" -#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" msgstr "Закрити панель" -#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" msgstr "Рівняти бічну панель по лівому краю" -#: ../midori/midori-panel.c:771 -msgid "Hide operating controls" -msgstr "Приховати панель _управління" - -#: ../midori/midori-websettings.c:200 -msgid "Show Blank page" -msgstr "Показати пусту сторінку" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "Показати швидкий виклик" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" msgstr "Показати домашню сторінку" -#: ../midori/midori-websettings.c:202 -msgid "Show last open tabs" -msgstr "Показати останньо відкриті вкладки" - -#: ../midori/midori-websettings.c:204 -msgid "Show last tabs without loading" -msgstr "Показати останні вкладки без завантаження" - -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:238 msgid "Japanese (SHIFT_JIS)" msgstr "Японська (SHIFT_JIS)" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:258 msgid "New tab" msgstr "Нова вкладка" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:259 msgid "New window" msgstr "Нове вікно" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:260 msgid "Current tab" msgstr "Поточна вкладка" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:275 msgid "Default" msgstr "Типово" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:276 msgid "Icons" msgstr "Значки" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:277 msgid "Small icons" msgstr "Маленькі значки" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:278 msgid "Text" msgstr "Текст" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:279 msgid "Icons and text" msgstr "Значки і текст" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:280 msgid "Text beside icons" msgstr "Текст за значками" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:295 msgid "Automatic (GNOME or environment)" msgstr "Автоматично (GNOME або змінні оточення)" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:296 msgid "HTTP proxy server" msgstr "Сервер HTTP проксі" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:297 msgid "No proxy server" msgstr "Немає сервера проксі" -#: ../midori/midori-websettings.c:295 -msgid "All cookies" -msgstr "Всі тістечка" - -#: ../midori/midori-websettings.c:296 -msgid "Session cookies" -msgstr "Тістечка сесії" - -#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 -msgid "None" -msgstr "Нічого" - -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:314 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:315 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:316 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:317 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:401 msgid "Remember last window size" msgstr "Запам'ятати останній розмір вікна" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:402 msgid "Whether to save the last window size" msgstr "Чи зберігати останній розмір вікна" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:410 msgid "Last window width" msgstr "Ширина останнього вікна" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:411 msgid "The last saved window width" msgstr "Остання збережена ширина вікна" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:419 msgid "Last window height" msgstr "Висота останнього вікна" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:420 msgid "The last saved window height" msgstr "Остання збережена висота вікна" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:445 msgid "Last panel position" msgstr "Остання позиція панелі" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:446 msgid "The last saved panel position" msgstr "Остання збережена позиція панелі" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:455 msgid "Last panel page" msgstr "Остання сторінка панелі" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:456 msgid "The last saved panel page" msgstr "Остання збережена сторінка панелі" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:464 msgid "Last Web search" msgstr "Останній пошук у Веб" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:465 msgid "The last saved Web search" msgstr "Останній збережений пошук у Веб" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:474 msgid "Show Menubar" msgstr "Показати панель меню" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:475 msgid "Whether to show the menubar" msgstr "Чи показувати панель меню" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:483 msgid "Show Navigationbar" msgstr "Показати панель навігації" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:484 msgid "Whether to show the navigationbar" msgstr "Чи показувати панель навігації" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:492 msgid "Show Bookmarkbar" msgstr "Показати панель закладок" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:493 msgid "Whether to show the bookmarkbar" msgstr "Чи показувати панель закладок" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:501 msgid "Show Panel" msgstr "Показати панель" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:502 msgid "Whether to show the panel" msgstr "Чи показувати панель" -#: ../midori/midori-websettings.c:485 -msgid "Show Transferbar" -msgstr "Показати панель завантажень" - -#: ../midori/midori-websettings.c:486 -msgid "Whether to show the transferbar" -msgstr "Чи показувати панель завантажень" - -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:510 msgid "Show Statusbar" msgstr "Показати панель стану" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:511 msgid "Whether to show the statusbar" msgstr "Чи показувати панель стану" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:520 msgid "Toolbar Style:" msgstr "Стиль панелі:" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:521 msgid "The style of the toolbar" msgstr "Стиль панелі" -#: ../midori/midori-websettings.c:521 -msgid "Show progress in location entry" -msgstr "Показати поступ у рядку адреси" - -#: ../midori/midori-websettings.c:522 -msgid "Whether to show loading progress in the location entry" -msgstr "Чи показувати прогрес завантаження в рядку адреси" - -#: ../midori/midori-websettings.c:537 -msgid "Search engines in location completion" -msgstr "Доповнення рядка в вікні пошуку" - -#: ../midori/midori-websettings.c:538 -msgid "Whether to show search engines in the location completion" -msgstr "Чи автоматично доповнювати стрічку в рядку пошуку" - -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:530 msgid "Toolbar Items" msgstr "Об'єкти панелі інструментів" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:531 msgid "The items to show on the toolbar" msgstr "Об'єкти, що відображаються у панелі інструментів" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:539 msgid "Compact Sidepanel" msgstr "Компактна бічна панель" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:540 msgid "Whether to make the sidepanel compact" msgstr "Налаштування відображення компактної бічної панелі" -#: ../midori/midori-websettings.c:571 -msgid "Show operating controls of the panel" -msgstr "Показати об’єкти налаштування панелі" - -#: ../midori/midori-websettings.c:572 -msgid "Whether to show the operating controls of the panel" -msgstr "Чи показувати пульт оправління панелі" - -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:555 msgid "Align sidepanel on the right" msgstr "Рівняти бічну панель по правому краю" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:556 msgid "Whether to align the sidepanel on the right" msgstr "Чи вирівнювати бічну панель по правому краю" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:571 msgid "Open panels in separate windows" msgstr "Відкривати панелі в нових вікнах" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:572 msgid "Whether to always open panels in separate windows" msgstr "Чи відкривати панелі в окремих вікнах" -#: ../midori/midori-websettings.c:613 +#: ../midori/midori-websettings.c:581 msgid "When Midori starts:" msgstr "Коли Мідорі стартує:" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:582 msgid "What to do when Midori starts" msgstr "Що завантажувати при старті" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:591 msgid "Homepage:" msgstr "Домашня сторінка:" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:592 msgid "The homepage" msgstr "Домашня сторінка" -#: ../midori/midori-websettings.c:639 +#: ../midori/midori-websettings.c:607 msgid "Show crash dialog" msgstr "Показати діалог краху" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:608 msgid "Show a dialog after Midori crashed" msgstr "Показати діалог, коли Мідорі зазнає краху" -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:656 -msgid "Show speed dial in new tabs" -msgstr "Показати швидкий виклик в новій вкладці" - -#: ../midori/midori-websettings.c:657 -msgid "Show speed dial in newly opened tabs" -msgstr "Показувати швидкий виклик в щойно відкритих вкладках" - -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:616 msgid "Save downloaded files to:" msgstr "Зберігати завантажені файли до:" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:617 msgid "The folder downloaded files are saved to" msgstr "Завантажені файли зберігати в теку" -#: ../midori/midori-websettings.c:687 -msgid "Ask for the destination folder" -msgstr "Запитати про теку призначення" - -#: ../midori/midori-websettings.c:688 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "Чи запитувати про теку призначення при завантаженні файлу" - -#: ../midori/midori-websettings.c:707 -msgid "Notify when a transfer has been completed" -msgstr "Повідомити про закінчення завантаження" - -#: ../midori/midori-websettings.c:708 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "Чи показувати повідомлення про завершення завантаження" +#: ../midori/midori-websettings.c:625 +msgid "Text Editor" +msgstr "Текстовий редактор" -#: ../midori/midori-websettings.c:720 -msgid "Download Manager" -msgstr "Менеджер завантажень" - -#: ../midori/midori-websettings.c:721 -msgid "An external download manager" -msgstr "Зовнішній менеджер завантажень" - -#: ../midori/midori-websettings.c:729 -msgid "Text Editor" -msgstr "Текстовий редактор" - -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:626 msgid "An external text editor" msgstr "Зовнішній текстовий редактор" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:641 msgid "News Aggregator" msgstr "Читалка новин" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:642 msgid "An external news aggregator" msgstr "Зовнішня читалка стрічок новин" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:650 msgid "Location entry Search" msgstr "Місце початку пошуку" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:651 msgid "The search to perform inside the location entry" msgstr "Здійснювати пошук всередині місця входження" -#: ../midori/midori-websettings.c:763 +#: ../midori/midori-websettings.c:659 msgid "Preferred Encoding" msgstr "Типове кодування" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:660 msgid "The preferred character encoding" msgstr "Типове кодування символів" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:670 msgid "Always Show Tabbar" msgstr "Завжди відображати панель вкладок" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:671 msgid "Always show the tabbar" msgstr "Завжди відображати панель вкладок" -#: ../midori/midori-websettings.c:783 +#: ../midori/midori-websettings.c:684 msgid "Close Buttons on Tabs" msgstr "Кнопки закриття на вкладках" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:685 msgid "Whether tabs have close buttons" msgstr "Чи матимуть вкладки кнопки закриття" -#: ../midori/midori-websettings.c:792 +#: ../midori/midori-websettings.c:710 msgid "Open new pages in:" msgstr "Відкривати нові сторінки в:" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:711 msgid "Where to open new pages" msgstr "Де відкривати нові сторінки" -#: ../midori/midori-websettings.c:802 -msgid "Open external pages in:" -msgstr "Відкривати зовнішні сторінки в:" - -#: ../midori/midori-websettings.c:803 -msgid "Where to open externally opened pages" -msgstr "Де відкривати сторінки зовнішнього виклику" - -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:720 msgid "Middle click opens Selection" msgstr "Середня кнопка відкриває виділене" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:721 msgid "Load an address from the selection via middle click" -msgstr "Завантажувати посилання URL з виділеного через клацання середньої кнопки" +msgstr "" +"Завантажувати посилання URL з виділеного через клацання середньої кнопки" -#: ../midori/midori-websettings.c:821 +#: ../midori/midori-websettings.c:729 msgid "Open tabs in the background" msgstr "Відкривати вкладки в фоні" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:730 msgid "Whether to open new tabs in the background" msgstr "Чи відкривати нові вкладки в фоновому режимі" -#: ../midori/midori-websettings.c:830 +#: ../midori/midori-websettings.c:738 msgid "Open Tabs next to Current" msgstr "Відкривати вкладки у наступних після поточної" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:739 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Чи відкривати нові вкладки у наступній за нею чи після останньої вкладки" +msgstr "" +"Чи відкривати нові вкладки у наступній за нею чи після останньої вкладки" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:747 msgid "Open popups in tabs" msgstr "Відкривати спливаючі вікна у вкладках" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:748 msgid "Whether to open popup windows in tabs" msgstr "Чи відкривати спливаючі вікна у вкладках" -#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:758 ../extensions/statusbar-features.c:134 msgid "Load images automatically" msgstr "Автоматично завантажити зображення" -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:759 msgid "Load and display images automatically" msgstr "Автоматично завантажити і показати зображення" -#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:766 ../extensions/statusbar-features.c:143 msgid "Enable scripts" msgstr "Ввімкнути скрипти" -#: ../midori/midori-websettings.c:859 +#: ../midori/midori-websettings.c:767 msgid "Enable embedded scripting languages" msgstr "Ввімкнути вбудовані мови скриптів" -#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:774 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" msgstr "Ввімкнути розширення Netscape" -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:775 msgid "Enable embedded Netscape plugin objects" -msgstr "Ввімкнути вбудовані об’єкти розширень Netscape" +msgstr "Ввімкнути вбудовані об'єкти розширень Netscape" + +#: ../midori/midori-websettings.c:790 +msgid "Enable Spell Checking" +msgstr "Ввімкнути перевірку правопису" + +#: ../midori/midori-websettings.c:791 +msgid "Enable spell checking while typing" +msgstr "Ввімкнути перевірку правопису під час введення тексту" -#: ../midori/midori-websettings.c:883 +#: ../midori/midori-websettings.c:797 msgid "Enable HTML5 database support" msgstr "Ввімкнути підтримку баз даних HTML5" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:798 msgid "Whether to enable HTML5 database support" msgstr "Чи дозволити підтримку баз даних HTML5" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:804 msgid "Enable HTML5 local storage support" msgstr "Ввімкнути підтримку локального сховища HTML5" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:805 msgid "Whether to enable HTML5 local storage support" msgstr "Чи дозволити підтримку локального сховища HTML5" -#: ../midori/midori-websettings.c:899 +#: ../midori/midori-websettings.c:811 msgid "Enable offline web application cache" msgstr "Ввімкнути кеш веб переглядача при роботі поза мережею" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:812 msgid "Whether to enable offline web application cache" msgstr "Чи дозволити кеш веб переглядача при роботі поза мережею" -#: ../midori/midori-websettings.c:925 +#: ../midori/midori-websettings.c:828 +msgid "Flash window on background tabs" +msgstr "Відкрити вікно у фонових вкладках" + +#: ../midori/midori-websettings.c:829 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "Відкривати вікно переглядача, якщо нова вкладка відкрита в фоні" + +#: ../midori/midori-websettings.c:837 +msgid "Enable WebGL support" +msgstr "Ввімкнути підтримку WebGL" + +#: ../midori/midori-websettings.c:838 +msgid "Allow websites to use OpenGL rendering" +msgstr "Дозволити веб-сайтам використовувати OpenGL для формування зображення" + +#: ../midori/midori-websettings.c:864 msgid "Zoom Text and Images" msgstr "Збільшувати/зменшувати текст і зображення" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:865 msgid "Whether to zoom text and images" msgstr "Чи збільшувати/зменшувати текст і зображення" -#: ../midori/midori-websettings.c:941 +#: ../midori/midori-websettings.c:880 msgid "Find inline while typing" msgstr "Шукати під час вписування" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:881 msgid "Whether to automatically find inline while typing" msgstr "Чи автоматично шукати при вписуванні" -#: ../midori/midori-websettings.c:957 +#: ../midori/midori-websettings.c:896 msgid "Kinetic scrolling" msgstr "Кінетичне прокручування" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:897 msgid "Whether scrolling should kinetically move according to speed" msgstr "Чи прокручування повинно кінетично рухатися відповідно до швидкості" -#: ../midori/midori-websettings.c:966 -msgid "Accept cookies" -msgstr "Приймати тістечка" - -#: ../midori/midori-websettings.c:967 -msgid "What type of cookies to accept" -msgstr "Тістечка якого типу приймати" - -#: ../midori/midori-websettings.c:976 -msgid "Maximum cookie age" -msgstr "Тривалість життя тістечка" +#: ../midori/midori-websettings.c:905 +msgid "Delete old Cookies after:" +msgstr "Вилучити старі тістечка через:" -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:906 msgid "The maximum number of days to save cookies for" msgstr "Максимальне число днів зберігання тістечок для" -#: ../midori/midori-websettings.c:986 -msgid "Maximum history age" -msgstr "Тривалість життя історії" +#: ../midori/midori-websettings.c:922 +msgid "Only accept Cookies from sites you visit" +msgstr "Приймати тістечка тільки з сторінок які ви відвідуєте" + +#: ../midori/midori-websettings.c:923 +msgid "Block cookies sent by third-party websites" +msgstr "Блокувати тістечка що посилаються сторонніми сторінками" + +#: ../midori/midori-websettings.c:937 +msgid "Delete pages from history after:" +msgstr "Видалити сторінку з історії через:" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:938 msgid "The maximum number of days to save the history for" msgstr "Максимальне число днів зберігання історії для" -#: ../midori/midori-websettings.c:995 -msgid "Remember last downloaded files" -msgstr "Запам'ятовувати останні завантажені файли" - -#: ../midori/midori-websettings.c:996 -msgid "Whether the last downloaded files are saved" -msgstr "Чи зберігати останні завантажені файли" - -#: ../midori/midori-websettings.c:1013 +#: ../midori/midori-websettings.c:953 msgid "Proxy server" msgstr "Сервер проксі" -#: ../midori/midori-websettings.c:1014 +#: ../midori/midori-websettings.c:954 msgid "The type of proxy server to use" msgstr "Тип проксі-сервера для використання" -#: ../midori/midori-websettings.c:1023 +#: ../midori/midori-websettings.c:963 msgid "HTTP Proxy Server" msgstr "HTTP сервер проксі" -#: ../midori/midori-websettings.c:1024 +#: ../midori/midori-websettings.c:964 msgid "The proxy server used for HTTP connections" msgstr "Проксі, що використовується для HTTP з'єднань" +#: ../midori/midori-websettings.c:979 +msgid "Port" +msgstr "Порт" + +#: ../midori/midori-websettings.c:980 +msgid "The proxy server port used for HTTP connections" +msgstr "Проксі, що використовується для HTTP з'єднань" + +#: ../midori/midori-websettings.c:998 +msgid "The maximum size of cached pages on disk" +msgstr "Максимальний розмір кешованих сторінок на диску" + #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1040 +#: ../midori/midori-websettings.c:1015 msgid "Identify as" msgstr "Ідентифікувати як" -#: ../midori/midori-websettings.c:1041 +#: ../midori/midori-websettings.c:1016 msgid "What to identify as to web pages" msgstr "Що ідентифікувати для веб-сторінок" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1032 msgid "Identification string" msgstr "Стрічка ідентифікації" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1033 msgid "The application identification string" msgstr "Стрічка ідентифікації програми" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1049 msgid "Preferred languages" msgstr "Типові мови" -#: ../midori/midori-websettings.c:1074 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "Розділений комами список бажаних мов для відображання веб-сторінок, наприклад: \"uk\", \"uk,ru,nl\" або \"en_us;q=1.0, fr-fr;q=0.667\"" +#: ../midori/midori-websettings.c:1050 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"Розділений комами список бажаних мов для відображання веб-сторінок, " +"наприклад: \"uk\", \"uk,ru,nl\" або \"en_us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1089 +#: ../midori/midori-websettings.c:1065 msgid "Clear private data" msgstr "Очистити приватні дані" -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1066 msgid "The private data selected for deletion" 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:1227 ../midori/midori-view.c:4442 -#: ../midori/midori-view.c:4446 +#: ../midori/midori-websettings.c:1081 +msgid "Clear data" +msgstr "Очистити дані" + +#: ../midori/midori-websettings.c:1082 +msgid "The data selected for deletion" +msgstr "Дані, що вибрані для вилучення" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1131 +msgid "Strip referrer details sent to websites" +msgstr "Пропустити деталі referer'а, що вислані до зовнішніх сторінок" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1133 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "Чи заголовок \"Referer'а\" повинен бути скорочений до назви сервера" + +#: ../midori/midori-websettings.c:1147 +msgid "Always use my font choices" +msgstr "Завжди використовувати мій вибір шрифтів" + +#: ../midori/midori-websettings.c:1148 +msgid "Override fonts picked by websites with user preferences" +msgstr "Перезаписати шрифти для веб-сторінок шрифтами вибраними користувачем" + +#: ../midori/midori-view.c:1375 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s бажає зберегти базу даних HTML5." + +#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1411 +msgid "_Deny" +msgstr "_Заборонити" + +#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1411 +msgid "_Allow" +msgstr "_Дозволити" + +#: ../midori/midori-view.c:1407 +#, c-format +msgid "%s wants to know your location." +msgstr "%s бажає знати Ваше знаходження." + +#: ../midori/midori-view.c:1500 #, c-format msgid "Error - %s" msgstr "Помилка - %s" -#: ../midori/midori-view.c:1228 +#: ../midori/midori-view.c:1501 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Сторінку '%s' неможливо завантажити." -#: ../midori/midori-view.c:1230 +#: ../midori/midori-view.c:1503 msgid "Try again" msgstr "Спробуйте знову" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1249 -#, c-format -msgid "Not found - %s" -msgstr "Не знайдено - %s" - -#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 +#: ../midori/midori-view.c:1701 ../midori/midori-view.c:2623 #, c-format msgid "Send a message to %s" msgstr "Послати повідомлення до %s" -#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 +#: ../midori/midori-view.c:2453 ../midori/midori-view.c:2779 msgid "Inspect _Element" msgstr "Перевірити _елемент" -#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2505 msgid "Open Link in New _Tab" msgstr "Відкрити посилання у новій в_кладці" -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2509 msgid "Open Link in _Foreground Tab" msgstr "Відкривати посилання у в_кладці переднього плану" -#: ../midori/midori-view.c:2118 +#: ../midori/midori-view.c:2510 msgid "Open Link in _Background Tab" msgstr "Відкрити посилання у фоновій в_кладці" -#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2513 msgid "Open Link in New _Window" msgstr "Відкрити посилання у новому _вікні" -#: ../midori/midori-view.c:2124 +#: ../midori/midori-view.c:2516 msgid "Open Link as Web A_pplication" msgstr "Відкрити посилання як веб-_додаток" -#: ../midori/midori-view.c:2127 +#: ../midori/midori-view.c:2521 msgid "Copy Link de_stination" msgstr "Копіювати поси_лання" -#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 -msgid "_Save Link destination" -msgstr "Збер_ігати віддаленні посилання" - -#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 -msgid "_Download Link destination" -msgstr "За_вантажувати віддалені посилання" - -#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 -#: ../midori/midori-view.c:2207 -msgid "Download with Download _Manager" -msgstr "Завантажувати в менеджері завантажень" - -#: ../midori/midori-view.c:2144 +#: ../midori/midori-view.c:2537 msgid "Open _Image in New Tab" msgstr "Відкрити зображення у новій _вкладці" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2540 msgid "Copy Image _Address" msgstr "Копіювати адрес _зображення" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2543 msgid "Save I_mage" msgstr "Зберегти з_ображення" -#: ../midori/midori-view.c:2151 -msgid "Download I_mage" -msgstr "Завантажити _зображення" +#: ../midori/midori-view.c:2546 +msgid "Open in Image _Viewer" +msgstr "Відкрити малюнок в _Переглядачі зображень" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2553 msgid "Copy Video _Address" msgstr "Скопіювати адресу _відео" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2556 msgid "Save _Video" msgstr "Зберегти _відео" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2556 msgid "Download _Video" msgstr "Завантажити _відео" -#: ../midori/midori-view.c:2224 +#: ../midori/midori-view.c:2582 msgid "Search _with" msgstr "Шукати _з" -#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2614 msgid "_Search the Web" msgstr "_Шукати Веб" -#: ../midori/midori-view.c:2287 +#: ../midori/midori-view.c:2631 msgid "Open Address in New _Tab" msgstr "Відкрити адресу у новій _вкладці" -#: ../midori/midori-view.c:2591 +#: ../midori/midori-view.c:2684 +msgid "Open _Frame in New Tab" +msgstr "Відкрити _фрейм у новій _вкладці" + +#: ../midori/midori-view.c:2988 msgid "Open or download file" msgstr "Відкрити або завантажити файл" -#: ../midori/midori-view.c:2610 +#: ../midori/midori-view.c:3008 #, c-format msgid "File Type: '%s'" msgstr "Тип файлу: '%s'" -#: ../midori/midori-view.c:2613 +#: ../midori/midori-view.c:3010 #, 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:2617 +#: ../midori/midori-view.c:3014 +#, c-format +msgid "File Name: %s" +msgstr "Ім'я файлу: %s" + +#: ../midori/midori-view.c:3041 #, c-format msgid "Open %s" msgstr "Відкрити %s" -#: ../midori/midori-view.c:3158 +#: ../midori/midori-view.c:3700 #, c-format msgid "Inspect page - %s" msgstr "Перевірка сторінки - %s" -#: ../midori/midori-view.c:3439 -msgid "Speed dial" +#: ../midori/midori-view.c:4047 +msgid "Speed Dial" msgstr "Швидкий виклик" -#: ../midori/midori-view.c:3440 +#: ../midori/midori-view.c:4048 ../midori/midori-view.c:4144 msgid "Click to add a shortcut" msgstr "Клікніть щоб додати скорочення" -#: ../midori/midori-view.c:3441 +#: ../midori/midori-view.c:4049 msgid "Enter shortcut address" msgstr "Введіть адресу скорочення" -#: ../midori/midori-view.c:3442 +#: ../midori/midori-view.c:4050 msgid "Enter shortcut title" msgstr "Введіть назву скорочення" -#: ../midori/midori-view.c:3443 +#: ../midori/midori-view.c:4051 msgid "Are you sure you want to delete this shortcut?" msgstr "Ви впевнені, що бажаєте видалити це скорочення?" -#: ../midori/midori-view.c:3444 -msgid "Set number of columns and rows" -msgstr "Встановити кількість колонок і рядків" - -#: ../midori/midori-view.c:3445 -msgid "Enter number of columns and rows:" -msgstr "Введіть кількість колонок і рядків:" - -#: ../midori/midori-view.c:3446 -msgid "Invalid input for the size of the speed dial" -msgstr "Неправильні дані для розміру швидкого виклику" - -#: ../midori/midori-view.c:3447 -msgid "Thumb size:" -msgstr "Розмір значка:" - -#: ../midori/midori-view.c:3448 -msgid "Small" -msgstr "Маленький" - -#: ../midori/midori-view.c:3449 -msgid "Medium" -msgstr "Середній" - -#: ../midori/midori-view.c:3450 -msgid "Big" -msgstr "Великий" - -#: ../midori/midori-view.c:3476 -#, c-format -msgid "Document cannot be displayed" -msgstr "Не можу відобразити документ" - -#: ../midori/midori-view.c:3499 +#: ../midori/midori-view.c:4213 #, c-format msgid "No documentation installed" -msgstr "Документація не заінстальована" +msgstr "Документація не встановлена" + +#: ../midori/midori-view.c:4289 +msgid "Midori doesn't store any personal data:" +msgstr "Мідорі не зберігає жодні персональні дані:" + +#: ../midori/midori-view.c:4290 +msgid "No history or web cookies are being saved." +msgstr "Історія і тістечка зберігаються." + +#: ../midori/midori-view.c:4291 +msgid "Extensions are disabled." +msgstr "Додатки виключено." + +#: ../midori/midori-view.c:4292 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "Сховище HTML5, локальна база даних і кеш програм виключено." + +#: ../midori/midori-view.c:4293 +msgid "Midori prevents websites from tracking the user:" +msgstr "Мідорі забороняє веб-сторінкам відслідковувати користувача:" + +#: ../midori/midori-view.c:4294 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "URL реферера обмежується до назви вузла." + +#: ../midori/midori-view.c:4295 +msgid "DNS prefetching is disabled." +msgstr "Попереднє отримання DNS виключено." + +#: ../midori/midori-view.c:4296 +msgid "The language and timezone are not revealed to websites." +msgstr "Мова і часовий пояс не показуються веб-сторінкам." + +#: ../midori/midori-view.c:4297 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "Flash та інші додатки Netscape не можуть бути показані веб-сторінкам." -#: ../midori/midori-view.c:3618 +#: ../midori/midori-view.c:4346 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "" +"Номери версії в дужках показують версію, що використовується в робочому " +"процесі." + +#: ../midori/midori-view.c:4402 msgid "Page loading delayed" msgstr "Завантаження сторінки затримане" -#: ../midori/midori-view.c:3619 +#: ../midori/midori-view.c:4403 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "Завантаження затримане або в зв’язку з останнім крахом або з налаштуваннями завантаження." +msgstr "" +"Завантаження затримане або в зв'язку з останнім крахом або з налаштуваннями " +"завантаження." -#: ../midori/midori-view.c:3620 +#: ../midori/midori-view.c:4404 msgid "Load Page" msgstr "Завантажити сторінку" -#: ../midori/midori-view.c:3764 +#: ../midori/midori-view.c:4570 msgid "Blank page" msgstr "Пуста сторінка" -#: ../midori/midori-view.c:4018 +#: ../midori/midori-view.c:4832 msgid "_Duplicate Tab" msgstr "_Дублювати вкладку" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4837 msgid "Show Tab _Label" msgstr "Показати мітку _вкладки" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4837 msgid "Show Tab _Icon Only" msgstr "Показати тільки _іконки вкладки" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4843 msgid "Close ot_her Tabs" msgstr "_Закрити інші вкладки" -#: ../midori/midori-view.c:4680 +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5656 +msgid "previous" +msgstr "попереднє" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5675 +msgid "next" +msgstr "наступне" + +#: ../midori/midori-view.c:5688 msgid "Print background images" msgstr "Відобразити зображення тла" -#: ../midori/midori-view.c:4681 +#: ../midori/midori-view.c:5689 msgid "Whether background images should be printed" msgstr "Чи відобразити зображення тла" -#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:5721 msgid "Features" msgstr "Опції" -#. Page "General" -#: ../midori/midori-preferences.c:301 -msgid "General" -msgstr "Основні" - -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "Початкові" -#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "Використати _поточну сторінку" + +#: ../midori/midori-preferences.c:314 msgid "Use current page as homepage" msgstr "Використати поточну сторінку як домашню" -#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "Завантаження" - #. Page "Appearance" -#: ../midori/midori-preferences.c:352 -msgid "Appearance" -msgstr "Зовнішній вигляд" - -#: ../midori/midori-preferences.c:353 -msgid "Font settings" -msgstr "Налаштування шрифтів" - -#: ../midori/midori-preferences.c:355 -msgid "Default Font Family" -msgstr "Типове сімейство шрифтів" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "Шрифти" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "Пропорційне сімейство шрифтів" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" msgstr "Шрифт по замовчуванню для відображення тексту" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" -msgstr "Розмір шрифта по замовчуванню для відображення тексту" +msgstr "Розмір шрифту по замовчуванню для відображення тексту" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" msgstr "Шрифти фіксованої ширини" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" msgstr "Шрифт для відображення тексту фіксованої ширини" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" -msgstr "Розмір шрифта для відображення тексту фіксованої ширини" +msgstr "Розмір шрифту для відображення тексту фіксованої ширини" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "Мінімальний розмір шрифту" -#: ../midori/midori-preferences.c:374 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" -msgstr "Мінімальний розмір шрифта для відображення тексту" +msgstr "Мінімальний розмір шрифту для відображення тексту" #. Page "Behavior" -#: ../midori/midori-preferences.c:383 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "Поведінка" -#: ../midori/midori-preferences.c:396 -msgid "Enforce 96 dots per inch" -msgstr "Примусити 96 пікселів на дюйм" - -#: ../midori/midori-preferences.c:397 -msgid "Enforce a video dot density of 96 DPI" -msgstr "Примусити 96 DPI для відео" - -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "Дозволити скриптам відкривати спливаючі вікна" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "Чи дозволяти криптам автоматично відкривати спливаючі вікна" - -#: ../midori/midori-preferences.c:422 -msgid "Spell Checking" -msgstr "Перевірка орфографії" - -#: ../midori/midori-preferences.c:425 -msgid "Enable Spell Checking" -msgstr "Ввімкнути перевірку правопису" - -#: ../midori/midori-preferences.c:426 -msgid "Enable spell checking while typing" -msgstr "Ввімкнути перевірку правопису під час введення тексту" - -#: ../midori/midori-preferences.c:428 -msgid "Spelling dictionaries:" -msgstr "Словники перевірки правопису:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:432 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "Розділений комами список мов, що використовуються для перевірки правопису, наприклад: \"uk_UA,en_US\"" +msgstr "Чи дозволяти скриптам автоматично відкривати спливаючі вікна" #. Page "Interface" -#: ../midori/midori-preferences.c:438 -msgid "Interface" -msgstr "Інтерфейс" - -#: ../midori/midori-preferences.c:439 -msgid "Navigationbar" -msgstr "Панель навігації" - -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "Перегляд сторінок" -#. Page "Applications" -#: ../midori/midori-preferences.c:471 -msgid "Applications" -msgstr "Програми" - -#: ../midori/midori-preferences.c:472 -msgid "External applications" -msgstr "Зовнішні рограми" - #. Page "Network" -#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "Мережа" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:463 msgid "Hostname" msgstr "Назва сервера" -#. Page "Privacy" -#: ../midori/midori-preferences.c:514 -msgid "Privacy" -msgstr "Приватність" - -#: ../midori/midori-preferences.c:515 -msgid "Web Cookies" -msgstr "Веб-тістечка" - -#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 -msgid "days" -msgstr "днів" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "МБ" -#: ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Пусто" - -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "Додати пошукову машину" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "Редагувати пошукову машину" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "_Назва:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "_Опис:" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "З_начок:" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "_Ознака:" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "Налаштувати пошукові машини" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" msgstr "Використовувати по _замовчуванню" -#: ../midori/sokoke.c:1303 -msgid "_Bookmark" -msgstr "_Закладка" - -#: ../midori/sokoke.c:1304 -msgid "_Bookmarks" -msgstr "_Закладки" - -#: ../midori/sokoke.c:1305 -msgid "Add Boo_kmark" -msgstr "_Додати закладку" - -#: ../midori/sokoke.c:1306 -msgid "_Console" -msgstr "_Консоль" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "Відкрити з" -#: ../midori/sokoke.c:1307 -msgid "_Extensions" -msgstr "_Розширення" - -#: ../midori/sokoke.c:1308 -msgid "_History" -msgstr "_Історія" - -#: ../midori/sokoke.c:1309 -msgid "_Homepage" -msgstr "Д_омашня сторінка" +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Виберіть програму або команду для відкриття \"%s\":" -#: ../midori/sokoke.c:1310 -msgid "_Userscripts" -msgstr "_Скрипти користувача" +#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "Неможливо запустити зовнішню програму." -#: ../midori/sokoke.c:1311 -msgid "New _Tab" -msgstr "Нова _вкладка" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d година" +msgstr[1] "%d години" +msgstr[2] "%d годин" + +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d хвилина" +msgstr[1] "%d хвилини" +msgstr[2] "%d хвилин" + +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d секунда" +msgstr[1] "%d секунди" +msgstr[2] "%d секунд" -#: ../midori/sokoke.c:1312 -msgid "_Transfers" -msgstr "_Завантаження" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s з %s" -#: ../midori/sokoke.c:1313 -msgid "Netscape p_lugins" -msgstr "Роз_ширення Netscape" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "?Б" + +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr " (%s/c)" -#: ../midori/sokoke.c:1316 -msgid "New _Folder" -msgstr "Нова _тека" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr " - %s залишилось" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:201 +#: ../toolbars/midori-findbar.c:291 msgid "_Inline Find:" msgstr "Знайти _входження:" -#: ../toolbars/midori-findbar.c:233 +#: ../toolbars/midori-findbar.c:317 msgid "Previous" msgstr "Попереднє" -#: ../toolbars/midori-findbar.c:239 +#: ../toolbars/midori-findbar.c:323 msgid "Next" msgstr "Наступне" -#: ../toolbars/midori-findbar.c:243 +#: ../toolbars/midori-findbar.c:327 msgid "Match Case" msgstr "Врахувати регістр" -#: ../toolbars/midori-findbar.c:252 +#: ../toolbars/midori-findbar.c:336 msgid "Highlight Matches" msgstr "Підсвітити збіги" -#: ../toolbars/midori-findbar.c:263 +#: ../toolbars/midori-findbar.c:347 msgid "Close Findbar" msgstr "Закрити панель пошуку" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 -#, c-format -msgid "%s of %s" -msgstr "%s з %s" - -#: ../toolbars/midori-transferbar.c:123 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." msgstr "Файл '%s' завантажено." -#: ../toolbars/midori-transferbar.c:126 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" msgstr "Передачу завершено" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "Завантажений файл містить помилки." + +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"Контрольна сума надана з посиланням не збігається. Це означає, що файл може " +"бути неповним або був зміненим пізніше." + +#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Очистити все" -#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 +#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 msgid "Some files are being downloaded" -msgstr "Деякі файли завантажено." +msgstr "Деякі файли завантажено" -#: ../toolbars/midori-transferbar.c:306 +#: ../toolbars/midori-transferbar.c:377 msgid "_Quit Midori" msgstr "_Вийти з Мідорі" -#: ../toolbars/midori-transferbar.c:308 +#: ../toolbars/midori-transferbar.c:379 msgid "The transfers will be cancelled if Midori quits." -msgstr "Всі завантаження буде скасовано, якщо вийти з Мідорі" +msgstr "Всі завантаження буде скасовано, якщо вийти з Мідорі." -#: ../panels/midori-bookmarks.c:116 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Закладки" -#: ../panels/midori-bookmarks.c:275 +#: ../panels/midori-bookmarks.c:257 #, c-format msgid "Failed to add bookmark item: %s\n" -msgstr "Не вдалося дадати закладку: %s\n" +msgstr "Не вдалося додати закладку: %s\n" -#: ../panels/midori-bookmarks.c:414 +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "Редагувати вибрану закладку" -#: ../panels/midori-bookmarks.c:422 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "Видалити вибрану закладку" -#: ../panels/midori-bookmarks.c:436 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" msgstr "Додати нову теку" -#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 +#: ../panels/midori-bookmarks.c:594 ../panels/midori-history.c:635 msgid "Separator" msgstr "Роздільник" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "Консоль" - -#: ../panels/midori-console.c:361 -msgid "Copy _All" -msgstr "Копіювати _все" - -#: ../panels/midori-console.c:362 -msgid "Copy All" -msgstr "Копіювати все" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "Історія" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Розширення" +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "Сьогодні" -#: ../panels/midori-history.c:146 -msgid "A week ago" -msgstr "Тижневої давності" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "Вчора" -#: ../panels/midori-history.c:148 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d день тому" -msgstr[1] "%d днів тому" +msgstr[1] "%d дні тому" msgstr[2] "%d днів тому" -#: ../panels/midori-history.c:151 -msgid "Today" -msgstr "Сьогодні" +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "Тижневої давності" -#: ../panels/midori-history.c:153 -msgid "Yesterday" -msgstr "Вчора" +#: ../panels/midori-history.c:232 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Невдача при видаленні об'єкту історії: %s\n" -#: ../panels/midori-history.c:324 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" msgstr "Ви впевнені, що бажаєте видалити всі об'єкти з історії?" -#: ../panels/midori-history.c:369 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" msgstr "Додати в закладки вибраний об'єкт історії" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" msgstr "Видалити вибраний об'єкт історії" -#: ../panels/midori-history.c:386 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "Очистити історію" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "Завантаження" + +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" msgstr "Відкрити теку при_значення" -#: ../panels/midori-transfers.c:484 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" msgstr "Копіювати поси_лання" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "Вимагається автентифікація" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" msgstr "" -"Вимагається назва користувача і пароль\n" +"Вимагається ім'я користувача і пароль\n" "для відкриття цієї адреси:" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "Назва користувача" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "Пароль" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" msgstr "За_пам'ятати пароль" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Названий значок '%s' не може бути завантажений" -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Значок '%s' не вдається завантажити" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "Кадри анімації пошкоджені" -#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 +#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Властивості '%s' неправильні для %s" -#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 -#: ../extensions/addons.c:119 +#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "Вибрати файл" -#: ../katze/katze-utils.c:564 +#: ../katze/katze-utils.c:506 msgid "Choose folder" msgstr "Вибрати теку" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "Нічого" + +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "1 година" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "1 день" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "1 тиждень" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "1 місяць" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "1 рік" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" msgstr "Налаштування для %s" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:473 msgid "Configure Advertisement filters" -msgstr "Кофігурувати фільтр реклам" +msgstr "Конфігурувати фільтр реклам" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:504 #, 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:587 -msgid "Configure _Advertisement filters..." -msgstr "Конфігурувати фільтри _реклам..." +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:841 +#: ../extensions/adblock.c:882 msgid "Edit rule" msgstr "Додати правило" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:896 msgid "_Rule:" msgstr "_Правило:" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:950 msgid "Bl_ock image" msgstr "Блокувати зображення" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:955 msgid "Bl_ock link" msgstr "Блокувати посилання" -#: ../extensions/adblock.c:1494 +#: ../extensions/adblock.c:1670 msgid "Advertisement blocker" msgstr "Блокіратор реклами" -#: ../extensions/adblock.c:1495 +#: ../extensions/adblock.c:1671 msgid "Block advertisements according to a filter list" msgstr "Блокувати рекламу використовуючи список фільтрів" -#: ../extensions/addons.c:130 ../extensions/addons.c:490 +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "" +"Здається, що ця сторінка містить користувацький скрипт. Ви бажаєте " +"встановити його?" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "_Встановити скрипт користувача" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "" +"Здається, що ця сторінка містить користувацький стиль. Ви бажаєте встановити " +"його?" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "_Встановити стиль користувача" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "Не встановлювати" + +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "Скрипти користувача" -#: ../extensions/addons.c:135 ../extensions/addons.c:492 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "Стилі користувача" -#: ../extensions/addons.c:191 ../extensions/addons.c:267 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Помилка" -#: ../extensions/addons.c:231 +#: ../extensions/addons.c:421 #, c-format msgid "Do you want to delete '%s'?" msgstr "Ви впевнені, що бажаєте видалити '%s'?" -#: ../extensions/addons.c:237 +#: ../extensions/addons.c:427 msgid "Delete user script" msgstr "Видалити скрипт користувача" -#: ../extensions/addons.c:238 +#: ../extensions/addons.c:428 msgid "Delete user style" msgstr "Видалити стиль користувача" -#: ../extensions/addons.c:242 +#: ../extensions/addons.c:431 #, c-format msgid "The file %s will be permanently deleted." -msgstr "Файл '%s' буде безповоротно вилучено." +msgstr "Файл %s буде безповоротно вилучено." -#: ../extensions/addons.c:377 ../extensions/addons.c:454 +#: ../extensions/addons.c:570 ../extensions/addons.c:647 msgid "Open in Text Editor" msgstr "Відкрити в текстовому редакторі" -#: ../extensions/addons.c:379 ../extensions/addons.c:463 +#: ../extensions/addons.c:572 ../extensions/addons.c:656 msgid "Open Target Folder" msgstr "Відкрити теку призначення" -#: ../extensions/addons.c:445 +#: ../extensions/addons.c:638 msgid "Add new addon" msgstr "Додати новий додаток" -#: ../extensions/addons.c:472 -msgid "Open target folder for selected addon" -msgstr "Відкрити теку призначення для вибраного додатку" - -#: ../extensions/addons.c:473 +#: ../extensions/addons.c:664 msgid "Remove selected addon" msgstr "Видалити вибраний додаток" -#: ../extensions/addons.c:1420 -#, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "" -"Неможливо зберегти конфігурацію розширення '%s':\r\n" -"%s\n" - -#: ../extensions/addons.c:1421 ../extensions/addons.c:1586 +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" msgstr "Додатки користувача" -#: ../extensions/addons.c:1543 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Не можу моніторувати теку '%s': %s" -#: ../extensions/addons.c:1587 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" msgstr "Підтримка користувацьких скриптів і стилів" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" msgstr "Кольорові вкладки" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "Забарвити кожну вкладку окремо" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" msgstr "Менеджер тістечок" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" msgstr "Видалити все" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 -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:105 +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:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" msgstr "Розкрити все" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" msgstr "Згорнути все" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" msgstr "Ви впевнені, що бажаєте видалити всі тістечка?" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "Питання" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." -msgstr "Будуть видалені тільки ті тістечка, які відповідають фільтрові" +msgstr "Будуть видалені тільки ті тістечка, які відповідають фільтрові." -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "Наприкінці сесії" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2442,99 +2481,91 @@ "Безпека: %s\n" "Дата закінчення: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "Так" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "Ні" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" "Cookies: %d" msgstr "" -"Домейн: %s\n" +"Домен: %s\n" "Тістечка: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "Назва" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" msgstr "Роз_крити все" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" msgstr "З_горнути все" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 msgid "Filter:" msgstr "Фільтр:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 -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" -msgstr "Менеджер _тістечок" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Введіть рядок фільтра, щоб показувати тільки тістечко, чиє поле імені або " +"домену відповідає введеному фільтру" -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" msgstr "Показати, переглянути і видалити тістечка" -#: ../extensions/copy-tabs.c:39 +#: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" msgstr "Копіювати адреси _вкладок" -#: ../extensions/copy-tabs.c:98 +#: ../extensions/copy-tabs.c:95 msgid "Copy Addresses of Tabs" msgstr "Копіювати адреси вкладок" -#: ../extensions/copy-tabs.c:99 +#: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Копіювати адреси усіх вкладок до буфера обміну" -#: ../extensions/external-applications.vala:93 -msgid "External Applications" -msgstr "Зовнішні програми" - -#: ../extensions/external-applications.vala:94 -msgid "Associate URL schemes with external commands" -msgstr "Асоціювати схеми URL із зовнішніми командами" - #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "Не можу знайти вимаганий елемент Atom \"entry\" в даних XML" +msgstr "Не можу знайти потрібний елемент Atom \"entry\" в даних XML." #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "Не можу знайти вимаганий елемент Atom \"feed\" в даних XML" +msgstr "Не можу знайти потрібний елемент Atom \"feed\" в даних XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." -msgstr "Останньо оновлювалося: %s." +msgstr "Востаннє оновлювалося: %s." -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" msgstr "Стрічки новин" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" msgstr "Додати нову стрічку новин" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" msgstr "Видалити стрічку новин" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" msgstr "Стрічки _новин" @@ -2555,7 +2586,7 @@ #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "Не можу знайти елемент \"channel\" в даних RSS XML" +msgstr "Не можу знайти елемент \"channel\" в даних RSS XML." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." @@ -2563,11 +2594,11 @@ #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "Не можу знайти вимаганий елемент RSS \"item\" в даних XML" +msgstr "Не можу знайти потрібний елемент RSS \"item\" в даних XML." #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "Не можу знайти вимаганий елемент RSS \"channel\" в даних XML" +msgstr "Не можу знайти потрібний елемент RSS \"channel\" в даних XML." #: ../extensions/feed-panel/main.c:131 #, c-format @@ -2579,182 +2610,698 @@ msgid "Error loading feed '%s'" msgstr "Помилка завантаження стрічки новин '%s'" -#: ../extensions/feed-panel/main.c:520 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "Панель стрічок новин" -#: ../extensions/feed-panel/main.c:521 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" -msgstr "Читати Atom-/ RSS стрічки новин" +msgstr "Читати Atom/ RSS стрічки новин" -#: ../extensions/formhistory.c:142 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" msgstr "Невдача при додаванні з значенням: %s\n" -#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "Історія автозаповнення форм" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Вимагається майстер пароль\n" +"для відкриття бази даних паролів" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "Запам'ятати пароль на даній сторінці?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Запам'ятати" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "Не зараз" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Ніколи для даної сторінки" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "Переключити стан форми історії" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "Активувати чи деактивувати форму історії для поточної вкладки." + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Не вдалось виконати запит бази даних: %s\n" -#: ../extensions/formhistory.c:503 +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" +"Тільки активувати форму історії за допомогою гарячих клавіш (Ctrl+Shift+F) " +"для вкладки" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "Заповнювач історії форм" + +#: ../extensions/formhistory/formhistory.c:669 msgid "Stores history of entered form data" msgstr "Зберігає історію введених даних форм" -#: ../extensions/formhistory.c:507 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 #, c-format -msgid "Not available: %s" -msgstr "Недоступно: %s" +msgid "Failed to select suggestions\n" +msgstr "Невдача при виборі пропозиції\n" -#: ../extensions/formhistory.c:508 -msgid "Resource files not installed" -msgstr "Файли русурсів не встановлені" +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "Немає непроглянутих вкладок" -#: ../extensions/formhistory.c:514 -msgid "Form history filler" -msgstr "Заповнювач історії форм" +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "Історія-Список" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "Поведінка замикання вкладки" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "Не робити нічого" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "Перейти до останньої переглянутої вкладки" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "Перейти до найновішої вкладки" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "Наступна нова вкладка (список історії)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "Наступна нова вкладка з історії" -#: ../extensions/history-list.vala:174 -msgid "Next Tab (History List)" -msgstr "Наступна вкладка (список історії)" - -#: ../extensions/history-list.vala:175 -msgid "Next tab from history" -msgstr "Наступна вкладка з історії" - -#: ../extensions/history-list.vala:184 -msgid "Previous Tab (History List)" -msgstr "Попередня вкладка (список історії)" - -#: ../extensions/history-list.vala:185 -msgid "Previous tab from history" -msgstr "Попередня вкладка з історії" +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "Попередня нова вкладка (список історії)" -#: ../extensions/history-list.vala:245 +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "Попередня нова вкладка з історії" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "Показувати вкладку в тлі (Список історії)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "Показати поточну вибрану вкладку в тлі" + +#: ../extensions/history-list.vala:569 msgid "History List" msgstr "Історія вкладок" -#: ../extensions/history-list.vala:246 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Дозволяє перемикатися між вкладками при виборі із списку, впорядкованим по часу останнього використання" +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "" +"Перейти до останньої використаної вкладки при переключанні або закривання " +"вкладок" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Жести миші" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 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 "Тримач сторінок" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "_Тримач сторінки" - -#: ../extensions/page-holder.c:178 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "Зберігати одну або кілька сторінок відкритими паралельно до ваших вкладок" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "Перезавантажити сторінку або зупинити завантаження" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" msgstr "Редагувати скорочення клавіатури" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." msgstr "Редагувати скоро_чення..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "Скорочення" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" msgstr "Переглянути і редагувати скорочення клавіатури" -#: ../extensions/status-clock.c:176 +#: ../extensions/status-clock.c:174 msgid "Statusbar Clock" msgstr "Годинник панелі статусу" -#: ../extensions/status-clock.c:177 +#: ../extensions/status-clock.c:175 msgid "Display date and time in the statusbar" msgstr "Показувати дату і час на панелі статусу" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/statusbar-features.c:131 msgid "Images" msgstr "Зображення" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "Скрипти" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Розширення Netscape" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" msgstr "Властивості панелі _стану" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" msgstr "Просте включання і виключання перемикання функцій на веб-сторінках" -#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Панель вкладок" -#: ../extensions/tab-panel.c:612 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "Панель в_кладок" -#: ../extensions/tab-panel.c:629 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Показати вкладки у вертикальній панелі" -#: ../extensions/tabs-minimized.c:79 +#: ../extensions/tabs-minimized.c:76 msgid "Only Icons on Tabs by default" -msgstr "По замовчуванню тільки іконки на вкладках " +msgstr "По замовчуванню тільки іконки на вкладках" -#: ../extensions/tabs-minimized.c:80 +#: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" msgstr "Нові вкладки по замовчуванню не будуть мати міток" -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Змінити панель інструментів" -#: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "Вибрати елементи, які будуть показані на панелі інструментів. Елементи можна перевпорядкувати, пересуваючи їх мишою (drag'n'drop)" +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"Вибрати елементи, які будуть показані на панелі інструментів. Елементи можна " +"перевпорядкувати, пересуваючи їх мишою (drag'n'drop)." -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Доступні елементи" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Елементи для показу" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." msgstr "Змінити пане_ль інструментів..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "_Налаштувати..." + +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" msgstr "Редактор панелі інструментів" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" msgstr "Легко редагувати формат панелі інструментів" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "Кешувати комунікацію HTTP на диск" +#~ msgid "The bookmarks couldn't be saved. %s" +#~ msgstr "Неможливо зберегти закладки. %s" + +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "Це невластива тека конфігурації." + +#~ msgid "Cookies" +#~ msgstr "Тістечка" + +#~ msgid "'Flash' Cookies" +#~ msgstr "'Очистити' тістечка" + +#~ msgid "HTML5 _Databases" +#~ msgstr "_Бази даних HTML5" + +#~ msgid "Offline Application Cache" +#~ msgstr "Кеш програми при праці без мережі" + +#~ msgid "Lightweight web browser" +#~ msgstr "Легкий переглядач Веб" + +#~ msgid "Not available: %s" +#~ msgstr "Недоступно: %s" + +#~ msgid "Resource files not installed" +#~ msgstr "Файли ресурсів не встановлені" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "Не зберігати будь-яких даних під час перегляду Веб" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Додати скорочення до швидкого виклику" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "Додати скорочення до стільниці" + +#~ msgid "Create a launcher" +#~ msgstr "Створити запускач" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "Підписатися на цю стрічку новин" + +#~ msgid "Close this window" +#~ msgstr "Закрити це вікно" + +#~ msgid "Close all open windows" +#~ msgstr "Закрити всі відкриті вікна" + +#~ msgid "Undo the last modification" +#~ msgstr "Скасувати останню зміну" + +#~ msgid "Redo the last modification" +#~ msgstr "Повернутися до останньої зміни" + +#~ msgid "Cut the selected text" +#~ msgstr "Вирізати вибраний текст" + +#~ msgid "Copy the selected text" +#~ msgstr "Копіювати вибраний текст" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "Вставити текст з буфера" + +#~ msgid "Delete the selected text" +#~ msgstr "Видалити вибраний текст" + +#~ msgid "Select all text" +#~ msgstr "Виділити весь текст" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "Шукати наступне входження слова або фрази" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "Шукати попереднє входження слова або фрази" + +#~ msgid "Reset the zoom level" +#~ msgstr "Відновити розмір перегляду" + +#~ msgid "View the source code of the page" +#~ msgstr "Переглянути вихідний код сторінки" + +#~ msgid "Scroll to the left" +#~ msgstr "Прокрутити вліво" + +#~ msgid "Scroll down" +#~ msgstr "Прокрутити вниз" + +#~ msgid "Scroll up" +#~ msgstr "Прокрутити вверх" + +#~ msgid "Scroll to the right" +#~ msgstr "Прокрутити вправо" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "Видалити вміст смітника" + +#~ msgid "Open the last closed tab" +#~ msgstr "Відкрити останню закриту вкладку" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Додати нову теку закладок" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "Додати, редагувати чи видалити пошукові машини..." + +#~ msgid "Clear private data..." +#~ msgstr "Очистити приватні дані..." + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "Перевірити сторінку і доступні знаряддя розробника" + +#~ msgid "Switch to the previous tab" +#~ msgstr "Перейти до попередньої вкладки" + +#~ msgid "Switch to the next tab" +#~ msgstr "Перейти до наступної вкладки" + +#~ msgid "Move tab behind the previous tab" +#~ msgstr "Перенести вкладку позаду попередню вкладку" + +#~ msgid "Move tab in front of the next tab" +#~ msgstr "Перенести вкладку попереду наступної вкладки" + +#~ msgid "Focus the current tab" +#~ msgstr "Фокусувати поточну вкладку" + +#~ msgid "Cycle focus between views" +#~ msgstr "Циклічне фокусування між переглядами" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "Показувати тільки іконку поточної вкладки" + +#~ msgid "Duplicate the current tab" +#~ msgstr "Дублювати поточну вкладку" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "Закрити всі вкладки окрім поточної вкладки" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "Відкрити вкладки, що збережені під час останньої сесії" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Показати найуживаніші запитання (FAQ)" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Відкрити баг-трекер Мідорі" + +#~ msgid "Show information about the program" +#~ msgstr "Показати інформацію про програму" + +#~ msgid "Show menubar" +#~ msgstr "Показати панель меню" + +#~ msgid "Show navigationbar" +#~ msgstr "Показати панель навігації" + +#~ msgid "Show sidepanel" +#~ msgstr "Показати бічну панель" + +#~ msgid "Show bookmarkbar" +#~ msgstr "Показати панель закладок" + +#~ msgid "Show statusbar" +#~ msgstr "Показати панель стану" + +#~ msgid "MD5-Checksum:" +#~ msgstr "Контрольна сума MD5:" + +#~ msgid "SHA1-Checksum:" +#~ msgstr "Контрольна сума SHA1:" + +#~ msgid "No filename specified" +#~ msgstr "Не вказано назви файлу" + +#~ msgid "Set number of columns and rows" +#~ msgstr "Встановити кількість колонок і рядків" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "Введіть кількість колонок і рядків:" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "Неправильні дані для розміру швидкого виклику" + +#~ msgid "Thumb size:" +#~ msgstr "Розмір значка:" + +#~ msgid "Small" +#~ msgstr "Маленький" + +#~ msgid "Medium" +#~ msgstr "Середній" + +#~ msgid "Big" +#~ msgstr "Великий" + +#~ msgid "Reset the last _session" +#~ msgstr "Скинути останню _сесію" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "Конфігурувати фільтри _реклам..." + +#~ msgid "Not found - %s" +#~ msgstr "Не знайдено - %s" + +#~ msgid "Document cannot be displayed" +#~ msgstr "Не можу відобразити документ" + +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "Примусити 96 пікселів на дюйм" + +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "Примусити 96 DPI для відео" + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "" +#~ "Переключити вкладки за допомогою Ctrl+Tab, впорядкованим по часу " +#~ "останнього використання" + +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "Вилучити старі тістечка через 1 годину" + +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "Вилучити старі тістечка через 1 тиждень" + +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "Вилучити старі тістечка через 1 місяць" + +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "Вилучити старі тістечка через 1 рік" + +#~ msgid "All cookies" +#~ msgstr "Всі тістечка" + +#~ msgid "Session cookies" +#~ msgstr "Тістечка сесії" + +#~ msgid "Show Transferbar" +#~ msgstr "Показати панель завантажень" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "Чи показувати панель завантажень" + +#~ msgid "Search engines in location completion" +#~ msgstr "Доповнення рядка в вікні пошуку" + +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "Чи автоматично доповнювати стрічку в рядку пошуку" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "Показати об’єкти налаштування панелі" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "Чи показувати пульт оправління панелі" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Показати швидкий виклик в новій вкладці" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Показувати швидкий виклик в щойно відкритих вкладках" + +#~ msgid "Download Manager" +#~ msgstr "Менеджер завантажень" + +#~ msgid "An external download manager" +#~ msgstr "Зовнішній менеджер завантажень" + +#~ msgid "Open external pages in:" +#~ msgstr "Відкривати зовнішні сторінки в:" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "Де відкривати сторінки зовнішнього виклику" + +#~ msgid "Accept cookies" +#~ msgstr "Приймати тістечка" + +#~ msgid "What type of cookies to accept" +#~ msgstr "Тістечка якого типу приймати" + +#~ msgid "Maximum cookie age" +#~ msgstr "Тривалість життя тістечка" + +#~ msgid "Maximum history age" +#~ msgstr "Тривалість життя історії" + +#~ msgid "Remember last downloaded files" +#~ msgstr "Запам'ятовувати останні завантажені файли" + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "Чи зберігати останні завантажені файли" + +#~ msgid "Appearance" +#~ msgstr "Зовнішній вигляд" + +#~ msgid "Applications" +#~ msgstr "Програми" + +#~ msgid "Web Cookies" +#~ msgstr "Веб-тістечка" + +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "Вилучити тістечка при _виході з Мідорі" + +#~ msgid "General" +#~ msgstr "Основні" + +#~ msgid "Font settings" +#~ msgstr "Налаштування шрифтів" + +#~ msgid "Interface" +#~ msgstr "Інтерфейс" + +#~ msgid "Navigationbar" +#~ msgstr "Панель навігації" + +#~ msgid "Next Tab (History List)" +#~ msgstr "Наступна вкладка (список історії)" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "Попередня вкладка (список історії)" + +#~ msgid "Previous tab from history" +#~ msgstr "Попередня вкладка з історії" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "Не вдалось виконати запит бази даних\n" + +#~ msgid "%s of %s, %s/s" +#~ msgstr "%s з %s, %s/s" + +#~ msgid "Open target folder for selected addon" +#~ msgstr "Відкрити теку призначення для вибраного додатку" + +#~ msgid "Download with Download _Manager" +#~ msgstr "Завантажувати в менеджері завантажень" + +#~ msgid "External applications" +#~ msgstr "Зовнішні рограми" + +#~ msgid "Pageholder" +#~ msgstr "Тримач сторінок" + +#~ msgid "_Pageholder" +#~ msgstr "_Тримач сторінки" + +#~ msgid "Keep one or multiple pages open in parallel to your tabs" +#~ msgstr "" +#~ "Зберігати одну або кілька сторінок відкритими паралельно до ваших вкладок" + +#~ msgid "Quit the application" +#~ msgstr "Вийти з програми" + +#~ msgid "Show Blank page" +#~ msgstr "Показати пусту сторінку" + +#~ msgid "_Contents" +#~ msgstr "_Зміст" + +#~ msgid "Show the documentation" +#~ msgstr "Показати документацію" + +#~ msgid "_Save Link destination" +#~ msgstr "Збер_ігати віддаленні посилання" + +#~ msgid "_Download Link destination" +#~ msgstr "За_вантажувати віддалені посилання" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% завантажено" + +#~ msgid "_Transferbar" +#~ msgstr "Панель за_вантажень" + +#~ msgid "Show transferbar" +#~ msgstr "Показати панель завантажень" + +#~ msgid "Show progress in location entry" +#~ msgstr "Показати поступ у рядку адреси" + +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "Чи показувати прогрес завантаження в рядку адреси" + +#~ msgid "Ask for the destination folder" +#~ msgstr "Запитати про теку призначення" + +#~ msgid "Whether to ask for the destination folder when downloading a file" +#~ msgstr "Чи запитувати про теку призначення при завантаженні файлу" + +#~ msgid "Whether to show a notification when a transfer has been completed" +#~ msgstr "Чи показувати повідомлення про завершення завантаження" + +#~ msgid "Download I_mage" +#~ msgstr "Завантажити _зображення" + +#~ msgid "Failed to clear search history: %s\n" +#~ msgstr "Неможливо очистити історію пошуку: %s\n" + +#~ msgid "Detach chosen panel from the window" +#~ msgstr "Від’єднати вибрану панель від вікна" + +#~ msgid "Hide operating controls" +#~ msgstr "Приховати панель _управління" + +#~ msgid "Spell Checking" +#~ msgstr "Перевірка орфографії" + +#~ msgid "" +#~ "A comma separated list of languages to be used for spell checking, for " +#~ "example \"en_GB,de_DE\"" +#~ msgstr "" +#~ "Розділений комами список мов, що використовуються для перевірки " +#~ "правопису, наприклад: \"uk_UA,en_US\"" + +#~ msgid "Minimize _Current Tab" +#~ msgstr "Мінімізувати _поточну вкладку" + +#~ msgid "Minimize the current tab" +#~ msgstr "Мінімізувати поточну вкладку" + +#~ msgid "External Applications" +#~ msgstr "Зовнішні програми" + +#~ msgid "Associate URL schemes with external commands" +#~ msgstr "Асоціювати схеми URL із зовнішніми командами" + +#~ msgid "_Accept" +#~ msgstr "_Прийняти" + +#~ msgid "Spelling dictionaries:" +#~ msgstr "Словники перевірки правопису:" + +#~ msgid "Console" +#~ msgstr "Консоль" + +#~ msgid "Copy _All" +#~ msgstr "Копіювати _все" + +#~ msgid "Copy All" +#~ msgstr "Копіювати все" + +#~ msgid "_Cookie Manager" +#~ msgstr "Менеджер _тістечок" + #~ msgid "_Restore Tab" #~ msgstr "_Відновити вкладку" @@ -2764,7 +3311,8 @@ #~ msgid "Erroneous clock time" #~ msgstr "Неправильний час годинника" -#~ msgid "The clock time lies in the past. Please check the current date and time." +#~ msgid "" +#~ "The clock time lies in the past. Please check the current date and time." #~ msgstr "Час годинника є в минулому. Перевірте поточні дату і час." #~ msgid "Copy %s to the folder %s." @@ -2782,15 +3330,9 @@ #~ msgid "Reopen pages that you visited earlier" #~ msgstr "Знову відкрити сторінки, що були переглянуті раніше" -#~ msgid "Show the saved bookmarks" -#~ msgstr "Показати збережені закладки" - #~ msgid "Original cookies only" #~ msgstr "Тільки оригінальні тістечка" -#~ msgid "Accept cookies from the original website only" -#~ msgstr "Приймати тістечка тільки з оригінального сайту" - #~ msgid "Remember last visited pages" #~ msgstr "Запам'ятати останні відвідані сторінки" @@ -2800,7 +3342,8 @@ #~ msgid "Detect proxy server automatically" #~ msgstr "Визначити сервер проксі автоматично" -#~ msgid "Whether to detect the proxy server automatically from the environment" +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" #~ msgstr "Чи визначати сервер проксі зі змінних оточення" #~ msgid "Set number of shortcuts" @@ -2809,8 +3352,10 @@ #~ msgid "Enter number of shortcuts:" #~ msgstr "Введіть кількість скорочень:" -#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "Копіювати скрипти користувачів до теки %s і копіювати стилі до теки %s." +#~ msgid "" +#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "" +#~ "Копіювати скрипти користувачів до теки %s і копіювати стилі до теки %s." #~ msgid "Open _Link" #~ msgstr "Відкрити _посилання" @@ -2833,9 +3378,6 @@ #~ msgid "The allowed size of the cache" #~ msgstr "Дозволений розмір кешу" -#~ msgid "MB" -#~ msgstr "MB" - #~ msgid "Resizable text areas" #~ msgstr "Розширюване текстове поле" @@ -2902,12 +3444,6 @@ #~ msgid "Whether text areas are resizable" #~ msgstr "Чи зберігати останні відвідані сторінки" -#~ msgid "_Closed Tabs and Windows" -#~ msgstr "_Закриті вкладки" - -#~ msgid "Last open pages" -#~ msgstr "Остання сторінка панелі" - #~ msgid "Load on Startup" #~ msgstr "Початкові" diff -Nru midori-0.2.8/po/zh_CN.po midori-0.4.6/po/zh_CN.po --- midori-0.2.8/po/zh_CN.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/zh_CN.po 2012-05-14 22:13:42.000000000 +0000 @@ -1,2411 +1,2442 @@ -# 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. +# Simplified Chinese translations for +# the midori package. +# This file is distributed under the same license as +# the midori package. # Stanley Zhang , 2009. -# Hunt Xu , 2009, 2010. +# Hunt Xu , 2009, 2010, 2011. +# Chipong Luo , 2011, 2012. +# msgid "" msgstr "" -"Project-Id-Version: midori 0.2.2\n" +"Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 22:08+0000\n" -"PO-Revision-Date: 2010-06-26 12:19+0800\n" -"Last-Translator: Hunt Xu \n" -"Language-Team: Simplified Chinese \n" +"POT-Creation-Date: 2012-04-26 00:12+0000\n" +"PO-Revision-Date: 2011-02-15 21:26+0800\n" +"Last-Translator: Chipong Luo \n" +"Language-Team: Chinese (Simplified) \n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "轻量的网页浏览器" +msgid "Browse the Web" +msgstr "浏览网络" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 -#: ../midori/main.c:1636 ../midori/main.c:1652 -#: ../midori/midori-websettings.c:314 +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "互联网；WWW；浏览器" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072 +#: ../midori/main.c:2086 ../midori/midori-websettings.c:312 msgid "Midori" -msgstr "Midori" +msgstr "Midori 浏览器" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" -msgstr "网页浏览器" +msgstr "网络浏览器" + +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Midori 私人浏览" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "打开新的私人浏览窗口" -#: ../midori/main.c:102 +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164 +msgid "Private Browsing" +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:150 #, c-format msgid "Value '%s' is invalid for %s" -msgstr "值 '%s' 在 %s 中无效" +msgstr "值 ‘%s’ 对 %s 无效" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:155 ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" -msgstr "无效的设置值 '%s'" +msgstr "无效的配置值 ‘%s’" + +#: ../midori/main.c:380 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "未能载入搜索引擎。%s\n" -#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 +#: ../midori/main.c:434 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "无法清除历史：%s\n" + +#: ../midori/main.c:454 ../midori/main.c:581 +#: ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" -msgstr "打开数据库失败: %s\n" +msgstr "无法打开数据库：%s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:524 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "删除旧的历史项目失败: %s\n" +msgstr "无法移除原历史项目：%s\n" -#: ../midori/main.c:468 +#: ../midori/main.c:564 ../panels/midori-history.c:232 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "无法移除历史项目：%s\n" + +#: ../midori/main.c:611 #, c-format msgid "The bookmarks couldn't be saved. %s" -msgstr "书签无法保存。%s" +msgstr "未能保存书签。%s" -#: ../midori/main.c:500 +#: ../midori/main.c:633 #, c-format msgid "The configuration couldn't be saved. %s" -msgstr "配置无法保存。%s" +msgstr "未能保存配置。%s" -#: ../midori/main.c:538 +#: ../midori/main.c:668 #, c-format msgid "The search engines couldn't be saved. %s" -msgstr "搜索引擎无法保存。%s" +msgstr "未能保存搜索引擎。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:558 ../midori/main.c:581 +#: ../midori/main.c:705 #, c-format msgid "The trash couldn't be saved. %s" -msgstr "回收站无法保存。%s" +msgstr "未能保存回收站。%s" -#: ../midori/main.c:640 ../midori/main.c:880 +#: ../midori/main.c:746 ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "扩展" + +#: ../midori/main.c:760 +msgid "Privacy" +msgstr "私人" + +#: ../midori/main.c:772 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "隐私信息存储登录数据、游戏状态或用于广告目的用户分布信息。" + +#: ../midori/main.c:828 #, c-format msgid "The session couldn't be saved. %s" -msgstr "会话无法保存。%s" +msgstr "未能保存会话。%s" -#: ../midori/main.c:824 -msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "无可用的根证书文件。SSL 证书无法认证。" +#: ../midori/main.c:1046 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "无有效的根证书文件。未能验证 SSL 证书。" -#: ../midori/main.c:914 -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:1115 +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:929 +#: ../midori/main.c:1134 msgid "Modify _preferences" msgstr "修改首选项(_P)" -#: ../midori/main.c:933 -msgid "Reset the last _session" -msgstr "重置最后的会话(_S)" - -#: ../midori/main.c:938 +#: ../midori/main.c:1138 msgid "Disable all _extensions" msgstr "禁用所有扩展(_E)" -#: ../midori/main.c:1174 ../midori/main.c:1905 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "会话无法加载: %s\n" +#: ../midori/main.c:1151 +msgid "Discard old tabs" +msgstr "舍弃原标签" -#: ../midori/main.c:1298 -msgid "No filename specified" -msgstr "没有指定文件名" +#: ../midori/main.c:1152 ../midori/midori-websettings.c:221 +msgid "Show last tabs without loading" +msgstr "显示上次打开的标签但不载入" -#: ../midori/main.c:1317 -msgid "An unknown error occured." -msgstr "发生了一个未知的错误。" +#: ../midori/main.c:1153 ../midori/midori-websettings.c:220 +msgid "Show last open tabs" +msgstr "显示上次打开的标签" -#: ../midori/main.c:1348 +#: ../midori/main.c:1400 ../midori/main.c:2464 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "未能载入会话：%s\n" + +#: ../midori/main.c:1538 #, c-format msgid "Snapshot saved to: %s\n" -msgstr "截图保存到: %s\n" +msgstr "截图保存至：%s\n" -#: ../midori/main.c:1520 +#: ../midori/main.c:1951 msgid "Run ADDRESS as a web application" -msgstr "将 ADDRESS 作为 web 应用程序运行" +msgstr "将‘地址’作为网络应用程序运行" -#: ../midori/main.c:1520 +#: ../midori/main.c:1951 msgid "ADDRESS" -msgstr "ADDRESS" +msgstr "地址" -#: ../midori/main.c:1523 +#: ../midori/main.c:1954 msgid "Use FOLDER as configuration folder" -msgstr "使用 FOLDER 作为设置目录" +msgstr "使用‘文件夹’作为配置文件夹" -#: ../midori/main.c:1523 +#: ../midori/main.c:1954 msgid "FOLDER" -msgstr "FOLDER" +msgstr "文件夹" -#: ../midori/main.c:1526 +#: ../midori/main.c:1957 +msgid "Private browsing, no changes are saved" +msgstr "私人浏览，未保存更改" + +#: ../midori/main.c:1959 msgid "Show a diagnostic dialog" msgstr "显示诊断对话框" -#: ../midori/main.c:1528 +#: ../midori/main.c:1961 msgid "Run the specified filename as javascript" -msgstr "将指定的文件当作 javascript 执行" +msgstr "将指定的文件名作为 javascript 运行" -#: ../midori/main.c:1531 +#: ../midori/main.c:1963 msgid "Take a snapshot of the specified URI" -msgstr "对指定 URI 截图" +msgstr "对指定的 URI 截图" -#: ../midori/main.c:1534 +#: ../midori/main.c:1965 msgid "Execute the specified command" -msgstr "执行特定命令" +msgstr "执行指定的命令" + +#: ../midori/main.c:1967 +msgid "List available commands to execute with -e/ --execute" +msgstr "列出可以带 -e/ --execute 执行的命令" -#: ../midori/main.c:1536 +#: ../midori/main.c:1969 msgid "Display program version" msgstr "显示程序版本" -#: ../midori/main.c:1538 +#: ../midori/main.c:1971 msgid "Addresses" msgstr "地址" -#: ../midori/main.c:1540 +#: ../midori/main.c:1973 msgid "Block URIs according to regular expression PATTERN" -msgstr "根据正则表达式 PATTERN 屏蔽 URI" +msgstr "按正则表达式‘类型’屏蔽 URI" -#: ../midori/main.c:1540 +#: ../midori/main.c:1973 msgid "PATTERN" -msgstr "PATTERN" +msgstr "类型" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1544 +#: ../midori/main.c:1977 msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "在不活动 SECONDS 秒之后重置 Midori" +msgstr "在‘秒’秒内无响应后重置 Midori" -#: ../midori/main.c:1544 +#: ../midori/main.c:1977 msgid "SECONDS" -msgstr "SECONDS" +msgstr "秒" -#: ../midori/main.c:1625 +#: ../midori/main.c:1980 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "重定向控制台警告信息至指定的‘文件名’" + +#: ../midori/main.c:1980 +msgid "FILENAME" +msgstr "文件名" + +#: ../midori/main.c:2045 msgid "[Addresses]" msgstr "[地址]" -#: ../midori/main.c:1653 +#: ../midori/main.c:2087 msgid "Please report comments, suggestions and bugs to:" -msgstr "请将意见、建议和问题反馈到:" +msgstr "请将意见、建议和缺陷报告至：" -#: ../midori/main.c:1655 +#: ../midori/main.c:2089 msgid "Check for new versions at:" -msgstr "在此检查新的版本:" +msgstr "在此检查新版本：" -#: ../midori/main.c:1752 -msgid "The specified configuration folder is invalid." -msgstr "无效的配置文件目录。" +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2173 +msgid "Saved logins and _passwords" +msgstr "已保存的用户名和密码(_P)" + +#: ../midori/main.c:2175 +msgid "Cookies and Website data" +msgstr "隐私信息和网站数据" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2179 ../midori/midori-websettings.c:996 +#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "网页缓存" -#: ../midori/main.c:1800 -msgid "An instance of Midori is already running but not responding.\n" -msgstr "已经有一个 Midori 在运行，但是无法响应。\n" +#: ../midori/main.c:2182 +msgid "Website icons" +msgstr "网站图标" -#: ../midori/main.c:1855 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "搜索引擎无法加载。%s\n" +#: ../midori/main.c:2288 +msgid "An unknown error occured" +msgstr "发生了一个未知错误" + +#: ../midori/main.c:2395 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "已有一个 Midori 实例在运行但无响应。\n" -#: ../midori/main.c:1877 +#: ../midori/main.c:2431 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" -msgstr "书签无法加载: %s\n" +msgstr "未能载入书签：%s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:2479 #, c-format msgid "The trash couldn't be loaded: %s\n" -msgstr "回收站无法加载: %s\n" +msgstr "未能载入回收站：%s\n" -#: ../midori/main.c:1934 +#: ../midori/main.c:2492 #, c-format msgid "The history couldn't be loaded: %s\n" -msgstr "历史记录无法加载: %s\n" +msgstr "未能载入历史：%s\n" -#: ../midori/main.c:1948 +#: ../midori/main.c:2508 msgid "The following errors occured:" -msgstr "发生了以下错误:" +msgstr "发生了以下错误：" -#: ../midori/main.c:1964 +#: ../midori/main.c:2524 msgid "_Ignore" msgstr "忽略(_I)" -#: ../midori/midori-array.c:428 +#: ../midori/midori-app.c:1334 +msgid "_Bookmark" +msgstr "书签(_B)" + +#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060 +msgid "_Bookmarks" +msgstr "书签(_B)" + +#: ../midori/midori-app.c:1336 +msgid "Add Boo_kmark" +msgstr "添加书签(_K)" + +#: ../midori/midori-app.c:1337 +msgid "_Console" +msgstr "控制台(_C)" + +#: ../midori/midori-app.c:1338 +msgid "_Extensions" +msgstr "扩展(_E)" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589 +msgid "_History" +msgstr "历史(_H)" + +#: ../midori/midori-app.c:1340 +msgid "_Homepage" +msgstr "主页(_H)" + +#: ../midori/midori-app.c:1341 +msgid "_Userscripts" +msgstr "用户脚本(_U)" + +#: ../midori/midori-app.c:1342 +msgid "New _Tab" +msgstr "新建标签(_T)" + +#: ../midori/midori-app.c:1343 +msgid "_Transfers" +msgstr "传输(_T)" + +#: ../midori/midori-app.c:1344 +msgid "Netscape p_lugins" +msgstr "Netscape 插件(_L)" + +#: ../midori/midori-app.c:1345 +msgid "_Closed Tabs" +msgstr "已关闭的标签(_C)" + +#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216 +msgid "New _Window" +msgstr "新建窗口(_W)" + +#: ../midori/midori-app.c:1347 +msgid "New _Folder" +msgstr "新建文件夹(_F)" + +#: ../midori/midori-array.c:522 msgid "File not found." -msgstr "没有找到文件。" +msgstr "未找到文件。" -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." -msgstr "异常的文件。" +msgstr "异常文档。" -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:628 msgid "Unrecognized bookmark format." -msgstr "不能识别的书签格式。" +msgstr "无法识别的书签格式。" -#: ../midori/midori-array.c:718 +#: ../midori/midori-array.c:915 msgid "Writing failed." -msgstr "写入失败。" +msgstr "无法写入。" -#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5033 -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298 +#: ../midori/midori-browser.c:5307 msgid "Reload the current page" -msgstr "重新载入当前页" +msgstr "重载当前页面" -#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5036 +#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304 msgid "Stop loading the current page" -msgstr "停止载入当前页" - -#: ../midori/midori-browser.c:456 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% 已加载" +msgstr "停止载入当前页面" -#: ../midori/midori-browser.c:494 +#: ../midori/midori-browser.c:476 #, c-format msgid "Failed to update title: %s\n" -msgstr "更新标题失败: %s\n" +msgstr "无法更新标题：%s\n" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." -msgstr "意外的活动 '%s'。" +msgstr "意外的动作 ‘%s’。" + +#: ../midori/midori-browser.c:569 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s(私人浏览)" + +#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716 +msgid "Toplevel folder" +msgstr "最上层文件夹" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:774 msgid "New folder" -msgstr "新建目录" +msgstr "新建文件夹" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:774 msgid "Edit folder" -msgstr "编辑目录" +msgstr "编辑文件夹" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:776 msgid "New bookmark" msgstr "新建书签" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:776 msgid "Edit bookmark" msgstr "编辑书签" -#: ../midori/midori-browser.c:764 +#: ../midori/midori-browser.c:818 msgid "_Title:" -msgstr "标题(_T):" +msgstr "标题(_T)：" -#: ../midori/midori-browser.c:777 ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "描述(_D):" - -#: ../midori/midori-browser.c:796 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" -msgstr "地址(_A):" +msgstr "地址(_A)：" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4189 +#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326 msgid "_Folder:" -msgstr "目录(_F):" - -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:933 -#: ../midori/midori-browser.c:4194 ../midori/midori-browser.c:4226 -msgid "Toplevel folder" -msgstr "最上层目录" +msgstr "文件夹(_F)：" -#: ../midori/midori-browser.c:874 +#: ../midori/midori-browser.c:877 msgid "Add to _Speed Dial" -msgstr "添加到快速拨号(_S)" +msgstr "添加至快速拨号(_S)" -#: ../midori/midori-browser.c:887 +#: ../midori/midori-browser.c:890 msgid "Show in the tool_bar" msgstr "在工具栏中显示(_B)" -#: ../midori/midori-browser.c:902 +#: ../midori/midori-browser.c:905 msgid "Run as _web application" -msgstr "作为 web 应用程序运行(_W)" +msgstr "作为网络应用程序运行(_W)" + +#: ../midori/midori-browser.c:976 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "未能在此文件夹中保存 “%s“ 文件。" + +#: ../midori/midori-browser.c:978 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "您没有权限在此位置写入。" -#: ../midori/midori-browser.c:977 +#: ../midori/midori-browser.c:985 #, c-format msgid "There is not enough free space to download \"%s\"." -msgstr "可用空间不足以下载 \"%s\"。" +msgstr "没有足够的空闲空间用来下载 “%s”。" -#: ../midori/midori-browser.c:981 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." -msgstr "该文件需要 %s 但只剩余 %s。" +msgstr "此文件需要 %s 但只剩余 %s。" -#: ../midori/midori-browser.c:1038 ../midori/midori-browser.c:4244 -#: ../midori/midori-browser.c:4276 +#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395 msgid "Save file as" msgstr "文件另存为" -#: ../midori/midori-browser.c:1431 +#: ../midori/midori-browser.c:1320 +msgid "New Window" +msgstr "新建窗口" + +#: ../midori/midori-browser.c:1320 +msgid "A new window has been opened" +msgstr "已打开了一个新窗口" + +#: ../midori/midori-browser.c:1323 +msgid "New Tab" +msgstr "新建标签" + +#: ../midori/midori-browser.c:1323 +msgid "A new tab has been opened" +msgstr "已打开了一个新标签" + +#: ../midori/midori-browser.c:1358 +msgid "Error opening the image!" +msgstr "打开图片时出错！" + +#: ../midori/midori-browser.c:1359 +msgid "Can not open selected image in a default viewer." +msgstr "未能在默认的查看器中打开选中的图片。" + +#: ../midori/midori-browser.c:1365 +msgid "Error downloading the image!" +msgstr "下载图片时出错！" + +#: ../midori/midori-browser.c:1366 +msgid "Can not download selected image." +msgstr "未能下载选中的图片。" + +#: ../midori/midori-browser.c:1492 msgid "Save file" msgstr "保存文件" -#: ../midori/midori-browser.c:2133 +#: ../midori/midori-browser.c:2367 msgid "Open file" msgstr "打开文件" -#: ../midori/midori-browser.c:2211 +#: ../midori/midori-browser.c:2499 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." msgstr "" -"要使用上面的 URI 打开一个新闻聚合。通常都有名为“新订阅”、“新新闻供稿”或者类似的菜单项或者按钮。\n" -"您可以选择进入 Midori 的首选项中的应用程序设置，并且选择一个新闻聚合。当您再次点击新闻供稿的图标时，该订阅将自动被添加。" +"要使用上面的 URI 打开一个新闻聚合器。通常有名为 “新建订阅”、 “新建新闻源” 或" +"类似的菜单或按钮。\n" +"您也可以进入首选项、Midori 中的应用程序，并选择一个新闻聚合器。您下次点击新闻" +"源图标时，将自动添加它。" -#: ../midori/midori-browser.c:2217 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365 msgid "New feed" -msgstr "新建订阅" +msgstr "新建源" -#: ../midori/midori-browser.c:2260 ../midori/midori-browser.c:5098 -#: ../panels/midori-bookmarks.c:418 +#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367 +#: ../panels/midori-bookmarks.c:427 msgid "Add a new bookmark" msgstr "添加新书签" -#: ../midori/midori-browser.c:2729 ../panels/midori-bookmarks.c:203 -#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 -#: ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "执行数据库操作失败: %s\n" - -#: ../midori/midori-browser.c:2809 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488 msgid "Empty" msgstr "清空" -#: ../midori/midori-browser.c:3416 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "无法运行外部程序。" +#: ../midori/midori-browser.c:3467 +msgid "Toggle text cursor navigation" +msgstr "切换文字光标导航" -#: ../midori/midori-browser.c:3693 ../midori/midori-browser.c:5479 +#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753 #, c-format msgid "Failed to insert new history item: %s\n" -msgstr "添加新历史项目失败: %s\n" +msgstr "无法插入新的历史项目：%s\n" -#: ../midori/midori-browser.c:4027 ../panels/midori-bookmarks.c:777 -#: ../panels/midori-history.c:741 +#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 msgid "Open all in _Tabs" -msgstr "在新标签页中打开所有项(_T)" +msgstr "全部在标签中打开(_T)" -#: ../midori/midori-browser.c:4034 ../panels/midori-bookmarks.c:783 -#: ../panels/midori-history.c:747 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" -msgstr "在新标签页中打开(_T)" +msgstr "在新标签中打开(_T)" -#: ../midori/midori-browser.c:4037 ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4112 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:749 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657 +#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "在新窗口中打开(_W)" -#: ../midori/midori-browser.c:4115 +#: ../midori/midori-browser.c:4213 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4116 +#: ../midori/midori-browser.c:4214 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4117 +#: ../midori/midori-browser.c:4215 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4118 +#: ../midori/midori-browser.c:4216 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4119 +#: ../midori/midori-browser.c:4217 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4140 +#: ../midori/midori-browser.c:4218 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox(%s)" + +#: ../midori/midori-browser.c:4239 msgid "Import bookmarks..." msgstr "导入书签..." -#: ../midori/midori-browser.c:4143 ../midori/midori-browser.c:5103 +#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372 msgid "_Import bookmarks" msgstr "导入书签(_I)" -#: ../midori/midori-browser.c:4154 +#: ../midori/midori-browser.c:4253 msgid "_Application:" -msgstr "应用程序(_A):" +msgstr "应用程序(_A)：" -#: ../midori/midori-browser.c:4181 ../midori/midori-browser.c:5207 -#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 -#: ../katze/katze-utils.c:691 -msgid "Custom..." -msgstr "定制..." +#: ../midori/midori-browser.c:4318 +msgid "Import from XBEL or HTML file" +msgstr "从 XBEL 或 HTML 文件导入" -#: ../midori/midori-browser.c:4255 +#: ../midori/midori-browser.c:4353 +msgid "Import from a file" +msgstr "从文件导入" + +#: ../midori/midori-browser.c:4365 msgid "Failed to import bookmarks" -msgstr "导入书签失败" +msgstr "无法导入书签" -#: ../midori/midori-browser.c:4291 -msgid "Failed to export bookmarks" -msgstr "导出书签失败" +#: ../midori/midori-browser.c:4400 +msgid "XBEL Bookmarks" +msgstr "XBEL 书签" -#: ../midori/midori-browser.c:4345 ../panels/midori-bookmarks.c:272 -#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "移除历史项目失败: %s\n" +#: ../midori/midori-browser.c:4405 +msgid "Netscape Bookmarks" +msgstr "Netscape 书签" + +#: ../midori/midori-browser.c:4419 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "Midori 只能导出为 XBEL(*.xbel) 和 Netscape(*.html)" + +#: ../midori/midori-browser.c:4434 +msgid "Failed to export bookmarks" +msgstr "无法导出书签" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4452 +#: ../midori/midori-browser.c:4556 msgid "Clear Private Data" msgstr "清除隐私数据" -#: ../midori/midori-browser.c:4456 +#: ../midori/midori-browser.c:4560 msgid "_Clear private data" msgstr "清除隐私数据(_C)" -#: ../midori/midori-browser.c:4470 +#: ../midori/midori-browser.c:4573 msgid "Clear the following data:" -msgstr "清除以下的数据:" +msgstr "清除以下数据：" -#: ../midori/midori-browser.c:4481 ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 -msgid "History" -msgstr "历史" - -#: ../midori/midori-browser.c:4487 -msgid "Cookies" -msgstr "Cookies" - -#: ../midori/midori-browser.c:4492 -msgid "'Flash' Cookies" -msgstr "'Flash' Cookies" - -#: ../midori/midori-browser.c:4497 -msgid "Website icons" -msgstr "网站图标" - -#: ../midori/midori-browser.c:4502 ../midori/sokoke.c:1298 -msgid "_Closed Tabs" -msgstr "关闭的标签页(_C)" +#: ../midori/midori-browser.c:4583 +msgid "Last open _tabs" +msgstr "上次打开的标签(_T)" -#: ../midori/midori-browser.c:4507 ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "网页缓存" - -#: ../midori/midori-browser.c:4515 +#: ../midori/midori-browser.c:4609 msgid "Clear private data when _quitting Midori" -msgstr "退出 Midori 前清除隐私数据(_Q)" +msgstr "退出 Midori 时清除隐私数据(_Q)" -#: ../midori/midori-browser.c:4616 +#: ../midori/midori-browser.c:4804 msgid "A lightweight web browser." -msgstr "轻量级的网页浏览器." +msgstr "轻量级的网络浏览器。" -#: ../midori/midori-browser.c:4618 -msgid "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." -msgstr "本软件库是自由软件；您可以在自由软件基金会发布的 GNU 较宽松公共许可协议(LGPL)条款的约束下再分发和/或对其进行修改；依据协议的 2.1 版本，或者（由您自行选择）更新的版本。" +#: ../midori/midori-browser.c:4805 +msgid "See about:version for version info." +msgstr "查看 about:version 获取版本信息。" -#: ../midori/midori-browser.c:4637 +#: ../midori/midori-browser.c:4807 +msgid "" +"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." +msgstr "" +"此库文件是自由软件；您可以以自由软件基金会发布的 GNU 宽通用公共许可协议 2.1 " +"版或(您可以选择)更高版方式重新发布和/或修改它。" + +#: ../midori/midori-browser.c:4828 msgid "translator-credits" msgstr "" "张翼 , 2009.\n" -"Hunt Xu , 2009, 2010." +"Hunt Xu , 2009, 2010, 2011.\n" +"Chipong Luo , 2011, 2012." -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:5214 msgid "_File" msgstr "文件(_F)" -#: ../midori/midori-browser.c:4948 ../midori/sokoke.c:1299 -msgid "New _Window" -msgstr "新建窗口(_W)" - -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:5217 msgid "Open a new window" msgstr "打开一个新窗口" -#: ../midori/midori-browser.c:4952 +#: ../midori/midori-browser.c:5220 msgid "Open a new tab" msgstr "打开一个新标签" -#: ../midori/midori-browser.c:4954 -msgid "P_rivate Browsing" -msgstr "隐私浏览(_R)" - -#: ../midori/midori-browser.c:4955 -msgid "Don't save any private data while browsing" -msgstr "在浏览时不保存任何隐私数据" +#: ../midori/midori-browser.c:5222 +msgid "New P_rivate Browsing Window" +msgstr "新建私人浏览窗口(_R)" -#: ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:5226 msgid "Open a file" msgstr "打开文件" -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:5228 +msgid "_Save Page As..." +msgstr "页面另存为(_S)..." + +#: ../midori/midori-browser.c:5229 msgid "Save to a file" -msgstr "保存到文件" +msgstr "保存至文件" -#: ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:5231 msgid "Add to Speed _dial" -msgstr "添加到快速拨号(_D)" - -#: ../midori/midori-browser.c:4965 -msgid "Add shortcut to speed dial" -msgstr "添加快捷方式到快速拨号" +msgstr "添加至快速拨号(_D)" -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:5235 msgid "Add Shortcut to the _desktop" -msgstr "添加快捷方式到桌面(_D)" +msgstr "添加快捷方式至桌面(_D)" -#: ../midori/midori-browser.c:4968 -msgid "Add shortcut to the desktop" -msgstr "添加快捷方式到桌面" +#: ../midori/midori-browser.c:5237 +msgid "Create _Launcher" +msgstr "创建启动器(_L)" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:5241 msgid "Subscribe to News _feed" -msgstr "添加到新闻订阅(_F)" +msgstr "订阅至新闻源(_F)" -#: ../midori/midori-browser.c:4971 -msgid "Subscribe to this news feed" -msgstr "添加到此新闻订阅" - -#: ../midori/midori-browser.c:4976 +#: ../midori/midori-browser.c:5247 msgid "_Close Tab" msgstr "关闭标签(_C)" -#: ../midori/midori-browser.c:4977 +#: ../midori/midori-browser.c:5248 msgid "Close the current tab" msgstr "关闭当前标签" -#: ../midori/midori-browser.c:4979 +#: ../midori/midori-browser.c:5250 msgid "C_lose Window" msgstr "关闭窗口(_L)" -#: ../midori/midori-browser.c:4980 -msgid "Close this window" -msgstr "关闭此窗口" - -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:5254 msgid "Print the current page" -msgstr "打印当前页" +msgstr "打印当前页面" -#: ../midori/midori-browser.c:4986 -msgid "Quit the application" -msgstr "退出程序" +#: ../midori/midori-browser.c:5256 +msgid "Close a_ll Windows" +msgstr "关闭所有窗口(_L)" -#: ../midori/midori-browser.c:4988 +#: ../midori/midori-browser.c:5259 msgid "_Edit" msgstr "编辑(_E)" -#: ../midori/midori-browser.c:4992 -msgid "Undo the last modification" -msgstr "撤销上个改动" - -#: ../midori/midori-browser.c:4995 -msgid "Redo the last modification" -msgstr "重复上个修改" - -#: ../midori/midori-browser.c:4999 -msgid "Cut the selected text" -msgstr "剪切" - -#: ../midori/midori-browser.c:5002 ../midori/midori-browser.c:5005 -msgid "Copy the selected text" -msgstr "复制" - -#: ../midori/midori-browser.c:5008 -msgid "Paste text from the clipboard" -msgstr "从剪贴板粘贴" - -#: ../midori/midori-browser.c:5011 -msgid "Delete the selected text" -msgstr "删除" - -#: ../midori/midori-browser.c:5014 -msgid "Select all text" -msgstr "全选" +#: ../midori/midori-browser.c:5282 +msgid "_Find..." +msgstr "查找(_F)..." -#: ../midori/midori-browser.c:5017 +#: ../midori/midori-browser.c:5283 msgid "Find a word or phrase in the page" -msgstr "在页面中查找" +msgstr "在页面中查找字词或短语" -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:5285 msgid "Find _Next" msgstr "查找下一个(_N)" -#: ../midori/midori-browser.c:5020 -msgid "Find the next occurrence of a word or phrase" -msgstr "查找该词或短语出现的下一处地方" - -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:5288 msgid "Find _Previous" msgstr "查找上一个(_P)" -#: ../midori/midori-browser.c:5023 -msgid "Find the previous occurrence of a word or phrase" -msgstr "查找该词或短语出现的上一处地方" - -#: ../midori/midori-browser.c:5027 +#: ../midori/midori-browser.c:5292 msgid "Configure the application preferences" -msgstr "设置程序首选项" +msgstr "配置应用程序首选项" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5294 msgid "_View" -msgstr "查看(_V)" +msgstr "视图(_V)" -#: ../midori/midori-browser.c:5030 +#: ../midori/midori-browser.c:5295 msgid "_Toolbars" msgstr "工具栏(_T)" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:5300 +msgid "Reload page without caching" +msgstr "重载页面但不缓存" + +#: ../midori/midori-browser.c:5310 msgid "Increase the zoom level" -msgstr "放大" +msgstr "增加缩放等级" -#: ../midori/midori-browser.c:5045 +#: ../midori/midori-browser.c:5313 msgid "Decrease the zoom level" -msgstr "缩小" +msgstr "减小缩放等级" -#: ../midori/midori-browser.c:5048 -msgid "Reset the zoom level" -msgstr "恢复默认大小" - -#: ../midori/midori-browser.c:5049 +#: ../midori/midori-browser.c:5317 msgid "_Encoding" msgstr "编码(_E)" -#: ../midori/midori-browser.c:5051 +#: ../midori/midori-browser.c:5319 msgid "View So_urce" msgstr "查看源码(_U)" -#: ../midori/midori-browser.c:5052 -msgid "View the source code of the page" -msgstr "查看页面的源代码" +#: ../midori/midori-browser.c:5322 +msgid "Ca_ret Browsing" +msgstr "光标浏览(_R)" -#: ../midori/midori-browser.c:5055 +#: ../midori/midori-browser.c:5326 msgid "Toggle fullscreen view" -msgstr "切换全屏" +msgstr "切换全屏视图" -#: ../midori/midori-browser.c:5058 +#: ../midori/midori-browser.c:5328 msgid "Scroll _Left" msgstr "向左滚动(_L)" -#: ../midori/midori-browser.c:5059 -msgid "Scroll to the left" -msgstr "向左滚动" - -#: ../midori/midori-browser.c:5061 +#: ../midori/midori-browser.c:5331 msgid "Scroll _Down" msgstr "向下滚动(_D)" -#: ../midori/midori-browser.c:5062 -msgid "Scroll down" -msgstr "向下滚动" - -#: ../midori/midori-browser.c:5064 +#: ../midori/midori-browser.c:5334 msgid "Scroll _Up" msgstr "向上滚动(_U)" -#: ../midori/midori-browser.c:5065 -msgid "Scroll up" -msgstr "向上滚动" - -#: ../midori/midori-browser.c:5067 +#: ../midori/midori-browser.c:5337 msgid "Scroll _Right" msgstr "向右滚动(_R)" -#: ../midori/midori-browser.c:5068 -msgid "Scroll to the right" -msgstr "向右滚动" - -#: ../midori/midori-browser.c:5071 +#: ../midori/midori-browser.c:5340 msgid "_Go" -msgstr "前进(_G)" +msgstr "转到(_G)" -#: ../midori/midori-browser.c:5074 +#: ../midori/midori-browser.c:5343 msgid "Go back to the previous page" -msgstr "返回上一页" +msgstr "返回上一页面" -#: ../midori/midori-browser.c:5077 +#: ../midori/midori-browser.c:5346 msgid "Go forward to the next page" -msgstr "转到下一页" +msgstr "进入下一页面" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5081 +#: ../midori/midori-browser.c:5350 msgid "Go to the previous sub-page" -msgstr "返回上个子页" +msgstr "转到上一子页面" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5085 +#: ../midori/midori-browser.c:5354 msgid "Go to the next sub-page" -msgstr "转到下个子页" +msgstr "转到下一子页面" -#: ../midori/midori-browser.c:5088 +#: ../midori/midori-browser.c:5357 msgid "Go to your homepage" -msgstr "回到主页" +msgstr "进入您的主页" -#: ../midori/midori-browser.c:5090 +#: ../midori/midori-browser.c:5359 msgid "Empty Trash" msgstr "清空回收站" -#: ../midori/midori-browser.c:5091 -msgid "Delete the contents of the trash" -msgstr "删除回收站中的内容" - -#: ../midori/midori-browser.c:5093 +#: ../midori/midori-browser.c:5362 msgid "Undo _Close Tab" msgstr "撤销关闭标签(_C)" -#: ../midori/midori-browser.c:5094 -msgid "Open the last closed tab" -msgstr "打开最后关闭的标签" - -#: ../midori/midori-browser.c:5100 +#: ../midori/midori-browser.c:5369 msgid "Add a new _folder" -msgstr "添加新目录(_F)" +msgstr "添加新文件夹(_F)" -#: ../midori/midori-browser.c:5101 -msgid "Add a new bookmark folder" -msgstr "添加一个新书签目录" - -#: ../midori/midori-browser.c:5106 +#: ../midori/midori-browser.c:5375 msgid "_Export bookmarks" msgstr "导出书签(_E)" -#: ../midori/midori-browser.c:5109 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "管理搜索引擎(_M)" -#: ../midori/midori-browser.c:5110 -msgid "Add, edit and remove search engines..." -msgstr "添加、编辑和移除搜索引擎..." - -#: ../midori/midori-browser.c:5113 +#: ../midori/midori-browser.c:5381 msgid "_Clear Private Data" msgstr "清除隐私数据(_C)" -#: ../midori/midori-browser.c:5114 -msgid "Clear private data..." -msgstr "清除隐私数据..." - -#: ../midori/midori-browser.c:5118 +#: ../midori/midori-browser.c:5384 msgid "_Inspect Page" msgstr "检查页面(_I)" -#: ../midori/midori-browser.c:5119 -msgid "Inspect page details and access developer tools..." -msgstr "检查页面详细信息并使用开发者工具..." - -#: ../midori/midori-browser.c:5124 +#: ../midori/midori-browser.c:5388 msgid "_Previous Tab" -msgstr "上一个标签(_P)" - -#: ../midori/midori-browser.c:5125 -msgid "Switch to the previous tab" -msgstr "转到上一个标签" +msgstr "上一标签(_P)" -#: ../midori/midori-browser.c:5127 +#: ../midori/midori-browser.c:5391 msgid "_Next Tab" -msgstr "下一个标签(_N)" +msgstr "下一标签(_N)" -#: ../midori/midori-browser.c:5128 -msgid "Switch to the next tab" -msgstr "转到下一个标签" +#: ../midori/midori-browser.c:5393 +msgid "Move Tab _Backward" +msgstr "向后移动标签(_B)" -#: ../midori/midori-browser.c:5130 +#: ../midori/midori-browser.c:5395 +msgid "_Move Tab Forward" +msgstr "向前移动标签(_M)" + +#: ../midori/midori-browser.c:5398 msgid "Focus _Current Tab" -msgstr "聚焦到当前标签页(_C)" +msgstr "聚焦当前标签(_C)" + +#: ../midori/midori-browser.c:5401 +msgid "Focus _Next view" +msgstr "聚焦下一视图(_N)" + +#: ../midori/midori-browser.c:5404 +msgid "Only show the Icon of the _Current Tab" +msgstr "仅显示当前标签的图标(_C)" + +#: ../midori/midori-browser.c:5407 +msgid "_Duplicate Current Tab" +msgstr "复制当前标签(_D)" -#: ../midori/midori-browser.c:5131 -msgid "Focus the current tab" -msgstr "聚焦到当前标签页" +#: ../midori/midori-browser.c:5410 +msgid "Close Ot_her Tabs" +msgstr "关闭其它标签(_H)" -#: ../midori/midori-browser.c:5133 +#: ../midori/midori-browser.c:5413 msgid "Open last _session" msgstr "打开上次会话(_S)" -#: ../midori/midori-browser.c:5134 -msgid "Open the tabs saved in the last session" -msgstr "打开上次运行时的标签页" - -#: ../midori/midori-browser.c:5136 +#: ../midori/midori-browser.c:5416 msgid "_Help" msgstr "帮助(_H)" -#: ../midori/midori-browser.c:5138 -msgid "_Contents" -msgstr "内容(_C)" - -#: ../midori/midori-browser.c:5139 -msgid "Show the documentation" -msgstr "显示文档" - -#: ../midori/midori-browser.c:5141 +#: ../midori/midori-browser.c:5418 msgid "_Frequent Questions" msgstr "常见问题(_F)" -#: ../midori/midori-browser.c:5142 -msgid "Show the Frequently Asked Questions" -msgstr "显示 FAQ" - -#: ../midori/midori-browser.c:5144 -msgid "_Report a Bug" -msgstr "报告 Bug(_R)" - -#: ../midori/midori-browser.c:5145 -msgid "Open Midori's bug tracker" -msgstr "打开 Midori 的错误跟踪器" - -#: ../midori/midori-browser.c:5148 -msgid "Show information about the program" -msgstr "显示此程序的信息" +#: ../midori/midori-browser.c:5421 +msgid "_Report a Problem..." +msgstr "报告问题(_R)..." -#: ../midori/midori-browser.c:5156 +#: ../midori/midori-browser.c:5433 msgid "_Menubar" msgstr "菜单栏(_M)" -#: ../midori/midori-browser.c:5157 -msgid "Show menubar" -msgstr "显示菜单栏" - -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:5437 msgid "_Navigationbar" msgstr "导航栏(_N)" -#: ../midori/midori-browser.c:5161 -msgid "Show navigationbar" -msgstr "显示导航栏" - -#: ../midori/midori-browser.c:5164 +#: ../midori/midori-browser.c:5441 msgid "Side_panel" -msgstr "侧栏(_P)" +msgstr "侧边栏(_P)" -#: ../midori/midori-browser.c:5165 -msgid "Show sidepanel" -msgstr "显示侧栏" +#: ../midori/midori-browser.c:5442 +msgid "Sidepanel" +msgstr "侧边栏" -#: ../midori/midori-browser.c:5168 +#: ../midori/midori-browser.c:5445 msgid "_Bookmarkbar" msgstr "书签栏(_B)" -#: ../midori/midori-browser.c:5169 -msgid "Show bookmarkbar" -msgstr "显示书签栏" - -#: ../midori/midori-browser.c:5172 -msgid "_Transferbar" -msgstr "传输栏(_T)" - -#: ../midori/midori-browser.c:5173 -msgid "Show transferbar" -msgstr "显示传输栏" - -#: ../midori/midori-browser.c:5176 +#: ../midori/midori-browser.c:5449 msgid "_Statusbar" msgstr "状态栏(_S)" -#: ../midori/midori-browser.c:5177 -msgid "Show statusbar" -msgstr "显示状态栏" - -#: ../midori/midori-browser.c:5185 +#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311 msgid "_Automatic" msgstr "自动(_A)" -#: ../midori/midori-browser.c:5188 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236 msgid "Chinese (BIG5)" -msgstr "繁体中文 (BIG5)" +msgstr "中文(BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5192 +#: ../midori/midori-browser.c:5465 msgid "Japanese (SHIFT__JIS)" -msgstr "日语 (SHIFT__JIS)" +msgstr "日语(SHIFT_JIS)" -#: ../midori/midori-browser.c:5195 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238 msgid "Korean (EUC-KR)" -msgstr "朝鲜语 (EUC-KR)" +msgstr "韩语(EUC-KR)" -#: ../midori/midori-browser.c:5198 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239 msgid "Russian (KOI8-R)" -msgstr "俄语 (KOI8-R)" +msgstr "俄语(KOI8-R)" -#: ../midori/midori-browser.c:5201 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240 msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" +msgstr "Unicode(UTF-8)" -#: ../midori/midori-browser.c:5204 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241 msgid "Western (ISO-8859-1)" -msgstr "西方 (ISO-8859-1)" +msgstr "西方语言(ISO-8859-1)" + +#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641 +msgid "Custom..." +msgstr "自定义..." -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5985 msgid "_Separator" -msgstr "分割符(_S)" +msgstr "分隔符(_S)" -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5992 msgid "_Location..." msgstr "位置(_L)..." -#: ../midori/midori-browser.c:5744 +#: ../midori/midori-browser.c:5994 msgid "Open a particular location" -msgstr "打开一个指定位置" +msgstr "打开特定位置" -#: ../midori/midori-browser.c:5768 +#: ../midori/midori-browser.c:6016 msgid "_Web Search..." -msgstr "搜索网页(_W)..." +msgstr "网络搜索(_W)..." -#: ../midori/midori-browser.c:5770 +#: ../midori/midori-browser.c:6018 msgid "Run a web search" -msgstr "运行网页搜索" +msgstr "运行网络搜索" -#: ../midori/midori-browser.c:5791 +#: ../midori/midori-browser.c:6045 msgid "Reopen a previously closed tab or window" -msgstr "重新打开以前关闭的标签或窗口" - -#: ../midori/midori-browser.c:5806 -msgid "_Recently visited pages" -msgstr "最近访问的页面(_R)" - -#: ../midori/midori-browser.c:5808 -msgid "Reopen pages that you visited earlier" -msgstr "重新打开以前访问过的页面" - -#: ../midori/midori-browser.c:5823 ../midori/sokoke.c:1288 -msgid "_Bookmarks" -msgstr "书签(_B)" +msgstr "重新打开先前关闭的标签或窗口" -#: ../midori/midori-browser.c:5825 +#: ../midori/midori-browser.c:6062 msgid "Show the saved bookmarks" -msgstr "显示保存的书签" +msgstr "显示已保存的书签" -#: ../midori/midori-browser.c:5840 +#: ../midori/midori-browser.c:6079 msgid "_Tools" msgstr "工具(_T)" -#: ../midori/midori-browser.c:5853 +#: ../midori/midori-browser.c:6095 msgid "_Window" msgstr "窗口(_W)" -#: ../midori/midori-browser.c:5855 +#: ../midori/midori-browser.c:6097 msgid "Show a list of all open tabs" msgstr "显示所有打开标签的列表" -#: ../midori/midori-browser.c:5869 +#: ../midori/midori-browser.c:6111 msgid "_Menu" msgstr "菜单(_M)" -#: ../midori/midori-browser.c:5871 +#: ../midori/midori-browser.c:6113 msgid "Menu" msgstr "菜单" -#: ../midori/midori-browser.c:6455 +#: ../midori/midori-browser.c:6927 #, c-format msgid "Unexpected setting '%s'" -msgstr "意外的设置 '%s'" +msgstr "意外的设置 ‘%s’" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-extension.c:329 #, c-format -msgid "Failed to select from history\n" -msgstr "从历史项目中选择失败\n" +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "未能载入扩展 ‘%s’ 的配置：%s\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844 +#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053 +#: ../extensions/addons.c:1695 #, c-format -msgid "Search for %s" -msgstr "搜索 %s" +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "未能保存扩展 ‘%s’ 的配置：%s\n" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:394 #, c-format msgid "Search with %s" -msgstr "使用 %s 搜索" +msgstr "用 %s 搜索" + +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "搜索方式..." + +#: ../midori/midori-locationaction.c:537 +#, c-format +msgid "Failed to select from history\n" +msgstr "无法从历史中选择\n" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:624 #, c-format -msgid "Failed to execute database statement\n" -msgstr "执行数据库操作失败\n" +msgid "Search for %s" +msgstr "搜索 %s" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1398 msgid "Paste and p_roceed" -msgstr "粘贴并转到(_R)" +msgstr "粘贴并继续(_R)" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 -msgid "Detach chosen panel from the window" -msgstr "从窗口中分离选择的面板" +#: ../midori/midori-locationaction.c:1739 +msgid "Not verified" +msgstr "未验证" + +#: ../midori/midori-locationaction.c:1759 +msgid "Verified and encrypted connection" +msgstr "已验证的加密连接" + +#: ../midori/midori-locationaction.c:1771 +msgid "Open, unencrypted connection" +msgstr "打开未加密的连接" -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565 msgid "Align sidepanel to the right" -msgstr "侧栏在右" +msgstr "侧边栏放在右边" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410 msgid "Close panel" -msgstr "关闭侧栏" +msgstr "关闭侧边栏" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566 msgid "Align sidepanel to the left" -msgstr "侧栏在左" +msgstr "侧边栏放在左边" -#: ../midori/midori-panel.c:802 -msgid "Hide operating controls" -msgstr "隐藏操作控件" +#: ../midori/midori-websettings.c:218 +msgid "Show Speed Dial" +msgstr "显示快速拨号" -#: ../midori/midori-websettings.c:204 -msgid "Show Blank page" -msgstr "显示空白页面" - -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:219 msgid "Show Homepage" msgstr "显示主页" -#: ../midori/midori-websettings.c:206 -msgid "Show last open tabs" -msgstr "显示最后打开的标签" - -#: ../midori/midori-websettings.c:207 -msgid "Show last tabs without loading" -msgstr "显示最后打开的标签但不载入" - -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:237 msgid "Japanese (SHIFT_JIS)" -msgstr "日语 (SHIFT_JIS)" +msgstr "日语(SHIFT_JIS)" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:257 msgid "New tab" msgstr "新建标签" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:258 msgid "New window" msgstr "新建窗口" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:259 msgid "Current tab" msgstr "当前标签" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:274 msgid "Default" msgstr "默认" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:275 msgid "Icons" msgstr "图标" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:276 msgid "Small icons" msgstr "小图标" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:277 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:278 msgid "Icons and text" msgstr "图标和文字" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:279 msgid "Text beside icons" msgstr "文字在图标旁" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:294 msgid "Automatic (GNOME or environment)" -msgstr "自动 (GNOME 或其他桌面环境)" +msgstr "自动(GNOME 或其它环境)" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:295 msgid "HTTP proxy server" msgstr "HTTP 代理服务器" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:296 msgid "No proxy server" -msgstr "不使用代理服务器" - -#: ../midori/midori-websettings.c:297 -msgid "All cookies" -msgstr "所有 Cookies" - -#: ../midori/midori-websettings.c:298 -msgid "Session cookies" -msgstr "会话 Cookies" - -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 -msgid "None" -msgstr "无" +msgstr "无代理服务器" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:400 msgid "Remember last window size" -msgstr "记住上次窗口的大小" +msgstr "记住上个窗口的大小" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:401 msgid "Whether to save the last window size" -msgstr "是否保存上次窗口的大小" +msgstr "是否保存上个窗口的大小" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:409 msgid "Last window width" -msgstr "上次窗口的宽度" +msgstr "上个窗口宽度" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:410 msgid "The last saved window width" -msgstr "上次保存的窗口宽度" +msgstr "上个保存的窗口宽度" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:418 msgid "Last window height" -msgstr "上次窗口的高度" +msgstr "上个窗口高度" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:419 msgid "The last saved window height" -msgstr "上次保存的窗口高度" +msgstr "上个保存的窗口高度" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:444 msgid "Last panel position" -msgstr "上次的侧栏位置" +msgstr "上个侧边栏位置" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:445 msgid "The last saved panel position" -msgstr "上次保存的侧栏位置" +msgstr "上个保存的侧边栏位置" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:454 msgid "Last panel page" -msgstr "上次的侧栏页" +msgstr "上个侧边栏页面" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:455 msgid "The last saved panel page" -msgstr "上次保存的侧栏页" +msgstr "上个保存的侧边栏页面" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:463 msgid "Last Web search" -msgstr "上次使用的 Web 搜索" +msgstr "上个网络搜索" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:464 msgid "The last saved Web search" -msgstr "上次保存的 Web 搜索" +msgstr "上个保存的网络搜索" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:473 msgid "Show Menubar" msgstr "显示菜单栏" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:474 msgid "Whether to show the menubar" msgstr "是否显示菜单栏" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:482 msgid "Show Navigationbar" msgstr "显示导航栏" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:483 msgid "Whether to show the navigationbar" msgstr "是否显示导航栏" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:491 msgid "Show Bookmarkbar" msgstr "显示书签栏" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:492 msgid "Whether to show the bookmarkbar" msgstr "是否显示书签栏" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:500 msgid "Show Panel" -msgstr "显示侧栏" +msgstr "显示侧边栏" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:501 msgid "Whether to show the panel" -msgstr "是否显示侧栏" - -#: ../midori/midori-websettings.c:487 -msgid "Show Transferbar" -msgstr "显示传输栏" +msgstr "是否显示侧边栏" -#: ../midori/midori-websettings.c:488 -msgid "Whether to show the transferbar" -msgstr "是否显示传输栏" - -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:509 msgid "Show Statusbar" msgstr "显示状态栏" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:510 msgid "Whether to show the statusbar" msgstr "是否显示状态栏" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:519 msgid "Toolbar Style:" -msgstr "工具栏样式:" +msgstr "工具栏样式：" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:520 msgid "The style of the toolbar" msgstr "工具栏的样式" -#: ../midori/midori-websettings.c:523 -msgid "Show progress in location entry" -msgstr "在地址栏中显示进度" - -#: ../midori/midori-websettings.c:524 -msgid "Whether to show loading progress in the location entry" -msgstr "是否在地址栏中显示加载进度" - -#: ../midori/midori-websettings.c:539 -msgid "Search engines in location completion" -msgstr "地址补全中显示搜索引擎" - -#: ../midori/midori-websettings.c:540 -msgid "Whether to show search engines in the location completion" -msgstr "是否在地址补全中显示搜索引擎" - -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:529 msgid "Toolbar Items" -msgstr "工具栏中的项目" +msgstr "工具栏项目" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:530 msgid "The items to show on the toolbar" -msgstr "在工具栏中显示的项目" +msgstr "在工具栏中要显示的项目" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:538 msgid "Compact Sidepanel" -msgstr "紧凑侧栏" +msgstr "紧凑侧边栏" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:539 msgid "Whether to make the sidepanel compact" -msgstr "是否让侧栏紧凑显示" - -#: ../midori/midori-websettings.c:573 -msgid "Show operating controls of the panel" -msgstr "显示面板的操作控件" +msgstr "是否紧凑显示侧边栏" -#: ../midori/midori-websettings.c:574 -msgid "Whether to show the operating controls of the panel" -msgstr "是否显示面板的操作控件" - -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:554 msgid "Align sidepanel on the right" -msgstr "侧栏在右" +msgstr "侧边栏放在右边" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:555 msgid "Whether to align the sidepanel on the right" -msgstr "是否让侧栏摆放到右侧" +msgstr "是否将侧边栏放在右边" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:570 msgid "Open panels in separate windows" -msgstr "在单独窗口中打开面板" +msgstr "在单独窗口中打开侧边栏" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:571 msgid "Whether to always open panels in separate windows" -msgstr "是否总是在单独窗口中打开面板" +msgstr "是否总是在单独窗口中打开侧边栏" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:580 msgid "When Midori starts:" -msgstr "当 Midori 启动时:" +msgstr "Midori 启动时：" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:581 msgid "What to do when Midori starts" -msgstr "Midori 启动时做什么" +msgstr "Midori 启动时做的事" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:590 msgid "Homepage:" -msgstr "主页:" +msgstr "主页：" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:591 msgid "The homepage" msgstr "主页" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:606 msgid "Show crash dialog" -msgstr "显示崩溃提示对话框" +msgstr "显示崩溃对话框" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:607 msgid "Show a dialog after Midori crashed" -msgstr "当 Midori 崩溃后显示提示对话框" - -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:658 -msgid "Show speed dial in new tabs" -msgstr "在新标签中显示快速拨号" +msgstr "Midori 崩溃后显示对话框" -#: ../midori/midori-websettings.c:659 -msgid "Show speed dial in newly opened tabs" -msgstr "在新标签中显示快速拨号" - -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:615 msgid "Save downloaded files to:" -msgstr "保存下载的文件到:" +msgstr "保存下载的文件至：" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:616 msgid "The folder downloaded files are saved to" -msgstr "下载的文件将保存到此目录" +msgstr "已下载文件所保存的文件夹" -#: ../midori/midori-websettings.c:689 -msgid "Ask for the destination folder" -msgstr "询问保存目录" - -#: ../midori/midori-websettings.c:690 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "是否在下载文件时询问保存目录" - -#: ../midori/midori-websettings.c:709 -msgid "Notify when a transfer has been completed" -msgstr "下载完成后显示提示" - -#: ../midori/midori-websettings.c:710 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "是否在下载完成时显示提示信息" - -#: ../midori/midori-websettings.c:722 -msgid "Download Manager" -msgstr "下载管理器" - -#: ../midori/midori-websettings.c:723 -msgid "An external download manager" -msgstr "外部的下载管理器" - -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:624 msgid "Text Editor" msgstr "文本编辑器" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:625 msgid "An external text editor" -msgstr "外部的文本编辑器" +msgstr "外部文本编辑器" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:640 msgid "News Aggregator" msgstr "新闻聚合器" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:641 msgid "An external news aggregator" -msgstr "外部的新闻聚合查看器" +msgstr "外部新闻聚合器" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:649 msgid "Location entry Search" -msgstr "地址栏查找" +msgstr "位置栏搜索" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:650 msgid "The search to perform inside the location entry" -msgstr "在地址栏中执行的查找" +msgstr "在位置栏内执行的搜索" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:658 msgid "Preferred Encoding" -msgstr "首选的编码" +msgstr "首选编码" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:659 msgid "The preferred character encoding" -msgstr "首选的字符编码集" +msgstr "首选的字符编码" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:669 msgid "Always Show Tabbar" msgstr "总是显示标签栏" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:670 msgid "Always show the tabbar" msgstr "总是显示标签栏" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:683 msgid "Close Buttons on Tabs" -msgstr "在标签上显示关闭按钮" +msgstr "标签上有关闭按钮" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:684 msgid "Whether tabs have close buttons" -msgstr "是否在标签上显示关闭按钮" +msgstr "标签上是否有关闭按钮" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:709 msgid "Open new pages in:" -msgstr "在...打开新的页面:" +msgstr "在此打开新页面：" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:710 msgid "Where to open new pages" -msgstr "在哪里打开新的页面" +msgstr "在哪里打开新页面" -#: ../midori/midori-websettings.c:804 -msgid "Open external pages in:" -msgstr "在...打开外部页面:" - -#: ../midori/midori-websettings.c:805 -msgid "Where to open externally opened pages" -msgstr "在哪里打开外部页面" - -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:719 msgid "Middle click opens Selection" -msgstr "鼠标中键打开所选地址" +msgstr "中击打开所选内容" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:720 msgid "Load an address from the selection via middle click" -msgstr "用鼠标中键单击打开选中地址" +msgstr "通过中击从所选内容中载入地址" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:728 msgid "Open tabs in the background" -msgstr "在后台打开新标签" +msgstr "在后台打开标签" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:729 msgid "Whether to open new tabs in the background" msgstr "是否在后台打开新标签" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:737 msgid "Open Tabs next to Current" -msgstr "在当前标签后打开新标签" +msgstr "在当前标签后打开标签" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:738 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "选择在当前标签后或者在最后的标签后打开新标签" +msgstr "在当前标签后还是在上一标签后打开新标签" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:746 msgid "Open popups in tabs" -msgstr "弹出窗口在新标签中打开" +msgstr "在标签中打开弹出窗口" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:747 msgid "Whether to open popup windows in tabs" -msgstr "弹出窗口是否在新标签中打开" +msgstr "是否在标签中打开弹出窗口" -#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134 msgid "Load images automatically" -msgstr "自动加载图像" +msgstr "自动载入图片" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:758 msgid "Load and display images automatically" -msgstr "自动加载和显示图像" +msgstr "自动载入并显示图片" -#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143 msgid "Enable scripts" msgstr "启用脚本" -#: ../midori/midori-websettings.c:861 +#: ../midori/midori-websettings.c:766 msgid "Enable embedded scripting languages" -msgstr "启用网页中的脚本" +msgstr "启用已嵌入的脚本语言" -#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154 msgid "Enable Netscape plugins" msgstr "启用 Netscape 插件" -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:774 msgid "Enable embedded Netscape plugin objects" -msgstr "启用嵌入的 Netscape 插件对象" +msgstr "启用已嵌入的 Netscape 插件对象" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:789 +msgid "Enable Spell Checking" +msgstr "启用拼写检查" + +#: ../midori/midori-websettings.c:790 +msgid "Enable spell checking while typing" +msgstr "输入时启用拼写检查" + +#: ../midori/midori-websettings.c:796 msgid "Enable HTML5 database support" msgstr "启用 HTML5 数据库支持" -#: ../midori/midori-websettings.c:886 +#: ../midori/midori-websettings.c:797 msgid "Whether to enable HTML5 database support" msgstr "是否启用 HTML5 数据库支持" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:803 msgid "Enable HTML5 local storage support" msgstr "启用 HTML5 本地存储支持" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:804 msgid "Whether to enable HTML5 local storage support" msgstr "是否启用 HTML5 本地存储支持" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:810 msgid "Enable offline web application cache" -msgstr "启用离线 web 应用程序缓存" +msgstr "启用离线网络应用程序缓存" -#: ../midori/midori-websettings.c:902 +#: ../midori/midori-websettings.c:811 msgid "Whether to enable offline web application cache" -msgstr "是否启用离线 web 应用程序缓存" +msgstr "是否启用离线网络应用程序缓存" + +#: ../midori/midori-websettings.c:827 +msgid "Flash window on background tabs" +msgstr "在后台标签的窗口闪烁" + +#: ../midori/midori-websettings.c:828 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "新标签在后台打开时浏览器窗口闪烁" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:836 +msgid "Enable WebGL support" +msgstr "启用 WebGL 支持" + +#: ../midori/midori-websettings.c:837 +msgid "Allow websites to use OpenGL rendering" +msgstr "允许站点使用 OpenGL 渲染" + +#: ../midori/midori-websettings.c:863 msgid "Zoom Text and Images" -msgstr "缩放文字和图像" +msgstr "缩放文字和图片" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:864 msgid "Whether to zoom text and images" -msgstr "是否缩放文字和图像" +msgstr "是否缩放文字和图片" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:879 msgid "Find inline while typing" -msgstr "输入时回忆" +msgstr "输入时在文中查找" -#: ../midori/midori-websettings.c:944 +#: ../midori/midori-websettings.c:880 msgid "Whether to automatically find inline while typing" -msgstr "是否输入时自动查找" +msgstr "输入时是否在文中自动查找" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:895 msgid "Kinetic scrolling" -msgstr "惯性滚动" +msgstr "动态滚动" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:896 msgid "Whether scrolling should kinetically move according to speed" -msgstr "是否根据拖拽速度惯性滚动页面" - -#: ../midori/midori-websettings.c:968 -msgid "Accept cookies" -msgstr "接收 Cookies" - -#: ../midori/midori-websettings.c:969 -msgid "What type of cookies to accept" -msgstr "接收什么类型的 Cookies" +msgstr "滚动是否按速度动态地移动" -#: ../midori/midori-websettings.c:985 -msgid "Original cookies only" -msgstr "只接收原始 Cookies" +#: ../midori/midori-websettings.c:904 +msgid "Delete old Cookies after:" +msgstr "删除此后的原隐私信息：" -#: ../midori/midori-websettings.c:986 -msgid "Accept cookies from the original website only" -msgstr "只接收原始网站的 Cookies" - -#: ../midori/midori-websettings.c:994 -msgid "Maximum cookie age" -msgstr "最长 Cookie 有效期" - -#: ../midori/midori-websettings.c:995 +#: ../midori/midori-websettings.c:905 msgid "The maximum number of days to save cookies for" -msgstr "最长 Cookie 保存天数" +msgstr "最长隐私信息保存天数" -#: ../midori/midori-websettings.c:1012 -msgid "Remember last visited pages" -msgstr "记录上次访问的页面" +#: ../midori/midori-websettings.c:921 +msgid "Only accept Cookies from sites you visit" +msgstr "只接受您访问的网站的隐私信息" -#: ../midori/midori-websettings.c:1013 -msgid "Whether the last visited pages are saved" -msgstr "是否记录上次访问的页面" +#: ../midori/midori-websettings.c:922 +msgid "Block cookies sent by third-party websites" +msgstr "屏蔽第三方网站发送的隐私信息" -#: ../midori/midori-websettings.c:1021 -msgid "Maximum history age" -msgstr "最长历史有效期" +#: ../midori/midori-websettings.c:936 +msgid "Delete pages from history after:" +msgstr "删除此历史后的页面：" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:937 msgid "The maximum number of days to save the history for" msgstr "最长历史保存天数" -#: ../midori/midori-websettings.c:1030 -msgid "Remember last downloaded files" -msgstr "记录上次下载的文件" - -#: ../midori/midori-websettings.c:1031 -msgid "Whether the last downloaded files are saved" -msgstr "是否保存上次下载的文件" - -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:952 msgid "Proxy server" msgstr "代理服务器" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:953 msgid "The type of proxy server to use" -msgstr "使用的代理服务器类型" +msgstr "所使用的代理服务器类型" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:962 msgid "HTTP Proxy Server" msgstr "HTTP 代理服务器" -#: ../midori/midori-websettings.c:1059 +#: ../midori/midori-websettings.c:963 msgid "The proxy server used for HTTP connections" msgstr "HTTP 连接所使用的代理服务器" -#: ../midori/midori-websettings.c:1074 -msgid "Detect proxy server automatically" -msgstr "自动检测代理服务器" - -#: ../midori/midori-websettings.c:1075 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "是否自动检测系统环境中的代理服务器设置" +#: ../midori/midori-websettings.c:978 +msgid "Port" +msgstr "端口" + +#: ../midori/midori-websettings.c:979 +msgid "The proxy server port used for HTTP connections" +msgstr "HTTP 连接所使用的代理服务器端口" + +#: ../midori/midori-websettings.c:997 +msgid "The maximum size of cached pages on disk" +msgstr "磁盘上缓存页面最大值" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1014 msgid "Identify as" msgstr "识别为" -#: ../midori/midori-websettings.c:1092 +#: ../midori/midori-websettings.c:1015 msgid "What to identify as to web pages" -msgstr "让页面识别为什么" +msgstr "让网页识别为什么" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1031 msgid "Identification string" msgstr "识别字符串" -#: ../midori/midori-websettings.c:1109 +#: ../midori/midori-websettings.c:1032 msgid "The application identification string" msgstr "应用程序识别字符串" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1048 msgid "Preferred languages" msgstr "首选语言" -#: ../midori/midori-websettings.c:1125 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "一个由逗号分隔的语言列表，以选择显示多语言网页时的首选语言，例如 \"de\"，\"ru,nl\" 或者 \"en-us;q=1.0, fr-fr;q=0.667\"" +#: ../midori/midori-websettings.c:1049 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"一个由逗号分隔的用以显示多语言网页的首选语言列表，例如 “de”，“ru,nl” 或 “en-" +"us;q=1.0, fr-fr;q=0.667”" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1064 msgid "Clear private data" msgstr "清除隐私数据" -#: ../midori/midori-websettings.c:1141 +#: ../midori/midori-websettings.c:1065 msgid "The private data selected for deletion" -msgstr "选中要删除的隐私数据" +msgstr "选中的要删除的隐私数据" + +#: ../midori/midori-websettings.c:1080 +msgid "Clear data" +msgstr "清除数据" + +#: ../midori/midori-websettings.c:1081 +msgid "The data selected for deletion" +msgstr "选中的要删除的数据" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1130 +msgid "Strip referrer details sent to websites" +msgstr "剥离向站点发送的提交信息详情" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1132 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "“提交信息” 头文件是否缩短为主机名" + +#: ../midori/midori-websettings.c:1146 +msgid "Always use my font choices" +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:1270 ../midori/midori-view.c:4576 -#: ../midori/midori-view.c:4580 +#: ../midori/midori-websettings.c:1147 +msgid "Override fonts picked by websites with user preferences" +msgstr "使用用户首选项替换网站采用的字体" + +#: ../midori/midori-view.c:1360 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s 要保存 HTML5 数据库。" + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Deny" +msgstr "拒绝(_D)" + +#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396 +msgid "_Allow" +msgstr "允许(_A)" + +#: ../midori/midori-view.c:1392 +#, c-format +msgid "%s wants to know your location." +msgstr "%s 要获知您的位置。" + +#: ../midori/midori-view.c:1485 #, c-format msgid "Error - %s" -msgstr "错误 - %s" +msgstr "错误-%s" -#: ../midori/midori-view.c:1271 +#: ../midori/midori-view.c:1486 #, c-format msgid "The page '%s' couldn't be loaded." -msgstr "网页 '%s' 无法打开。" +msgstr "未能载入 ‘%s’ 页面。" -#: ../midori/midori-view.c:1273 +#: ../midori/midori-view.c:1488 msgid "Try again" msgstr "重试" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1292 -#, c-format -msgid "Not found - %s" -msgstr "没有找到 - %s" - -#: ../midori/midori-view.c:1529 ../midori/midori-view.c:2374 +#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598 #, c-format msgid "Send a message to %s" -msgstr "发送消息到 %s" +msgstr "向 %s 发送邮件" -#: ../midori/midori-view.c:2156 ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747 msgid "Inspect _Element" -msgstr "检查网页元素(_E)" +msgstr "检查元素(_E)" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2278 +#: ../midori/midori-view.c:2480 msgid "Open Link in New _Tab" msgstr "在新标签中打开链接(_T)" -#: ../midori/midori-view.c:2212 +#: ../midori/midori-view.c:2484 msgid "Open Link in _Foreground Tab" -msgstr "在前台标签页中打开链接(_F)" +msgstr "在前台标签中打开链接(_F)" -#: ../midori/midori-view.c:2213 +#: ../midori/midori-view.c:2485 msgid "Open Link in _Background Tab" msgstr "在后台标签中打开链接(_B)" -#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2488 msgid "Open Link in New _Window" msgstr "在新窗口中打开链接(_W)" -#: ../midori/midori-view.c:2219 +#: ../midori/midori-view.c:2491 msgid "Open Link as Web A_pplication" -msgstr "将链接作为 Web 应用程序运行(_P)" +msgstr "将链接作为网络应用程序打开(_P)" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2496 msgid "Copy Link de_stination" -msgstr "复制链接目标(_S)" +msgstr "复制链接目的地(_S)" -#: ../midori/midori-view.c:2225 ../midori/midori-view.c:2297 -msgid "_Save Link destination" -msgstr "保存链接目标(_S)" - -#: ../midori/midori-view.c:2226 ../midori/midori-view.c:2291 -msgid "_Download Link destination" -msgstr "下载链接目标(_D)" - -#: ../midori/midori-view.c:2230 ../midori/midori-view.c:2260 -#: ../midori/midori-view.c:2302 -msgid "Download with Download _Manager" -msgstr "用下载管理器下载(_M)" - -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2512 msgid "Open _Image in New Tab" -msgstr "在新标签页中打开图像(_I)" +msgstr "在新标签中打开图片(_I)" -#: ../midori/midori-view.c:2242 +#: ../midori/midori-view.c:2515 msgid "Copy Image _Address" -msgstr "复制图像地址(_A)" +msgstr "复制图片地址(_A)" -#: ../midori/midori-view.c:2245 +#: ../midori/midori-view.c:2518 msgid "Save I_mage" -msgstr "保存图像文件(_M)" +msgstr "保存图片(_M)" -#: ../midori/midori-view.c:2246 -msgid "Download I_mage" -msgstr "下载图像(_M)" +#: ../midori/midori-view.c:2521 +msgid "Open in Image _Viewer" +msgstr "在图片查看器中打开(_V)" -#: ../midori/midori-view.c:2253 +#: ../midori/midori-view.c:2528 msgid "Copy Video _Address" msgstr "复制视频地址(_A)" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2531 msgid "Save _Video" -msgstr "保存视频文件(_V)" +msgstr "保存视频(_V)" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2531 msgid "Download _Video" -msgstr "下载视频文件(_V)" +msgstr "下载视频(_V)" -#: ../midori/midori-view.c:2319 +#: ../midori/midori-view.c:2557 msgid "Search _with" -msgstr "使用...搜索(_W)" +msgstr "搜索方式(_W)" -#: ../midori/midori-view.c:2354 ../midori/midori-view.c:2361 +#: ../midori/midori-view.c:2589 msgid "_Search the Web" -msgstr "搜索网页(_S)" +msgstr "搜索网络(_S)" -#: ../midori/midori-view.c:2382 +#: ../midori/midori-view.c:2606 msgid "Open Address in New _Tab" msgstr "在新标签中打开地址(_T)" -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:2909 msgid "Open or download file" msgstr "打开或下载文件" -#: ../midori/midori-view.c:2702 +#: ../midori/midori-view.c:2929 #, c-format msgid "File Type: '%s'" -msgstr "文件类型: '%s'" +msgstr "文件类型：‘%s’" -#: ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:2931 #, c-format msgid "File Type: %s ('%s')" -msgstr "文件类型: %s ('%s')" +msgstr "文件类型：%s(‘%s’)" -#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2709 +#: ../midori/midori-view.c:2935 +#, c-format +msgid "File Name: %s" +msgstr "文件名：%s" + +#: ../midori/midori-view.c:2955 #, c-format msgid "Open %s" msgstr "打开 %s" -#: ../midori/midori-view.c:3253 +#: ../midori/midori-view.c:3576 #, c-format msgid "Inspect page - %s" -msgstr "检查页面 - %s" +msgstr "检查页面-%s" -#: ../midori/midori-view.c:3535 -msgid "Speed dial" +#: ../midori/midori-view.c:3923 +msgid "Speed Dial" msgstr "快速拨号" -#: ../midori/midori-view.c:3536 +#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020 msgid "Click to add a shortcut" -msgstr "单击添加快捷方式" +msgstr "点击添加快捷方式" -#: ../midori/midori-view.c:3537 +#: ../midori/midori-view.c:3925 msgid "Enter shortcut address" msgstr "输入快捷方式地址" -#: ../midori/midori-view.c:3538 +#: ../midori/midori-view.c:3926 msgid "Enter shortcut title" msgstr "输入快捷方式标题" -#: ../midori/midori-view.c:3539 +#: ../midori/midori-view.c:3927 msgid "Are you sure you want to delete this shortcut?" -msgstr "确认删除此快捷方式？" +msgstr "您确定要删除此快捷方式吗？" + +#: ../midori/midori-view.c:4089 +#, c-format +msgid "No documentation installed" +msgstr "未安装文档" -#: ../midori/midori-view.c:3540 -msgid "Set number of columns and rows" -msgstr "设置列数和行数" +#: ../midori/midori-view.c:4165 +msgid "Midori doesn't store any personal data:" +msgstr "Midori 没有存储任何个人数据：" -#: ../midori/midori-view.c:3541 -msgid "Enter number of columns and rows:" -msgstr "输入列数和行数:" +#: ../midori/midori-view.c:4166 +msgid "No history or web cookies are being saved." +msgstr "未保存历史或网络隐私信息。" -#: ../midori/midori-view.c:3542 -msgid "Invalid input for the size of the speed dial" -msgstr "快速拨号数量输入无效" +#: ../midori/midori-view.c:4167 +msgid "Extensions are disabled." +msgstr "已禁用扩展。" -#: ../midori/midori-view.c:3543 -msgid "Thumb size:" -msgstr "缩略图大小:" +#: ../midori/midori-view.c:4168 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "已禁用 HTML5 存储、本地数据库和应用程序缓存。" -#: ../midori/midori-view.c:3544 -msgid "Small" -msgstr "小" +#: ../midori/midori-view.c:4169 +msgid "Midori prevents websites from tracking the user:" +msgstr "Midori 阻止网站追踪用户：" -#: ../midori/midori-view.c:3545 -msgid "Medium" -msgstr "中" +#: ../midori/midori-view.c:4170 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "剥离提交信息 URL 为主机名。" -#: ../midori/midori-view.c:3546 -msgid "Big" -msgstr "大" +#: ../midori/midori-view.c:4171 +msgid "DNS prefetching is disabled." +msgstr "已禁用 DNS 预取。" -#: ../midori/midori-view.c:3572 -#, c-format -msgid "Document cannot be displayed" -msgstr "文档无法显示" +#: ../midori/midori-view.c:4172 +msgid "The language and timezone are not revealed to websites." +msgstr "不向网站透露语言和时区。" -#: ../midori/midori-view.c:3595 -#, c-format -msgid "No documentation installed" -msgstr "没有安装文档" +#: ../midori/midori-view.c:4173 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "网站未能列出动画和其它 Netscape 插件。" -#: ../midori/midori-view.c:3716 +#: ../midori/midori-view.c:4222 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "在括号中的版本号显示运行时的版本。" + +#: ../midori/midori-view.c:4278 msgid "Page loading delayed" msgstr "页面载入发生延迟" -#: ../midori/midori-view.c:3717 +#: ../midori/midori-view.c:4279 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "页面载入由于程序之前的崩溃或者首选项设定而发生延迟" +msgstr "由于最近的崩溃或启动首选项，载入页面发生延迟。" -#: ../midori/midori-view.c:3718 +#: ../midori/midori-view.c:4280 msgid "Load Page" msgstr "载入页面" -#: ../midori/midori-view.c:3862 +#: ../midori/midori-view.c:4446 msgid "Blank page" -msgstr "空白页" +msgstr "空白页面" -#: ../midori/midori-view.c:4116 +#: ../midori/midori-view.c:4708 msgid "_Duplicate Tab" msgstr "复制标签(_D)" -#: ../midori/midori-view.c:4121 -msgid "_Restore Tab" -msgstr "恢复标签(_R)" - -#: ../midori/midori-view.c:4121 -msgid "_Minimize Tab" -msgstr "最小化标签(_M)" +#: ../midori/midori-view.c:4713 +msgid "Show Tab _Label" +msgstr "显示标签标记(_L)" + +#: ../midori/midori-view.c:4713 +msgid "Show Tab _Icon Only" +msgstr "仅显示标签图标(_I)" -#: ../midori/midori-view.c:4127 +#: ../midori/midori-view.c:4719 msgid "Close ot_her Tabs" -msgstr "关闭其他标签(_H)" +msgstr "关闭其它标签(_H)" + +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5532 +msgid "previous" +msgstr "上一个" -#: ../midori/midori-view.c:4813 +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5551 +msgid "next" +msgstr "下一个" + +#: ../midori/midori-view.c:5564 msgid "Print background images" msgstr "打印背景图片" -#: ../midori/midori-view.c:4814 +#: ../midori/midori-view.c:5565 msgid "Whether background images should be printed" msgstr "是否打印页面的背景图片" -#: ../midori/midori-view.c:4866 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:5597 msgid "Features" -msgstr "特性" +msgstr "功能" -#. Page "General" -#: ../midori/midori-preferences.c:298 -msgid "General" -msgstr "常规" - -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "启动" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 -msgid "Use current page as homepage" -msgstr "设置当前页为主页" +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "使用当前页面(_C)" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "文件传输" +#: ../midori/midori-preferences.c:314 +msgid "Use current page as homepage" +msgstr "使用当前页面作为主页" #. Page "Appearance" -#: ../midori/midori-preferences.c:349 -msgid "Appearance" -msgstr "外观" - -#: ../midori/midori-preferences.c:350 -msgid "Font settings" -msgstr "字体设置" - -#: ../midori/midori-preferences.c:352 -msgid "Default Font Family" -msgstr "默认的字体族" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "字体" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "合适的字体族" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:330 msgid "The default font family used to display text" -msgstr "默认用以显示文字的字体族" +msgstr "用来显示文字的默认字体族" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" -msgstr "默认用以显示文字的字体大小" +msgstr "用来显示文字的默认字体大小" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:335 msgid "Fixed-width Font Family" -msgstr "定宽字体族" +msgstr "等宽字体族" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:339 msgid "The font family used to display fixed-width text" -msgstr "用以显示定宽文本的字体族" +msgstr "用来显示等宽文字的字体族" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:342 msgid "The font size used to display fixed-width text" -msgstr "用以显示定宽文本的字体大小" +msgstr "用来显示等宽文字的字体大小" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" -msgstr "最小字体尺寸" +msgstr "最小字体大小" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" -msgstr "用以显示文字的最小字体尺寸" +msgstr "用来显示文字的最小字体大小" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "行为" -#: ../midori/midori-preferences.c:393 -msgid "Enforce 96 dots per inch" -msgstr "强制每英寸 96 点" - -#: ../midori/midori-preferences.c:394 -msgid "Enforce a video dot density of 96 DPI" -msgstr "强制画面点密度为 96 DPI" - -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:385 msgid "Allow scripts to open popups" msgstr "允许脚本打开弹出窗口" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:386 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "是否允许脚本自动打开弹出窗口" -#: ../midori/midori-preferences.c:419 -msgid "Spell Checking" -msgstr "拼写检查" - -#: ../midori/midori-preferences.c:422 -msgid "Enable Spell Checking" -msgstr "启用拼写检查" - -#: ../midori/midori-preferences.c:423 -msgid "Enable spell checking while typing" -msgstr "输入时启用拼写检查" - -#: ../midori/midori-preferences.c:425 -msgid "Spelling dictionaries:" -msgstr "用以进行拼写检查的词典:" - -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 -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:435 -msgid "Interface" -msgstr "界面" - -#: ../midori/midori-preferences.c:436 -msgid "Navigationbar" -msgstr "导航栏" - -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "浏览" -#. Page "Applications" -#: ../midori/midori-preferences.c:468 -msgid "Applications" -msgstr "应用程序" - -#: ../midori/midori-preferences.c:469 -msgid "External applications" -msgstr "外部应用程序" - #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "网络" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:463 msgid "Hostname" msgstr "主机名" -#. Page "Privacy" -#: ../midori/midori-preferences.c:511 -msgid "Privacy" -msgstr "隐私" +#: ../midori/midori-preferences.c:487 +msgid "MB" +msgstr "M" -#: ../midori/midori-preferences.c:512 -msgid "Web Cookies" -msgstr "Web Cookies" - -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 -msgid "days" -msgstr "天" - -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "添加搜索引擎" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "编辑搜索引擎" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" -msgstr "名称(_N):" +msgstr "名称(_N)：" + +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "描述(_D)：" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" -msgstr "图标(_I):" +msgstr "图标(_I)：" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" -msgstr "记号(_T):" +msgstr "标志(_T)：" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "管理搜索引擎" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1395 msgid "Use as _default" -msgstr "作为默认(_D)" +msgstr "用作默认(_D)" -#: ../midori/sokoke.c:1287 -msgid "_Bookmark" -msgstr "书签(_B)" +#: ../midori/sokoke.c:354 +msgid "Open with" +msgstr "打开方式" -#: ../midori/sokoke.c:1289 -msgid "Add Boo_kmark" -msgstr "添加书签(_K)" - -#: ../midori/sokoke.c:1290 -msgid "_Console" -msgstr "控制台(_C)" +#: ../midori/sokoke.c:362 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "挑选打开 “%s” 的应用程序或命令：" -#: ../midori/sokoke.c:1291 -msgid "_Extensions" -msgstr "扩展(_E)" +#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441 +#: ../midori/sokoke.c:470 ../midori/sokoke.c:484 +msgid "Could not run external program." +msgstr "未能运行外部程序。" -#: ../midori/sokoke.c:1292 -msgid "_History" -msgstr "历史(_H)" +#: ../midori/sokoke.c:1595 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d 小时" -#: ../midori/sokoke.c:1293 -msgid "_Homepage" -msgstr "主页(_H)" +#: ../midori/sokoke.c:1596 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d 分钟" -#: ../midori/sokoke.c:1294 -msgid "_Userscripts" -msgstr "用户脚本(_U)" +#: ../midori/sokoke.c:1597 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d 秒" -#: ../midori/sokoke.c:1295 -msgid "New _Tab" -msgstr "新建标签(_T)" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268 +#, c-format +msgid "%s of %s" +msgstr "%s/%s" -#: ../midori/sokoke.c:1296 -msgid "_Transfers" -msgstr "传输(_T)" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1614 +msgid "?B" +msgstr "?B" -#: ../midori/sokoke.c:1297 -msgid "Netscape p_lugins" -msgstr "Netscape 插件(_L)" +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1617 +#, c-format +msgid " (%s/s)" +msgstr "(%s/s)" -#: ../midori/sokoke.c:1300 -msgid "New _Folder" -msgstr "新建目录(_F)" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1634 +#, c-format +msgid " - %s remaining" +msgstr "-%s 剩余" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:201 +#: ../toolbars/midori-findbar.c:291 msgid "_Inline Find:" -msgstr "在文中查找(_I):" +msgstr "在文中查找(_I)：" -#: ../toolbars/midori-findbar.c:233 +#: ../toolbars/midori-findbar.c:317 msgid "Previous" msgstr "上一个" -#: ../toolbars/midori-findbar.c:239 +#: ../toolbars/midori-findbar.c:323 msgid "Next" msgstr "下一个" -#: ../toolbars/midori-findbar.c:243 +#: ../toolbars/midori-findbar.c:327 msgid "Match Case" -msgstr "区分大小写" +msgstr "匹配大小写" -#: ../toolbars/midori-findbar.c:252 +#: ../toolbars/midori-findbar.c:336 msgid "Highlight Matches" -msgstr "高亮显示匹配" +msgstr "突出显示匹配者" -#: ../toolbars/midori-findbar.c:263 +#: ../toolbars/midori-findbar.c:347 msgid "Close Findbar" msgstr "关闭查找栏" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "已下载 %s，共 %s" - -#: ../toolbars/midori-transferbar.c:123 +#: ../toolbars/midori-transferbar.c:122 #, c-format msgid "The file '%s' has been downloaded." -msgstr "文件 '%s' 已下载。" +msgstr "文件 ‘%s’ 已经下载。" -#: ../toolbars/midori-transferbar.c:126 +#: ../toolbars/midori-transferbar.c:125 msgid "Transfer completed" -msgstr "下载完成" +msgstr "传输已完成" + +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "已下载的文件不正确。" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +#: ../toolbars/midori-transferbar.c:194 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "与链接提供的校验值不匹配。这意味着此文件可能未完整下载或后来被修改过。" + +#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141 msgid "Clear All" -msgstr "清除所有项目" +msgstr "全部清除" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373 msgid "Some files are being downloaded" -msgstr "有文件下载正在进行中" +msgstr "有些文件正在下载" -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:377 msgid "_Quit Midori" msgstr "退出 Midori(_Q)" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:379 msgid "The transfers will be cancelled if Midori quits." -msgstr "如果退出 Midori，正在执行的下载将会被取消。" +msgstr "如果退出 Midori 则取消传输。" -#: ../panels/midori-bookmarks.c:109 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "书签" -#: ../panels/midori-bookmarks.c:245 +#: ../panels/midori-bookmarks.c:257 #, c-format msgid "Failed to add bookmark item: %s\n" -msgstr "添加书签项失败: %s\n" +msgstr "无法添加书签项目：%s\n" -#: ../panels/midori-bookmarks.c:426 +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" msgstr "编辑选中的书签" -#: ../panels/midori-bookmarks.c:434 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" msgstr "删除选中的书签" -#: ../panels/midori-bookmarks.c:448 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" -msgstr "添加新书签目录" +msgstr "添加新文件夹" -#: ../panels/midori-bookmarks.c:582 +#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633 msgid "Separator" msgstr "分隔符" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "控制台" - -#: ../panels/midori-console.c:361 -msgid "Copy _All" -msgstr "复制全部内容(_A)" - -#: ../panels/midori-console.c:362 -msgid "Copy All" -msgstr "复制全部内容" - -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "扩展" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "历史" -#: ../panels/midori-history.c:273 -msgid "Erroneous clock time" -msgstr "错误的时钟时间" - -#: ../panels/midori-history.c:274 -msgid "The clock time lies in the past. Please check the current date and time." -msgstr "时钟时间滞后，请检查当前的日期和时间。" +#: ../panels/midori-history.c:158 ../panels/midori-history.c:189 +msgid "Today" +msgstr "今天" -#: ../panels/midori-history.c:286 -msgid "A week ago" -msgstr "一周以前" +#: ../panels/midori-history.c:160 ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "昨天" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:186 #, c-format msgid "%d day ago" msgid_plural "%d days ago" -msgstr[0] "%d 天以前" - -#: ../panels/midori-history.c:291 -msgid "Today" -msgstr "今天" +msgstr[0] "%d 天前" -#: ../panels/midori-history.c:293 -msgid "Yesterday" -msgstr "昨天" +#: ../panels/midori-history.c:165 ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "一周前" -#: ../panels/midori-history.c:370 +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" -msgstr "确认删除所有的历史项？" +msgstr "您确定要移除所有历史项目吗？" -#: ../panels/midori-history.c:444 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" -msgstr "将选中的历史项加入书签" +msgstr "将选中的历史项目加入书签" -#: ../panels/midori-history.c:453 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" -msgstr "删除选中的历史项" +msgstr "删除选中的历史项目" -#: ../panels/midori-history.c:461 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" -msgstr "清空全部历史" +msgstr "清除全部历史" -#: ../panels/midori-history.c:943 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "过滤器(_F):" +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "传输" -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:469 msgid "Open Destination _Folder" -msgstr "打开保存文件目录(_F)" +msgstr "打开目的地文件夹(_F)" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:472 msgid "Copy Link Loc_ation" -msgstr "复制链接地址(_A)" +msgstr "复制链接位置(_A)" -#: ../katze/katze-http-auth.c:214 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" msgstr "需要认证" -#: ../katze/katze-http-auth.c:230 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" msgstr "" -"需要输入用户名和密码\n" -"以打开此位置:" +"需要用户名和密码\n" +"来打开此位置：" -#: ../katze/katze-http-auth.c:244 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "用户名" -#: ../katze/katze-http-auth.c:257 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "密码" -#: ../katze/katze-http-auth.c:272 +#: ../katze/katze-http-auth.c:267 msgid "_Remember password" -msgstr "保存密码(_R)" +msgstr "记住密码(_R)" -#: ../katze/katze-throbber.c:882 +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "图标 '%s' 无法加载" +msgstr "未能载入已命名图标 ‘%s’" -#: ../katze/katze-throbber.c:895 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "库存图标 '%s' 无法加载" +msgstr "未能载入备用图标 ‘%s’" -#: ../katze/katze-throbber.c:963 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" msgstr "动画帧损坏" -#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879 #, c-format msgid "Property '%s' is invalid for %s" -msgstr "属性 '%s' 在 '%s' 中无效" +msgstr "属性 ‘%s’ 对 ‘%s’ 无效" -#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520 +#: ../extensions/addons.c:308 msgid "Choose file" -msgstr "选择文件" +msgstr "挑选文件" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:506 msgid "Choose folder" -msgstr "选择目录" +msgstr "挑选文件夹" -#: ../katze/katze-preferences.c:95 +#: ../katze/katze-utils.c:610 +msgid "None" +msgstr "无" + +#: ../katze/katze-utils.c:725 +msgid "1 hour" +msgstr "一小时" + +#: ../katze/katze-utils.c:726 +msgid "1 day" +msgstr "一天" + +#: ../katze/katze-utils.c:727 +msgid "1 week" +msgstr "一周" + +#: ../katze/katze-utils.c:728 +msgid "1 month" +msgstr "一月" + +#: ../katze/katze-utils.c:729 +msgid "1 year" +msgstr "一年" + +#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235 #, c-format msgid "Preferences for %s" -msgstr "%s 的首选项" +msgstr "%s 首选项" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:473 msgid "Configure Advertisement filters" -msgstr "设置广告过滤器" +msgstr "配置广告过滤器" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:504 #, 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:587 -msgid "Configure _Advertisement filters..." -msgstr "设置广告过滤器(_A)..." +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:841 +#: ../extensions/adblock.c:882 msgid "Edit rule" msgstr "编辑规则" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:896 msgid "_Rule:" -msgstr "规则(_R):" +msgstr "规则(_R)：" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:950 msgid "Bl_ock image" -msgstr "屏蔽图像(_O)" +msgstr "屏蔽图片(_O)" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:955 msgid "Bl_ock link" msgstr "屏蔽链接(_O)" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1670 msgid "Advertisement blocker" -msgstr "广告拦截器" +msgstr "广告屏蔽器" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1671 msgid "Block advertisements according to a filter list" -msgstr "使用过滤列表拦截广告" +msgstr "按过滤器列表屏蔽广告" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "复制 %s 至文件夹 %s。" +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "此页面看来包含一个用户脚本。您想安装它吗？" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "安装用户脚本(_I)" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "此页面看来包含一个用户样式。您想安装它吗？" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "安装用户样式(_I)" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "不安装" -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:319 ../extensions/addons.c:681 msgid "Userscripts" msgstr "用户脚本" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:324 ../extensions/addons.c:683 msgid "Userstyles" msgstr "用户样式" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:380 ../extensions/addons.c:459 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "错误" + +#: ../extensions/addons.c:421 #, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "扩展 '%s' 的配置无法保存: %s\n" +msgid "Do you want to delete '%s'?" +msgstr "您要删除 ‘%s’ 吗？" + +#: ../extensions/addons.c:427 +msgid "Delete user script" +msgstr "删除用户脚本" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:428 +msgid "Delete user style" +msgstr "删除用户样式" + +#: ../extensions/addons.c:431 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "将永远删除 %s 文件。" + +#: ../extensions/addons.c:570 ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "在文本编辑器中打开" + +#: ../extensions/addons.c:572 ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "打开目标文件夹" + +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "添加新插件" + +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "移除选中的插件" + +#: ../extensions/addons.c:1696 ../extensions/addons.c:1914 msgid "User addons" msgstr "用户插件" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1826 #, c-format msgid "Can't monitor folder '%s': %s" -msgstr "无法监视 “%s” 目录：%s" +msgstr "未能监视 ‘%s’ 文件夹：%s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1915 msgid "Support for userscripts and userstyles" -msgstr "支持用户自定义脚本及样式" +msgstr "支持用户脚本和用户样式" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:201 msgid "Colorful Tabs" -msgstr "多彩标签" +msgstr "彩色标签" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:202 msgid "Tint each tab distinctly" msgstr "用不同颜色区分标签" -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 msgid "Cookie Manager" -msgstr "Cookie 管理器" +msgstr "隐私信息管理器" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:103 msgid "Delete All" -msgstr "删除所有" +msgstr "全部删除" -#: ../extensions/cookie-manager/cookie-manager-page.c:114 -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:105 +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:129 +#: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" -msgstr "展开所有项目" +msgstr "全部展开" -#: ../extensions/cookie-manager/cookie-manager-page.c:136 +#: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" -msgstr "折叠所有项目" +msgstr "全部折叠" -#: ../extensions/cookie-manager/cookie-manager-page.c:578 +#: ../extensions/cookie-manager/cookie-manager-page.c:572 msgid "Do you really want to delete all cookies?" -msgstr "确认删除所有的 Cookie？" +msgstr "您真的要删除所有隐私信息吗？" -#: ../extensions/cookie-manager/cookie-manager-page.c:580 +#: ../extensions/cookie-manager/cookie-manager-page.c:574 msgid "Question" msgstr "问题" -#: ../extensions/cookie-manager/cookie-manager-page.c:589 +#: ../extensions/cookie-manager/cookie-manager-page.c:583 msgid "Only cookies which match the filter will be deleted." -msgstr "只删除匹配过滤字符串的 Cookies" +msgstr "只删除与此过滤器匹配的隐私信息。" -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:671 msgid "At the end of the session" msgstr "在会话结束时" -#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#: ../extensions/cookie-manager/cookie-manager-page.c:674 #, c-format msgid "" "Host: %s\n" @@ -2415,329 +2446,395 @@ "Secure: %s\n" "Expires: %s" msgstr "" -"主机: %s\n" -"名称: %s\n" -"值: %s\n" -"路径: %s\n" -"安全: %s\n" -"有效期: %s" +"主机：%s\n" +"名称：%s\n" +"值：%s\n" +"路径：%s\n" +"安全：%s\n" +"有效期：%s" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "Yes" msgstr "是" -#: ../extensions/cookie-manager/cookie-manager-page.c:686 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "No" msgstr "否" -#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#: ../extensions/cookie-manager/cookie-manager-page.c:694 #, c-format msgid "" "Domain: %s\n" "Cookies: %d" msgstr "" -"域: %s\n" -"Cookies: %d" +"域：%s\n" +"隐私信息：%d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 msgid "Name" msgstr "名称" -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 msgid "_Expand All" -msgstr "展开所有项目(_E)" +msgstr "全部展开(_E)" -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 msgid "_Collapse All" -msgstr "折叠所有项目(_C)" +msgstr "全部折叠(_C)" -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "输入过滤字符串以只显示名称或主机名相符的 Cookies" +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +msgid "Filter:" +msgstr "过滤器：" -#: ../extensions/cookie-manager/main.c:40 -msgid "_Cookie Manager" -msgstr "Cookie 管理器(_C)" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "输入过滤器字符串以便只显示与输入的过滤器名称或域区域匹配的隐私信息" -#: ../extensions/cookie-manager/main.c:57 +#: ../extensions/cookie-manager/main.c:36 msgid "List, view and delete cookies" -msgstr "列出、查看和删除 Cookies" +msgstr "列出、查看和删除隐私信息" -#: ../extensions/copy-tabs.c:39 +#: ../extensions/copy-tabs.c:38 msgid "Copy Tab _Addresses" msgstr "复制标签地址(_A)" -#: ../extensions/copy-tabs.c:98 +#: ../extensions/copy-tabs.c:95 msgid "Copy Addresses of Tabs" -msgstr "复制标签地址" +msgstr "复制标签的地址" -#: ../extensions/copy-tabs.c:99 +#: ../extensions/copy-tabs.c:96 msgid "Copy the addresses of all tabs to the clipboard" -msgstr "复制所有标签中的地址至剪贴板" +msgstr "将所有标签的地址复制至剪贴板" #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "查找必须的 XML 数据中的 Atom \"entry\" 元素失败。" +msgstr "无法在 XML 数据中查找所需的 Atom “条目” 元素。" #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "查找必需的 XML 数据中的 Atom \"feed\" 元素失败。" +msgstr "无法在 XML 数据中查找所需的 Atom “源” 元素。" #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:387 #, c-format msgctxt "Feed" msgid "Last updated: %s." -msgstr "最后更新: %s。" +msgstr "最后更新：%s。" -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:653 msgid "Feeds" -msgstr "订阅" +msgstr "源" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:706 msgid "Add new feed" -msgstr "添加新订阅" +msgstr "添加新源" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Delete feed" -msgstr "删除所有订阅" +msgstr "删除源" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:795 msgid "_Feeds" -msgstr "订阅(_F)" +msgstr "源(_F)" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." -msgstr "查找订阅的 XML 数据根元素失败。" +msgstr "无法在源 XML 数据中查找根元素。" -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." -msgstr "不支持的订阅格式。" +msgstr "不支持的源格式。" -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" -msgstr "解析 XML 订阅失败: %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 数据中查找 “频道” 元素。" #: ../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 “项目” 元素。" #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "查找必需的 XML 数据中的 RSS \"channel\" 元素失败。" - -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "错误" +msgstr "无法在 XML 数据中查找所需的 RSS “频道” 元素。" #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" -msgstr "订阅 '%s' 已经存在" +msgstr "源 ‘%s’ 已经存在" #: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" -msgstr "加载订阅 '%s' 出错" +msgstr "载入源 ‘%s’ 时出错" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" -msgstr "订阅面板" +msgstr "源面板" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" -msgstr "阅读 Atom 及 RSS 订阅" +msgstr "阅读 Atom/RSS 源" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory/formhistory.c:39 #, c-format msgid "Failed to add form value: %s\n" -msgstr "添加表格值失败: %s\n" +msgstr "无法添加表单值：%s\n" -#: ../extensions/formhistory.c:510 -msgid "Stores history of entered form data" -msgstr "保存表格输入历史" +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "表单历史" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"需要主密码来\n" +"打开密码数据库：" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "记住此页的密码？" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "记住" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "现在不" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "对此页从不" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "切换表单历史状态" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "为当前标签激活或停用表单历史。" + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 #, c-format -msgid "Not available: %s" -msgstr "%s 不可用" +msgid "Failed to execute database statement: %s\n" +msgstr "无法执行数据库语句：%s\n" -#: ../extensions/formhistory.c:515 -msgid "Resource files not installed" -msgstr "资源文件没有安装" +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "在每个标签上通过热键(Ctrl + Shift + F)只激活表单历史" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory/formhistory.c:668 msgid "Form history filler" -msgstr "表格历史过滤器" +msgstr "表单历史填写器" + +#: ../extensions/formhistory/formhistory.c:669 +msgid "Stores history of entered form data" +msgstr "存储已输入的表单数据历史" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#, c-format +msgid "Failed to select suggestions\n" +msgstr "无法选择建议\n" + +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "没有未浏览的标签" + +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "历史列表" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "标签关闭行为" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "不做" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "切换至上次查看的标签" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "切换至最新标签" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "下一新标签(历史列表)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "历史中的下一新标签" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "上一新标签(历史列表)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "历史中的上一新标签" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "在后台显示标签(历史列表)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "在后台显示当前选中的标签" + +#: ../extensions/history-list.vala:569 +msgid "History List" +msgstr "历史列表" + +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "切换或关闭标签时移动至上次使用的标签" + +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "鼠标手势" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" -msgstr "用鼠标移动控制 Midori" +msgstr "通过移动鼠标控制 Midori" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 -msgid "Pageholder" -msgstr "常驻页面" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "常驻页面(_P)" - -#: ../extensions/page-holder.c:178 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "保持标签中的一个或多个页面同时打开" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "重载页面或停止载入" -#: ../extensions/shortcuts.c:170 +#: ../extensions/shortcuts.c:176 msgid "Customize Keyboard shortcuts" -msgstr "定制快捷键" +msgstr "自定义键盘快捷键" -#: ../extensions/shortcuts.c:276 +#: ../extensions/shortcuts.c:283 msgid "Customize Sh_ortcuts..." -msgstr "定制快捷键(_O)..." +msgstr "自定义快捷键(_O)..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:320 msgid "Shortcuts" msgstr "快捷键" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:321 msgid "View and edit keyboard shortcuts" -msgstr "查看和编辑快捷键" +msgstr "查看和编辑键盘快捷键" -#: ../extensions/status-clock.c:176 +#: ../extensions/status-clock.c:174 msgid "Statusbar Clock" msgstr "状态栏时钟" -#: ../extensions/status-clock.c:177 +#: ../extensions/status-clock.c:175 msgid "Display date and time in the statusbar" -msgstr "在状态栏显示日期和时间" +msgstr "在状态栏中显示日期和时间" -#: ../extensions/statusbar-features.c:84 +#: ../extensions/statusbar-features.c:131 msgid "Images" -msgstr "图像" +msgstr "图片" -#: ../extensions/statusbar-features.c:96 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" msgstr "脚本" -#: ../extensions/statusbar-features.c:108 +#: ../extensions/statusbar-features.c:151 msgid "Netscape plugins" msgstr "Netscape 插件" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:199 msgid "Statusbar Features" -msgstr "状态栏特性" +msgstr "状态栏功能" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:200 msgid "Easily toggle features on web pages on and off" -msgstr "方便地打开/关闭网页中的特性" +msgstr "方便地打开或关闭网页中的功能" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "标签面板" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "标签面板(_A)" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" -msgstr "在垂直面板里显示标签" - -#: ../extensions/tab-switcher.c:402 -msgid "Tab History List" -msgstr "标签页历史列表" +msgstr "在竖直面板里显示标签" -#: ../extensions/tab-switcher.c:403 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "允许从上次打开顺序排序的列表中切换标签页" +#: ../extensions/tabs-minimized.c:76 +msgid "Only Icons on Tabs by default" +msgstr "默认仅标签上的图标" -#: ../extensions/tabs-minimized.c:79 -msgid "Minimize new Tabs" -msgstr "最小化新是打开标签" +#: ../extensions/tabs-minimized.c:77 +msgid "New tabs have no label by default" +msgstr "新标签默认没有标记" -#: ../extensions/tabs-minimized.c:80 -msgid "New tabs open minimized" -msgstr "新标签以最小化方式打开" - -#: ../extensions/toolbar-editor.c:389 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" -msgstr "定制工具栏" +msgstr "自定义工具栏" -#: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "选择在工具栏上显示的项目，可以拖动各项调整显示顺序。" +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "选择要在工具栏上显示的项目。可以拖放各项目调整顺序。" -#: ../extensions/toolbar-editor.c:421 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" -msgstr "可用的项目" +msgstr "可用项目" -#: ../extensions/toolbar-editor.c:442 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" -msgstr "显示的项目" +msgstr "已显示的项目" -#: ../extensions/toolbar-editor.c:577 +#: ../extensions/toolbar-editor.c:581 msgid "Customize _Toolbar..." -msgstr "定制工具栏(_T)" +msgstr "自定义工具栏(_T)..." + +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "自定义(_C)..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:627 msgid "Toolbar Editor" msgstr "工具栏编辑器" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:628 msgid "Easily edit the toolbar layout" -msgstr "轻松编辑工具栏布局" +msgstr "轻松地编辑工具栏布局" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "在磁盘上缓存 HTTP 通讯" -#~ msgid "Set number of shortcuts" -#~ msgstr "设置快捷方式数目" - -#~ msgid "Enter number of shortcuts:" -#~ msgstr "输入快捷方式数:" - -#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "复制用户脚本到 %s 目录，用户样式到 %s 目录。" - -#~ msgid "REGEX" -#~ msgstr "REGEX" - -#~ msgid "Open _Link" -#~ msgstr "打开链接(_L)" - -#~ msgid "Open Image in New Wi_ndow" -#~ msgstr "在新窗口中打开图像(_N)" - -#~ msgid "Failed to get current time: %s\n" -#~ msgstr "获取当前时间失败: %s\n" - -#~ msgid "Not available on this platform" -#~ msgstr "在此平台上不可用" +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "指定的配置文件夹无效。" -#~ msgid "Show panel _titles" -#~ msgstr "显示面板标题(_T)" +#~ msgid "Cookies" +#~ msgstr "隐私信息" -#~ msgid "Options" -#~ msgstr "选项" +#~ msgid "'Flash' Cookies" +#~ msgstr "‘动画’隐私信息" -#~ msgid "DNS prefetching" -#~ msgstr "DNS 预获取" +#~ msgid "HTML5 _Databases" +#~ msgstr "HTML5 数据库(_D)" -#~ msgid "Prefetch IP addresses of hovered links" -#~ msgstr "当鼠标停留在链接上时预先获取 IP 地址" +#~ msgid "Offline Application Cache" +#~ msgstr "离线应用程序缓存" diff -Nru midori-0.2.8/po/zh_TW.po midori-0.4.6/po/zh_TW.po --- midori-0.2.8/po/zh_TW.po 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/po/zh_TW.po 2012-05-14 22:13:42.000000000 +0000 @@ -2,1515 +2,2240 @@ # Copyright (C) 2009 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Wei-Lun Chao , 2009. +# Cheng-Chia Tseng , 2010. # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.4\n" +"Project-Id-Version: midori master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-22 19:30+0100\n" -"PO-Revision-Date: 2009-03-06 15:33+0800\n" -"Last-Translator: Wei-Lun Chao \n" -"Language-Team: Chinese (traditional) \n" +"POT-Creation-Date: 2012-03-21 08:42+0000\n" +"PO-Revision-Date: 2012-03-21 22:17+0800\n" +"Last-Translator: Cheng-Chia Tseng \n" +"Language-Team: chinese-l10n \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Midori 輕量網頁瀏覽器" +msgid "Browse the Web" +msgstr "瀏覽網頁" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1599 ../midori/main.c:1705 -#: ../midori/main.c:1714 ../midori/main.c:1725 -#: ../midori/midori-websettings.c:265 -msgid "Midori" -msgstr "綠網頁瀏覽器" +#: ../data/midori.desktop.in.h:2 +msgid "Internet;WWW;Explorer" +msgstr "Internet;WWW;Explorer" #: ../data/midori.desktop.in.h:3 +#: ../midori/main.c:1989 +#: ../midori/main.c:2009 +#: ../midori/main.c:2023 +#: ../midori/midori-websettings.c:308 +msgid "Midori" +msgstr "Midori" + +#: ../data/midori.desktop.in.h:4 msgid "Web Browser" msgstr "網頁瀏覽器" -#: ../midori/main.c:106 +#: ../data/midori-private.desktop.in.h:1 +msgid "Midori Private Browsing" +msgstr "Midori 私密瀏覽" + +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "開啟新的私密瀏覽視窗" + +#: ../data/midori-private.desktop.in.h:3 +#: ../midori/midori-view.c:4114 +msgid "Private Browsing" +msgstr "私密瀏覽" + +#: ../midori/main.c:96 +#: ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "無法載入組態：%s\n" -#: ../midori/main.c:161 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "「%s」值對於 %s 無效" -#: ../midori/main.c:168 ../midori/main.c:238 +#: ../midori/main.c:155 +#: ../midori/main.c:259 #, c-format msgid "Invalid configuration value '%s'" msgstr "無效的組態值「%s」" -#: ../midori/main.c:480 -msgid "File not found." -msgstr "找不到檔案。" +#: ../midori/main.c:364 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "無法載入搜尋引擎。%s\n" -#: ../midori/main.c:488 ../midori/main.c:497 -msgid "Malformed document." -msgstr "異常文件。" +#: ../midori/main.c:418 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "清空歷史時失敗：%s\n" -#: ../midori/main.c:519 +#: ../midori/main.c:438 +#: ../midori/main.c:562 +#: ../extensions/formhistory/formhistory.c:531 #, c-format msgid "Failed to open database: %s\n" msgstr "開啟資料庫時失敗：%s\n" -#: ../midori/main.c:551 +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:505 #, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "執行資料庫敘述時失敗：%s\n" +msgid "Failed to remove old history items: %s\n" +msgstr "移除舊的歷史項目時失敗：%s\n" -#: ../midori/main.c:605 +#: ../midori/main.c:545 +#: ../panels/midori-history.c:232 #, c-format msgid "Failed to remove history item: %s\n" msgstr "移除歷史項目時失敗：%s\n" -#: ../midori/main.c:629 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "清空歷史時失敗：%s\n" - -#: ../midori/main.c:652 ../midori/main.c:686 ../midori/main.c:702 -#, 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:882 +#: ../midori/main.c:592 #, c-format -msgid "Failed to remove old history items: %s\n" -msgstr "移除舊的歷史項目時失敗：%s\n" +msgid "The bookmarks couldn't be saved. %s" +msgstr "無法儲存書籤。%s" -#: ../midori/main.c:910 +#: ../midori/main.c:614 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "無法儲存組態。%s" -#: ../midori/main.c:939 +#: ../midori/main.c:649 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "無法儲存搜尋引擎。%s" -#: ../midori/main.c:1069 ../midori/sokoke.c:580 -#, c-format -msgid "Writing failed." -msgstr "寫入失敗。" - -#: ../midori/main.c:1090 ../midori/main.c:1117 ../midori/main.c:1145 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "無法儲存書籤。%s" - #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1169 ../midori/main.c:1193 +#: ../midori/main.c:686 #, c-format msgid "The trash couldn't be saved. %s" msgstr "無法儲存回收筒。%s" -#: ../midori/main.c:1224 ../midori/midori-preferences.c:404 -msgid "Transfers" -msgstr "傳送" +#: ../midori/main.c:727 +#: ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "擴充功能" + +#: ../midori/main.c:741 +msgid "Privacy" +msgstr "隱私" + +#: ../midori/main.c:753 +msgid "Cookies store login data, saved games, or user profiles for advertisement purposes." +msgstr "訊餅用來儲藏登入資料、儲存的遊戲，或為廣告目的採集使用者個人資料。" -#: ../midori/main.c:1265 +#: ../midori/main.c:809 #, c-format msgid "The session couldn't be saved. %s" msgstr "無法儲存執行階段。%s" -#: ../midori/main.c:1401 -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:1027 +msgid "No root certificate file is available. SSL certificates cannot be verified." +msgstr "沒有可用的根憑證。SSL 憑證無法通過驗證。" + +#: ../midori/main.c:1096 +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:1416 +#: ../midori/main.c:1115 msgid "Modify _preferences" msgstr "修改偏好設定(_P)" -#: ../midori/main.c:1420 -msgid "Reset the last _session" -msgstr "重置上次執行階段(_S)" - -#: ../midori/main.c:1425 +#: ../midori/main.c:1119 msgid "Disable all _extensions" msgstr "停用所有擴充功能(_E)" -#: ../midori/main.c:1599 -msgid "No filename specified" -msgstr "未指定任何檔名" - -#: ../midori/main.c:1631 ../midori/gjs.c:514 -msgid "An unknown error occured." -msgstr "發生不明錯誤。" +#: ../midori/main.c:1132 +msgid "Discard old tabs" +msgstr "丟棄舊分頁" + +#: ../midori/main.c:1133 +#: ../midori/midori-websettings.c:217 +msgid "Show last tabs without loading" +msgstr "顯示上次的分頁但不要載入" + +#: ../midori/main.c:1134 +#: ../midori/midori-websettings.c:216 +msgid "Show last open tabs" +msgstr "顯示最近開啟的分頁" + +#: ../midori/main.c:1342 +#: ../midori/main.c:2400 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "無法載入執行階段：%s\n" + +#: ../midori/main.c:1480 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "快照已儲存至：%s\n" + +#: ../midori/main.c:1892 +msgid "Run ADDRESS as a web application" +msgstr "將 ADDRESS 作為網頁應用程式執行" + +#: ../midori/main.c:1892 +msgid "ADDRESS" +msgstr "ADDRESS" + +#: ../midori/main.c:1895 +msgid "Use FOLDER as configuration folder" +msgstr "使用 FOLDER 作為組態資料夾" -#: ../midori/main.c:1654 +#: ../midori/main.c:1895 +msgid "FOLDER" +msgstr "FOLDER" + +#: ../midori/main.c:1898 +msgid "Private browsing, no changes are saved" +msgstr "私密瀏覽，不會儲存任何更動" + +#: ../midori/main.c:1900 +msgid "Show a diagnostic dialog" +msgstr "顯示診斷對話窗" + +#: ../midori/main.c:1902 msgid "Run the specified filename as javascript" msgstr "將指定檔名當做 javascript 來執行" -#: ../midori/main.c:1656 +#: ../midori/main.c:1904 +msgid "Take a snapshot of the specified URI" +msgstr "拍攝指定 URI 的快照" + +#: ../midori/main.c:1906 +msgid "Execute the specified command" +msgstr "執行指定的指令" + +#: ../midori/main.c:1908 +msgid "List available commands to execute with -e/ --execute" +msgstr "列出可透過 -e/ --execute 執行的指令" + +#: ../midori/main.c:1910 msgid "Display program version" msgstr "顯示程式版本" -#: ../midori/main.c:1658 +#: ../midori/main.c:1912 msgid "Addresses" msgstr "位址" -#: ../midori/main.c:1702 +#: ../midori/main.c:1914 +msgid "Block URIs according to regular expression PATTERN" +msgstr "根據常規表示式 PATTERN 封鎖 URI" + +#: ../midori/main.c:1914 +msgid "PATTERN" +msgstr "PATTERN" + +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:1918 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "在 SECONDS 秒不活動後重設 Midori" + +#: ../midori/main.c:1918 +msgid "SECONDS" +msgstr "SECONDS" + +#: ../midori/main.c:1921 +msgid "Redirects console warnings to the specified FILENAME" +msgstr "將主控臺警告重新導向至指定的 FILENAME" + +#: ../midori/main.c:1921 +msgid "FILENAME" +msgstr "FILENAME" + +#: ../midori/main.c:1986 msgid "[Addresses]" msgstr "[位址]" -#: ../midori/main.c:1726 +#: ../midori/main.c:1996 +msgid "The specified configuration folder is invalid." +msgstr "指定的組態資料夾無效。" + +#: ../midori/main.c:2024 msgid "Please report comments, suggestions and bugs to:" msgstr "請回報意見、建議和錯誤給：" -#: ../midori/main.c:1728 +#: ../midori/main.c:2026 msgid "Check for new versions at:" msgstr "檢查看看新版本於：" -#: ../midori/main.c:1755 -msgid "An instance of Midori is already running but not responding.\n" -msgstr "一份 Midori 已經在執行中卻無反應。\n" +#. i18n: Logins and passwords in websites and web forms +#: ../midori/main.c:2110 +msgid "Saved logins and _passwords" +msgstr "儲存登入名稱與密碼(_P)" + +#: ../midori/main.c:2112 +msgid "Cookies and Website data" +msgstr "訊餅與網站資料" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/main.c:2116 +#: ../midori/midori-websettings.c:985 +#: ../extensions/web-cache.c:462 +#: ../extensions/web-cache.c:471 +msgid "Web Cache" +msgstr "網頁快取" + +#: ../midori/main.c:2119 +msgid "Website icons" +msgstr "網站圖示" + +#: ../midori/main.c:2225 +msgid "An unknown error occured" +msgstr "遭遇未知錯誤" -#: ../midori/main.c:1823 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "無法載入搜尋引擎。%s\n" +#: ../midori/main.c:2331 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Midori 的實體已經在執行中但沒有回應。\n" -#: ../midori/main.c:1835 +#: ../midori/main.c:2367 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "無法載入書籤：%s\n" -#: ../midori/main.c:1850 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "無法載入執行階段：%s\n" - -#: ../midori/main.c:1863 +#: ../midori/main.c:2415 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "無法載入回收筒：%s\n" -#: ../midori/main.c:1876 +#: ../midori/main.c:2428 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "無法載入歷史：%s\n" -#: ../midori/main.c:1888 +#: ../midori/main.c:2444 msgid "The following errors occured:" msgstr "發生下列錯誤：" -#: ../midori/main.c:1904 +#: ../midori/main.c:2460 msgid "_Ignore" msgstr "忽略(_I)" -#: ../midori/midori-browser.c:259 ../midori/midori-browser.c:2925 -#: ../midori/midori-browser.c:2931 +#: ../midori/midori-app.c:1334 +msgid "_Bookmark" +msgstr "書籤(_B)" + +#: ../midori/midori-app.c:1335 +#: ../midori/midori-browser.c:6038 +msgid "_Bookmarks" +msgstr "書籤(_B)" + +#: ../midori/midori-app.c:1336 +msgid "Add Boo_kmark" +msgstr "加入書籤(_K)" + +#: ../midori/midori-app.c:1337 +msgid "_Console" +msgstr "主控臺(_C)" + +#: ../midori/midori-app.c:1338 +msgid "_Extensions" +msgstr "擴充功能(_E)" + +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1339 +#: ../midori/midori-browser.c:4566 +msgid "_History" +msgstr "歷史(_H)" + +#: ../midori/midori-app.c:1340 +msgid "_Homepage" +msgstr "首頁(_H)" + +#: ../midori/midori-app.c:1341 +msgid "_Userscripts" +msgstr "使用者指令稿(_U)" + +#: ../midori/midori-app.c:1342 +msgid "New _Tab" +msgstr "新分頁(_T)" + +#: ../midori/midori-app.c:1343 +msgid "_Transfers" +msgstr "傳輸(_T)" + +#: ../midori/midori-app.c:1344 +msgid "Netscape p_lugins" +msgstr "Netscape 外掛程式(_L)" + +#: ../midori/midori-app.c:1345 +msgid "_Closed Tabs" +msgstr "關閉的分頁(_C)" + +#: ../midori/midori-app.c:1346 +#: ../midori/midori-browser.c:5194 +msgid "New _Window" +msgstr "開新視窗(_W)" + +#: ../midori/midori-app.c:1347 +msgid "New _Folder" +msgstr "新資料夾(_F)" + +#: ../midori/midori-array.c:522 +msgid "File not found." +msgstr "找不到檔案。" + +#: ../midori/midori-array.c:547 +#: ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 +#: ../midori/midori-array.c:619 +msgid "Malformed document." +msgstr "異常文件。" + +#: ../midori/midori-array.c:628 +msgid "Unrecognized bookmark format." +msgstr "無法辨識的書籤格式。" + +#: ../midori/midori-array.c:915 +msgid "Writing failed." +msgstr "寫入失敗。" + +#: ../midori/midori-browser.c:331 +#: ../midori/midori-browser.c:5276 +#: ../midori/midori-browser.c:5285 msgid "Reload the current page" msgstr "重新載入目前頁面" -#: ../midori/midori-browser.c:271 ../midori/midori-browser.c:2928 +#: ../midori/midori-browser.c:340 +#: ../midori/midori-browser.c:5282 msgid "Stop loading the current page" msgstr "停止載入目前頁面" -#: ../midori/midori-browser.c:333 +#: ../midori/midori-browser.c:476 #, c-format -msgid "%d%% loaded" -msgstr "%d%% 已載入" +msgid "Failed to update title: %s\n" +msgstr "更新標題失敗：%s\n" -#: ../midori/midori-browser.c:358 +#: ../midori/midori-browser.c:489 #, c-format msgid "Unexpected action '%s'." msgstr "未預期的動作「%s」。" -#: ../midori/midori-browser.c:534 +#: ../midori/midori-browser.c:579 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (私密瀏覽)" + +#: ../midori/midori-browser.c:693 +#: ../midori/midori-browser.c:726 +msgid "Toplevel folder" +msgstr "最上層資料夾" + +#: ../midori/midori-browser.c:784 msgid "New folder" msgstr "新資料夾" -#: ../midori/midori-browser.c:534 +#: ../midori/midori-browser.c:784 msgid "Edit folder" msgstr "編輯資料夾" -#: ../midori/midori-browser.c:536 +#: ../midori/midori-browser.c:786 msgid "New bookmark" msgstr "新書籤" -#: ../midori/midori-browser.c:536 +#: ../midori/midori-browser.c:786 msgid "Edit bookmark" msgstr "編輯書籤" -#: ../midori/midori-browser.c:566 +#: ../midori/midori-browser.c:828 msgid "_Title:" msgstr "標題(_T)：" -#: ../midori/midori-browser.c:579 ../midori/midori-searchaction.c:855 -msgid "_Description:" -msgstr "描述(_D)：" - -#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:869 +#: ../midori/midori-browser.c:848 +#: ../midori/midori-searchaction.c:961 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "位址(_A)：" -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:871 +#: ../midori/midori-browser.c:4303 msgid "_Folder:" msgstr "資料夾(_F)：" -#: ../midori/midori-browser.c:621 ../midori/midori-browser.c:658 -msgid "Toplevel folder" -msgstr "最上層資料夾" +#: ../midori/midori-browser.c:887 +msgid "Add to _Speed Dial" +msgstr "加入至快速播號(_S)" + +#: ../midori/midori-browser.c:900 +msgid "Show in the tool_bar" +msgstr "顯示於工具列內(_B)" + +#: ../midori/midori-browser.c:915 +msgid "Run as _web application" +msgstr "以網頁應用程式執行(_W)" + +#: ../midori/midori-browser.c:986 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "標題「%s」無法儲存於此資料夾。" + +#: ../midori/midori-browser.c:988 +#, c-format +msgid "You don't have permission to write in this location." +msgstr "您尚未獲得寫入此位置的許可。" + +#: ../midori/midori-browser.c:995 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "沒有足夠的空間可以讓您下載「%s」。" + +#: ../midori/midori-browser.c:998 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "該檔案需要 %s，但僅剩 %s。" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:1036 +#: ../midori/midori-browser.c:4372 msgid "Save file as" msgstr "檔案另存為" -#: ../midori/midori-browser.c:1340 +#: ../midori/midori-browser.c:1330 +msgid "New Window" +msgstr "新增視窗" + +#: ../midori/midori-browser.c:1330 +msgid "A new window has been opened" +msgstr "新視窗已經開啟" + +#: ../midori/midori-browser.c:1333 +msgid "New Tab" +msgstr "新分頁" + +#: ../midori/midori-browser.c:1333 +msgid "A new tab has been opened" +msgstr "新分頁已經開啟" + +#: ../midori/midori-browser.c:1368 +msgid "Error opening the image!" +msgstr "開啟影像時發生錯誤！" + +#: ../midori/midori-browser.c:1369 +msgid "Can not open selected image in a default viewer." +msgstr "無法在預設檢視器中開啟所選的影像。" + +#: ../midori/midori-browser.c:1375 +msgid "Error downloading the image!" +msgstr "下載影像流時發生錯誤！" + +#: ../midori/midori-browser.c:1376 +msgid "Can not download selected image." +msgstr "無法下載所選的影像。" + +#: ../midori/midori-browser.c:1479 +msgid "Save file" +msgstr "儲存檔案" + +#: ../midori/midori-browser.c:2346 msgid "Open file" msgstr "開啟檔案" -#: ../midori/midori-browser.c:2530 ../panels/midori-bookmarks.c:754 -#: ../panels/midori-history.c:788 +#: ../midori/midori-browser.c:2478 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "" +"若要使用上方的 URI，請開啟新聞匯流器。通常都會有個名為「新聞訂閱」、「新聞 Feed」等類似的選單或按鈕。\n" +"或者前往 Midori 中「偏好設定」的「應用程式」內，並選取一個新聞匯流器。下一次您按下新聞饋流按鈕時，它就會被自動加入。" + +#: ../midori/midori-browser.c:2484 +#: ../extensions/feed-panel/main.c:365 +msgid "New feed" +msgstr "新饋流" + +#: ../midori/midori-browser.c:2527 +#: ../midori/midori-browser.c:5345 +#: ../panels/midori-bookmarks.c:427 +msgid "Add a new bookmark" +msgstr "加入新的書籤" + +#: ../midori/midori-browser.c:3026 +#: ../midori/midori-searchaction.c:488 +msgid "Empty" +msgstr "清空" + +#: ../midori/midori-browser.c:3446 +msgid "Toggle text cursor navigation" +msgstr "切換文字游標導覽" + +#: ../midori/midori-browser.c:3762 +#: ../midori/midori-browser.c:5731 +#, c-format +msgid "Failed to insert new history item: %s\n" +msgstr "無法插入新歷史項目：%s\n" + +#: ../midori/midori-browser.c:4091 +#: ../panels/midori-bookmarks.c:743 +#: ../panels/midori-history.c:801 +msgid "Open all in _Tabs" +msgstr "以分頁開啟全部(_T)" + +#: ../midori/midori-browser.c:4098 +#: ../panels/midori-bookmarks.c:749 +#: ../panels/midori-history.c:807 +#: ../extensions/feed-panel/feed-panel.c:528 msgid "Open in New _Tab" msgstr "在新分頁中開啟(_T)" -#: ../midori/midori-browser.c:2532 ../panels/midori-bookmarks.c:756 -#: ../panels/midori-history.c:790 +#: ../midori/midori-browser.c:4101 +#: ../midori/midori-view.c:2645 +#: ../midori/midori-view.c:4643 +#: ../panels/midori-bookmarks.c:751 +#: ../panels/midori-history.c:809 +#: ../extensions/feed-panel/feed-panel.c:530 msgid "Open in New _Window" msgstr "在新視窗中開啟(_W)" -#: ../midori/midori-browser.c:2674 +#: ../midori/midori-browser.c:4190 +msgid "Arora" +msgstr "Arora" + +#: ../midori/midori-browser.c:4191 +msgid "Kazehakase" +msgstr "Kazehakase" + +#: ../midori/midori-browser.c:4192 +msgid "Opera" +msgstr "Opera" + +#: ../midori/midori-browser.c:4193 +msgid "Konqueror" +msgstr "征服家" + +#: ../midori/midori-browser.c:4194 +msgid "Epiphany" +msgstr "Epiphany" + +#: ../midori/midori-browser.c:4195 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" + +#: ../midori/midori-browser.c:4216 +msgid "Import bookmarks..." +msgstr "匯入書籤..." + +#: ../midori/midori-browser.c:4219 +#: ../midori/midori-browser.c:5350 +msgid "_Import bookmarks" +msgstr "匯入書籤(_I)" + +#: ../midori/midori-browser.c:4230 +msgid "_Application:" +msgstr "應用程式(_A)：" + +#: ../midori/midori-browser.c:4295 +msgid "Import from XBEL or HTML file" +msgstr "從 XBEL 或 HTML 檔案匯入" + +#: ../midori/midori-browser.c:4330 +msgid "Import from a file" +msgstr "從檔案匯入" + +#: ../midori/midori-browser.c:4342 +msgid "Failed to import bookmarks" +msgstr "匯入書籤失敗" + +#: ../midori/midori-browser.c:4377 +msgid "XBEL Bookmarks" +msgstr "XBEL 書籤" + +#: ../midori/midori-browser.c:4382 +msgid "Netscape Bookmarks" +msgstr "Netscape 書籤" + +#: ../midori/midori-browser.c:4396 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "Midori 僅能匯出為 XBEL (*.xbel) 與 Netscape (*.html)" + +#: ../midori/midori-browser.c:4411 +msgid "Failed to export bookmarks" +msgstr "無法匯出書籤" + +#. i18n: Dialog: Clear Private Data, in the Tools menu +#: ../midori/midori-browser.c:4533 +msgid "Clear Private Data" +msgstr "清除隱私資料" + +#: ../midori/midori-browser.c:4537 +msgid "_Clear private data" +msgstr "清除隱私資料(_C)" + +#: ../midori/midori-browser.c:4550 +msgid "Clear the following data:" +msgstr "清除下列資料：" + +#: ../midori/midori-browser.c:4560 +msgid "Last open _tabs" +msgstr "上次開啟頁面(_T)" + +#: ../midori/midori-browser.c:4586 +msgid "Clear private data when _quitting Midori" +msgstr "當退出 Midori 時清除隱私資料(_Q)" + +#: ../midori/midori-browser.c:4781 msgid "A lightweight web browser." msgstr "輕量網頁瀏覽器。" -#: ../midori/midori-browser.c:2682 +#: ../midori/midori-browser.c:4782 +msgid "See about:version for version info." +msgstr "查看 about:version 來取得版本資訊。" + +#: ../midori/midori-browser.c:4784 +msgid "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." +msgstr "這個函式庫為自由軟體；基於 Free Software Foundation 所發布的 GNU Lesser General Public License 授權條款，不管是該條款的 2.1 版，或是 (您可自由選擇) 任意後續版本；您可以將它再次散布出去，與/或修改它。" + +#: ../midori/midori-browser.c:4805 msgid "translator-credits" -msgstr "趙惟倫 " +msgstr "" +"趙惟倫 , 2009.\n" +"曾政嘉 , 2010." -#: ../midori/midori-browser.c:2859 +#: ../midori/midori-browser.c:5192 msgid "_File" msgstr "檔案(_F)" -#: ../midori/midori-browser.c:2862 +#: ../midori/midori-browser.c:5195 msgid "Open a new window" msgstr "開啟新視窗" -#: ../midori/midori-browser.c:2865 +#: ../midori/midori-browser.c:5198 msgid "Open a new tab" msgstr "開啟新分頁" -#: ../midori/midori-browser.c:2868 +#: ../midori/midori-browser.c:5200 +msgid "New P_rivate Browsing Window" +msgstr "新增私人瀏覽視窗(_R)" + +#: ../midori/midori-browser.c:5204 msgid "Open a file" msgstr "開啟檔案" -#: ../midori/midori-browser.c:2871 +#: ../midori/midori-browser.c:5206 +msgid "_Save Page As..." +msgstr "另存網頁為(_S)..." + +#: ../midori/midori-browser.c:5207 msgid "Save to a file" msgstr "儲存到檔案" -#: ../midori/midori-browser.c:2873 +#: ../midori/midori-browser.c:5209 +msgid "Add to Speed _dial" +msgstr "加入快速播號(_D)" + +#: ../midori/midori-browser.c:5213 +msgid "Add Shortcut to the _desktop" +msgstr "將捷徑加入至桌面(_D)" + +#: ../midori/midori-browser.c:5215 +msgid "Create _Launcher" +msgstr "建立啟動器(_L)" + +#: ../midori/midori-browser.c:5219 +msgid "Subscribe to News _feed" +msgstr "訂閱新聞饋流(_F)" + +#: ../midori/midori-browser.c:5225 msgid "_Close Tab" msgstr "關閉分頁(_C)" -#: ../midori/midori-browser.c:2874 +#: ../midori/midori-browser.c:5226 msgid "Close the current tab" msgstr "關閉目前分頁" -#: ../midori/midori-browser.c:2876 +#: ../midori/midori-browser.c:5228 msgid "C_lose Window" msgstr "關閉視窗(_L)" -#: ../midori/midori-browser.c:2877 -msgid "Close this window" -msgstr "關閉這個視窗" - -#: ../midori/midori-browser.c:2880 +#: ../midori/midori-browser.c:5232 msgid "Print the current page" msgstr "列印目前頁面" -#: ../midori/midori-browser.c:2883 -msgid "Quit the application" -msgstr "退出應用程式" +#: ../midori/midori-browser.c:5234 +msgid "Close a_ll Windows" +msgstr "關閉所有視窗(_L)" -#: ../midori/midori-browser.c:2885 +#: ../midori/midori-browser.c:5237 msgid "_Edit" msgstr "編輯(_E)" -#: ../midori/midori-browser.c:2888 -msgid "Cut the selected text" -msgstr "剪下所選文字" - -#: ../midori/midori-browser.c:2891 ../midori/midori-browser.c:2894 -msgid "Copy the selected text" -msgstr "複製所選文字" - -#: ../midori/midori-browser.c:2897 -msgid "Paste text from the clipboard" -msgstr "從剪貼簿貼上文字" - -#: ../midori/midori-browser.c:2900 -msgid "Delete the selected text" -msgstr "刪除所選文字" - -#: ../midori/midori-browser.c:2903 -msgid "Select all text" -msgstr "選取所有文字" +#: ../midori/midori-browser.c:5260 +msgid "_Find..." +msgstr "尋找(_F)…" -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:5261 msgid "Find a word or phrase in the page" msgstr "在頁面中尋找字詞或片語" -#: ../midori/midori-browser.c:2908 +#: ../midori/midori-browser.c:5263 msgid "Find _Next" msgstr "找下一個(_N)" -#: ../midori/midori-browser.c:2909 -msgid "Find the next occurrence of a word or phrase" -msgstr "尋找下一個出現的字詞或片語" - -#: ../midori/midori-browser.c:2911 +#: ../midori/midori-browser.c:5266 msgid "Find _Previous" msgstr "找上一個(_P)" -#: ../midori/midori-browser.c:2912 -msgid "Find the previous occurrence of a word or phrase" -msgstr "尋找上一個出現的字詞或片語" - -#: ../midori/midori-browser.c:2915 -msgid "_Quick Find" -msgstr "快速尋找(_Q)" - -#: ../midori/midori-browser.c:2916 -msgid "Quickly jump to a word or phrase" -msgstr "快速跳到字詞或片語" - -#: ../midori/midori-browser.c:2919 +#: ../midori/midori-browser.c:5270 msgid "Configure the application preferences" msgstr "組配應用程式偏好設定" -#: ../midori/midori-browser.c:2921 +#: ../midori/midori-browser.c:5272 msgid "_View" msgstr "檢視(_V)" -#: ../midori/midori-browser.c:2922 +#: ../midori/midori-browser.c:5273 msgid "_Toolbars" msgstr "工具列(_T)" -#: ../midori/midori-browser.c:2934 +#: ../midori/midori-browser.c:5278 +msgid "Reload page without caching" +msgstr "重新載入頁面而不使用快取功能" + +#: ../midori/midori-browser.c:5288 msgid "Increase the zoom level" msgstr "增加縮放等級" -#: ../midori/midori-browser.c:2937 +#: ../midori/midori-browser.c:5291 msgid "Decrease the zoom level" msgstr "減少縮放等級" -#: ../midori/midori-browser.c:2940 -msgid "Reset the zoom level" -msgstr "重置縮放等級" - -#: ../midori/midori-browser.c:2942 ../midori/midori-view.c:1076 -msgid "View _Source" -msgstr "檢視原始碼(_S)" - -#: ../midori/midori-browser.c:2943 -msgid "View the source code of the page" -msgstr "檢視頁面的原始碼" - -#: ../midori/midori-browser.c:2945 -msgid "View Selection Source" -msgstr "檢視所選原始碼" - -#: ../midori/midori-browser.c:2946 -msgid "View the source code of the selection" -msgstr "檢視所選部份的原始碼" +#: ../midori/midori-browser.c:5295 +msgid "_Encoding" +msgstr "編碼(_E)" + +#: ../midori/midori-browser.c:5297 +msgid "View So_urce" +msgstr "檢視源碼(_U)" + +#: ../midori/midori-browser.c:5300 +msgid "Ca_ret Browsing" +msgstr "鍵盤瀏覽(_R)" -#: ../midori/midori-browser.c:2950 +#: ../midori/midori-browser.c:5304 msgid "Toggle fullscreen view" msgstr "切換全螢幕檢視" -#: ../midori/midori-browser.c:2952 +#: ../midori/midori-browser.c:5306 +msgid "Scroll _Left" +msgstr "向左捲(_L)" + +#: ../midori/midori-browser.c:5309 +msgid "Scroll _Down" +msgstr "向下捲(_D)" + +#: ../midori/midori-browser.c:5312 +msgid "Scroll _Up" +msgstr "向上捲(_U)" + +#: ../midori/midori-browser.c:5315 +msgid "Scroll _Right" +msgstr "向右捲(_R)" + +#: ../midori/midori-browser.c:5318 msgid "_Go" msgstr "前往(_G)" -#: ../midori/midori-browser.c:2955 +#: ../midori/midori-browser.c:5321 msgid "Go back to the previous page" msgstr "回到上一頁" -#: ../midori/midori-browser.c:2958 +#: ../midori/midori-browser.c:5324 msgid "Go forward to the next page" msgstr "前往下一頁" -#: ../midori/midori-browser.c:2961 +#. i18n: Visit the previous logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5328 +msgid "Go to the previous sub-page" +msgstr "回到上一子頁" + +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5332 +msgid "Go to the next sub-page" +msgstr "前往下一子頁" + +#: ../midori/midori-browser.c:5335 msgid "Go to your homepage" msgstr "前往您的首頁" -#: ../midori/midori-browser.c:2963 +#: ../midori/midori-browser.c:5337 msgid "Empty Trash" msgstr "清空回收筒" -#: ../midori/midori-browser.c:2964 -msgid "Delete the contents of the trash" -msgstr "刪除回收筒的內容" - -#: ../midori/midori-browser.c:2966 ../midori/midori-view.c:1048 -msgid "Undo Close Tab" -msgstr "復原關閉分頁" - -#: ../midori/midori-browser.c:2967 -msgid "Open the last closed tab" -msgstr "開啟上次關閉的分頁" - -#: ../midori/midori-browser.c:2971 ../panels/midori-bookmarks.c:228 -msgid "Add a new bookmark" -msgstr "加入新的書籤" - -#: ../midori/midori-browser.c:2972 -msgid "_Tools" -msgstr "工具(_T)" +#: ../midori/midori-browser.c:5340 +msgid "Undo _Close Tab" +msgstr "復原關閉分頁(_C)" + +#: ../midori/midori-browser.c:5347 +msgid "Add a new _folder" +msgstr "加入新的資料夾(_F)" + +#: ../midori/midori-browser.c:5353 +msgid "_Export bookmarks" +msgstr "匯出書籤(_E)" -#: ../midori/midori-browser.c:2974 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:5356 +#: ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "管理搜尋引擎(_M)" -#: ../midori/midori-browser.c:2975 -msgid "Add, edit and remove search engines..." -msgstr "加入、編輯和移除搜尋引擎…" +#: ../midori/midori-browser.c:5359 +msgid "_Clear Private Data" +msgstr "清除隱私資料(_C)" + +#: ../midori/midori-browser.c:5362 +msgid "_Inspect Page" +msgstr "審閱頁面(_I)" -#: ../midori/midori-browser.c:2979 +#: ../midori/midori-browser.c:5366 msgid "_Previous Tab" msgstr "上一個分頁(_P)" -#: ../midori/midori-browser.c:2980 -msgid "Switch to the previous tab" -msgstr "切換至上一個分頁" - -#: ../midori/midori-browser.c:2982 +#: ../midori/midori-browser.c:5369 msgid "_Next Tab" msgstr "下一個分頁(_N)" -#: ../midori/midori-browser.c:2983 -msgid "Switch to the next tab" -msgstr "切換至下一個分頁" +#: ../midori/midori-browser.c:5371 +msgid "Move Tab _Backward" +msgstr "將分頁往後移(_B)" + +#: ../midori/midori-browser.c:5373 +msgid "_Move Tab Forward" +msgstr "將分頁往前移(_M)" + +#: ../midori/midori-browser.c:5376 +msgid "Focus _Current Tab" +msgstr "專注於目前分頁(_C)" + +#: ../midori/midori-browser.c:5379 +msgid "Focus _Next view" +msgstr "聚焦下個檢視點(_N)" + +#: ../midori/midori-browser.c:5382 +msgid "Only show the Icon of the _Current Tab" +msgstr "只顯示目前分頁的圖示(_C)" + +#: ../midori/midori-browser.c:5385 +msgid "_Duplicate Current Tab" +msgstr "製作目前分頁的複本(_D)" + +#: ../midori/midori-browser.c:5388 +msgid "Close Ot_her Tabs" +msgstr "關閉其它分頁(_H)" + +#: ../midori/midori-browser.c:5391 +msgid "Open last _session" +msgstr "開啟上次工作階段(_S)" -#: ../midori/midori-browser.c:2985 +#: ../midori/midori-browser.c:5394 msgid "_Help" msgstr "求助(_H)" -#: ../midori/midori-browser.c:2987 -msgid "_Contents" -msgstr "內容(_C)" - -#: ../midori/midori-browser.c:2988 -msgid "Show the documentation" -msgstr "顯示文件" - -#: ../midori/midori-browser.c:2990 +#: ../midori/midori-browser.c:5396 msgid "_Frequent Questions" msgstr "常見問題(_F)" -#: ../midori/midori-browser.c:2991 -msgid "Show the Frequently Asked Questions" -msgstr "顯示常見問題集" - -#: ../midori/midori-browser.c:2993 -msgid "_Report a Bug" -msgstr "回報錯誤(_R)" - -#: ../midori/midori-browser.c:2994 -msgid "Open Midori's bug tracker" -msgstr "開啟 Midori 錯誤追蹤器" - -#: ../midori/midori-browser.c:2997 -msgid "Show information about the program" -msgstr "顯示程式相關資訊" - -#: ../midori/midori-browser.c:3004 -msgid "P_rivate Browsing" -msgstr "私人瀏覽(_R)" - -#: ../midori/midori-browser.c:3005 -msgid "Don't save any private data while browsing" -msgstr "瀏覽時不儲存任何私人資料" +#: ../midori/midori-browser.c:5399 +msgid "_Report a Problem..." +msgstr "回報問題(_R)..." -#: ../midori/midori-browser.c:3010 +#: ../midori/midori-browser.c:5411 msgid "_Menubar" msgstr "選單列(_M)" -#: ../midori/midori-browser.c:3011 -msgid "Show menubar" -msgstr "顯示選單列" - -#: ../midori/midori-browser.c:3014 +#: ../midori/midori-browser.c:5415 msgid "_Navigationbar" msgstr "導覽列(_N)" -#: ../midori/midori-browser.c:3015 -msgid "Show navigationbar" -msgstr "顯示導覽列" - -#: ../midori/midori-browser.c:3018 +#: ../midori/midori-browser.c:5419 msgid "Side_panel" -msgstr "側邊欄(_P)" +msgstr "側邊面板(_P)" -#: ../midori/midori-browser.c:3019 -msgid "Show sidepanel" -msgstr "顯示側邊欄" +#: ../midori/midori-browser.c:5420 +msgid "Sidepanel" +msgstr "側邊面板" -#: ../midori/midori-browser.c:3022 +#: ../midori/midori-browser.c:5423 msgid "_Bookmarkbar" msgstr "書籤列(_B)" -#: ../midori/midori-browser.c:3023 -msgid "Show bookmarkbar" -msgstr "顯示書籤列" +#: ../midori/midori-browser.c:5427 +msgid "_Statusbar" +msgstr "狀態列(_S)" -#: ../midori/midori-browser.c:3026 -msgid "_Transferbar" -msgstr "傳送列(_T)" +#: ../midori/midori-browser.c:5436 +#: ../midori/midori-websettings.c:307 +msgid "_Automatic" +msgstr "自動(_A)" -#: ../midori/midori-browser.c:3027 -msgid "Show transferbar" -msgstr "顯示傳送列" +#: ../midori/midori-browser.c:5439 +#: ../midori/midori-websettings.c:232 +msgid "Chinese (BIG5)" +msgstr "中文 (BIG5)" -#: ../midori/midori-browser.c:3030 -msgid "_Statusbar" -msgstr "狀態列(_S)" +#. i18n: A double underscore "__" is used to prevent the mnemonic +#: ../midori/midori-browser.c:5443 +msgid "Japanese (SHIFT__JIS)" +msgstr "日文 (SHIFT__JIS)" + +#: ../midori/midori-browser.c:5446 +#: ../midori/midori-websettings.c:234 +msgid "Korean (EUC-KR)" +msgstr "韓文 (EUC-KR)" -#: ../midori/midori-browser.c:3031 -msgid "Show statusbar" -msgstr "顯示狀態列" +#: ../midori/midori-browser.c:5449 +#: ../midori/midori-websettings.c:235 +msgid "Russian (KOI8-R)" +msgstr "俄文 (KOI8-R)" + +#: ../midori/midori-browser.c:5452 +#: ../midori/midori-websettings.c:236 +msgid "Unicode (UTF-8)" +msgstr "統一碼 (UTF-8)" + +#: ../midori/midori-browser.c:5455 +#: ../midori/midori-websettings.c:237 +msgid "Western (ISO-8859-1)" +msgstr "西歐 (ISO-8859-1)" + +#: ../midori/midori-browser.c:5458 +#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:313 +#: ../katze/katze-utils.c:635 +msgid "Custom..." +msgstr "自訂…" -#: ../midori/midori-browser.c:3436 +#: ../midori/midori-browser.c:5963 msgid "_Separator" msgstr "分隔符號(_S)" -#: ../midori/midori-browser.c:3443 +#: ../midori/midori-browser.c:5970 msgid "_Location..." msgstr "位置(_L)…" -#: ../midori/midori-browser.c:3445 +#: ../midori/midori-browser.c:5972 msgid "Open a particular location" msgstr "開啟特定位置" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:5994 msgid "_Web Search..." msgstr "網頁搜尋(_W)…" -#: ../midori/midori-browser.c:3471 +#: ../midori/midori-browser.c:5996 msgid "Run a web search" msgstr "執行網頁搜尋" -#: ../midori/midori-browser.c:3490 +#: ../midori/midori-browser.c:6023 msgid "Reopen a previously closed tab or window" msgstr "重新開啟之前關閉的分頁或視窗" -#: ../midori/midori-browser.c:3503 -msgid "_Recently visited pages" -msgstr "最近造訪的頁面(_R)" - -#: ../midori/midori-browser.c:3505 -msgid "Reopen pages that you visited earlier" -msgstr "重新開啟您之前造訪過的頁面" - -#: ../midori/midori-browser.c:3518 ../midori/sokoke.c:735 -msgid "_Bookmarks" -msgstr "書籤(_B)" - -#: ../midori/midori-browser.c:3520 +#: ../midori/midori-browser.c:6040 msgid "Show the saved bookmarks" msgstr "顯示已儲存書籤" -#: ../midori/midori-browser.c:3533 +#: ../midori/midori-browser.c:6057 +msgid "_Tools" +msgstr "工具(_T)" + +#: ../midori/midori-browser.c:6073 msgid "_Window" msgstr "視窗(_W)" -#: ../midori/midori-browser.c:3535 +#: ../midori/midori-browser.c:6075 msgid "Show a list of all open tabs" msgstr "顯示所有開啟分頁的清單" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3697 -msgid "_Inline Find:" -msgstr "列內尋找(_I)：" - -#: ../midori/midori-browser.c:3722 -msgid "Previous" -msgstr "上一個" - -#: ../midori/midori-browser.c:3727 -msgid "Next" -msgstr "下一個" +#: ../midori/midori-browser.c:6089 +msgid "_Menu" +msgstr "選單(_M)" + +#: ../midori/midori-browser.c:6091 +msgid "Menu" +msgstr "選單" -#: ../midori/midori-browser.c:3732 -msgid "Match Case" -msgstr "符合大小寫" +#: ../midori/midori-browser.c:6787 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "未預期的設定「%s」" -#: ../midori/midori-browser.c:3740 -msgid "Highlight Matches" -msgstr "標識相符者" +#: ../midori/midori-extension.c:310 +#, c-format +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "無法載入「%s」擴充功能的組態：%s\n" -#: ../midori/midori-browser.c:3750 -msgid "Close Findbar" -msgstr "關閉尋找列" +#: ../midori/midori-extension.c:721 +#: ../midori/midori-extension.c:818 +#: ../midori/midori-extension.c:915 +#: ../midori/midori-extension.c:1027 +#: ../extensions/addons.c:1695 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "無法儲存「%s」擴充功能的組態：%s\n" -#: ../midori/midori-browser.c:4034 +#: ../midori/midori-locationaction.c:394 #, c-format -msgid "Unexpected setting '%s'" -msgstr "未預期的設定「%s」" +msgid "Search with %s" +msgstr "以 %s 搜尋" -#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:479 -msgid "Align sidepanel on the right" -msgstr "側邊欄靠右對齊" +#: ../midori/midori-locationaction.c:412 +msgid "Search with..." +msgstr "搜尋採用..." -#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:480 -msgid "Whether to align the sidepanel on the right" -msgstr "是否要將側邊欄靠右對齊" +#: ../midori/midori-locationaction.c:537 +#, c-format +msgid "Failed to select from history\n" +msgstr "從歷史選取時失敗\n" -#: ../midori/midori-panel.c:241 ../midori/midori-panel.c:242 -msgid "Close panel" -msgstr "關閉側邊欄" +#: ../midori/midori-locationaction.c:624 +#, c-format +msgid "Search for %s" +msgstr "搜尋 %s" -#: ../midori/midori-websettings.c:175 ../midori/midori-view.c:1811 -msgid "Blank page" -msgstr "空白頁面" +#. i18n: Right-click on Location, Open an URL from the clipboard +#: ../midori/midori-locationaction.c:1400 +msgid "Paste and p_roceed" +msgstr "貼上並處理(_R)" -#: ../midori/midori-websettings.c:176 ../midori/midori-websettings.c:499 -msgid "Homepage" -msgstr "首頁" +#: ../midori/midori-locationaction.c:1768 +msgid "Not verified" +msgstr "尚未驗證" -#: ../midori/midori-websettings.c:177 -msgid "Last open pages" -msgstr "上次開啟頁面" +#: ../midori/midori-locationaction.c:1788 +msgid "Verified and encrypted connection" +msgstr "通過驗證且經過加密的連線" -#: ../midori/midori-websettings.c:192 -msgid "Chinese (BIG5)" -msgstr "中文 (BIG5)" +#: ../midori/midori-panel.c:397 +#: ../midori/midori-panel.c:399 +#: ../midori/midori-panel.c:562 +#: ../midori/midori-panel.c:565 +msgid "Align sidepanel to the right" +msgstr "側面板靠右對齊" -#: ../midori/midori-websettings.c:193 -msgid "Japanese (SHIFT_JIS)" -msgstr "日文 (SHIFT_JIS)" +#: ../midori/midori-panel.c:409 +#: ../midori/midori-panel.c:410 +msgid "Close panel" +msgstr "關閉面板" -#: ../midori/midori-websettings.c:194 -msgid "Russian (KOI8-R)" -msgstr "俄文 (KOI8-R)" +#: ../midori/midori-panel.c:563 +#: ../midori/midori-panel.c:566 +msgid "Align sidepanel to the left" +msgstr "側面板靠左對齊" -#: ../midori/midori-websettings.c:195 -msgid "Unicode (UTF-8)" -msgstr "萬國碼 (UTF-8)" +#: ../midori/midori-websettings.c:214 +msgid "Show Speed Dial" +msgstr "顯示快速播號" -#: ../midori/midori-websettings.c:196 -msgid "Western (ISO-8859-1)" -msgstr "西歐 (ISO-8859-1)" +#: ../midori/midori-websettings.c:215 +msgid "Show Homepage" +msgstr "顯示首頁" -#: ../midori/midori-websettings.c:197 ../midori/midori-websettings.c:269 -msgid "Custom..." -msgstr "自訂…" +#: ../midori/midori-websettings.c:233 +msgid "Japanese (SHIFT_JIS)" +msgstr "日文 (SHIFT_JIS)" -#: ../midori/midori-websettings.c:212 +#: ../midori/midori-websettings.c:253 msgid "New tab" msgstr "新分頁" -#: ../midori/midori-websettings.c:213 +#: ../midori/midori-websettings.c:254 msgid "New window" msgstr "新視窗" -#: ../midori/midori-websettings.c:214 +#: ../midori/midori-websettings.c:255 msgid "Current tab" msgstr "目前分頁" -#: ../midori/midori-websettings.c:229 +#: ../midori/midori-websettings.c:270 msgid "Default" msgstr "預設" -#: ../midori/midori-websettings.c:230 +#: ../midori/midori-websettings.c:271 msgid "Icons" msgstr "圖示" -#: ../midori/midori-websettings.c:231 +#: ../midori/midori-websettings.c:272 +msgid "Small icons" +msgstr "小圖示" + +#: ../midori/midori-websettings.c:273 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:232 -msgid "Both" -msgstr "兩者" - -#: ../midori/midori-websettings.c:233 -msgid "Both horizontal" -msgstr "水平並列" - -#: ../midori/midori-websettings.c:248 -msgid "All cookies" -msgstr "所有訊餅" - -#: ../midori/midori-websettings.c:249 -msgid "Session cookies" -msgstr "執行階段訊餅" - -#: ../midori/midori-websettings.c:250 ../panels/midori-addons.c:96 -msgid "None" -msgstr "無" +#: ../midori/midori-websettings.c:274 +msgid "Icons and text" +msgstr "圖示與文字" + +#: ../midori/midori-websettings.c:275 +msgid "Text beside icons" +msgstr "文字於圖示旁" + +#: ../midori/midori-websettings.c:290 +msgid "Automatic (GNOME or environment)" +msgstr "自動 (GNOME 或環境)" + +#: ../midori/midori-websettings.c:291 +msgid "HTTP proxy server" +msgstr "HTTP 代理伺服器" + +#: ../midori/midori-websettings.c:292 +msgid "No proxy server" +msgstr "無代理伺服器" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:309 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:267 -msgid "Firefox" +#: ../midori/midori-websettings.c:310 +msgid "iPhone" +msgstr "iPhone" + +#: ../midori/midori-websettings.c:311 +msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:312 msgid "Internet Explorer" msgstr "網路探險家" -#: ../midori/midori-websettings.c:309 +#: ../midori/midori-websettings.c:388 msgid "Remember last window size" msgstr "記住上次視窗大小" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:389 msgid "Whether to save the last window size" msgstr "是否要儲存上次視窗大小" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:397 msgid "Last window width" msgstr "上次視窗寬度" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:398 msgid "The last saved window width" msgstr "上次儲存的視窗寬度" -#: ../midori/midori-websettings.c:327 +#: ../midori/midori-websettings.c:406 msgid "Last window height" msgstr "上次視窗高度" -#: ../midori/midori-websettings.c:328 +#: ../midori/midori-websettings.c:407 msgid "The last saved window height" msgstr "上次儲存的視窗高度" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:432 msgid "Last panel position" -msgstr "上次側邊欄位置" +msgstr "上次面板位置" -#: ../midori/midori-websettings.c:354 +#: ../midori/midori-websettings.c:433 msgid "The last saved panel position" -msgstr "上次儲存的側邊欄位置" +msgstr "上次儲存的面板位置" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:363 +#: ../midori/midori-websettings.c:442 msgid "Last panel page" -msgstr "上次側邊欄頁面" +msgstr "上次面板頁面" -#: ../midori/midori-websettings.c:364 +#: ../midori/midori-websettings.c:443 msgid "The last saved panel page" -msgstr "上次儲存的側邊欄頁面" +msgstr "上次儲存的面板頁面" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:451 msgid "Last Web search" msgstr "上次網頁搜尋" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:452 msgid "The last saved Web search" msgstr "上次儲存的網頁搜尋" -#: ../midori/midori-websettings.c:382 +#: ../midori/midori-websettings.c:461 msgid "Show Menubar" msgstr "顯示選單列" -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:462 msgid "Whether to show the menubar" msgstr "是否要顯示選單列" -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:470 msgid "Show Navigationbar" msgstr "顯示導覽列" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:471 msgid "Whether to show the navigationbar" msgstr "是否要顯示導覽列" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:479 msgid "Show Bookmarkbar" msgstr "顯示書籤列" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:480 msgid "Whether to show the bookmarkbar" msgstr "是否要顯示書籤列" -#: ../midori/midori-websettings.c:409 +#: ../midori/midori-websettings.c:488 msgid "Show Panel" -msgstr "顯示側邊欄" +msgstr "顯示面板" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:489 msgid "Whether to show the panel" -msgstr "是否要顯示側邊欄" +msgstr "是否要顯示面板" -#: ../midori/midori-websettings.c:418 +#: ../midori/midori-websettings.c:497 msgid "Show Statusbar" msgstr "顯示狀態列" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:498 msgid "Whether to show the statusbar" msgstr "是否要顯示狀態列" -#: ../midori/midori-websettings.c:428 -msgid "Toolbar Style" -msgstr "工具列樣式" +#: ../midori/midori-websettings.c:507 +msgid "Toolbar Style:" +msgstr "工具列樣式：" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:508 msgid "The style of the toolbar" msgstr "工具列的樣式" -#: ../midori/midori-websettings.c:445 -msgid "Show progress in location entry" -msgstr "在位置欄中顯示進度" - -#: ../midori/midori-websettings.c:446 -msgid "Whether to show loading progress in the location entry" -msgstr "是否要在位置欄中顯示載入進度" - -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:517 msgid "Toolbar Items" msgstr "工具列項目" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:518 msgid "The items to show on the toolbar" msgstr "顯示在工具列上的項目" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:526 msgid "Compact Sidepanel" -msgstr "壓縮側邊欄" +msgstr "壓縮側邊面板" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:527 msgid "Whether to make the sidepanel compact" -msgstr "是否要壓縮側邊欄" +msgstr "是否要壓縮側邊面板" -#: ../midori/midori-websettings.c:489 -msgid "Load on Startup" -msgstr "啟動時載入" +#: ../midori/midori-websettings.c:542 +msgid "Align sidepanel on the right" +msgstr "側邊面板靠右對齊" + +#: ../midori/midori-websettings.c:543 +msgid "Whether to align the sidepanel on the right" +msgstr "是否要將側邊面板靠右對齊" + +#: ../midori/midori-websettings.c:558 +msgid "Open panels in separate windows" +msgstr "在獨立的視窗中開啟面板" + +#: ../midori/midori-websettings.c:559 +msgid "Whether to always open panels in separate windows" +msgstr "是否總是要在獨立的視窗中開啟面板" + +#: ../midori/midori-websettings.c:568 +msgid "When Midori starts:" +msgstr "當 Midori 啟動時：" -#: ../midori/midori-websettings.c:490 -msgid "What to load on startup" -msgstr "啟動時要載入什麼" +#: ../midori/midori-websettings.c:569 +msgid "What to do when Midori starts" +msgstr "Midori 啟動時要載入什麼" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:578 +msgid "Homepage:" +msgstr "首頁：" + +#: ../midori/midori-websettings.c:579 msgid "The homepage" msgstr "首頁" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:594 msgid "Show crash dialog" -msgstr "顯示當機對話框" +msgstr "顯示當機對話窗" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:595 msgid "Show a dialog after Midori crashed" -msgstr "Midori 當機之後顯示對話框" +msgstr "Midori 當機之後顯示對話窗" -#: ../midori/midori-websettings.c:524 -msgid "Download Folder" -msgstr "下載資料夾" +#: ../midori/midori-websettings.c:603 +msgid "Save downloaded files to:" +msgstr "儲存下載檔案至：" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:604 msgid "The folder downloaded files are saved to" msgstr "儲存下載檔案的資料夾" -#: ../midori/midori-websettings.c:533 -msgid "Download Manager" -msgstr "下載管理員" - -#: ../midori/midori-websettings.c:534 -msgid "An external download manager" -msgstr "外部下載管理員" - -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:612 msgid "Text Editor" msgstr "文字編輯器" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:613 msgid "An external text editor" msgstr "外部文字編輯器" -#: ../midori/midori-websettings.c:551 +#: ../midori/midori-websettings.c:628 +msgid "News Aggregator" +msgstr "新聞匯流器" + +#: ../midori/midori-websettings.c:629 +msgid "An external news aggregator" +msgstr "外部新聞匯流程式" + +#: ../midori/midori-websettings.c:637 msgid "Location entry Search" msgstr "位置欄搜尋" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:638 msgid "The search to perform inside the location entry" -msgstr "於位置欄之內進行的搜尋" +msgstr "於位置列之內進行的搜尋" -#: ../midori/midori-websettings.c:560 +#: ../midori/midori-websettings.c:646 msgid "Preferred Encoding" msgstr "偏好的編碼" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:647 msgid "The preferred character encoding" msgstr "偏好的字元編碼" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:657 msgid "Always Show Tabbar" -msgstr "固定顯示頁標列" +msgstr "固定顯示分頁列" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:658 msgid "Always show the tabbar" -msgstr "固定顯示分頁頁標列" +msgstr "固定顯示分頁列" -#: ../midori/midori-websettings.c:580 +#: ../midori/midori-websettings.c:672 msgid "Close Buttons on Tabs" -msgstr "關閉按鈕位於頁標" +msgstr "關閉按鈕位於分頁上" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:673 msgid "Whether tabs have close buttons" -msgstr "頁標上是否有關閉按鈕" +msgstr "分頁上是否有關閉按鈕" -#: ../midori/midori-websettings.c:590 -msgid "Open new pages in" -msgstr "開啟新頁面於" +#: ../midori/midori-websettings.c:698 +msgid "Open new pages in:" +msgstr "開啟新頁面於：" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:699 msgid "Where to open new pages" msgstr "何處開啟新頁面" -#: ../midori/midori-websettings.c:601 -msgid "Open external pages in" -msgstr "開啟外部頁面於" - -#: ../midori/midori-websettings.c:602 -msgid "Where to open externally opened pages" -msgstr "何處開啟外部開啟的頁面" - -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:708 msgid "Middle click opens Selection" msgstr "按下滑鼠中鍵開啟所選" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:709 msgid "Load an address from the selection via middle click" msgstr "透過按下滑鼠中鍵以載入所選位址" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:717 msgid "Open tabs in the background" msgstr "在背景中開啟分頁" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:718 msgid "Whether to open new tabs in the background" msgstr "是否要在背景中開啟分頁" -#: ../midori/midori-websettings.c:633 +#: ../midori/midori-websettings.c:726 msgid "Open Tabs next to Current" msgstr "於目前之下開啟分頁" -#: ../midori/midori-websettings.c:634 +#: ../midori/midori-websettings.c:727 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "是否要開啟新分頁於目前分頁之下或最後一頁之後" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:735 msgid "Open popups in tabs" msgstr "在分頁中開啟對話框" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:736 msgid "Whether to open popup windows in tabs" msgstr "是否要在分頁中開啟彈出視窗" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:746 +#: ../extensions/statusbar-features.c:134 +msgid "Load images automatically" +msgstr "自動載入圖像" + +#: ../midori/midori-websettings.c:747 +msgid "Load and display images automatically" +msgstr "自動載入與顯示圖像" + +#: ../midori/midori-websettings.c:754 +#: ../extensions/statusbar-features.c:143 +msgid "Enable scripts" +msgstr "啟用命令稿" + +#: ../midori/midori-websettings.c:755 +msgid "Enable embedded scripting languages" +msgstr "啟用嵌入式命令稿語言" + +#: ../midori/midori-websettings.c:762 +#: ../extensions/statusbar-features.c:154 +msgid "Enable Netscape plugins" +msgstr "啟用 Netscape 外掛程式" + +#: ../midori/midori-websettings.c:763 +msgid "Enable embedded Netscape plugin objects" +msgstr "啟用嵌入式 Netscape 外掛程式物件" + +#: ../midori/midori-websettings.c:778 +msgid "Enable Spell Checking" +msgstr "啟用拼字檢查" + +#: ../midori/midori-websettings.c:779 +msgid "Enable spell checking while typing" +msgstr "啟用打字時的拼字檢查" + +#: ../midori/midori-websettings.c:785 +msgid "Enable HTML5 database support" +msgstr "啟用 HTML 資料庫支援" + +#: ../midori/midori-websettings.c:786 +msgid "Whether to enable HTML5 database support" +msgstr "是否要啟用 HTML5 資料庫支援" + +#: ../midori/midori-websettings.c:792 +msgid "Enable HTML5 local storage support" +msgstr "啟用 HTML 本地端儲存支援" + +#: ../midori/midori-websettings.c:793 +msgid "Whether to enable HTML5 local storage support" +msgstr "是否要啟用 HTML 本地端儲存支援" + +#: ../midori/midori-websettings.c:799 +msgid "Enable offline web application cache" +msgstr "啟用離線網頁應用程式快取" + +#: ../midori/midori-websettings.c:800 +msgid "Whether to enable offline web application cache" +msgstr "是否啟用離線網頁應用程式快取" + +#: ../midori/midori-websettings.c:816 +msgid "Flash window on background tabs" +msgstr "於背景分頁閃動視窗" + +#: ../midori/midori-websettings.c:817 +msgid "Flash the browser window if a new tab was opened in the background" +msgstr "新分頁在背景開啟時是否要閃動瀏覽器視窗" + +#: ../midori/midori-websettings.c:825 +msgid "Enable WebGL support" +msgstr "啟用 WebGL 支援" + +#: ../midori/midori-websettings.c:826 +msgid "Allow websites to use OpenGL rendering" +msgstr "允許網站使用 OpenGL 算圖" + +#: ../midori/midori-websettings.c:852 msgid "Zoom Text and Images" msgstr "縮放文字和圖像" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:853 msgid "Whether to zoom text and images" msgstr "是否要縮放文字和圖像" -#: ../midori/midori-websettings.c:705 -msgid "Accept cookies" -msgstr "接受訊餅" - -#: ../midori/midori-websettings.c:706 -msgid "What type of cookies to accept" -msgstr "要接受什麼型態的訊餅" - -#: ../midori/midori-websettings.c:719 -msgid "Original cookies only" -msgstr "只限原本的訊餅" - -#: ../midori/midori-websettings.c:720 -msgid "Accept cookies from the original website only" -msgstr "只接受來自原始網站的訊餅" - -#: ../midori/midori-websettings.c:728 -msgid "Maximum cookie age" -msgstr "最大訊餅時限" +#: ../midori/midori-websettings.c:868 +msgid "Find inline while typing" +msgstr "輸入時於列內尋找" + +#: ../midori/midori-websettings.c:869 +msgid "Whether to automatically find inline while typing" +msgstr "是否要在輸入時自動在列內尋找" + +#: ../midori/midori-websettings.c:884 +msgid "Kinetic scrolling" +msgstr "動力捲動" + +#: ../midori/midori-websettings.c:885 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "捲動是否該根據速度動態移動" + +#: ../midori/midori-websettings.c:893 +msgid "Delete old Cookies after:" +msgstr "刪除舊訊餅經過：" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:894 msgid "The maximum number of days to save cookies for" msgstr "訊餅的最大儲存日數限制" -#: ../midori/midori-websettings.c:739 -msgid "Remember last visited pages" -msgstr "記住上次造訪的頁面" - -#: ../midori/midori-websettings.c:740 -msgid "Whether the last visited pages are saved" -msgstr "是否要儲存上次造訪的頁面" - -#: ../midori/midori-websettings.c:748 -msgid "Maximum history age" -msgstr "最大造訪歷史時限" +#: ../midori/midori-websettings.c:910 +msgid "Only accept Cookies from sites you visit" +msgstr "只接受來自您造訪網站的訊餅" + +#: ../midori/midori-websettings.c:911 +msgid "Block cookies sent by third-party websites" +msgstr "阻擋第三方網站訊餅" + +#: ../midori/midori-websettings.c:925 +msgid "Delete pages from history after:" +msgstr "從歷史刪除頁面經過：" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:926 msgid "The maximum number of days to save the history for" msgstr "造訪歷史的最大儲存日數限制" -#: ../midori/midori-websettings.c:757 -msgid "Remember last form inputs" -msgstr "記住上次表單輸入" - -#: ../midori/midori-websettings.c:758 -msgid "Whether the last form inputs are saved" -msgstr "是否要儲存上次表單輸入" - -#: ../midori/midori-websettings.c:766 -msgid "Remember last downloaded files" -msgstr "記住上次下載檔案" - -#: ../midori/midori-websettings.c:767 -msgid "Whether the last downloaded files are saved" -msgstr "是否要儲存上次下載的檔案" - -#: ../midori/midori-websettings.c:777 -msgid "Proxy Server" +#: ../midori/midori-websettings.c:941 +msgid "Proxy server" msgstr "代理伺服器" -#: ../midori/midori-websettings.c:778 +#: ../midori/midori-websettings.c:942 +msgid "The type of proxy server to use" +msgstr "要使用的代理伺服器類型" + +#: ../midori/midori-websettings.c:951 +msgid "HTTP Proxy Server" +msgstr "HTTP 代理伺服器" + +#: ../midori/midori-websettings.c:952 msgid "The proxy server used for HTTP connections" msgstr "用於 HTTP 連接的代理伺服器" -#: ../midori/midori-websettings.c:797 -msgid "Detect proxy server automatically" -msgstr "自動偵測代理伺服器" - -#: ../midori/midori-websettings.c:798 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "是否要自動從環境中偵測代理伺服器" +#: ../midori/midori-websettings.c:967 +msgid "Port" +msgstr "連接埠" + +#: ../midori/midori-websettings.c:968 +msgid "The proxy server port used for HTTP connections" +msgstr "用於 HTTP 連線的代理伺服器" + +#: ../midori/midori-websettings.c:986 +msgid "The maximum size of cached pages on disk" +msgstr "磁碟上快取網頁的大小上限" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:1003 msgid "Identify as" msgstr "識別為" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:1004 msgid "What to identify as to web pages" msgstr "要讓網頁識別為什麼" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:1020 msgid "Identification string" msgstr "識別字串" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:1021 msgid "The application identification string" msgstr "應用程式識別字串" -#: ../midori/midori-websettings.c:852 -msgid "Cache size" -msgstr "快取大小" +#: ../midori/midori-websettings.c:1037 +msgid "Preferred languages" +msgstr "偏好的語言" -#: ../midori/midori-websettings.c:853 -msgid "The allowed size of the cache" -msgstr "允許的快取大小" +#: ../midori/midori-websettings.c:1038 +msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "用於繪製多語網頁時所偏好的語言清單，請用半形逗號 (,) 隔開語言。例：「de」，「ru,nl」或「en-us;q=1.0, fr-fr;q=0.667」" + +#: ../midori/midori-websettings.c:1053 +msgid "Clear private data" +msgstr "清除隱私資料" + +#: ../midori/midori-websettings.c:1054 +msgid "The private data selected for deletion" +msgstr "選取要刪除的隱私資料" -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:629 +#: ../midori/midori-websettings.c:1069 +msgid "Clear data" +msgstr "清除資料" + +#: ../midori/midori-websettings.c:1070 +msgid "The data selected for deletion" +msgstr "選取要刪除的資料" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-websettings.c:1119 +msgid "Strip referrer details sent to websites" +msgstr "截短傳送給網站的參照子細節" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-websettings.c:1121 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "是否「Referer」標頭要被截短成主機名稱" + +#: ../midori/midori-websettings.c:1135 +msgid "Always use my font choices" +msgstr "總是使用我的字型選擇" + +#: ../midori/midori-websettings.c:1136 +msgid "Override fonts picked by websites with user preferences" +msgstr "用使用者的偏好設定凌駕網站挑選的字型" + +#: ../midori/midori-view.c:1353 #, c-format -msgid "Not found - %s" -msgstr "找不到 - %s" +msgid "%s wants to save an HTML5 database." +msgstr "%s 想要儲存一門 HTML 資料庫。" -#: ../midori/midori-view.c:959 -msgid "Open _Link" -msgstr "開啟鏈結(_L)" +#: ../midori/midori-view.c:1357 +#: ../midori/midori-view.c:1389 +msgid "_Deny" +msgstr "拒絕(_D)" -#: ../midori/midori-view.c:961 +#: ../midori/midori-view.c:1357 +#: ../midori/midori-view.c:1389 +msgid "_Allow" +msgstr "允許(_A)" + +#: ../midori/midori-view.c:1385 +#, c-format +msgid "%s wants to know your location." +msgstr "%s 想要知道您的所在位置。" + +#: ../midori/midori-view.c:1476 +#, c-format +msgid "Error - %s" +msgstr "錯誤 - %s" + +#: ../midori/midori-view.c:1477 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "無法載入「%s」頁面。" + +#: ../midori/midori-view.c:1479 +msgid "Try again" +msgstr "重試" + +#: ../midori/midori-view.c:1676 +#: ../midori/midori-view.c:2586 +#, c-format +msgid "Send a message to %s" +msgstr "傳送訊息至 %s" + +#: ../midori/midori-view.c:2416 +#: ../midori/midori-view.c:2735 +msgid "Inspect _Element" +msgstr "審閱元素(_E)" + +#: ../midori/midori-view.c:2468 msgid "Open Link in New _Tab" msgstr "在新分頁中開啟鏈結(_T)" -#: ../midori/midori-view.c:978 +#: ../midori/midori-view.c:2472 +msgid "Open Link in _Foreground Tab" +msgstr "在前景分頁中開啟鏈結(_F)" + +#: ../midori/midori-view.c:2473 +msgid "Open Link in _Background Tab" +msgstr "在背景分頁中開啟鏈結(_B)" + +#: ../midori/midori-view.c:2476 msgid "Open Link in New _Window" msgstr "在開新視窗中開啟鏈結(_W)" -#: ../midori/midori-view.c:988 -msgid "_Save Link destination" -msgstr "儲存鏈結網址(_S)" - -#: ../midori/midori-view.c:996 -msgid "_Download Link destination" -msgstr "下載鏈結網址(_D)" +#: ../midori/midori-view.c:2479 +msgid "Open Link as Web A_pplication" +msgstr "開啟鏈結為網頁應用程式(_P)" + +#: ../midori/midori-view.c:2484 +msgid "Copy Link de_stination" +msgstr "複製鏈結目的地(_S)" + +#: ../midori/midori-view.c:2500 +msgid "Open _Image in New Tab" +msgstr "於新分頁中開啟影像(_I)" + +#: ../midori/midori-view.c:2503 +msgid "Copy Image _Address" +msgstr "複製影像位址(_A)" + +#: ../midori/midori-view.c:2506 +msgid "Save I_mage" +msgstr "儲存影像(_M)" + +#: ../midori/midori-view.c:2509 +msgid "Open in Image _Viewer" +msgstr "於影像檢視器中開啟(_V)" + +#: ../midori/midori-view.c:2516 +msgid "Copy Video _Address" +msgstr "複製視訊位址(_A)" + +#: ../midori/midori-view.c:2519 +msgid "Save _Video" +msgstr "儲存視訊(_V)" + +#: ../midori/midori-view.c:2519 +msgid "Download _Video" +msgstr "下載視訊(_V)" + +#: ../midori/midori-view.c:2545 +msgid "Search _with" +msgstr "以此搜尋(_S)" -#: ../midori/midori-view.c:1018 +#: ../midori/midori-view.c:2577 msgid "_Search the Web" msgstr "搜尋網頁(_S)" -#: ../midori/midori-view.c:1027 +#: ../midori/midori-view.c:2594 msgid "Open Address in New _Tab" msgstr "在新分頁中開啟位址(_T)" -#: ../midori/midori-view.c:1501 +#: ../midori/midori-view.c:2883 +msgid "Open or download file" +msgstr "開啟或下載檔案" + +#: ../midori/midori-view.c:2902 #, c-format -msgid "Inspect page - %s" -msgstr "檢閱頁面 - %s" +msgid "File Type: '%s'" +msgstr "檔案類型：'%s'" + +#: ../midori/midori-view.c:2904 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "檔案類型：%s ('%s')" + +#: ../midori/midori-view.c:2908 +#, c-format +msgid "File Name: %s" +msgstr "檔案名稱：%s" -#: ../midori/midori-view.c:1654 -msgid "Source" -msgstr "原始碼" +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:2927 +#, c-format +msgid "Open %s" +msgstr "開啟 %s" -#: ../midori/midori-view.c:1678 +#: ../midori/midori-view.c:3572 #, c-format -msgid "Document cannot be displayed" -msgstr "無法顯示文件" +msgid "Inspect page - %s" +msgstr "審閱頁面 - %s" + +#: ../midori/midori-view.c:3873 +msgid "Speed Dial" +msgstr "快速播號" + +#: ../midori/midori-view.c:3874 +#: ../midori/midori-view.c:3970 +msgid "Click to add a shortcut" +msgstr "按一下以加入捷徑" + +#: ../midori/midori-view.c:3875 +msgid "Enter shortcut address" +msgstr "輸入捷徑位址" + +#: ../midori/midori-view.c:3876 +msgid "Enter shortcut title" +msgstr "輸入捷徑標題" + +#: ../midori/midori-view.c:3877 +msgid "Are you sure you want to delete this shortcut?" +msgstr "確定要刪除這個捷徑？" -#: ../midori/midori-view.c:1694 +#: ../midori/midori-view.c:4039 #, c-format msgid "No documentation installed" msgstr "沒有已安裝文件" -#: ../midori/midori-preferences.c:93 -#, c-format -msgid "Preferences for %s" -msgstr "偏好設定用於 %s" +#: ../midori/midori-view.c:4115 +msgid "Midori doesn't store any personal data:" +msgstr "Midori 不會儲存任何個人資料；" + +#: ../midori/midori-view.c:4116 +msgid "No history or web cookies are being saved." +msgstr "沒有歷史或網頁訊餅將被儲存。" + +#: ../midori/midori-view.c:4117 +msgid "Extensions are disabled." +msgstr "擴充套件已停用。" + +#: ../midori/midori-view.c:4118 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "HTML 5 儲存、本地端資料庫、應用程式快取等皆已停用。" + +#: ../midori/midori-view.c:4119 +msgid "Midori prevents websites from tracking the user:" +msgstr "Midori 防止下列網站追蹤使用者：" + +#: ../midori/midori-view.c:4120 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "參照子 URL 被截短成主機名稱。" + +#: ../midori/midori-view.c:4121 +msgid "DNS prefetching is disabled." +msgstr "DNS 預擷取已停用。" + +#: ../midori/midori-view.c:4122 +msgid "The language and timezone are not revealed to websites." +msgstr "語言與時區不顯露給這些網站。" + +#: ../midori/midori-view.c:4123 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "Flash 與其他 Netscape 插件無法被這些網站列出。" + +#: ../midori/midori-view.c:4161 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "中括號內的版本編號顯示執行時期使用的版本。" + +#: ../midori/midori-view.c:4217 +msgid "Page loading delayed" +msgstr "頁面載入延遲" + +#: ../midori/midori-view.c:4218 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "載入延遲，可能是因為最近的當掉或啟動偏好設定之故。" + +#: ../midori/midori-view.c:4219 +msgid "Load Page" +msgstr "載入頁面" -#. Page "General" -#: ../midori/midori-preferences.c:390 -msgid "General" -msgstr "一般" +#: ../midori/midori-view.c:4385 +msgid "Blank page" +msgstr "空白頁面" + +#: ../midori/midori-view.c:4647 +msgid "_Duplicate Tab" +msgstr "製作頁面複本(_E)" + +#: ../midori/midori-view.c:4652 +msgid "Show Tab _Label" +msgstr "顯示分頁標籤(_L)" + +#: ../midori/midori-view.c:4652 +msgid "Show Tab _Icon Only" +msgstr "只顯示分頁圖示(_I)" + +#: ../midori/midori-view.c:4658 +msgid "Close ot_her Tabs" +msgstr "關閉其它分頁(_H)" + +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5429 +msgid "previous" +msgstr "上一頁" + +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5448 +msgid "next" +msgstr "下一頁" + +#: ../midori/midori-view.c:5461 +msgid "Print background images" +msgstr "列印背景圖像" + +#: ../midori/midori-view.c:5462 +msgid "Whether background images should be printed" +msgstr "是否應該列印背景圖像" -#: ../midori/midori-preferences.c:391 +#: ../midori/midori-view.c:5494 +msgid "Features" +msgstr "特色" + +#: ../midori/midori-preferences.c:297 msgid "Startup" msgstr "啟動" +#: ../midori/midori-preferences.c:310 +msgid "Use _current page" +msgstr "使用目前頁面(_C)" + +#: ../midori/midori-preferences.c:314 +msgid "Use current page as homepage" +msgstr "使用目前頁面作為首頁" + #. Page "Appearance" -#: ../midori/midori-preferences.c:440 -msgid "Appearance" -msgstr "外觀" - -#: ../midori/midori-preferences.c:441 -msgid "Font settings" -msgstr "字型設定" - -#: ../midori/midori-preferences.c:443 -msgid "Default Font Family" -msgstr "預設字族" +#: ../midori/midori-preferences.c:323 +msgid "Fonts" +msgstr "字型" + +#: ../midori/midori-preferences.c:326 +msgid "Proportional Font Family" +msgstr "比例字族" + +#: ../midori/midori-preferences.c:330 +msgid "The default font family used to display text" +msgstr "用來顯示文字的預設字族" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:333 msgid "The default font size used to display text" msgstr "用來顯示文字的預設字型大小" -#: ../midori/midori-preferences.c:452 +#: ../midori/midori-preferences.c:335 +msgid "Fixed-width Font Family" +msgstr "等寬字族" + +#: ../midori/midori-preferences.c:339 +msgid "The font family used to display fixed-width text" +msgstr "用來顯示等寬文字的字族" + +#: ../midori/midori-preferences.c:342 +msgid "The font size used to display fixed-width text" +msgstr "用來顯示等寬文字的字型大小" + +#: ../midori/midori-preferences.c:344 msgid "Minimum Font Size" msgstr "最小字型尺寸" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:348 msgid "The minimum font size used to display text" msgstr "用來顯示文字的最小字型尺寸" -#: ../midori/midori-preferences.c:462 -msgid "Encoding" -msgstr "編碼" - -#: ../midori/midori-preferences.c:465 -msgid "The character encoding to use by default" -msgstr "預設使用的字元編碼" - #. Page "Behavior" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:359 msgid "Behavior" msgstr "行為" -#: ../midori/midori-preferences.c:473 -msgid "Features" -msgstr "特徵" - -#: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:40 -msgid "Load images automatically" -msgstr "自動載入圖像" - -#: ../midori/midori-preferences.c:477 -msgid "Load and display images automatically" -msgstr "自動載入與顯示圖像" - -#: ../midori/midori-preferences.c:480 -msgid "Shrink images automatically" -msgstr "自動收縮圖像" - -#: ../midori/midori-preferences.c:481 -msgid "Automatically shrink standalone images to fit" -msgstr "自動收縮單獨圖像以符合頁面" - -#: ../midori/midori-preferences.c:484 -msgid "Print background images" -msgstr "列印背景圖像" - -#: ../midori/midori-preferences.c:485 -msgid "Whether background images should be printed" -msgstr "是否應該列印背景圖像" - -#: ../midori/midori-preferences.c:488 -msgid "Resizable text areas" -msgstr "可變更大小的文字區" - -#: ../midori/midori-preferences.c:489 -msgid "Whether text areas are resizable" -msgstr "是否文字區可變更大小" - -#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:47 -msgid "Enable scripts" -msgstr "啟用命令稿" - -#: ../midori/midori-preferences.c:493 -msgid "Enable embedded scripting languages" -msgstr "啟用嵌入式命令稿語言" - -#: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:54 -msgid "Enable plugins" -msgstr "啟用外掛程式" - -#: ../midori/midori-preferences.c:497 -msgid "Enable embedded plugin objects" -msgstr "啟用嵌入式外掛程式物件" - -#: ../midori/midori-preferences.c:500 -msgid "Enforce 96 dots per inch" -msgstr "強制每英吋 96 點" - -#: ../midori/midori-preferences.c:501 -msgid "Enforce a video dot density of 96 DPI" -msgstr "強制畫面像點密度為 96 DPI" - -#: ../midori/midori-preferences.c:504 -msgid "Enable developer tools" -msgstr "啟用開發工具" - -#: ../midori/midori-preferences.c:505 -msgid "Enable special extensions for developers" -msgstr "啟用給開發者的特殊擴充功能" +#: ../midori/midori-preferences.c:385 +msgid "Allow scripts to open popups" +msgstr "允許指令稿開啟彈出式視窗" + +#: ../midori/midori-preferences.c:386 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "是否允許指令稿自動開啟彈出視窗" #. Page "Interface" -#: ../midori/midori-preferences.c:515 -msgid "Interface" -msgstr "介面" - -#: ../midori/midori-preferences.c:516 -msgid "Navigationbar" -msgstr "導覽列" - -#: ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:416 msgid "Browsing" msgstr "瀏覽" -#: ../midori/midori-preferences.c:562 ../midori/midori-preferences.c:563 +#. Page "Network" +#: ../midori/midori-preferences.c:456 msgid "Network" msgstr "網路" -#: ../midori/midori-preferences.c:590 +#: ../midori/midori-preferences.c:463 +msgid "Hostname" +msgstr "主機名稱" + +#: ../midori/midori-preferences.c:487 msgid "MB" msgstr "MB" -#. Page "Privacy" -#: ../midori/midori-preferences.c:597 -msgid "Privacy" -msgstr "私密性" - -#: ../midori/midori-preferences.c:604 -msgid "Web Cookies" -msgstr "網頁訊餅" - -#: ../midori/midori-preferences.c:617 ../midori/midori-preferences.c:629 -msgid "days" -msgstr "天" - -#: ../midori/midori-preferences.c:622 ../panels/midori-history.c:104 -msgid "History" -msgstr "歷史" - -#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:279 -msgid "Empty" -msgstr "清空" - -#: ../midori/midori-searchaction.c:811 +#: ../midori/midori-searchaction.c:902 msgid "Add search engine" msgstr "加入搜尋引擎" -#: ../midori/midori-searchaction.c:811 +#: ../midori/midori-searchaction.c:902 msgid "Edit search engine" msgstr "編輯搜尋引擎" -#: ../midori/midori-searchaction.c:839 +#: ../midori/midori-searchaction.c:931 msgid "_Name:" msgstr "名稱(_N)：" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:947 +msgid "_Description:" +msgstr "描述(_D)：" + +#: ../midori/midori-searchaction.c:981 msgid "_Icon:" msgstr "圖示(_I)：" -#: ../midori/midori-searchaction.c:897 +#: ../midori/midori-searchaction.c:995 msgid "_Token:" msgstr "符記(_T)：" -#: ../midori/midori-searchaction.c:1074 +#: ../midori/midori-searchaction.c:1295 msgid "Manage Search Engines" msgstr "管理搜尋引擎" -#: ../midori/sokoke.c:109 ../midori/sokoke.c:121 +#: ../midori/midori-searchaction.c:1395 +msgid "Use as _default" +msgstr "作為預設使用(_D)" + +#: ../midori/sokoke.c:412 +msgid "Open with" +msgstr "以此開啟" + +#: ../midori/sokoke.c:420 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "選擇開啟「%s」用的應用程式或指令：" + +#: ../midori/sokoke.c:461 +#: ../midori/sokoke.c:471 +#: ../midori/sokoke.c:499 +#: ../midori/sokoke.c:528 +#: ../midori/sokoke.c:542 msgid "Could not run external program." msgstr "無法執行外部程式。" -#. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:403 -msgid "Warning: You are using a superuser account!" -msgstr "警告：您正在使用超級使用者帳號！" - -#: ../midori/sokoke.c:734 -msgid "_Bookmark" -msgstr "書籤(_B)" - -#: ../midori/sokoke.c:736 -msgid "_Add Bookmark" -msgstr "加入書籤(_A)" +#: ../midori/sokoke.c:1653 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d 小時" -#: ../midori/sokoke.c:737 -msgid "_Console" -msgstr "主控臺(_C)" +#: ../midori/sokoke.c:1654 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d 分鐘" -#: ../midori/sokoke.c:738 -msgid "_Extensions" -msgstr "擴充功能(_E)" +#: ../midori/sokoke.c:1655 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d 秒" -#: ../midori/sokoke.c:739 -msgid "_History" -msgstr "歷史(_H)" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/sokoke.c:1663 +#: ../panels/midori-transfers.c:267 +#, c-format +msgid "%s of %s" +msgstr "%s / %s" -#: ../midori/sokoke.c:740 -msgid "_Homepage" -msgstr "首頁(_H)" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/sokoke.c:1672 +msgid "?B" +msgstr "?B" -#: ../midori/sokoke.c:741 -msgid "_Userscripts" -msgstr "使用者命令稿(_U)" +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/sokoke.c:1675 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/sokoke.c:742 -msgid "User_styles" -msgstr "使用者樣式(_S)" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/sokoke.c:1692 +#, c-format +msgid " - %s remaining" +msgstr " - 還要 %s" -#: ../midori/sokoke.c:743 -msgid "New _Tab" -msgstr "新分頁(_T)" +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:264 +msgid "_Inline Find:" +msgstr "列內尋找(_I)：" -#: ../midori/sokoke.c:744 -msgid "_Transfers" -msgstr "傳送(_T)" +#: ../toolbars/midori-findbar.c:290 +msgid "Previous" +msgstr "上一個" -#: ../midori/sokoke.c:745 -msgid "_Closed Tabs and Windows" -msgstr "關閉的分頁和視窗(_C)" +#: ../toolbars/midori-findbar.c:296 +msgid "Next" +msgstr "下一個" -#: ../midori/sokoke.c:746 -msgid "New _Window" -msgstr "開新視窗(_W)" +#: ../toolbars/midori-findbar.c:300 +msgid "Match Case" +msgstr "符合大小寫" -#: ../midori/gjs.c:742 ../midori/gjs.c:832 -#, c-format -msgid "%s has no property '%s'" -msgstr "%s 沒有任何「%s」屬性" +#: ../toolbars/midori-findbar.c:309 +msgid "Highlight Matches" +msgstr "突顯相符者" -#: ../midori/gjs.c:878 -#, c-format -msgid "%s cannot be assigned to %s.%s" -msgstr "%s 無法被指派為 %s.%s" +#: ../toolbars/midori-findbar.c:320 +msgid "Close Findbar" +msgstr "關閉尋找列" -#: ../midori/gjs.c:888 +#: ../toolbars/midori-transferbar.c:122 #, c-format -msgid "%s.%s cannot be accessed" -msgstr "%s.%s 無法被存取" +msgid "The file '%s' has been downloaded." +msgstr "已下載「%s」檔案。" -#: ../panels/midori-addons.c:97 ../panels/midori-addons.c:143 -msgid "Userscripts" -msgstr "使用者命令稿" - -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:145 -msgid "Userstyles" -msgstr "使用者樣式" +#: ../toolbars/midori-transferbar.c:125 +msgid "Transfer completed" +msgstr "傳輸完成" + +#: ../toolbars/midori-transferbar.c:193 +msgid "The downloaded file is erroneous." +msgstr "下載的檔案有錯誤。" + +#: ../toolbars/midori-transferbar.c:194 +msgid "The checksum provided with the link did not match. This means the file is probably incomplete or was modified afterwards." +msgstr "連結所提供的檢驗計算碼不相符。這代表檔案可能不完整或之後有被修改過。" + +#: ../toolbars/midori-transferbar.c:331 +#: ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "清除全部" + +#: ../toolbars/midori-transferbar.c:368 +#: ../toolbars/midori-transferbar.c:370 +msgid "Some files are being downloaded" +msgstr "有些檔案正在下載中" + +#: ../toolbars/midori-transferbar.c:374 +msgid "_Quit Midori" +msgstr "退出 Midori(_Q)" + +#: ../toolbars/midori-transferbar.c:376 +msgid "The transfers will be cancelled if Midori quits." +msgstr "若退出 Midori，將會取消傳輸作業。" -#: ../panels/midori-addons.c:1005 ../panels/midori-extensions.c:144 -msgid "_Enable" -msgstr "啟用(_E)" - -#: ../panels/midori-addons.c:1014 ../panels/midori-extensions.c:153 -msgid "_Disable" -msgstr "停用(_D)" - -#: ../panels/midori-bookmarks.c:103 +#: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "書籤" -#: ../panels/midori-bookmarks.c:236 +#: ../panels/midori-bookmarks.c:257 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "加入書籤項目失敗：%s\n" + +#: ../panels/midori-bookmarks.c:435 msgid "Edit the selected bookmark" -msgstr "編輯已選書籤" +msgstr "編輯所選書籤" -#: ../panels/midori-bookmarks.c:244 +#: ../panels/midori-bookmarks.c:443 msgid "Delete the selected bookmark" -msgstr "刪除已選書籤" +msgstr "刪除所選書籤" -#: ../panels/midori-bookmarks.c:257 +#: ../panels/midori-bookmarks.c:458 msgid "Add a new folder" msgstr "加入新的資料夾" -#: ../panels/midori-bookmarks.c:589 +#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-history.c:633 msgid "Separator" msgstr "分隔符號" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "主控臺" +#: ../panels/midori-history.c:111 +msgid "History" +msgstr "歷史" -#: ../panels/midori-extensions.c:87 -msgid "Extensions" -msgstr "擴充功能" +#: ../panels/midori-history.c:158 +#: ../panels/midori-history.c:189 +msgid "Today" +msgstr "今天" -#: ../panels/midori-history.c:159 +#: ../panels/midori-history.c:160 +#: ../panels/midori-history.c:191 +msgid "Yesterday" +msgstr "昨天" + +#: ../panels/midori-history.c:162 +#: ../panels/midori-history.c:186 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "%d 天前" + +#: ../panels/midori-history.c:165 +#: ../panels/midori-history.c:184 +msgid "A week ago" +msgstr "一週前" + +#: ../panels/midori-history.c:360 msgid "Are you sure you want to remove all history items?" msgstr "確定要移除所有歷史項目？" -#: ../panels/midori-history.c:216 +#: ../panels/midori-history.c:407 msgid "Bookmark the selected history item" -msgstr "已選歷史項目加入書籤" +msgstr "將所選歷史項目加入書籤" -#: ../panels/midori-history.c:225 +#: ../panels/midori-history.c:416 msgid "Delete the selected history item" -msgstr "刪除已選歷史項目" +msgstr "刪除所選歷史項目" -#: ../panels/midori-history.c:233 +#: ../panels/midori-history.c:424 msgid "Clear the entire history" msgstr "清空整個歷史" -#: ../panels/midori-history.c:603 -#, c-format -msgid "A week ago" -msgstr "一週之前" - -#: ../panels/midori-history.c:609 -#, c-format -msgid "%d days ago" -msgstr "%d 天之前" - -#: ../panels/midori-history.c:616 -msgid "Today" -msgstr "今天" +#: ../panels/midori-transfers.c:86 +msgid "Transfers" +msgstr "傳輸" -#: ../panels/midori-history.c:618 -msgid "Yesterday" -msgstr "昨天" +#: ../panels/midori-transfers.c:467 +msgid "Open Destination _Folder" +msgstr "開啟目的地資料夾(_F)" -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:52 -msgid "Plugins" -msgstr "外掛程式" +#: ../panels/midori-transfers.c:470 +msgid "Copy Link Loc_ation" +msgstr "複製鏈結位置(_A)" -#: ../katze/katze-http-auth.c:101 +#: ../katze/katze-http-auth.c:210 msgid "Authentication Required" -msgstr "認證所需" +msgstr "需要認證" -#: ../katze/katze-http-auth.c:117 +#: ../katze/katze-http-auth.c:226 msgid "" "A username and a password are required\n" "to open this location:" @@ -1518,62 +2243,1120 @@ "需要使用者名稱和密碼\n" "以開啟這個位置：" -#: ../katze/katze-http-auth.c:131 +#: ../katze/katze-http-auth.c:240 msgid "Username" msgstr "使用者名稱" -#: ../katze/katze-http-auth.c:142 +#: ../katze/katze-http-auth.c:253 msgid "Password" msgstr "密碼" -#: ../katze/katze-throbber.c:828 +#: ../katze/katze-http-auth.c:267 +msgid "_Remember password" +msgstr "記住密碼(_R)" + +#: ../katze/katze-throbber.c:949 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "無法載入名為「%s」的圖示" -#: ../katze/katze-throbber.c:841 +#: ../katze/katze-throbber.c:962 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "無法載入庫存圖示「%s」" -#: ../katze/katze-throbber.c:907 +#: ../katze/katze-throbber.c:1042 msgid "Animation frames are broken" -msgstr "動畫訊框不完整" +msgstr "動畫訊框損壞" -#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389 +#: ../katze/katze-utils.c:439 +#: ../katze/katze-utils.c:873 #, c-format msgid "Property '%s' is invalid for %s" msgstr "屬性「%s」對於 %s 無效" -#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248 +#: ../katze/katze-utils.c:485 +#: ../katze/katze-utils.c:514 +#: ../extensions/addons.c:308 msgid "Choose file" msgstr "選擇檔案" -#: ../katze/katze-utils.c:229 +#: ../katze/katze-utils.c:500 msgid "Choose folder" msgstr "選擇資料夾" -#: ../extensions/mouse-gestures/main.c:216 +#: ../katze/katze-utils.c:604 +msgid "None" +msgstr "無" + +#: ../katze/katze-utils.c:719 +msgid "1 hour" +msgstr "一小時" + +#: ../katze/katze-utils.c:720 +msgid "1 day" +msgstr "一天" + +#: ../katze/katze-utils.c:721 +msgid "1 week" +msgstr "一週" + +#: ../katze/katze-utils.c:722 +msgid "1 month" +msgstr "一個月" + +#: ../katze/katze-utils.c:723 +msgid "1 year" +msgstr "一年" + +#: ../katze/katze-preferences.c:91 +#: ../extensions/history-list.vala:235 +#, c-format +msgid "Preferences for %s" +msgstr "偏好設定用於 %s" + +#: ../extensions/adblock.c:467 +msgid "Configure Advertisement filters" +msgstr "設定廣告過濾條件" + +#: ../extensions/adblock.c:498 +#, 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:846 +msgid "Edit rule" +msgstr "編輯規則" + +#: ../extensions/adblock.c:860 +msgid "_Rule:" +msgstr "規則(_R)：" + +#: ../extensions/adblock.c:914 +msgid "Bl_ock image" +msgstr "阻擋影像(_O)" + +#: ../extensions/adblock.c:919 +msgid "Bl_ock link" +msgstr "阻擋鏈結(_O)" + +#: ../extensions/adblock.c:1620 +msgid "Advertisement blocker" +msgstr "廣告阻擋器" + +#: ../extensions/adblock.c:1621 +msgid "Block advertisements according to a filter list" +msgstr "根據過濾清單阻擋廣告" + +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:221 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "此頁面似乎含有一份使用者指令稿。您想要安裝它嗎？" + +#: ../extensions/addons.c:222 +msgid "_Install user script" +msgstr "安裝使用者指令稿(_I)" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:227 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "此頁面似乎包含一種使用者樣式。您想要安裝它嗎？" + +#: ../extensions/addons.c:228 +msgid "_Install user style" +msgstr "安裝使用者樣式(_I)" + +#: ../extensions/addons.c:236 +msgid "Don't install" +msgstr "不要安裝" + +#: ../extensions/addons.c:319 +#: ../extensions/addons.c:681 +msgid "Userscripts" +msgstr "使用者指令稿" + +#: ../extensions/addons.c:324 +#: ../extensions/addons.c:683 +msgid "Userstyles" +msgstr "使用者樣式" + +#: ../extensions/addons.c:380 +#: ../extensions/addons.c:459 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "錯誤" + +#: ../extensions/addons.c:421 +#, c-format +msgid "Do you want to delete '%s'?" +msgstr "您想要刪除「%s」嗎？" + +#: ../extensions/addons.c:427 +msgid "Delete user script" +msgstr "刪除使用者指令稿" + +#: ../extensions/addons.c:428 +msgid "Delete user style" +msgstr "刪除使用者樣式" + +#: ../extensions/addons.c:431 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "將永遠刪除 %s 檔案。" + +#: ../extensions/addons.c:570 +#: ../extensions/addons.c:647 +msgid "Open in Text Editor" +msgstr "以文字編輯器開啟" + +#: ../extensions/addons.c:572 +#: ../extensions/addons.c:656 +msgid "Open Target Folder" +msgstr "開啟目標資料夾" + +#: ../extensions/addons.c:638 +msgid "Add new addon" +msgstr "加入新的附加元件" + +#: ../extensions/addons.c:664 +msgid "Remove selected addon" +msgstr "移除所選的附加元件" + +#: ../extensions/addons.c:1696 +#: ../extensions/addons.c:1914 +msgid "User addons" +msgstr "使用者附加元件" + +#: ../extensions/addons.c:1826 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "無法監控「%s」資料夾：%s" + +#: ../extensions/addons.c:1915 +msgid "Support for userscripts and userstyles" +msgstr "支援使用者指令稿與使用者樣式" + +#: ../extensions/colorful-tabs.c:201 +msgid "Colorful Tabs" +msgstr "彩色分頁" + +#: ../extensions/colorful-tabs.c:202 +msgid "Tint each tab distinctly" +msgstr "將每個分頁著上不同的色彩" + +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 +msgid "Cookie Manager" +msgstr "訊餅管理員" + +#: ../extensions/cookie-manager/cookie-manager-page.c:103 +msgid "Delete All" +msgstr "刪除全部" + +#: ../extensions/cookie-manager/cookie-manager-page.c:105 +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:120 +msgid "Expand All" +msgstr "全部擴展" + +#: ../extensions/cookie-manager/cookie-manager-page.c:127 +msgid "Collapse All" +msgstr "全部折疊" + +#: ../extensions/cookie-manager/cookie-manager-page.c:572 +msgid "Do you really want to delete all cookies?" +msgstr "確定要移除所有訊餅？" + +#: ../extensions/cookie-manager/cookie-manager-page.c:574 +msgid "Question" +msgstr "問題" + +#: ../extensions/cookie-manager/cookie-manager-page.c:583 +msgid "Only cookies which match the filter will be deleted." +msgstr "只有符合過濾條件的訊餅會被刪除。" + +#: ../extensions/cookie-manager/cookie-manager-page.c:671 +msgid "At the end of the session" +msgstr "於工作階段結束" + +#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" +"主機：%s\n" +"名稱：%s\n" +"值：%s\n" +"路徑：%s\n" +"安全：%s\n" +"期限：%s" + +#: ../extensions/cookie-manager/cookie-manager-page.c:680 +msgid "Yes" +msgstr "是" + +#: ../extensions/cookie-manager/cookie-manager-page.c:680 +msgid "No" +msgstr "否" + +#: ../extensions/cookie-manager/cookie-manager-page.c:694 +#, c-format +msgid "" +"Domain: %s\n" +"Cookies: %d" +msgstr "" +"網域：%s\n" +"訊餅：%d" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1024 +msgid "Name" +msgstr "名稱" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1077 +msgid "_Expand All" +msgstr "全部擴展(_E)" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1085 +msgid "_Collapse All" +msgstr "全部折疊(_C)" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1139 +msgid "Filter:" +msgstr "過濾條件：" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "輸入過濾條件字串，只會顯示名稱或網域符合輸入的過濾字串的訊餅" + +#: ../extensions/cookie-manager/main.c:36 +msgid "List, view and delete cookies" +msgstr "列出、檢視、刪除訊餅" + +#: ../extensions/copy-tabs.c:38 +msgid "Copy Tab _Addresses" +msgstr "複製分頁位址(_A)" + +#: ../extensions/copy-tabs.c:95 +msgid "Copy Addresses of Tabs" +msgstr "複製分頁的位址" + +#: ../extensions/copy-tabs.c:96 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "複製所有分頁的位址至剪貼簿" + +#: ../extensions/feed-panel/feed-atom.c:209 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "無法在 XML 資料內找到必須的 RSS 「entry」元素。" + +#: ../extensions/feed-panel/feed-atom.c:315 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "無法在 XML 資料內找到必須的 Atom「feed」元素。" + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:387 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "上次更新：%s" + +#: ../extensions/feed-panel/feed-panel.c:653 +msgid "Feeds" +msgstr "饋流" + +#: ../extensions/feed-panel/feed-panel.c:706 +msgid "Add new feed" +msgstr "加入新饋流" + +#: ../extensions/feed-panel/feed-panel.c:713 +msgid "Delete feed" +msgstr "刪除饋流" + +#: ../extensions/feed-panel/feed-panel.c:795 +msgid "_Feeds" +msgstr "饋流(_F)" + +#: ../extensions/feed-panel/feed-parse.c:195 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "無法於饋流 XML 資料內找到根元素。" + +#: ../extensions/feed-panel/feed-parse.c:235 +#, c-format +msgid "Unsupported feed format." +msgstr "未支援的饋流格式。" + +#: ../extensions/feed-panel/feed-parse.c:265 +#, 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 資料內找到必須的 RSS 「channel」元素。" + +#: ../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 "無法在 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」元素。" + +#: ../extensions/feed-panel/main.c:131 +#, c-format +msgid "Feed '%s' already exists" +msgstr "「%s」饋流已經存在" + +#: ../extensions/feed-panel/main.c:208 +#, c-format +msgid "Error loading feed '%s'" +msgstr "載入「%s」饋流時發生錯誤" + +#: ../extensions/feed-panel/main.c:518 +msgid "Feed Panel" +msgstr "饋流面板" + +#: ../extensions/feed-panel/main.c:519 +msgid "Read Atom/ RSS feeds" +msgstr "閱讀 Atom/ RSS 饋流" + +#: ../extensions/formhistory/formhistory.c:39 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "加入表單值失敗：%s\n" + +#: ../extensions/formhistory/formhistory.c:95 +msgid "Form history" +msgstr "從歷史" + +#: ../extensions/formhistory/formhistory.c:112 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"需要主密碼才能\n" +"開啟密碼資料庫" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "記住此網頁上的密碼？" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "記住" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "不是現在" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "對於這個網頁永遠不要" + +#: ../extensions/formhistory/formhistory.c:437 +msgid "Toggle form history state" +msgstr "從歷史狀態切換" + +#: ../extensions/formhistory/formhistory.c:438 +msgid "Activate or deactivate form history for the current tab." +msgstr "為目前分頁啟動或關閉表單歷史。" + +#: ../extensions/formhistory/formhistory.c:549 +#: ../extensions/formhistory/formhistory.c:553 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "執行資料庫敘述時失敗：%s\n" + +#: ../extensions/formhistory/formhistory.c:629 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "只透過熱鍵 (Ctrl+Shift+F) 在每個分頁上啟動表單歷史" + +#: ../extensions/formhistory/formhistory.c:668 +msgid "Form history filler" +msgstr "表單歷史填寫器" + +#: ../extensions/formhistory/formhistory.c:669 +msgid "Stores history of entered form data" +msgstr "儲存已輸入表單資料的歷史" + +#: ../extensions/formhistory/formhistory-gdom-frontend.c:225 +#: ../extensions/formhistory/formhistory-js-frontend.c:106 +#, c-format +msgid "Failed to select suggestions\n" +msgstr "無法選取建議\n" + +#: ../extensions/history-list.vala:197 +msgid "There are no unvisited tabs" +msgstr "沒有尚未造訪的分頁" + +#: ../extensions/history-list.vala:235 +#, c-format +msgid "History-List" +msgstr "歷史清單" + +#: ../extensions/history-list.vala:275 +msgid "Tab closing behavior" +msgstr "分頁關閉行為" + +#: ../extensions/history-list.vala:283 +msgid "Do nothing" +msgstr "不做任何事" + +#: ../extensions/history-list.vala:289 +msgid "Switch to last viewed tab" +msgstr "切換至最後檢視的分頁" + +#: ../extensions/history-list.vala:295 +msgid "Switch to newest tab" +msgstr "切換至最新的分頁" + +#: ../extensions/history-list.vala:423 +msgid "Next new Tab (History List)" +msgstr "下一個新分頁 (歷史清單)" + +#: ../extensions/history-list.vala:424 +msgid "Next new tab from history" +msgstr "下一個歷史中的新分頁" + +#: ../extensions/history-list.vala:433 +msgid "Previous new Tab (History List)" +msgstr "上一個新分頁 (歷史清單)" + +#: ../extensions/history-list.vala:434 +msgid "Previous new tab from history" +msgstr "上一個歷史中的新分頁" + +#: ../extensions/history-list.vala:443 +msgid "Display tab in background (History List)" +msgstr "在背景顯示分頁 (歷史清單)" + +#: ../extensions/history-list.vala:444 +msgid "Display the current selected tab in background" +msgstr "在背景顯示目前選取的分頁" + +#: ../extensions/history-list.vala:569 +msgid "History List" +msgstr "歷史清單" + +#: ../extensions/history-list.vala:570 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "當切換或關閉分頁時移動最後使用的分頁" + +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "滑鼠手勢" -#: ../extensions/mouse-gestures/main.c:217 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "藉由移動滑鼠來控制 Midori" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:116 ../extensions/page-holder.c:153 -msgid "Pageholder" -msgstr "長駐頁面" - -#: ../extensions/page-holder.c:137 -msgid "_Pageholder" -msgstr "長駐頁面(_P)" +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "重新載入頁面或停止載入" + +#: ../extensions/shortcuts.c:176 +msgid "Customize Keyboard shortcuts" +msgstr "自訂鍵盤捷徑" + +#: ../extensions/shortcuts.c:283 +msgid "Customize Sh_ortcuts..." +msgstr "自訂捷徑(_O)..." + +#: ../extensions/shortcuts.c:320 +msgid "Shortcuts" +msgstr "捷徑" + +#: ../extensions/shortcuts.c:321 +msgid "View and edit keyboard shortcuts" +msgstr "檢視並編輯鍵盤捷徑" + +#: ../extensions/status-clock.c:174 +msgid "Statusbar Clock" +msgstr "狀態列時鐘" + +#: ../extensions/status-clock.c:175 +msgid "Display date and time in the statusbar" +msgstr "於狀態列顯示日期與時間" -#: ../extensions/statusbar-features.c:38 +#: ../extensions/statusbar-features.c:131 msgid "Images" -msgstr "圖像" +msgstr "影像" -#: ../extensions/statusbar-features.c:45 +#: ../extensions/statusbar-features.c:140 msgid "Scripts" -msgstr "命令稿" +msgstr "指令稿" + +#: ../extensions/statusbar-features.c:151 +msgid "Netscape plugins" +msgstr "Netscapte 外掛程式" + +#: ../extensions/statusbar-features.c:199 +msgid "Statusbar Features" +msgstr "狀態列特色" + +#: ../extensions/statusbar-features.c:200 +msgid "Easily toggle features on web pages on and off" +msgstr "輕鬆開啟或關閉網頁上的功能" + +#: ../extensions/tab-panel.c:593 +#: ../extensions/tab-panel.c:680 +msgid "Tab Panel" +msgstr "分頁面板" + +#: ../extensions/tab-panel.c:663 +msgid "T_ab Panel" +msgstr "分頁面板(_A)" + +#: ../extensions/tab-panel.c:681 +msgid "Show tabs in a vertical panel" +msgstr "以垂直面板顯示分頁" + +#: ../extensions/tabs-minimized.c:76 +msgid "Only Icons on Tabs by default" +msgstr "分頁預設只使用圖示表示" + +#: ../extensions/tabs-minimized.c:77 +msgid "New tabs have no label by default" +msgstr "新分頁預設情況下沒有分頁標籤" + +#: ../extensions/toolbar-editor.c:393 +msgid "Customize Toolbar" +msgstr "自訂工具列" + +#: ../extensions/toolbar-editor.c:409 +msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop." +msgstr "選取工具列上要顯示的項目。這些項目可以利用拖曳方式來重新調整位置。" + +#: ../extensions/toolbar-editor.c:425 +msgid "Available Items" +msgstr "可用項目" + +#: ../extensions/toolbar-editor.c:446 +msgid "Displayed Items" +msgstr "顯示的項目" + +#: ../extensions/toolbar-editor.c:581 +msgid "Customize _Toolbar..." +msgstr "自訂工具列(_T)…" + +#: ../extensions/toolbar-editor.c:597 +msgid "_Customize..." +msgstr "自訂(_C)…" + +#: ../extensions/toolbar-editor.c:627 +msgid "Toolbar Editor" +msgstr "工具列編輯器" + +#: ../extensions/toolbar-editor.c:628 +msgid "Easily edit the toolbar layout" +msgstr "輕鬆編輯工具列配置" + +#: ../extensions/web-cache.c:463 +msgid "Cache HTTP communication on disk" +msgstr "對 HTTP 通訊製作一份硬碟快取" + +#~ msgid "Cookies" +#~ msgstr "訊餅" + +#~ msgid "'Flash' Cookies" +#~ msgstr "'Flash' 訊餅" + +#~ msgid "HTML5 _Databases" +#~ msgstr "HTML5 資料庫(_D)" + +#~ msgid "Offline Application Cache" +#~ msgstr "離線應用程式快取" + +#~ msgid "Lightweight web browser" +#~ msgstr "輕量網頁瀏覽器" + +#~ msgid "Not available: %s" +#~ msgstr "不可用：%s" + +#~ msgid "Resource files not installed" +#~ msgstr "尚未安裝資源檔" + +#~ msgid "No filename specified" +#~ msgstr "未指定任何檔名" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "瀏覽時不儲存任何隱私資料" + +#~ msgid "Add shortcut to speed dial" +#~ msgstr "加入捷徑至快速播號" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "將捷徑加入至桌面" + +#~ msgid "Create a launcher" +#~ msgstr "建立啟動器" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "訂閱此新聞饋流" + +#~ msgid "Close this window" +#~ msgstr "關閉這個視窗" + +#~ msgid "Close all open windows" +#~ msgstr "關閉所有開啟的視窗" + +#~ msgid "Undo the last modification" +#~ msgstr "取消上次的修改" + +#~ msgid "Redo the last modification" +#~ msgstr "再次執行上次的修改" + +#~ msgid "Cut the selected text" +#~ msgstr "剪下所選文字" + +#~ msgid "Copy the selected text" +#~ msgstr "複製所選文字" + +#~ msgid "Paste text from the clipboard" +#~ msgstr "從剪貼簿貼上文字" + +#~ msgid "Delete the selected text" +#~ msgstr "刪除所選文字" + +#~ msgid "Select all text" +#~ msgstr "選取所有文字" + +#~ msgid "Find the next occurrence of a word or phrase" +#~ msgstr "尋找下一個出現的字詞或片語" + +#~ msgid "Find the previous occurrence of a word or phrase" +#~ msgstr "尋找上一個出現的字詞或片語" + +#~ msgid "Reset the zoom level" +#~ msgstr "重置縮放等級" + +#~ msgid "View the source code of the page" +#~ msgstr "檢視頁面的原始碼" + +#~ msgid "Scroll to the left" +#~ msgstr "向左捲" + +#~ msgid "Scroll down" +#~ msgstr "向下捲" + +#~ msgid "Scroll up" +#~ msgstr "向上捲" + +#~ msgid "Scroll to the right" +#~ msgstr "向右捲" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "刪除回收筒的內容" + +#~ msgid "Open the last closed tab" +#~ msgstr "開啟上次關閉的分頁" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "加入新的書籤資料夾" + +#~ msgid "Add, edit and remove search engines..." +#~ msgstr "加入、編輯、移除搜尋引擎…" + +#~ msgid "Clear private data..." +#~ msgstr "清除隱私資料..." + +#~ msgid "Inspect page details and access developer tools..." +#~ msgstr "審閱頁面詳細資料並存取開發者工具..." + +#~ msgid "Switch to the previous tab" +#~ msgstr "切換至上一個分頁" + +#~ msgid "Switch to the next tab" +#~ msgstr "切換至下一個分頁" + +#~ msgid "Move tab behind the previous tab" +#~ msgstr "將分頁移至上個分頁之後" + +#~ msgid "Move tab in front of the next tab" +#~ msgstr "將分頁移至下個分頁之前" + +#~ msgid "Focus the current tab" +#~ msgstr "專注於目前分頁" + +#~ msgid "Cycle focus between views" +#~ msgstr "在檢視點之間循環切換焦點" + +#~ msgid "Only show the icon of the current tab" +#~ msgstr "只顯示目前分頁的圖示" + +#~ msgid "Duplicate the current tab" +#~ msgstr "製作目前分頁的複本" + +#~ msgid "Close all tabs except the current tab" +#~ msgstr "關閉目前分頁除外的所有分頁" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "開啟上次工作階段儲存的分頁" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "顯示常見問題集" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "開啟 Midori 錯誤追蹤器" + +#~ msgid "Show information about the program" +#~ msgstr "顯示程式相關資訊" + +#~ msgid "Show menubar" +#~ msgstr "顯示選單列" + +#~ msgid "Show navigationbar" +#~ msgstr "顯示導覽列" + +#~ msgid "Show sidepanel" +#~ msgstr "顯示側邊面板" + +#~ msgid "Show bookmarkbar" +#~ msgstr "顯示書籤列" + +#~ msgid "Show statusbar" +#~ msgstr "顯示狀態列" + +#~ msgid "MD5-Checksum:" +#~ msgstr "MD5 檢驗計算碼：" + +#~ msgid "SHA1-Checksum:" +#~ msgstr "SHA1 檢驗計算碼：" + +#~ msgid "Set number of columns and rows" +#~ msgstr "設定欄與列的數目" + +#~ msgid "Enter number of columns and rows:" +#~ msgstr "輸入欄與列的數目：" + +#~ msgid "Invalid input for the size of the speed dial" +#~ msgstr "快速播號的大小輸入無效" + +#~ msgid "Thumb size:" +#~ msgstr "縮圖大小：" + +#~ msgid "Small" +#~ msgstr "小" + +#~ msgid "Medium" +#~ msgstr "中" + +#~ msgid "Big" +#~ msgstr "大" + +#~ msgid "Reset the last _session" +#~ msgstr "重置上次執行階段(_S)" + +#~ msgid "Quit the application" +#~ msgstr "退出應用程式" + +#~ msgid "_Contents" +#~ msgstr "內容(_C)" + +#~ msgid "Show the documentation" +#~ msgstr "顯示文件" + +#~ msgid "Failed to execute database statement\n" +#~ msgstr "執行資料庫敘述時失敗\n" + +#~ msgid "Show Blank page" +#~ msgstr "縣市空白頁面" + +#~ msgid "All cookies" +#~ msgstr "所有訊餅" + +#~ msgid "Session cookies" +#~ msgstr "工作階段訊餅" + +#~ msgid "Show Transferbar" +#~ msgstr "顯示傳輸列" + +#~ msgid "Whether to show the transferbar" +#~ msgstr "是否要顯示傳輸列" + +#, fuzzy +#~ msgid "Search engines in location completion" +#~ msgstr "在位置欄中顯示進度" + +#, fuzzy +#~ msgid "Whether to show search engines in the location completion" +#~ msgstr "是否要在位置欄中顯示載入進度" + +#~ msgid "Show operating controls of the panel" +#~ msgstr "顯示面板的操作控制項" + +#~ msgid "Whether to show the operating controls of the panel" +#~ msgstr "是否要顯示面板的操作控制項" + +#~ msgid "Show speed dial in new tabs" +#~ msgstr "於新分頁顯示快速播號" + +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "於新開啟的分頁內顯示快速播號" + +#~ msgid "Download Manager" +#~ msgstr "下載管理員" + +#~ msgid "An external download manager" +#~ msgstr "外部下載管理員" + +#~ msgid "Open external pages in:" +#~ msgstr "開啟外部頁面於：" + +#~ msgid "Where to open externally opened pages" +#~ msgstr "何處開啟外部開啟的頁面" + +#~ msgid "Accept cookies" +#~ msgstr "接受訊餅" + +#~ msgid "What type of cookies to accept" +#~ msgstr "要接受什麼類型的訊餅" + +#~ msgid "Maximum cookie age" +#~ msgstr "最大訊餅時限" + +#~ msgid "Maximum history age" +#~ msgstr "最大造訪歷史時限" + +#~ msgid "Remember last downloaded files" +#~ msgstr "記住上次下載檔案" + +#~ msgid "Whether the last downloaded files are saved" +#~ msgstr "是否要儲存上次下載的檔案" + +#~ msgid "Not found - %s" +#~ msgstr "找不到 - %s" + +#~ msgid "Download with Download _Manager" +#~ msgstr "使用下載管理員下載(_M)" + +#~ msgid "Document cannot be displayed" +#~ msgstr "無法顯示文件" + +#~ msgid "General" +#~ msgstr "一般" + +#~ msgid "Appearance" +#~ msgstr "外觀" + +#~ msgid "Font settings" +#~ msgstr "字型設定值" + +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "強制每英吋 96 點" + +#~ msgid "Enforce a video dot density of 96 DPI" +#~ msgstr "強制畫面像點密度為 96 DPI" + +#~ msgid "Interface" +#~ msgstr "介面" + +#~ msgid "Navigationbar" +#~ msgstr "導覽列" + +#~ msgid "Applications" +#~ msgstr "應用程式" + +#~ msgid "External applications" +#~ msgstr "外部應用程式" + +#~ msgid "Web Cookies" +#~ msgstr "網頁訊餅" + +#~ msgid "Delete cookies when quitting Midori" +#~ msgstr "當退出 Midori 時刪除訊餅" + +#~ msgid "Delete old cookies after 1 hour" +#~ msgstr "刪除大於 1 小時的舊訊餅" + +#~ msgid "Delete old cookies after 1 week" +#~ msgstr "刪除大於 1 週的舊訊餅" + +#~ msgid "Delete old cookies after 1 month" +#~ msgstr "刪除大於 1 個月的舊訊餅" + +#~ msgid "Delete old cookies after 1 year" +#~ msgstr "刪除大於 1 年的舊訊餅" + +#~ msgid "Configure _Advertisement filters..." +#~ msgstr "設定廣告過濾條件(_A)..." + +#~ msgid "Open target folder for selected addon" +#~ msgstr "為所選的附加元件開啟目標資料夾" + +#~ msgid "Next Tab (History List)" +#~ msgstr "下一個分頁 (歷史清單)" + +#~ msgid "Previous Tab (History List)" +#~ msgstr "上一個分頁 (歷史清單)" + +#~ msgid "Previous tab from history" +#~ msgstr "上一個歷史中的分頁" + +#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage" +#~ msgstr "以 Ctrl+Tab 在上次使用時所儲存的分頁間切換" + +#~ msgid "Pageholder" +#~ msgstr "頁面夾" + +#~ msgid "_Pageholder" +#~ msgstr "頁面夾(_P)" + +#~ msgid "Keep one or multiple pages open in parallel to your tabs" +#~ msgstr "與您的分頁平行開啟的一個或多個頁面" + +#~ msgid "%d%% loaded" +#~ msgstr "%d%% 已載入" + +#~ msgid "_Transferbar" +#~ msgstr "傳輸列(_T)" + +#~ msgid "Show transferbar" +#~ msgstr "顯示傳輸列" + +#~ msgid "Hide operating controls" +#~ msgstr "隱藏操作控制項" + +#~ msgid "Show progress in location entry" +#~ msgstr "在位置欄中顯示進度" + +#~ msgid "Whether to show loading progress in the location entry" +#~ msgstr "是否要在位置欄中顯示載入進度" + +#~ msgid "Ask for the destination folder" +#~ msgstr "詢問目的地資料夾" + +#~ msgid "Whether to ask for the destination folder when downloading a file" +#~ msgstr "下載檔案時是否要詢問儲存的目的地" + +#~ msgid "Whether to show a notification when a transfer has been completed" +#~ msgstr "當傳輸完成時是否要顯示通知" + +#~ msgid "_Save Link destination" +#~ msgstr "儲存鏈結網址(_S)" + +#~ msgid "_Download Link destination" +#~ msgstr "下載鏈結網址(_D)" + +#~ msgid "Download I_mage" +#~ msgstr "下載影像(_M)" + +#~ msgid "Spell Checking" +#~ msgstr "拼字檢查" + +#~ msgid "_Quick Find" +#~ msgstr "快速尋找(_Q)" + +#~ msgid "Quickly jump to a word or phrase" +#~ msgstr "快速跳到字詞或片語" + +#~ msgid "View Selection Source" +#~ msgstr "檢視所選原始碼" + +#~ msgid "_Recently visited pages" +#~ msgstr "最近造訪的頁面(_R)" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "重新開啟您之前造訪過的頁面" + +#~ msgid "Both" +#~ msgstr "兩者" + +#~ msgid "Both horizontal" +#~ msgstr "水平並列" + +#~ msgid "Load on Startup" +#~ msgstr "啟動時載入" + +#~ msgid "Original cookies only" +#~ msgstr "只限原本的訊餅" + +#~ msgid "Remember last visited pages" +#~ msgstr "記住上次造訪的頁面" + +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "是否要儲存上次造訪的頁面" + +#~ msgid "Remember last form inputs" +#~ msgstr "記住上次表單輸入" + +#~ msgid "Whether the last form inputs are saved" +#~ msgstr "是否要儲存上次表單輸入" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "自動偵測代理伺服器" + +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" +#~ msgstr "是否要自動從環境中偵測代理伺服器" + +#~ msgid "Cache size" +#~ msgstr "快取大小" + +#~ msgid "The allowed size of the cache" +#~ msgstr "允許的快取大小" + +#~ msgid "Open _Link" +#~ msgstr "開啟鏈結(_L)" + +#~ msgid "Source" +#~ msgstr "原始碼" + +#~ msgid "The character encoding to use by default" +#~ msgstr "預設使用的字元編碼" + +#~ msgid "Shrink images automatically" +#~ msgstr "自動收縮圖像" + +#~ msgid "Automatically shrink standalone images to fit" +#~ msgstr "自動收縮單獨圖像以符合頁面" + +#~ msgid "Resizable text areas" +#~ msgstr "可變更大小的文字區" + +#~ msgid "Whether text areas are resizable" +#~ msgstr "是否文字區可變更大小" + +#~ msgid "Enable developer tools" +#~ msgstr "啟用開發工具" + +#~ msgid "Enable special extensions for developers" +#~ msgstr "啟用給開發者的特殊擴充功能" + +#~ msgid "Warning: You are using a superuser account!" +#~ msgstr "警告：您正在使用超級使用者帳號！" + +#~ msgid "User_styles" +#~ msgstr "使用者樣式(_S)" + +#~ msgid "%s has no property '%s'" +#~ msgstr "%s 沒有任何「%s」屬性" + +#~ msgid "%s cannot be assigned to %s.%s" +#~ msgstr "%s 無法被指派為 %s.%s" + +#~ msgid "%s.%s cannot be accessed" +#~ msgstr "%s.%s 無法被存取" + +#~ msgid "_Enable" +#~ msgstr "啟用(_E)" + +#~ msgid "_Disable" +#~ msgstr "停用(_D)" + +#~ msgid "Console" +#~ msgstr "主控臺" + +#~ msgid "Plugins" +#~ msgstr "外掛程式" diff -Nru midori-0.2.8/tests/bookmarks.c midori-0.4.6/tests/bookmarks.c --- midori-0.2.8/tests/bookmarks.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/tests/bookmarks.c 2012-05-14 22:13:42.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Christian Dywan + Copyright (C) 2012 Vincent Cappe This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -7,151 +7,203 @@ version 2.1 of the License, or (at your option) any later version. See the file COPYING for the full license text. -*/ - -#if HAVE_CONFIG_H - #include -#endif + */ #include "midori.h" -#include "midori-bookmarks.h" +#include "panels/midori-bookmarks.h" -static void -bookmarks_panel_create (void) +typedef struct +{ + KatzeArray* db_bookmarks; + KatzeArray* test_bookmarks; +} BookmarksFixture; + +typedef struct { - MidoriApp* app; - MidoriBookmarks* bookmarks; - gpointer value; + char *dbfile; /* usually ":memory:" */ + gboolean verbose; /* print debug stuff if TRUE */ + char* infile; /* (e.g. to test import), usually NULL */ + char* outfile; /* (e.g. to test export), if it can be avoided it's + better to not write anything to disk, though */ +} TestParameters; - app = g_object_new (MIDORI_TYPE_APP, NULL); +typedef void (*FixtureFunc)(BookmarksFixture*, const void*); - bookmarks = g_object_new (MIDORI_TYPE_BOOKMARKS, NULL); - value = katze_object_get_object (bookmarks, "app"); - g_assert (value == NULL); - gtk_widget_destroy (GTK_WIDGET (bookmarks)); - bookmarks = g_object_new (MIDORI_TYPE_BOOKMARKS, "app", app, NULL); - value = katze_object_get_object (bookmarks, "app"); - g_assert (value == app); - gtk_widget_destroy (GTK_WIDGET (bookmarks)); +static void +fixture_setup (BookmarksFixture* fixture, + const TestParameters* params) +{ + KatzeItem* item; + KatzeArray* folder; + sqlite3* db; + gchar *errmsg = NULL; - bookmarks = g_object_new (MIDORI_TYPE_BOOKMARKS, NULL); - g_object_set (bookmarks, "app", app, NULL); - value = katze_object_get_object (bookmarks, "app"); - g_assert (value == app); - gtk_widget_destroy (GTK_WIDGET (bookmarks)); + fixture->db_bookmarks = katze_array_new (KATZE_TYPE_ARRAY); + db = midori_bookmarks_initialize (fixture->db_bookmarks, params->dbfile, &errmsg); + if (db == NULL) + g_error ("Bookmarks couldn't be loaded: %s\n", errmsg); + g_assert (errmsg == NULL); + g_object_set_data ( G_OBJECT (fixture->db_bookmarks), "db", db); + + + fixture->test_bookmarks = katze_array_new (KATZE_TYPE_ARRAY); + + item = (KatzeItem*)katze_array_new (KATZE_TYPE_ARRAY); + item->name = "i am a folder"; + katze_array_add_item (fixture->test_bookmarks, item); + folder = (KatzeArray *) item; + + item = (KatzeItem*)katze_array_new (KATZE_TYPE_ARRAY); + item->name = "i am a folder inside a folder"; + katze_array_add_item (folder, item); + folder = (KatzeArray *) item; + + item = g_object_new (KATZE_TYPE_ITEM, + "uri", "http://xyzzy.invalid", + "name", "xyzzy", NULL); + katze_item_set_meta_integer (item, "app", TRUE); + katze_array_add_item (folder, item); + + /* level up */ + folder = katze_item_get_parent ((KatzeItem*)folder); + + item = g_object_new (KATZE_TYPE_ITEM, + "uri", "http://zyxxy.invalid", + "name", "zyxxy", + "text", "i have a description and am in a folder", NULL); + katze_item_set_meta_integer(item, "toolbar", TRUE); + katze_array_add_item (folder, item); + + folder = katze_item_get_parent ((KatzeItem*)folder); + /* we should be at toplevel, now */ + g_assert (folder == fixture->test_bookmarks); + + item = g_object_new (KATZE_TYPE_ITEM, + "uri", "http://foobarbaz.invalid", + "name", "i am in the toplevel folder", NULL); + katze_array_add_item (folder, item); } -static KatzeItem* -bookmark_new (const gchar* uri, - const gchar* title) +static void +fixture_teardown (BookmarksFixture* fixture, + const TestParameters *params) { - return g_object_new (KATZE_TYPE_ITEM, "uri", uri, "name", title, NULL); + sqlite3* db = g_object_get_data (G_OBJECT (fixture->db_bookmarks), "db"); + sqlite3_close (db); + g_object_unref (fixture->db_bookmarks); + g_object_unref (fixture->test_bookmarks); } -static KatzeArray* -folder_new (const gchar* title) +static void +print_bookmark (KatzeItem *bookmark) { - KatzeArray* folder; + g_print ("title : '%s'\n", katze_item_get_name (bookmark)); + g_print ("uri : '%s'\n", katze_item_get_uri (bookmark)); + g_print ("desc : '%s'\n", katze_item_get_text (bookmark)); + g_print ("app : %d\n", katze_item_get_meta_boolean (bookmark, "app")); + g_print ("toolbar: %d\n", katze_item_get_meta_boolean (bookmark, "toolbar")); +} + +static void +compare_items (KatzeItem *a, KatzeItem *b) +{ + g_assert_cmpstr ( katze_item_get_uri (a), ==, katze_item_get_uri (b)); + g_assert_cmpstr ( katze_item_get_name (a), ==, katze_item_get_name (b)); + g_assert_cmpstr ( katze_str_non_null (katze_item_get_text (a)), ==, katze_str_non_null (katze_item_get_text (b))); + g_assert_cmpint ( katze_item_get_meta_boolean (a, "app"), ==, katze_item_get_meta_boolean (b, "app")); + g_assert_cmpint ( katze_item_get_meta_boolean (a, "toolbar"), ==, katze_item_get_meta_boolean (b, "toolbar")); +} - folder = katze_array_new (KATZE_TYPE_ARRAY); - g_object_set (folder, "name", title, NULL); - return folder; +/* NB: assumes "title" is unique in a set */ +static void +compare_test_and_db (KatzeArray* test_bookmarks, + KatzeArray* db_bookmarks, + gboolean verbose) +{ + KatzeArray* db_items; + KatzeItem *test_item, *db_item; + GList* list; + + KATZE_ARRAY_FOREACH_ITEM_L (test_item, test_bookmarks, list) + { + if (verbose) + { + print_bookmark (test_item); + g_print ("----------\n"); + } + + db_items = midori_array_query_recursive (db_bookmarks, + "*", "title='%q'", katze_item_get_name (test_item), FALSE); + + g_assert_cmpint (katze_array_get_length (db_items), ==, 1); + db_item = katze_array_get_nth_item (db_items, 0); + + compare_items (db_item, test_item); + + if (KATZE_ITEM_IS_FOLDER(test_item)) + compare_test_and_db ( KATZE_ARRAY (test_item), db_bookmarks, verbose); + } + g_list_free (list); } static void -bookmarks_panel_fill (void) -{ - MidoriApp* app; - KatzeArray* array; - MidoriBookmarks* bookmarks; - GList* children; - GtkWidget* treeview; - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* bookmark; - KatzeArray* folder; - guint n; - gpointer value; +insert_bookmarks (KatzeArray* test_bookmarks, + KatzeArray* db_bookmarks, + gboolean verbose) +{ + KatzeItem* item; + GList* list; + sqlite3 *db = g_object_get_data (G_OBJECT (db_bookmarks), "db"); + + KATZE_ARRAY_FOREACH_ITEM_L (item, test_bookmarks, list) + { + if (verbose) + { + print_bookmark (item); + g_print ("----------\n"); + } + + midori_bookmarks_insert_item_db (db, item, 0); + + if (KATZE_ITEM_IS_FOLDER(item)) + insert_bookmarks (KATZE_ARRAY (item), db_bookmarks, verbose); + } + g_list_free (list); +} - app = g_object_new (MIDORI_TYPE_APP, NULL); - array = katze_array_new (KATZE_TYPE_ARRAY); - g_object_set (app, "bookmarks", array, NULL); - value = katze_object_get_object (app, "bookmarks"); - g_assert (value == array); - bookmarks = g_object_new (MIDORI_TYPE_BOOKMARKS, "app", app, NULL); - children = gtk_container_get_children (GTK_CONTAINER (bookmarks)); - treeview = g_list_nth_data (children, 0); - g_list_free (children); - g_assert (GTK_IS_TREE_VIEW (treeview)); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); - g_assert (GTK_IS_TREE_MODEL (model)); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, 0); - bookmark = bookmark_new ("http://www.example.com", "Example"); - katze_array_add_item (array, bookmark); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, 1); - katze_array_remove_item (array, bookmark); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, 0); - bookmark = bookmark_new ("http://www.example.com", "Example"); - katze_array_add_item (array, bookmark); - folder = folder_new ("Empty"); - katze_array_add_item (array, folder); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, 2); - katze_array_remove_item (array, folder); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, 1); - folder = folder_new ("Empty"); - katze_array_add_item (array, folder); - folder = folder_new ("Kurioses"); - katze_array_add_item (array, folder); - bookmark = bookmark_new ("http://www.ende.de", "Das Ende"); - katze_array_add_item (folder, bookmark); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, 3); - folder = folder_new ("Miscellaneous"); - katze_array_add_item (array, folder); - gtk_tree_model_iter_nth_child (model, &iter, NULL, 3); - n = gtk_tree_model_iter_n_children (model, &iter); - g_assert_cmpint (n, ==, 0); - bookmark = bookmark_new ("http://thesaurus.reference.com/", "Thesaurus"); - katze_array_add_item (folder, bookmark); - n = gtk_tree_model_iter_n_children (model, &iter); - g_assert_cmpint (n, ==, 1); - bookmark = bookmark_new ("http://en.wikipedia.org/", "Wikipedia"); - katze_array_add_item (folder, bookmark); - n = gtk_tree_model_iter_n_children (model, &iter); - g_assert_cmpint (n, ==, 2); - katze_array_remove_item (folder, bookmark); - n = gtk_tree_model_iter_n_children (model, &iter); - g_assert_cmpint (n, ==, 1); - katze_array_remove_item (array, folder); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, 3); - katze_array_add_item (array, folder); - /* katze_array_clear (folder); - n = gtk_tree_model_iter_n_children (model, &iter); - g_assert_cmpint (n, ==, 0); */ - katze_array_clear (array); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, 0); +static void +simple_test (BookmarksFixture* fixture, + const TestParameters* params) +{ + if (params->verbose) + g_print ("\n===== inserting items in the database =====\n"); + insert_bookmarks (fixture->test_bookmarks, fixture->db_bookmarks, params->verbose); + + if (params->verbose) + g_print ("===== comparing database with the original =====\n"); + compare_test_and_db (fixture->test_bookmarks, fixture->db_bookmarks, params->verbose); } + int main (int argc, char** argv) { - /* libSoup uses threads, therefore if WebKit is built with libSoup - or Midori is using it, we need to initialize threads. */ - if (!g_thread_supported ()) g_thread_init (NULL); + //TestParameters default_params = {"/a/path/unlikely/to/exists/bookmarks.db", TRUE, NULL, NULL}; + //TestParameters default_params = {"/tmp/bookmarks.db", TRUE, NULL, NULL}; + //TestParameters default_params = {":memory:", TRUE, NULL, NULL}; + TestParameters default_params = {":memory:", FALSE, NULL, NULL}; + + midori_app_setup (argv); g_test_init (&argc, &argv, NULL); gtk_init_check (&argc, &argv); - g_test_add_func ("/bookmarks/panel/create", bookmarks_panel_create); - g_test_add_func ("/bookmarks/panel/fill", bookmarks_panel_fill); + g_test_add ("/bookmarks/simple test", + BookmarksFixture, &default_params, + (FixtureFunc) fixture_setup, + (FixtureFunc) simple_test, + (FixtureFunc) fixture_teardown); return g_test_run (); } diff -Nru midori-0.2.8/tests/browser.c midori-0.4.6/tests/browser.c --- midori-0.2.8/tests/browser.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/tests/browser.c 2012-05-14 22:13:42.000000000 +0000 @@ -9,13 +9,7 @@ See the file COPYING for the full license text. */ -#if HAVE_CONFIG_H - #include -#endif - #include "midori.h" -#include "midori-stock.h" -#include "sokoke.h" static void browser_create (void) @@ -39,7 +33,9 @@ if (g_strcmp0 (gtk_action_get_name (action), "WindowClose")) if (g_strcmp0 (gtk_action_get_name (action), "EncodingCustom")) if (g_strcmp0 (gtk_action_get_name (action), "AddSpeedDial")) - gtk_action_activate (action); + if (g_strcmp0 (gtk_action_get_name (action), "PrivateBrowsing")) + if (g_strcmp0 (gtk_action_get_name (action), "AddDesktopShortcut")) + gtk_action_activate (action); actions = g_list_next (actions); } g_list_free (actions); @@ -47,18 +43,102 @@ g_object_unref (app); } +static void +browser_tooltips (void) +{ + MidoriBrowser* browser; + GtkActionGroup* action_group; + GList* actions; + gchar* toolbar; + guint errors = 0; + + browser = midori_browser_new (); + action_group = midori_browser_get_action_group (browser); + actions = gtk_action_group_list_actions (action_group); + toolbar = g_strjoinv (" ", (gchar**)midori_browser_get_toolbar_actions (browser)); + + while (actions) + { + GtkAction* action = actions->data; + const gchar* name = gtk_action_get_name (action); + + if (strstr ("CompactMenu Location Separator", name)) + { + actions = g_list_next (actions); + continue; + } + + if (strstr (toolbar, name) != NULL) + { + if (!gtk_action_get_tooltip (action)) + { + printf ("'%s' can be toolbar item but tooltip is unset\n", name); + errors++; + } + } + else + { + if (gtk_action_get_tooltip (action)) + { + printf ("'%s' is no toolbar item but tooltip is set\n", name); + errors++; + } + } + actions = g_list_next (actions); + } + g_free (toolbar); + g_list_free (actions); + gtk_widget_destroy (GTK_WIDGET (browser)); + + if (errors) + g_error ("Tooltip errors"); +} + +static void +browser_site_data (void) +{ + typedef struct + { + const gchar* url; + MidoriSiteDataPolicy policy; + } PolicyItem; + + static const PolicyItem items[] = { + { "google.com", MIDORI_SITE_DATA_BLOCK }, + { "facebook.com", MIDORI_SITE_DATA_BLOCK }, + { "bugzilla.gnome.org", MIDORI_SITE_DATA_PRESERVE }, + { "bugs.launchpad.net", MIDORI_SITE_DATA_ACCEPT }, + }; + + const gchar* rules = "-google.com,-facebook.com,!bugzilla.gnome.org,+bugs.launchpad.net"; + MidoriWebSettings* settings = g_object_new (MIDORI_TYPE_WEB_SETTINGS, + "site-data-rules", rules, NULL); + + guint i; + for (i = 0; i < G_N_ELEMENTS (items); i++) + { + MidoriSiteDataPolicy policy = midori_web_settings_get_site_data_policy ( + settings, items[i].url); + if (policy != items[i].policy) + g_error ("Match '%s' yields %d but %d expected", + items[i].url, policy, items[i].policy); + } + g_object_unref (settings); +} + int main (int argc, char** argv) { - /* libSoup uses threads, therefore if WebKit is built with libSoup - or Midori is using it, we need to initialize threads. */ - if (!g_thread_supported ()) g_thread_init (NULL); + midori_app_setup (argv); + g_object_set_data (G_OBJECT (webkit_get_default_session ()), + "midori-session-initialized", (void*)1); g_test_init (&argc, &argv, NULL); gtk_init_check (&argc, &argv); - sokoke_register_stock_items (); g_test_add_func ("/browser/create", browser_create); + g_test_add_func ("/browser/tooltips", browser_tooltips); + g_test_add_func ("/browser/site_data", browser_site_data); return g_test_run (); } diff -Nru midori-0.2.8/tests/completion.c midori-0.4.6/tests/completion.c --- midori-0.2.8/tests/completion.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/tests/completion.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,328 +0,0 @@ -/* - 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. -*/ - -#if HAVE_CONFIG_H - #include -#endif - -#include "midori.h" - -/* This is a private function */ -GtkWidget* -midori_location_action_entry_for_proxy (GtkWidget* proxy); - -static const gchar* compare_urls[] = { - "http://en.wikipedia.org/wiki/Foul", - "http://de.wikipedia.org/wiki/Düsseldorf", - "http://de.wikipedia.org/wiki/Düsseldorf", - "http://ja.wikipedia.org/wiki/若井はんじ・けんじ", - "http://www.johannkönig.com", - "http://şøñđëřżēıċħęŋđőmæîņĭśŧşũþėŗ.de", - }; - -static void -completion_compare (void) -{ - const guint runs = 10000; - guint t; - gdouble elapsed = 0.0; - - for (t = 0; t < runs; t++) - { - g_test_timer_start (); - guint i, j; - for (i = 0; i < G_N_ELEMENTS (compare_urls); i++) - { - gchar* url = katze_collfold (compare_urls[i]); - for (j = 0; j < G_N_ELEMENTS (compare_urls); j++) - katze_utf8_stristr (compare_urls[i], url); - g_free (url); - } - elapsed += g_test_timer_elapsed (); - } - g_print ("%f seconds for comparison\n", elapsed / runs); -} - -typedef struct -{ - const gchar* uri; - const gchar* name; -} CompletionItem; - -static const CompletionItem items[] = { - { "http://one.com", "One" }, - { "http://one.com/", "One" }, /* Duplicate */ - { "http://one.com/", "One One" }, /* Duplicate */ - { "http://one.com", "One Two" }, /* Duplicate */ - { "http://two.com", "Two" }, - { "http://three.com", "Three" }, - { "http://one.com/one/", "One off" }, - { "http://four.org", "One" }, - { "https://four.org", "Four" }, - { "ftp://four.org/", "ごオルゴ" }, - { "http://muenchen.de/weißwürste/", "Münchner Weißwürste" }, /* Umlauts */ - }; -static const guint items_n = 9; - -static void -completion_count (void) -{ - MidoriLocationAction* action; - GtkWidget* toolitem; - GtkWidget* location_entry; - GtkWidget* entry; - GtkTreeModel* model; - guint n, i; - - action = g_object_new (MIDORI_TYPE_LOCATION_ACTION, NULL); - toolitem = gtk_action_create_tool_item (GTK_ACTION (action)); - location_entry = midori_location_action_entry_for_proxy (toolitem); - entry = gtk_bin_get_child (GTK_BIN (location_entry)); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); - - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, 0); - midori_location_action_add_item (action, "http://one.com", NULL, "One"); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, 1); - midori_location_action_clear (action); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, 0); - for (i = 0; i < G_N_ELEMENTS (items); i++) - midori_location_action_add_item (action, items[i].uri, - NULL, items[i].name); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, items_n); - /* Adding the exact same items again shouldn't increase the total amount */ - for (i = 0; i < G_N_ELEMENTS (items); i++) - midori_location_action_add_item (action, items[i].uri, - NULL, items[i].name); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, items_n); -} - -/* Components to construct test addresses, the numbers take into account - how many items minus duplicates are unique. */ -static const gchar* protocols[] = { - "http", "https", "ftp" - }; -static const guint protocols_n = 3; -static const gchar* subs[] = { - "", "www.", "ww2.", "ftp." - }; -static const guint subs_n = 4; -static const gchar* slds[] = { - "one", "two", "four", "six", "seven"/*, "Seven", "SEVEN"*/ - }; -static const guint slds_n = 5; -static const gchar* tlds[] = { - "com", "org", "net", "de", "co.uk", "com.au"/*, "Com.Au", "COM.AU"*/ - }; -static const guint tlds_n = 6; -static const gchar* files[] = { - "/", "/index.html", "/img.png", /*"/weißwürste",*/ "/images/" - /*, "/Images", "/IMAGES/"*/ - }; -static const guint files_n = 4; - -static const gchar* inputs[] = { - "http://www.one.com/index", "http://two.de/images", "http://six.com.au/img"/*, - "http://muenchen.de/weißwürste/"*/ - }; -static const gchar* additions[] = { - "http://www.one.com/invention", "http://two.de/island", "http://six.com.au/ish" - }; - -static void location_action_fill (MidoriLocationAction* action) -{ - guint i, j, k, l, m; - - for (i = 0; i < G_N_ELEMENTS (protocols); i++) - for (j = 0; j < G_N_ELEMENTS (subs); j++) - for (k = 0; k < G_N_ELEMENTS (slds); k++) - for (l = 0; l < G_N_ELEMENTS (tlds); l++) - for (m = 0; m < G_N_ELEMENTS (files); m++) - { - gchar* uri = g_strdup_printf ("%s://%s%s.%s%s", - protocols[i], subs[j], slds[k], tlds[l], files[m]); - midori_location_action_add_item (action, uri, NULL, uri); - g_free (uri); - } -} - -static void -completion_fill (void) -{ - MidoriLocationAction* action; - GtkWidget* toolitem; - GtkWidget* location_entry; - GtkWidget* entry; - GtkTreeModel* model; - guint i, items_added, items_added_effective, n; - gdouble elapsed; - - action = g_object_new (MIDORI_TYPE_LOCATION_ACTION, NULL); - toolitem = gtk_action_create_tool_item (GTK_ACTION (action)); - location_entry = midori_location_action_entry_for_proxy (toolitem); - entry = gtk_bin_get_child (GTK_BIN (location_entry)); - - g_print ("...\n"); - - items_added = G_N_ELEMENTS (protocols) * G_N_ELEMENTS (subs) - * G_N_ELEMENTS (slds) * G_N_ELEMENTS (tlds) * G_N_ELEMENTS (files); - items_added_effective = protocols_n * subs_n * slds_n * tlds_n * files_n; - g_print ("Adding %d items, effectively %d items:\n", - items_added, items_added_effective); - - /* Since adding items when the action is frozen is very fast, - we run it 5 times and take the average time. */ - elapsed = 0.0; - for (i = 0; i < 5; i++) - { - midori_location_action_clear (action); - midori_location_action_freeze (action); - g_test_timer_start (); - location_action_fill (action); - elapsed += g_test_timer_elapsed (); - midori_location_action_thaw (action); - } - model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, items_added_effective); - g_print ("%f seconds, the action is frozen\n", elapsed / 5.0); - - midori_location_action_clear (action); - g_test_timer_start (); - location_action_fill (action); - elapsed = g_test_timer_elapsed (); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, items_added_effective); - g_print ("%f seconds, the action updates normally\n", elapsed); - - /* We don't clear the action intentionally in order to see - how long adding only duplicates takes. */ - g_test_timer_start (); - location_action_fill (action); - elapsed = g_test_timer_elapsed (); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, items_added_effective); - g_print ("%f seconds, adding exact duplicates\n", elapsed); - - g_print ("..."); -} - -static guint matches = 0; -static guint matches_expected = 0; - -static gboolean -entry_completion_insert_prefix_cb (GtkEntryCompletion* completion, - const gchar* prefix, - MidoriLocationAction* action) -{ - GtkWidget* entry = gtk_entry_completion_get_entry (completion); - const gchar* text = gtk_entry_get_text (GTK_ENTRY (entry)); - - if (!g_strrstr (prefix, text)) - g_print ("Match failed, input: %s, result: %s\n", - text, prefix); - g_assert (g_strrstr (prefix, text)); - midori_location_action_delete_item_from_uri (action, text); - midori_location_action_add_uri (action, text); - - matches++; - - return FALSE; -} - -static void -completion_match (void) -{ - MidoriLocationAction* action; - GtkWidget* toolitem; - GtkWidget* location_entry; - GtkWidget* entry; - GtkEntryCompletion* completion; - guint i; - - action = g_object_new (MIDORI_TYPE_LOCATION_ACTION, NULL); - - midori_location_action_freeze (action); - location_action_fill (action); - midori_location_action_thaw (action); - - toolitem = gtk_action_create_tool_item (GTK_ACTION (action)); - location_entry = midori_location_action_entry_for_proxy (toolitem); - entry = gtk_bin_get_child (GTK_BIN (location_entry)); - completion = gtk_entry_get_completion (GTK_ENTRY (entry)); - g_signal_connect (completion, "insert-prefix", - G_CALLBACK (entry_completion_insert_prefix_cb), action); - gtk_entry_completion_set_inline_completion (completion, TRUE); - gtk_entry_completion_set_popup_single_match (completion, FALSE); - - for (i = 0; i < G_N_ELEMENTS (inputs); i++) - { - matches_expected++; - gtk_entry_set_text (GTK_ENTRY (entry), inputs[i]); - gtk_entry_completion_complete (completion); - gtk_entry_completion_insert_prefix (completion); - if (matches != matches_expected) - g_print ("Match failed, input: %s, result: %s\n", - inputs[i], gtk_entry_get_text (GTK_ENTRY (entry))); - g_assert_cmpint (matches, ==, matches_expected); - } - for (i = 0; i < G_N_ELEMENTS (additions); i++) - { - midori_location_action_add_uri (action, additions[i]); - midori_location_action_delete_item_from_uri (action, additions[i]); - midori_location_action_add_uri (action, additions[i]); - } - for (i = 0; i < G_N_ELEMENTS (inputs); i++) - { - matches_expected++; - gtk_entry_set_text (GTK_ENTRY (entry), inputs[i]); - gtk_entry_completion_complete (completion); - gtk_entry_completion_insert_prefix (completion); - if (matches != matches_expected) - g_print ("Match failed, input: %s, result: %s\n", - inputs[i], gtk_entry_get_text (GTK_ENTRY (entry))); - g_assert_cmpint (matches, ==, matches_expected); - } - for (i = 0; i < G_N_ELEMENTS (additions); i++) - { - matches_expected++; - gtk_entry_set_text (GTK_ENTRY (entry), additions[i]); - gtk_entry_completion_complete (completion); - gtk_entry_completion_insert_prefix (completion); - if (matches != matches_expected) - g_print ("Match failed, input: %s, result: %s\n", - additions[i], gtk_entry_get_text (GTK_ENTRY (entry))); - g_assert_cmpint (matches, ==, matches_expected); - } -} - -int -main (int argc, - char** argv) -{ - /* libSoup uses threads, so we need to initialize threads. */ - if (!g_thread_supported ()) g_thread_init (NULL); - g_test_init (&argc, &argv, NULL); - gtk_init_check (&argc, &argv); - - g_test_add_func ("/completion/compare", completion_compare); - g_test_add_func ("/completion/count", completion_count); - g_test_add_func ("/completion/fill", completion_fill); - g_test_add_func ("/completion/match", completion_match); - - return g_test_run (); -} diff -Nru midori-0.2.8/tests/extensions.c midori-0.4.6/tests/extensions.c --- midori-0.2.8/tests/extensions.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/tests/extensions.c 2012-05-14 22:13:42.000000000 +0000 @@ -9,10 +9,6 @@ See the file COPYING for the full license text. */ -#if HAVE_CONFIG_H - #include -#endif - #include "midori.h" const gpointer magic = (gpointer)0xdeadbeef; @@ -170,10 +166,25 @@ static void extension_activate (gconstpointer data) { + MidoriExtension* extension; MidoriApp* app = midori_app_new (); - MidoriExtension* extension = MIDORI_EXTENSION (data); - /* g_signal_emit_by_name (extension, "activate", app); - midori_extension_deactivate (extension); */ + g_object_set (app, "settings", midori_web_settings_new (), NULL); + + if (MIDORI_IS_EXTENSION (data)) + { + extension = MIDORI_EXTENSION (data); + g_signal_emit_by_name (extension, "activate", app); + midori_extension_deactivate (extension); + } + else if (KATZE_IS_ARRAY (data)) + { + KATZE_ARRAY_FOREACH_ITEM (extension, KATZE_ARRAY (data)) + { + g_signal_emit_by_name (extension, "activate", app); + midori_extension_deactivate (extension); + } + } + g_object_unref (app); } @@ -234,9 +245,11 @@ main (int argc, char** argv) { + midori_app_setup (argv); g_test_init (&argc, &argv, NULL); gtk_init_check (&argc, &argv); - if (!g_thread_supported ()) g_thread_init (NULL); + soup_session_add_feature_by_type (webkit_get_default_session (), + SOUP_TYPE_COOKIE_JAR); g_test_add_func ("/extensions/create", extension_create); g_test_add_func ("/extensions/settings", extension_settings); diff -Nru midori-0.2.8/tests/history.c midori-0.4.6/tests/history.c --- midori-0.2.8/tests/history.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/tests/history.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,221 +0,0 @@ -/* - 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. -*/ - -#if HAVE_CONFIG_H - #include -#endif - -#include "midori.h" -#include "midori-history.h" -#include "sokoke.h" - -static void -history_panel_create (void) -{ - MidoriApp* app; - MidoriHistory* history; - gpointer value; - - app = g_object_new (MIDORI_TYPE_APP, NULL); - - history = g_object_new (MIDORI_TYPE_HISTORY, NULL); - value = katze_object_get_object (history, "app"); - g_assert (value == NULL); - gtk_widget_destroy (GTK_WIDGET (history)); - - history = g_object_new (MIDORI_TYPE_HISTORY, "app", app, NULL); - value = katze_object_get_object (history, "app"); - g_assert (value == app); - gtk_widget_destroy (GTK_WIDGET (history)); - - history = g_object_new (MIDORI_TYPE_HISTORY, NULL); - g_object_set (history, "app", app, NULL); - value = katze_object_get_object (history, "app"); - g_assert (value == app); - gtk_widget_destroy (GTK_WIDGET (history)); -} - -static KatzeItem* -bookmark_new (const gchar* uri, - const gchar* title) -{ - return g_object_new (KATZE_TYPE_ITEM, "uri", uri, "name", title, NULL); -} - -static KatzeArray* -folder_new (const gchar* title) -{ - KatzeArray* folder; - - folder = katze_array_new (KATZE_TYPE_ARRAY); - g_object_set (folder, "name", title, NULL); - return folder; -} - -static void -history_panel_fill (void) -{ - MidoriApp* app; - KatzeArray* array; - MidoriHistory* history; - GList* children; - GtkWidget* treeview; - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* bookmark; - KatzeArray* folder; - guint n; - gpointer value; - - app = g_object_new (MIDORI_TYPE_APP, NULL); - array = katze_array_new (KATZE_TYPE_ARRAY); - g_object_set (app, "history", array, NULL); - value = katze_object_get_object (app, "history"); - g_assert (value == array); - history = g_object_new (MIDORI_TYPE_HISTORY, "app", app, NULL); - children = gtk_container_get_children (GTK_CONTAINER (history)); - treeview = g_list_nth_data (children, 1); - g_list_free (children); - g_assert (GTK_IS_TREE_VIEW (treeview)); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); - g_assert (GTK_IS_TREE_MODEL (model)); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, 0); - bookmark = bookmark_new ("http://www.example.com", "Example"); - katze_array_add_item (array, bookmark); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, 1); - katze_array_remove_item (array, bookmark); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, 0); - bookmark = bookmark_new ("http://www.example.com", "Example"); - katze_array_add_item (array, bookmark); - folder = folder_new ("Empty"); - katze_array_add_item (array, folder); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, 2); - katze_array_remove_item (array, folder); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, 1); - folder = folder_new ("Empty"); - katze_array_add_item (array, folder); - folder = folder_new ("Kurioses"); - katze_array_add_item (array, folder); - bookmark = bookmark_new ("http://www.ende.de", "Das Ende"); - katze_array_add_item (folder, bookmark); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, 3); - folder = folder_new ("Miscellaneous"); - katze_array_add_item (array, folder); - gtk_tree_model_iter_nth_child (model, &iter, NULL, 3); - n = gtk_tree_model_iter_n_children (model, &iter); - g_assert_cmpint (n, ==, 0); - bookmark = bookmark_new ("http://thesaurus.reference.com/", "Thesaurus"); - katze_array_add_item (folder, bookmark); - n = gtk_tree_model_iter_n_children (model, &iter); - g_assert_cmpint (n, ==, 1); - bookmark = bookmark_new ("http://en.wikipedia.org/", "Wikipedia"); - katze_array_add_item (folder, bookmark); - n = gtk_tree_model_iter_n_children (model, &iter); - g_assert_cmpint (n, ==, 2); - katze_array_remove_item (folder, bookmark); - n = gtk_tree_model_iter_n_children (model, &iter); - g_assert_cmpint (n, ==, 1); - katze_array_remove_item (array, folder); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, 3); - katze_array_add_item (array, folder); - /* katze_array_clear (folder); - n = gtk_tree_model_iter_n_children (model, &iter); - g_assert_cmpint (n, ==, 0); */ - katze_array_clear (array); - n = gtk_tree_model_iter_n_children (model, NULL); - g_assert_cmpint (n, ==, 0); -} - -static void -notify_load_status_cb (GtkWidget* view, - GParamSpec* pspec, - guint* done) -{ - MidoriLoadStatus status; - - status = midori_view_get_load_status (MIDORI_VIEW (view)); - if (*done == 2 && status == MIDORI_LOAD_COMMITTED) - *done = 1; - else if (*done == 1 && status == MIDORI_LOAD_FINISHED) - *done = 0; -} - -static void -history_browser_add (void) -{ - MidoriBrowser* browser; - MidoriWebSettings* settings; - KatzeArray* array; - GtkWidget* view; - guint done; - KatzeItem* date; - gsize i; - GtkActionGroup* action_group; - GtkAction* action; - - browser = midori_browser_new (); - settings = midori_web_settings_new (); - array = katze_array_new (KATZE_TYPE_ARRAY); - g_object_set (browser, "settings", settings, "history", array, NULL); - view = midori_view_new (NULL); - midori_browser_add_tab (browser, view); - midori_view_set_uri (MIDORI_VIEW (view), - "data:text/html;charset=utf-8,TestTest"); - g_signal_connect (view, "notify::load-status", - G_CALLBACK (notify_load_status_cb), &done); - done = 2; - while (done) - gtk_main_iteration (); - g_assert_cmpint (katze_array_get_length (array), ==, 1); - date = katze_array_get_nth_item (array, 0); - g_assert_cmpint (katze_array_get_length (KATZE_ARRAY (date)), ==, 1); - i = 0; - gtk_widget_show (view); - midori_browser_set_current_tab (browser, view); - g_assert (midori_browser_get_current_tab (browser) == view); - done = 2; - action_group = midori_browser_get_action_group (browser); - action = gtk_action_group_get_action (action_group, "Location"); - midori_location_action_set_uri (MIDORI_LOCATION_ACTION (action), - "data:text/html;charset=utf-8,TestTest"); - g_signal_emit_by_name (action, "submit-uri", - "data:text/html;charset=utf-8,TestTest", FALSE); - while (done) - gtk_main_iteration (); - g_assert_cmpint (katze_array_get_length (array), ==, 1); - date = katze_array_get_nth_item (array, 0); - g_assert_cmpint (katze_array_get_length (KATZE_ARRAY (date)), ==, 1); - i = 0; -} - -int -main (int argc, - char** argv) -{ - /* libSoup uses threads, so we need to initialize threads. */ - if (!g_thread_supported ()) g_thread_init (NULL); - g_test_init (&argc, &argv, NULL); - gtk_init_check (&argc, &argv); - sokoke_register_stock_items (); - - g_test_add_func ("/history/panel/create", history_panel_create); - g_test_add_func ("/history/panel/fill", history_panel_fill); - g_test_add_func ("/history/browser/add", history_browser_add); - - return g_test_run (); -} diff -Nru midori-0.2.8/tests/magic-uri.c midori-0.4.6/tests/magic-uri.c --- midori-0.2.8/tests/magic-uri.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/tests/magic-uri.c 2012-05-14 22:13:42.000000000 +0000 @@ -10,27 +10,10 @@ See the file COPYING for the full license text. */ -#if HAVE_CONFIG_H - #include -#endif - -#include "sokoke.h" +#include #define SM "http://www.searchmash.com/search/" - -static void -sokoke_assert_str_equal (const gchar* input, - const gchar* result, - const gchar* expected) -{ - if (g_strcmp0 (result, expected)) - { - g_error ("Input: %s\nExpected: %s\nResult: %s", - input ? input : "NULL", - expected ? expected : "NULL", - result ? result : "NULL"); - } -} +#define HTTP_PREFIX "midori-unit-test-expected-http-prefix" static void test_input (const gchar* input, @@ -38,6 +21,7 @@ { static KatzeArray* search_engines = NULL; gchar* uri; + gchar* real_expected = NULL; if (G_UNLIKELY (!search_engines)) { @@ -59,34 +43,38 @@ uri = sokoke_magic_uri (input); if (!uri) { - gchar** parts; - gchar* keywords = NULL; + const gchar* keywords = NULL; const gchar* search_uri = NULL; + KatzeItem* item; /* Do we have a keyword and a string? */ - parts = g_strsplit (input, " ", 2); - if (parts[0]) + if ((item = katze_array_find_token (search_engines, input))) { - KatzeItem* item; - if ((item = katze_array_find_token (search_engines, parts[0]))) - { - keywords = g_strdup (parts[1] ? parts[1] : ""); - search_uri = katze_item_get_uri (item); - } + keywords = strchr (input, ' '); + if (keywords != NULL) + keywords++; + else + keywords = ""; + search_uri = katze_item_get_uri (item); } - g_strfreev (parts); - - uri = keywords ? sokoke_search_uri (search_uri, keywords) : NULL; - g_free (keywords); + uri = search_uri ? midori_uri_for_search (search_uri, keywords) : NULL; } - sokoke_assert_str_equal (input, uri, expected); + + if (!g_strcmp0 (expected, HTTP_PREFIX)) + real_expected = g_strconcat ("http://", input, NULL); + + katze_assert_str_equal (input, uri, real_expected ? real_expected : expected); + g_free (real_expected); g_free (uri); } static void magic_uri_uri (void) { + const gchar* uri; + gchar* path; + test_input ("ftp://ftp.mozilla.org", "ftp://ftp.mozilla.org"); test_input ("ftp://ftp.mozilla.org/pub", "ftp://ftp.mozilla.org/pub"); test_input ("http://www.example.com", "http://www.example.com"); @@ -95,6 +83,8 @@ test_input ("example.com", "http://example.com"); test_input ("www.google..com", "http://www.google..com"); test_input ("/home/user/midori.html", "file:///home/user/midori.html"); + test_input ("http://www.google.com/search?q=query test", + "http://www.google.com/search?q=query test"); if (sokoke_resolve_hostname ("localhost")) { test_input ("localhost", "http://localhost"); @@ -109,6 +99,27 @@ test_input ("foo:123@bar.baz", "http://foo:123@bar.baz"); /* test_input ("foo:f1o2o3@bar.baz", "http://f1o2o3:foo@bar.baz"); */ /* test_input ("foo:foo@bar.baz", "http://foo:foo@bar.baz"); */ + + test_input ("2001:0db8:85a3:0000:0000:8a2e:0370:7334", HTTP_PREFIX); + test_input ("fe80:0:0:0:202:b3ff:fe1e:8329", HTTP_PREFIX); + test_input ("fe80::202:b3ff:fe1e:8329", HTTP_PREFIX); + test_input ("fe80::76e5:bff:fe04:38e0/64", HTTP_PREFIX); + test_input ("content::browser", NULL); + test_input ("std::copy", NULL); + + uri = "http://bugs.launchpad.net/midori"; + g_assert_cmpstr ("bugs.launchpad.net", ==, midori_uri_parse_hostname (uri, NULL)); + uri = "https://bugs.launchpad.net/midori"; + g_assert_cmpstr ("bugs.launchpad.net", ==, midori_uri_parse_hostname (uri, NULL)); + g_assert_cmpstr ("bugs.launchpad.net", ==, midori_uri_parse_hostname (uri, &path)); + g_assert_cmpstr ("/midori", ==, path); + uri = "http://айкидо.ru/users/kotyata"; + g_assert_cmpstr ("айкидо.ru", ==, midori_uri_parse_hostname (uri, &path)); + g_assert_cmpstr ("/users/kotyata", ==, path); + uri = "invalid:/uri.like/thing"; + g_assert_cmpstr (NULL, ==, midori_uri_parse_hostname (uri, NULL)); + uri = "invalid-uri.like:thing"; + g_assert_cmpstr (NULL, ==, midori_uri_parse_hostname (uri, NULL)); } static void @@ -121,19 +132,11 @@ } URIItem; static const URIItem items[] = { - #if HAVE_LIBIDN || defined (HAVE_LIBSOUP_2_27_90) { "http://www.münchhausen.at", "http://www.xn--mnchhausen-9db.at" }, { "http://www.خداوند.com/", "http://www.xn--mgbndb8il.com/" }, { "айкидо.com", "xn--80aildf0a.com" }, { "http://東京理科大学.jp", "http://xn--1lq68wkwbj6ugkpigi.jp" }, { "https://青のネコ", "https://xn--u9jthzcs263c" }, - #else - { "http://www.münchhausen.at", NULL }, - { "http://www.خداوند.com/", NULL }, - { "айкидо.com", NULL }, - { "http://東京理科大学.jp", NULL }, - { "https://青のネコ.co.jp", NULL }, - #endif { "http://en.wikipedia.org/wiki/Kölsch_language", NULL }, { "file:///home/mark/frühstück", NULL }, { "about:version", NULL }, @@ -142,17 +145,13 @@ for (i = 0; i < G_N_ELEMENTS (items); i++) { - gchar* result = sokoke_uri_to_ascii (items[i].before); + gchar* result = midori_uri_to_ascii (items[i].before); const gchar* after = items[i].after ? items[i].after : items[i].before; - sokoke_assert_str_equal (items[i].before, result, after); + katze_assert_str_equal (items[i].before, result, after); g_free (result); } - #if HAVE_LIBIDN - test_input ("айкидо.com", "http://xn--80aildf0a.com"); - #else test_input ("айкидо.com", "http://айкидо.com"); - #endif test_input ("sm Küchenzubehör", SM "Küchenzubehör"); test_input ("sm 東京理科大学", SM "東京理科大学"); } @@ -161,8 +160,8 @@ magic_uri_search (void) { test_input ("sm midori", SM "midori"); - test_input ("sm cats dogs", SM "cats dogs"); - test_input ("se cats dogs", SM "cats dogs"); + test_input ("sm cats dogs", SM "cats%20dogs"); + test_input ("se cats dogs", SM "cats%20dogs"); test_input ("dict midori", NULL); test_input ("cats", NULL); test_input ("cats dogs", NULL); @@ -185,9 +184,9 @@ test_input ("de.po verbose", NULL); test_input ("verbose de.po", NULL); test_input ("g de.po verbose", NULL); - test_input ("sm de.po verbose", SM "de.po verbose"); + test_input ("sm de.po verbose", SM "de.po%20verbose"); test_input ("sm warning: configure /dev/net: virtual", - SM "warning: configure /dev/net: virtual"); + SM "warning:%20configure%20/dev/net:%20virtual"); test_input ("g \"ISO 9001:2000 certified\"", NULL); test_input ("g conference \"April 2, 7:00 am\"", NULL); test_input ("max@mustermann.de", NULL); @@ -225,6 +224,22 @@ } static void +magic_uri_fingerprint (void) +{ + const gchar* uri; + uri = "http://midori-0.4.1.tar.bz2#!md5!33dde203cd71ae2b1d2adcc7f5739f65"; + g_assert_cmpint (midori_uri_get_fingerprint (uri, NULL, NULL), ==, G_CHECKSUM_MD5); + uri = "http://midori-0.4.1.tar.bz2#!md5!33DDE203CD71AE2B1D2ADCC7F5739F65"; + g_assert_cmpint (midori_uri_get_fingerprint (uri, NULL, NULL), ==, G_CHECKSUM_MD5); + uri = "http://midori-0.4.1.tar.bz2#!sha1!0c499459b1049feabf86dce89f49020139a9efd9"; + g_assert_cmpint (midori_uri_get_fingerprint (uri, NULL, NULL), ==, G_CHECKSUM_SHA1); + uri = "http://midori-0.4.1.tar.bz2#!sha256!123456"; + g_assert_cmpint (midori_uri_get_fingerprint (uri, NULL, NULL), ==, G_MAXINT); + uri = "http://midori-0.4.1.tar.bz2#abcdefg"; + g_assert_cmpint (midori_uri_get_fingerprint (uri, NULL, NULL), ==, G_MAXINT); +} + +static void magic_uri_format (void) { typedef struct @@ -248,9 +263,9 @@ for (i = 0; i < G_N_ELEMENTS (items); i++) { - gchar* result = sokoke_format_uri_for_display (items[i].before); + gchar* result = midori_uri_format_for_display (items[i].before); const gchar* after = items[i].after ? items[i].after : items[i].before; - sokoke_assert_str_equal (items[i].before, result, after); + katze_assert_str_equal (items[i].before, result, after); g_free (result); } } @@ -258,27 +273,25 @@ static void magic_uri_prefetch (void) { - g_assert (!sokoke_prefetch_uri (NULL, NULL, NULL)); - g_assert (sokoke_prefetch_uri ("http://google.com", NULL, NULL)); - g_assert (sokoke_prefetch_uri ("http://google.com", NULL, NULL)); - g_assert (sokoke_prefetch_uri ("http://googlecom", NULL, NULL)); - g_assert (sokoke_prefetch_uri ("http://1kino.com", NULL, NULL)); - g_assert (sokoke_prefetch_uri ("http://", NULL, NULL)); - g_assert (!sokoke_prefetch_uri ("http:/", NULL, NULL)); - g_assert (!sokoke_prefetch_uri ("http", NULL, NULL)); - g_assert (!sokoke_prefetch_uri ("ftp://ftphost.org", NULL, NULL)); - g_assert (!sokoke_prefetch_uri ("http://10.0.0.1", NULL, NULL)); - g_assert (!sokoke_prefetch_uri ("about:blank", NULL, NULL)); - g_assert (!sokoke_prefetch_uri ("javascript: alert()", NULL, NULL)); + g_assert (!sokoke_prefetch_uri (NULL, NULL, NULL, NULL)); + g_assert (sokoke_prefetch_uri (NULL, "http://google.com", NULL, NULL)); + g_assert (sokoke_prefetch_uri (NULL, "http://google.com", NULL, NULL)); + g_assert (sokoke_prefetch_uri (NULL, "http://googlecom", NULL, NULL)); + g_assert (sokoke_prefetch_uri (NULL, "http://1kino.com", NULL, NULL)); + g_assert (sokoke_prefetch_uri (NULL, "http://", NULL, NULL)); + g_assert (!sokoke_prefetch_uri (NULL, "http:/", NULL, NULL)); + g_assert (!sokoke_prefetch_uri (NULL, "http", NULL, NULL)); + g_assert (!sokoke_prefetch_uri (NULL, "ftp://ftphost.org", NULL, NULL)); + g_assert (!sokoke_prefetch_uri (NULL, "http://10.0.0.1", NULL, NULL)); + g_assert (!sokoke_prefetch_uri (NULL, "about:blank", NULL, NULL)); + g_assert (!sokoke_prefetch_uri (NULL, "javascript: alert()", NULL, NULL)); } int main (int argc, char** argv) { - /* libSoup uses threads, therefore if WebKit is built with libSoup - or Midori is using it, we need to initialize threads. */ - if (!g_thread_supported ()) g_thread_init (NULL); + midori_app_setup (argv); g_test_init (&argc, &argv, NULL); gtk_init_check (&argc, &argv); @@ -287,6 +300,7 @@ g_test_add_func ("/magic-uri/search", magic_uri_search); g_test_add_func ("/magic-uri/pseudo", magic_uri_pseudo); g_test_add_func ("/magic-uri/performance", magic_uri_performance); + g_test_add_func ("/magic-uri/fingerprint", magic_uri_fingerprint); g_test_add_func ("/magic-uri/format", magic_uri_format); g_test_add_func ("/magic-uri/prefetch", magic_uri_prefetch); diff -Nru midori-0.2.8/tests/properties.c midori-0.4.6/tests/properties.c --- midori-0.2.8/tests/properties.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/tests/properties.c 2012-05-14 22:13:42.000000000 +0000 @@ -9,13 +9,7 @@ See the file COPYING for the full license text. */ -#if HAVE_CONFIG_H - #include -#endif - #include "midori.h" -#include "midori-bookmarks.h" -#include "sokoke.h" typedef struct { @@ -133,11 +127,14 @@ G_PARAM_SPEC_ENUM (pspec)->default_value, NULL); for (k = enum_class->minimum; k < enum_class->maximum; k++) { - GEnumValue* enum_value = g_enum_get_value (enum_class, k); + GEnumValue* enum_value; + GEnumValue* enum_value_; + + enum_value = g_enum_get_value (enum_class, k); if (!enum_value) g_error ("%s.%s has no value %d", G_OBJECT_TYPE_NAME (object), property, k); - GEnumValue* enum_value_ = g_enum_get_value_by_name (enum_class, + enum_value_ = g_enum_get_value_by_name (enum_class, enum_value->value_name); if (!enum_value) g_error ("%s.%s has no value '%s'", @@ -156,13 +153,13 @@ static void properties_object_test (gconstpointer object) { - if (GTK_IS_OBJECT (object)) + if (GTK_IS_WIDGET (object)) g_object_ref_sink ((GObject*)object); properties_object_get_set ((GObject*)object); - if (GTK_IS_OBJECT (object)) - gtk_object_destroy (GTK_OBJECT (object)); + if (GTK_IS_WIDGET (object)) + gtk_widget_destroy (GTK_WIDGET (object)); g_object_unref ((GObject*)object); } @@ -190,12 +187,11 @@ main (int argc, char** argv) { - /* libSoup uses threads, therefore if WebKit is built with libSoup - or Midori is using it, we need to initialize threads. */ - if (!g_thread_supported ()) g_thread_init (NULL); + midori_app_setup (argv); + g_object_set_data (G_OBJECT (webkit_get_default_session ()), + "midori-session-initialized", (void*)1); g_test_init (&argc, &argv, NULL); gtk_init_check (&argc, &argv); - sokoke_register_stock_items (); g_test_add_data_func ("/properties/app", (gconstpointer)MIDORI_TYPE_APP, properties_type_test); diff -Nru midori-0.2.8/tests/wscript_build midori-0.4.6/tests/wscript_build --- midori-0.2.8/tests/wscript_build 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/tests/wscript_build 2012-05-14 22:13:42.000000000 +0000 @@ -31,10 +31,10 @@ obj = bld.new_task_gen ('cc', 'program') obj.target = 'test-' + target obj.includes = '.. ../midori ../panels' - obj.cflags = ['-DEXTENSION_PATH="' + os.path.abspath ('_build_/default/extensions') + '"'] + obj.cflags = ['-DEXTENSION_PATH="' + os.path.abspath ('_build/default/extensions') + '"'] obj.source = source obj.vapi_dirs = '../midori' obj.packages = 'glib-2.0 gio-2.0 gtk+-2.0 libsoup-2.4 webkit-1.0 midori' - obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML' + obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML GRANITE' obj.uselib_local = 'midori-core' obj.unit_test = 1 diff -Nru midori-0.2.8/toolbars/midori-findbar.c midori-0.4.6/toolbars/midori-findbar.c --- midori-0.2.8/toolbars/midori-findbar.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/toolbars/midori-findbar.c 2012-05-14 22:13:42.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2008-2010 Christian Dywan + Copyright (C) 2008-2012 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -12,16 +12,13 @@ #include "midori-findbar.h" #include "midori-browser.h" -#include "gtkiconentry.h" -#include "sokoke.h" +#include "midori-platform.h" #include #include #include -#if HAVE_CONFIG_H - #include "config.h" -#endif +#include "config.h" struct _MidoriFindbar { @@ -49,6 +46,34 @@ } static void +midori_findbar_set_icon (MidoriFindbar* findbar, + GtkIconEntryPosition icon_pos, + const gchar* icon_name) +{ + #if !HAVE_HILDON + GdkScreen* screen = gtk_widget_get_screen (findbar->find_text); + GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen); + gchar* symbolic_icon_name; + + if (icon_name == NULL) + { + gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (findbar->find_text), + icon_pos, NULL); + return; + } + + symbolic_icon_name = g_strconcat (icon_name, "-symbolic", NULL); + if (gtk_icon_theme_has_icon (icon_theme, symbolic_icon_name)) + gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (findbar->find_text), + icon_pos, symbolic_icon_name); + else + gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (findbar->find_text), + icon_pos, icon_name); + g_free (symbolic_icon_name); + #endif +} + +static void midori_findbar_done (MidoriFindbar* findbar) { MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (findbar)); @@ -64,11 +89,17 @@ midori_findbar_find_key_press_event_cb (MidoriFindbar* findbar, GdkEventKey* event) { - if (event->keyval == GDK_Escape) + if (event->keyval == GDK_KEY_Escape) { midori_findbar_done (findbar); return TRUE; } + else if (event->keyval == GDK_KEY_Return + && (event->state & GDK_SHIFT_MASK)) + { + midori_findbar_find_text (findbar, NULL, FALSE); + return TRUE; + } return FALSE; } @@ -77,10 +108,12 @@ midori_findbar_entry_clear_icon_released_cb (GtkIconEntry* entry, gint icon_pos, gint button, - gpointer user_data) + MidoriFindbar*findbar) { if (icon_pos == GTK_ICON_ENTRY_SECONDARY) - gtk_entry_set_text (GTK_ENTRY (entry), ""); + { + midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, "edit-find"); + } } static gboolean @@ -97,60 +130,90 @@ } void -midori_findbar_find (MidoriFindbar* findbar, - gboolean forward) +midori_findbar_find_text (MidoriFindbar* findbar, + const gchar* text, + gboolean forward) { MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (findbar)); - const gchar* text; gboolean case_sensitive; GtkWidget* view; if (!(view = midori_browser_get_current_tab (browser))) return; - text = gtk_entry_get_text (GTK_ENTRY (findbar->find_text)); + if (text == NULL) + text = gtk_entry_get_text (GTK_ENTRY (findbar->find_text)); + case_sensitive = midori_findbar_case_sensitive (findbar); midori_view_search_text (MIDORI_VIEW (view), text, case_sensitive, forward); } +/** + * midori_findbar_get_text: + * @findbar: #MidoriFindbar + * + * Returns: the text typed in the entry + * + * Since: 0.4.5 + **/ +const gchar* +midori_findbar_get_text (MidoriFindbar* findbar) +{ + g_return_val_if_fail (MIDORI_IS_FINDBAR (findbar), NULL); + + return gtk_entry_get_text (GTK_ENTRY (findbar->find_text)); +} + +/** + * midori_findbar_find: + * @findbar: #MidoriFindbar + * @forward: %TRUE to search forward + * + * Advance to the next match. + * + * Deprecated: 0.4.5: Use midori_findbar_find_text() instead. + **/ +void +midori_findbar_find (MidoriFindbar* findbar, + gboolean forward) +{ + midori_findbar_find_text (findbar, NULL, forward); +} + void midori_findbar_invoke (MidoriFindbar* findbar) { if (gtk_widget_get_visible (GTK_WIDGET (findbar))) - midori_findbar_done (findbar); + gtk_widget_grab_focus (GTK_WIDGET (findbar->find_text)); else { MidoriBrowser* browser = midori_browser_get_for_widget (findbar->find_text); GtkWidget* view = midori_browser_get_current_tab (browser); const gchar* text; - #if !HAVE_HILDON - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (findbar->find_text), - GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FIND); + midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, "edit-find"); gtk_widget_show (GTK_WIDGET (findbar->find_case)); - #endif gtk_widget_show (GTK_WIDGET (findbar->find_highlight)); gtk_widget_show (GTK_WIDGET (findbar->find_close)); if ((text = midori_view_get_selected_text (MIDORI_VIEW (view)))) gtk_entry_set_text (GTK_ENTRY (findbar->find_text), text); gtk_widget_show (GTK_WIDGET (findbar)); + gtk_widget_grab_focus (GTK_WIDGET (findbar->find_text)); } - - gtk_widget_grab_focus (GTK_WIDGET (findbar->find_text)); } static void midori_findbar_next_activate_cb (GtkWidget* entry, MidoriFindbar* findbar) { - midori_findbar_find (findbar, TRUE); + midori_findbar_find_text (findbar, NULL, TRUE); } static void midori_findbar_previous_clicked_cb (GtkWidget* entry, MidoriFindbar* findbar) { - midori_findbar_find (findbar, FALSE); + midori_findbar_find_text (findbar, NULL, FALSE); } static void @@ -161,18 +224,28 @@ } static void -midori_findbar_text_changed_cb (GtkWidget* entry, - MidoriFindbar* findbar) +midori_findbar_preedit_changed_cb (GtkWidget* entry, + const gchar* preedit, + MidoriFindbar* findbar) { - if (findbar->find_typing) + MidoriBrowser* browser = midori_browser_get_for_widget (entry); + GtkWidget* view = midori_browser_get_current_tab (browser); + midori_view_unmark_text_matches (MIDORI_VIEW (view)); + if (g_utf8_strlen (preedit, -1) >= 1) { - MidoriBrowser* browser = midori_browser_get_for_widget (entry); - GtkWidget* view = midori_browser_get_current_tab (browser); - const gchar* text = gtk_entry_get_text (GTK_ENTRY (entry)); - midori_view_unmark_text_matches (MIDORI_VIEW (view)); - if (g_utf8_strlen (text, -1) > 1) - midori_findbar_find (findbar, TRUE); + midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_SECONDARY, "edit-clear"); + midori_findbar_find_text (findbar, preedit, TRUE); } + else + midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_SECONDARY, NULL); +} + +static void +midori_findbar_text_changed_cb (GtkWidget* entry, + MidoriFindbar* findbar) +{ + const gchar* text = gtk_entry_get_text (GTK_ENTRY (entry)); + midori_findbar_preedit_changed_cb (entry, text, findbar); } static gboolean @@ -201,8 +274,13 @@ GtkToolItem* toolitem; gtk_widget_set_name (GTK_WIDGET (findbar), "MidoriFindbar"); + #if GTK_CHECK_VERSION (3, 0, 0) + gtk_style_context_add_class ( + gtk_widget_get_style_context (GTK_WIDGET (findbar)), "bottom-toolbar"); + #endif gtk_toolbar_set_icon_size (GTK_TOOLBAR (findbar), GTK_ICON_SIZE_MENU); gtk_toolbar_set_style (GTK_TOOLBAR (findbar), GTK_TOOLBAR_BOTH_HORIZ); + gtk_toolbar_set_show_arrow (GTK_TOOLBAR (findbar), FALSE); g_signal_connect (findbar, "key-press-event", G_CALLBACK (midori_findbar_find_key_press_event_cb), NULL); @@ -213,20 +291,14 @@ gtk_label_new_with_mnemonic (_("_Inline Find:"))); gtk_toolbar_insert (GTK_TOOLBAR (findbar), toolitem, -1); findbar->find_text = gtk_icon_entry_new (); - #if !HAVE_HILDON - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (findbar->find_text), - GTK_ICON_ENTRY_PRIMARY, - GTK_STOCK_FIND); - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (findbar->find_text), - GTK_ICON_ENTRY_SECONDARY, - GTK_STOCK_CLEAR); - gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (findbar->find_text), - GTK_ICON_ENTRY_SECONDARY, TRUE); - #endif + midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, "edit-find"); + sokoke_entry_set_clear_button_visible (GTK_ENTRY (findbar->find_text), TRUE); g_signal_connect (findbar->find_text, "icon-release", - G_CALLBACK (midori_findbar_entry_clear_icon_released_cb), NULL); + G_CALLBACK (midori_findbar_entry_clear_icon_released_cb), findbar); g_signal_connect (findbar->find_text, "activate", G_CALLBACK (midori_findbar_next_activate_cb), findbar); + g_signal_connect (findbar->find_text, "preedit-changed", + G_CALLBACK (midori_findbar_preedit_changed_cb), findbar); g_signal_connect (findbar->find_text, "changed", G_CALLBACK (midori_findbar_text_changed_cb), findbar); g_signal_connect (findbar->find_text, "focus-out-event", @@ -275,12 +347,9 @@ _("Close Findbar")); g_signal_connect (findbar->find_close, "clicked", G_CALLBACK (midori_findbar_button_close_clicked_cb), findbar); - #if HAVE_OSX - gtk_toolbar_insert (GTK_TOOLBAR (findbar), findbar->find_close, 0); - #else gtk_toolbar_insert (GTK_TOOLBAR (findbar), findbar->find_close, -1); - #endif - sokoke_container_show_children (GTK_CONTAINER (findbar)); + gtk_container_foreach (GTK_CONTAINER (findbar), + (GtkCallback)(gtk_widget_show_all), NULL); } void @@ -295,12 +364,14 @@ midori_findbar_search_text (MidoriFindbar* findbar, GtkWidget* view, gboolean found, - gchar* typing) + const gchar* typing) { const gchar* text; gboolean case_sensitive; gboolean highlight; + midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, found ? "edit-find" : "stop"); + if (typing) { MidoriBrowser* browser = midori_browser_get_for_widget (view); @@ -322,10 +393,6 @@ } if (gtk_widget_get_visible (GTK_WIDGET (findbar)) && !typing) { - #if !HAVE_HILDON - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (findbar->find_text), - GTK_ICON_ENTRY_PRIMARY, (found) ? GTK_STOCK_FIND : GTK_STOCK_STOP); - #endif text = gtk_entry_get_text (GTK_ENTRY (findbar->find_text)); case_sensitive = midori_findbar_case_sensitive (findbar); midori_view_mark_text_matches (MIDORI_VIEW (view), text, case_sensitive); @@ -335,4 +402,15 @@ } } +void +midori_findbar_set_close_button_left (MidoriFindbar* findbar, + gboolean close_button_left) +{ + g_object_ref (findbar->find_close); + gtk_container_remove (GTK_CONTAINER (findbar), + GTK_WIDGET (findbar->find_close)); + gtk_toolbar_insert (GTK_TOOLBAR (findbar), findbar->find_close, + close_button_left ? 0 : -1); + g_object_unref (findbar->find_close); +} diff -Nru midori-0.2.8/toolbars/midori-findbar.h midori-0.4.6/toolbars/midori-findbar.h --- midori-0.2.8/toolbars/midori-findbar.h 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/toolbars/midori-findbar.h 2012-05-14 22:13:42.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2010 Christian Dywan + Copyright (C) 2012 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -43,6 +43,14 @@ gboolean forward); void +midori_findbar_find_text (MidoriFindbar* findbar, + const gchar* text, + gboolean forward); + +const gchar* +midori_findbar_get_text (MidoriFindbar* findbar); + +void midori_findbar_set_can_find (MidoriFindbar* findbar, gboolean can_find); @@ -50,7 +58,11 @@ midori_findbar_search_text (MidoriFindbar* findbar, GtkWidget* view, gboolean found, - gchar* typing); + const gchar* typing); + +void +midori_findbar_set_close_button_left (MidoriFindbar* findbar, + gboolean close_button_left); G_END_DECLS diff -Nru midori-0.2.8/toolbars/midori-transferbar.c midori-0.4.6/toolbars/midori-transferbar.c --- midori-0.2.8/toolbars/midori-transferbar.c 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/toolbars/midori-transferbar.c 2012-05-14 22:13:42.000000000 +0000 @@ -12,6 +12,7 @@ #include "midori-transferbar.h" #include "midori-browser.h" +#include "midori-core.h" #include "sokoke.h" #include @@ -37,7 +38,6 @@ /* Nothing to do */ } -#if WEBKIT_CHECK_VERSION (1, 1, 3) typedef struct { WebKitDownload* download; @@ -55,7 +55,7 @@ transferbar->infos = g_list_remove (transferbar->infos, info); g_object_unref (info->download); gtk_widget_destroy (info->toolitem); - g_free (info); + g_slice_free (TransferInfo, info); if (!transferbar->infos || !g_list_nth_data (transferbar->infos, 0)) gtk_widget_hide (GTK_WIDGET (transferbar->clear)); @@ -75,23 +75,18 @@ GParamSpec* pspec, GtkWidget* progress) { - gchar* current; - gchar* total; - gchar* size_text; + gchar* tooltip; gchar* text; gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), webkit_download_get_progress (download)); - - current = g_format_size_for_display (webkit_download_get_current_size (download)); - total = g_format_size_for_display (webkit_download_get_total_size (download)); - size_text = g_strdup_printf (_("%s of %s"), current, total); - g_free (current); - g_free (total); - text = g_strdup_printf ("%s (%s)", - gtk_progress_bar_get_text (GTK_PROGRESS_BAR (progress)), - size_text); + tooltip = midori_download_prepare_tooltip_text (download); + text = g_strdup_printf ("%s\n%s", + gtk_progress_bar_get_text (GTK_PROGRESS_BAR (progress)), tooltip); gtk_widget_set_tooltip_text (progress, text); + + g_free (tooltip); + g_free (text); } static void @@ -107,14 +102,18 @@ case WEBKIT_DOWNLOAD_STATUS_FINISHED: { MidoriBrowser* browser = midori_browser_get_for_widget (button); - MidoriWebSettings* settings = midori_browser_get_settings (browser); + WebKitNetworkRequest* request; + const gchar* original_uri; + GChecksumType checksum_type; + gchar* fingerprint; + gboolean verified = TRUE; icon = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU); gtk_button_set_image (GTK_BUTTON (button), icon); if (g_object_get_data (G_OBJECT (download), "open-download")) gtk_button_clicked (GTK_BUTTON (button)); - if (katze_object_get_boolean (settings, "notify-transfer-completed")) + if (1) { const gchar* uri = webkit_download_get_destination_uri (download); gchar* path = soup_uri_decode (uri); @@ -126,6 +125,39 @@ _("Transfer completed"), msg); g_free (msg); } + + /* Link Fingerprint */ + request = webkit_download_get_network_request (download); + original_uri = g_object_get_data (G_OBJECT (request), "midori-original-uri"); + if (!original_uri) + original_uri = webkit_download_get_uri (download); + checksum_type = midori_uri_get_fingerprint (original_uri, &fingerprint, NULL); + if (fingerprint != NULL) + { + gchar* filename = g_filename_from_uri ( + webkit_download_get_destination_uri (download), NULL, NULL); + gchar* contents; + gsize length; + gboolean y = g_file_get_contents (filename, &contents, &length, NULL); + gchar* checksum = g_compute_checksum_for_data (checksum_type, + (guchar*)contents, length); + g_free (filename); + g_free (contents); + /* Checksums are case-insensitive */ + if (!y || g_ascii_strcasecmp (fingerprint, checksum) != 0) + verified = FALSE; + g_free (checksum); + } + g_free (fingerprint); + if (verified) + { + if (!sokoke_is_app_or_private ()) + gtk_recent_manager_add_item (gtk_recent_manager_get_default (), + webkit_download_get_destination_uri (download)); + } + else + gtk_image_set_from_stock (GTK_IMAGE (icon), + GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU); break; } case WEBKIT_DOWNLOAD_STATUS_CANCELLED: @@ -152,7 +184,19 @@ case WEBKIT_DOWNLOAD_STATUS_FINISHED: { const gchar* uri = webkit_download_get_destination_uri (download); - if (sokoke_show_uri (gtk_widget_get_screen (button), + GtkWidget* icon = gtk_button_get_image (GTK_BUTTON (button)); + gchar* stock_id; + gtk_image_get_stock (GTK_IMAGE (icon), &stock_id, NULL); + if (g_str_equal (stock_id, GTK_STOCK_DIALOG_WARNING)) + { + sokoke_message_dialog (GTK_MESSAGE_WARNING, + _("The downloaded file is erroneous."), + _("The checksum provided with the link did not match. " \ + "This means the file is probably incomplete or was " \ + "modified afterwards."), + TRUE); + } + else if (sokoke_show_uri (gtk_widget_get_screen (button), uri, gtk_get_current_event_time (), NULL)) gtk_widget_destroy (button); break; @@ -165,6 +209,35 @@ } void +midori_transferbar_check_size (GtkWidget* statusbar, + MidoriTransferbar* transferbar) +{ + GtkWidget* window; + GtkRequisition req; + gint reqwidth, winwidth; + gtk_widget_size_request (statusbar, &req); + reqwidth = req.width; + window = gtk_widget_get_toplevel (GTK_WIDGET(transferbar)); + gtk_window_get_size (GTK_WINDOW(window), &winwidth, NULL); + + if (reqwidth > winwidth) + { + GList* list; + for (list = transferbar->infos; list != NULL; list = g_list_next (list)) + { + TransferInfo* info = list->data; + WebKitDownloadStatus status = webkit_download_get_status (info->download); + if (status == WEBKIT_DOWNLOAD_STATUS_ERROR + || status == WEBKIT_DOWNLOAD_STATUS_CANCELLED + || status == WEBKIT_DOWNLOAD_STATUS_FINISHED) + { + gtk_widget_destroy (info->button); + } + } + } +} + +void midori_transferbar_add_download_item (MidoriTransferbar* transferbar, WebKitDownload* download) { @@ -189,8 +262,11 @@ g_free (path); } else - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), - webkit_download_get_suggested_filename (download)); + { + gchar* filename = sokoke_get_download_filename (download); + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), filename); + g_free (filename); + } sokoke_widget_get_text_size (progress, "M", &width, NULL); gtk_widget_set_size_request (progress, width * 10, 1); /* Avoid a bug in WebKit */ @@ -210,7 +286,7 @@ gtk_toolbar_insert (GTK_TOOLBAR (transferbar), toolitem, 0); gtk_widget_show (GTK_WIDGET (transferbar->clear)); - info = g_new (TransferInfo, 1); + info = g_slice_new (TransferInfo); info->download = g_object_ref (download); info->button = button; info->toolitem = GTK_WIDGET (toolitem); @@ -225,6 +301,8 @@ G_CALLBACK (midori_transferbar_download_notify_status_cb), info); g_signal_connect (button, "clicked", G_CALLBACK (midori_transferbar_download_button_clicked_cb), info); + g_object_set_data_full (G_OBJECT (download), "last-time", g_new0 (gdouble, 1), g_free); + g_object_set_data_full (G_OBJECT (download), "last-size", g_new0 (guint64, 1), g_free); } static void @@ -245,7 +323,6 @@ } } } -#endif static void midori_transferbar_init (MidoriTransferbar* transferbar) @@ -256,10 +333,8 @@ transferbar->clear = gtk_tool_button_new_from_stock (GTK_STOCK_CLEAR); gtk_tool_button_set_label (GTK_TOOL_BUTTON (transferbar->clear), _("Clear All")); gtk_tool_item_set_is_important (transferbar->clear, TRUE); - #if WEBKIT_CHECK_VERSION (1, 1, 3) g_signal_connect (transferbar->clear, "clicked", G_CALLBACK (midori_transferbar_clear_clicked_cb), transferbar); - #endif gtk_toolbar_insert (GTK_TOOLBAR (transferbar), transferbar->clear, -1); transferbar->infos = NULL; @@ -270,7 +345,6 @@ { GtkWidget* dialog = NULL; gboolean cancel = FALSE; - #if WEBKIT_CHECK_VERSION (1, 1, 3) GList* list; gboolean all_done = TRUE; @@ -289,9 +363,6 @@ } if (!all_done) - #else - if (transferbar->infos || g_list_nth_data (transferbar->infos, 0)) - #endif { GtkWidget* widget = gtk_widget_get_toplevel (GTK_WIDGET (transferbar)); dialog = gtk_message_dialog_new (GTK_WINDOW (widget), @@ -309,7 +380,7 @@ } if (dialog != NULL) { - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_CANCEL) + if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_ACCEPT) cancel = TRUE; gtk_widget_destroy (dialog); } diff -Nru midori-0.2.8/tools/check-style midori-0.4.6/tools/check-style --- midori-0.2.8/tools/check-style 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/tools/check-style 2012-05-14 22:13:42.000000000 +0000 @@ -47,6 +47,8 @@ ['asctime|ctime|getgrgid|getprgnam|getlogin \ |getpwnam|getpwuid|gmtime|localtime \ |rand|readdir|strtok|ttyname', 'Not thread-safe posix, use _r variant'], + ['while.*g_list_nth', 'Use g_list_next() instead of g_list_nth'], + ['[^a-z]g_new.*1[^0-9]', 'Use g_slice_new() instead of g_new()'], ] # No validation for strings, comments, includes omissions = [ diff -Nru midori-0.2.8/tools/midori-dev midori-0.4.6/tools/midori-dev --- midori-0.2.8/tools/midori-dev 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/tools/midori-dev 2012-05-14 22:13:42.000000000 +0000 @@ -19,7 +19,7 @@ #----------------------------------------------------------------------------- -BIN=_build_/default/midori/midori +BIN=_build/default/midori/midori BASENAME=`basename $0` ulimit -c unlimited Binary files /tmp/hnprLcaoKe/midori-0.2.8/waf and /tmp/1hDe3mfscy/midori-0.4.6/waf differ diff -Nru midori-0.2.8/win32/README_OPENSUSE_MINGW.txt midori-0.4.6/win32/README_OPENSUSE_MINGW.txt --- midori-0.2.8/win32/README_OPENSUSE_MINGW.txt 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/win32/README_OPENSUSE_MINGW.txt 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,92 @@ +This file is licensed under the terms of the LGPL 2.1, see the file COPYING. + + FILES + +README.txt This file, explaining how to build Midori. +midori-0.3.3.nsi The NSIS installer creation script. + +packages.list The suse mingw packages required to build Midori. +x86-mingw32-opensuse/ Install and update script for the opensuse repository. + +makedist/ Scripts to create distribution package + from cross-compiled binaries and libs. + +crossconfig.sh Setup environment for cross build and run + configure script for cross build. + + + INTRODUCTION + +This document will explain how to get Midori compiling for windows, hopefully. + + + REQUIREMENTS + +A working tool chain with the mingw compiler is required. This can either be +native in Windows or a cross-chain. +This tool chain must have the following applications and all applications +needed to build Midori: +- basename, for x86-mingw32-opensuse +- bash, for the shell scripts +- cat, for makedist.midori +- cp, for x86-mingw32-opensuse and makedist.midori +- cpio, for x86-mingw32-opensuse +- echo, for x86-mingw32-opensuse and makedist.midori +- find, for makedist.midori +- git, to get the development sources +- grep, for makedist.midori +- gunzip, for x86-mingw32-opensuse +- head, for x86-mingw32-opensuse +- ls, for makedist.midori +- mkdir, for x86-mingw32-opensuse and makedist.midori +- mktemp, for makedist.midori +- pwd, for makedist.midori +- rm, for x86-mingw32-opensuse and makedist.midori +- rmdir, for makedist.midori +- rpm2cpio, for x86-mingw32-opensuse +- sed, for x86-mingw32-opensuse +- sha1sum, for makedist.midori +- sort, for x86-mingw32-opensuse and makedist.midori +- strings, for makedist.midori +- tar, to unpack the scripts +- touch, for x86-mingw32-opensuse +- uniq, for makedist.midori +- wget, for x86-mingw32-opensuse +- xmlgrep, for x86-mingw32-opensuse +- zip, for makedist.midori + + + PREPARATIONS + +Install all the packages needed by Midori and its dependencies. There are two +ways to do this. Automatically install the dependencies from opensuse.org or +manually install them. +To automatically install the packages use the scripts and change configuration +in header of install.sh file where needed. And run ./install.sh to install all +necessary packages. +This script can be also invoked with "update" argument ./install.sh update +to update the installed packages to newer versions. +To install the dependencies manually install the packages in packages.list. +This are all the packages needed by Midori and its dependencies. + +Get the Midori sources. Either use git to get them or download a snapshot or a +release. See http://git.xfce.org/apps/midori or +http://archive.xfce.org/src/apps/midori/ + + + BUILDING + +Read the instruction in the source tree. For cross compiling the script +crossconfig.sh might help. + + + DISTRIBUTION + +To create a Windows installer for Midori you need NSIS. See +http://nsis.sourceforge.net/Main_Page +Use the makedist.midori script to get all files needed for distribution. Add +the version number as argument to makedist.midori to create a version number +in the distribution package. eg. ./makedist.midori -0.3.3 +To complete the installer unzip the file created by the makedist script. +Compile midori-0.3.3.nsi with NSIS. + diff -Nru midori-0.2.8/win32/makedist/makedist.midori midori-0.4.6/win32/makedist/makedist.midori --- midori-0.2.8/win32/makedist/makedist.midori 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/win32/makedist/makedist.midori 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,216 @@ +#! /bin/sh + +# Copyright (C) 2010-2011 Peter de Ridder +# Copyright (C) 2012 Paweł Forysiuk +# +# 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. + +# script: makedist.midori [version tag] +# +# This script creates an archive containing all required files for +# midori on windows. The midori version is inserted in the name of +# the archive and appended to the name of the root directory in the +# archive. +# The name of the archive is contructed as follows: +# midori-.extension +# The archive contains a root directory named: +# midori + +# a bit of configuration +root_dir=$MINGW_PREFIX + +if [ "$MINGW_PREFIX" == "" ]; then + echo "Warning! MINGW_PREFIX variable is empty!" + sleep 5s +fi + +# create temporary working directory +temp_dir=`mktemp -d` + +# check if we can use 7zip +have_7zip=`which 7za` + +if [ "$1" != "" ]; then + if [ "$1" == "debug" ]; then + DEBUG_BUILD=1 + else + version_tag=$1 + fi +fi + +# generate unique filename +if [ "$have_7zip" != "" ]; then + ARCHIVE=midori$version_tag-`date +%Y%m%d%H%M`.7z +else + ARCHIVE=midori$version_tag-`date +%Y%m%d%H%M`.zip +fi + +# function: dll-recursive +# +# recursively search all dll dependencies of the input files. +# The resulting list of dll files including the input files is +# printed to stdout. +dll_recursive () +{ + temp_file_new=`mktemp` + temp_file_old=`mktemp` + + while [ "$1" ] + do + echo $1 >> $temp_file_new + shift + done + + while [ "x`sha1sum - < $temp_file_new`" != "x`sha1sum - < $temp_file_old`" ] + do + files=`cat $temp_file_new $temp_file_old | sort | uniq -u` + cp -L $temp_file_new $temp_file_old + strings $files 2> /dev/null | grep \\.dll | cat - $temp_file_old | sort | uniq > $temp_file_new + done + + cat $temp_file_new + + rm $temp_file_new $temp_file_old +} + +grab_files () +{ + local dir="$1" + pushd $root_dir > /dev/null + shift + while [ "$1" ]; do + find $dir "(" -name "$1" ")" -prune -exec mkdir -p $workdir/{} ";" -exec rmdir --ignore-fail-on-non-empty $workdir/{} ";" -exec cp -Lr {} $workdir/{} ";" + shift + done + popd > /dev/null +} + +echo -n "Creating $ARCHIVE ." + +# create destination folder +workdir=$temp_dir/midori$version_tag +mkdir $workdir + +echo -n . + +# auto generate dll list, only of existing files +pushd $root_dir/bin > /dev/null +dll_recursive midori*.exe gspawn-*-helper*.exe libhunspell*.dll > $temp_dir/midori.exe.lst +dll_recursive ../lib/gio/modules/*.dll >> $temp_dir/midori.exe.lst +dll_recursive iconv.dll >> $temp_dir/midori.exe.lst +dll_recursive ../lib/gstreamer-0.10/*.dll >> $temp_dir/midori.exe.lst + +if [ "$DEBUG_BUILD" != "" ]; then + dll_recursive gdb.exe GtkLauncher.exe >> $temp_dir/midori.exe.lst +fi + +files=`ls | cat - $temp_dir/midori.exe.lst | sort | uniq -d` +rm $temp_dir/midori.exe.lst +popd > /dev/null + +echo -n . + +# copy auto generate dll list +pushd $root_dir/bin > /dev/null +mkdir $workdir/bin +cp -L $files $workdir/bin +popd > /dev/null + +echo -n . + +# copy etc +grab_files etc midori +grab_files etc gtkrc + +# If modules are not compiled we need a list of them +grab_files etc pango +# Freetype is preferred font backend +# copy configuration, otherwise webkit will crash +grab_files etc fonts + +echo -n . + +# copy lib +grab_files lib midori +grab_files lib gtk-2.0 +grab_files lib/engines "*" +grab_files lib gdk-pixbuf-2.0 + +grab_files lib enchant +grab_files lib gio + +# Fedora ships on-demand pango modules, check just in case +grab_files lib pango + +grab_files lib gstreamer-0.10 + +echo -n . + +# copy share +grab_files share midori +grab_files share icons +grab_files share MS-Windows +grab_files share mime +grab_files share midori.mo + +grab_files share webkitgtk-1.0 + +if [ "$DEBUG_BUILD" == "" ];then + pushd $workdir > /dev/null + find -iname *.debug -exec rm {} \; + popd > /dev/null +fi + +# copy locales for gtk +# so we have translated stock items, file dialogs + +pushd $root_dir > /dev/null +find share "(" -name "midori.mo" ")" > $temp_dir/locale.list +mkdir -p $workdir/share/locale/ +for LOCALE in $(cat $temp_dir/locale.list); do + LOCALE=$(echo $LOCALE|awk -F/ '{print $3}') + cp /usr/share/locale/$LOCALE/LC_MESSAGES/gtk20.mo $workdir/share/locale/$LOCALE/LC_MESSAGES/ +done +rm $temp_dir/locale.list + +# Use small icons and tango icons +gtk_etc_dir="$workdir/etc/gtk-2.0/" +mkdir -p $gtk_etc_dir +cat > $gtk_etc_dir/gtkrc << _EOF +gtk-theme-name = "MS-Windows" +gtk-fallback-icon-theme = "Tango" +gtk-toolbar-style = GTK_TOOLBAR_ICONS +_EOF + +popd > /dev/null + +echo -n . + +# copy doc files to root +cp -L $workdir/share/doc/midori/{COPYING,AUTHORS} $workdir + +echo -n . + +ARCHIVE=`pwd`/$ARCHIVE + +# store as zip/7z file +pushd $temp_dir > /dev/null +if [ "$have_7zip" != "" ]; then + 7za a -m0=lzma $ARCHIVE midori$version_tag +else + zip -rq $ARCHIVE midori$version_tag +fi +popd > /dev/null + +echo -n . + +# remove working directory +rm -r $temp_dir + +echo " ready" + diff -Nru midori-0.2.8/win32/makedist/midori-0.3.3.nsi midori-0.4.6/win32/makedist/midori-0.3.3.nsi --- midori-0.2.8/win32/makedist/midori-0.3.3.nsi 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/win32/makedist/midori-0.3.3.nsi 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,664 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; Copyright (C) 2009 Enrico Tröger +; 2010-2011 Peter de Ridder +; +; 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. +; +; Installer script for Midori (Windows Installer) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + +; Do a Cyclic Redundancy Check to make sure the installer was not corrupted by the download +CRCCheck force +RequestExecutionLevel user ; set execution level for Windows Vista + +;;;;;;;;;;;;;;;;;;; +; helper defines ; +;;;;;;;;;;;;;;;;;;; +!define PRODUCT_NAME "Midori" +!define PRODUCT_VERSION "0.3.3" +!define PRODUCT_BUILD "0" +!define PRODUCT_VERSION_ID "${PRODUCT_VERSION}.${PRODUCT_BUILD}" +!define PRODUCT_PUBLISHER "Christian Dywan" +!define PRODUCT_WEB_SITE "http://www.twotoasts.de/" +!define PRODUCT_DIR_REGKEY "Software\${PRODUCT_NAME}" +!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" +!define PRODUCT_BROWER_KEY "Software\Clients\StartMenuInternet" +!define PRODUCT_EXE "$INSTDIR\bin\midori.exe" +!define UNINSTALL_EXE "$INSTDIR\uninst.exe" +!define RESOURCEDIR "midori-${PRODUCT_VERSION}" + +;;;;;;;;;;;;;;;;;;;;; +; Version resource ; +;;;;;;;;;;;;;;;;;;;;; +VIProductVersion "${PRODUCT_VERSION_ID}" +VIAddVersionKey "ProductName" "${PRODUCT_NAME}" +VIAddVersionKey "FileVersion" "${PRODUCT_VERSION}" +VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}" +VIAddVersionKey "LegalCopyright" "Copyright 2009 by Christian Dywan" +VIAddVersionKey "FileDescription" "${PRODUCT_NAME} Installer" + +BrandingText "$(^NAME) installer (NSIS ${NSIS_VERSION})" +InstallDir "$PROGRAMFILES\${PRODUCT_NAME}" +Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" +SetCompressor /SOLID lzma +ShowInstDetails hide +ShowUnInstDetails hide +XPStyle on +OutFile "${PRODUCT_NAME}-${PRODUCT_VERSION}_setup.exe" + +Var Answer +Var UserName +Var StartmenuFolder +Var UNINSTDIR +Var DefaultBrowser + +;;;;;;;;;;;;;;;; +; MUI Settings ; +;;;;;;;;;;;;;;;; +!include "MUI2.nsh" + +!define MUI_ABORTWARNING +!define MUI_ICON "midori.ico" +!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall-full.ico" + +; Welcome page +!insertmacro MUI_PAGE_WELCOME +; License page +;!define MUI_LICENSEPAGE_RADIOBUTTONS +!insertmacro MUI_PAGE_LICENSE "${RESOURCEDIR}\COPYING" +; Components page +!insertmacro MUI_PAGE_COMPONENTS +; Directory page +!define MUI_PAGE_CUSTOMFUNCTION_LEAVE OnDirLeave +!insertmacro MUI_PAGE_DIRECTORY +; Start menu page +!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Midori" +!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM +!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" +!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" +!insertmacro MUI_PAGE_STARTMENU ${PRODUCT_NAME} "$StartmenuFolder" +; Instfiles page +!insertmacro MUI_PAGE_INSTFILES +; Finish page +!define MUI_FINISHPAGE_RUN "${PRODUCT_EXE}" +!define MUI_FINISHPAGE_RUN_NOTCHECKED +!define MUI_FINISHPAGE_NOREBOOTSUPPORT +!insertmacro MUI_PAGE_FINISH + +; Uninstaller page +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES +!insertmacro MUI_UNPAGE_FINISH + +; Language file +!insertmacro MUI_LANGUAGE "English" + +;;;;;;;;;;;;;;;;;;;;;;;;;;; +; Sections and InstTypes ; +;;;;;;;;;;;;;;;;;;;;;;;;;;; +InstType "Full" +InstType "Minimal" + +Section "!Program Files" SEC01 + SectionIn RO 1 2 + SetOverwrite ifnewer + + SetOutPath "$INSTDIR" + File "${RESOURCEDIR}\*" + + SetOutPath "$INSTDIR\bin" + File /r "${RESOURCEDIR}\bin\*" + + SetOutPath "$INSTDIR\etc" + File /r "${RESOURCEDIR}\etc\*" + + SetOutPath "$INSTDIR\lib" + File /r /x "midori" "${RESOURCEDIR}\lib\*" + + SetOutPath "$INSTDIR\share" + File /r /x "locale" /x "user" /x "Tango" "${RESOURCEDIR}\share\*" + + SetOutPath "$INSTDIR\share\icons\Tango" + File "${RESOURCEDIR}\share\icons\Tango\index.theme" + + SetOutPath "$INSTDIR" + CreateShortCut "$INSTDIR\Midori.lnk" "${PRODUCT_EXE}" + + !insertmacro MUI_STARTMENU_WRITE_BEGIN ${PRODUCT_NAME} + CreateDirectory "$SMPROGRAMS\$StartmenuFolder" + CreateShortCut "$SMPROGRAMS\$StartmenuFolder\Midori.lnk" "${PRODUCT_EXE}" + !insertmacro MUI_STARTMENU_WRITE_END +SectionEnd + +Section "Extensions" SEC04 + SectionIn 1 + SetOverwrite ifnewer + SetOutPath "$INSTDIR\lib" + File /r "${RESOURCEDIR}\lib\midori" +SectionEnd + +Section "Language Files" SEC02 + SectionIn 1 + SetOutPath "$INSTDIR\share" + File /r "${RESOURCEDIR}\share\locale" +SectionEnd + +Section "FAQ" SEC06 + SectionIn 1 + SetOutPath "$INSTDIR\share\doc\midori" + File "${RESOURCEDIR}\share\doc\midori\faq.css" + File "${RESOURCEDIR}\share\doc\midori\faq.html" +SectionEnd + +!macro InstallTangoIconRenameSmall OPath IPath + File "/oname=16x16\${OPath}.png" "${RESOURCEDIR}\share\icons\Tango\16x16\${IPath}.png" + File "/oname=22x22\${OPath}.png" "${RESOURCEDIR}\share\icons\Tango\22x22\${IPath}.png" + File "/oname=32x32\${OPath}.png" "${RESOURCEDIR}\share\icons\Tango\32x32\${IPath}.png" +!macroend + +!macro InstallTangoIconRename OPath IPath + !insertmacro InstallTangoIconRenameSmall ${OPath} ${IPath} + File "/oname=48x48\${OPath}.png" "${RESOURCEDIR}\share\icons\Tango\48x48\${IPath}.png" + File /nonfatal "/oname=64x64\${OPath}.png" "${RESOURCEDIR}\share\icons\Tango\64x64\${IPath}.png" + File /nonfatal "/oname=72x72\${OPath}.png" "${RESOURCEDIR}\share\icons\Tango\72x72\${IPath}.png" + File /nonfatal "/oname=96x96\${OPath}.png" "${RESOURCEDIR}\share\icons\Tango\96x96\${IPath}.png" + File /nonfatal "/oname=128x128\${OPath}.png" "${RESOURCEDIR}\share\icons\Tango\128x128\${IPath}.png" + File "/oname=scalable\${OPath}.svg" "${RESOURCEDIR}\share\icons\Tango\scalable\${IPath}.svg" + File /nonfatal "/oname=scalable\${OPath}.icon" "${RESOURCEDIR}\share\icons\Tango\scalable\${IPath}.icon" +!macroend + +!macro InstallTangoIconSmall IconPath + !insertmacro InstallTangoIconRenameSmall ${IconPath} ${IconPath} +!macroend + +!macro InstallTangoIcon IconPath + !insertmacro InstallTangoIconRename ${IconPath} ${IconPath} +!macroend + +!macro CreateTangoSectionsSmall SectionPath + CreateDirectory "$INSTDIR\share\icons\Tango\16x16\${SectionPath}" + CreateDirectory "$INSTDIR\share\icons\Tango\22x22\${SectionPath}" + CreateDirectory "$INSTDIR\share\icons\Tango\32x32\${SectionPath}" +!macroend + +!macro CreateTangoSections SectionPath + !insertmacro CreateTangoSectionsSmall ${SectionPath} + CreateDirectory "$INSTDIR\share\icons\Tango\48x48\${SectionPath}" + CreateDirectory "$INSTDIR\share\icons\Tango\64x64\${SectionPath}" + CreateDirectory "$INSTDIR\share\icons\Tango\72x72\${SectionPath}" + CreateDirectory "$INSTDIR\share\icons\Tango\96x96\${SectionPath}" + CreateDirectory "$INSTDIR\share\icons\Tango\128x128\${SectionPath}" + CreateDirectory "$INSTDIR\share\icons\Tango\scalable\${SectionPath}" +!macroend + +Section "Tango icons" SEC07 + SectionIn 1 + SetOutPath "$INSTDIR\share\icons\Tango" + + !insertmacro CreateTangoSections "actions" + !insertmacro CreateTangoSectionsSmall "animations" + !insertmacro CreateTangoSections "apps" + !insertmacro CreateTangoSections "categories" + !insertmacro CreateTangoSections "devices" + !insertmacro CreateTangoSections "emblems" + !insertmacro CreateTangoSections "emotes" + !insertmacro CreateTangoSections "mimetypes" + !insertmacro CreateTangoSections "places" + !insertmacro CreateTangoSections "status" + + !insertmacro InstallTangoIcon "actions\gtk-add" + !insertmacro InstallTangoIcon "actions\gtk-bold" + !insertmacro InstallTangoIcon "actions\gtk-cancel" + !insertmacro InstallTangoIcon "actions\gtk-cancel" + !insertmacro InstallTangoIcon "actions\gtk-clear" + !insertmacro InstallTangoIcon "actions\gtk-copy" + !insertmacro InstallTangoIcon "actions\gtk-cut" + !insertmacro InstallTangoIcon "actions\gtk-delete" + !insertmacro InstallTangoIcon "actions\gtk-find" + !insertmacro InstallTangoIcon "actions\gtk-fullscreen" + !insertmacro InstallTangoIcon "actions\gtk-go-back-ltr" + !insertmacro InstallTangoIcon "actions\gtk-go-back-ltr" + !insertmacro InstallTangoIcon "actions\gtk-go-down" + !insertmacro InstallTangoIcon "actions\gtk-go-forward-ltr" + !insertmacro InstallTangoIcon "actions\gtk-go-forward-ltr" + !insertmacro InstallTangoIcon "actions\gtk-go-up" + !insertmacro InstallTangoIcon "actions\gtk-goto-first-ltr" + !insertmacro InstallTangoIcon "actions\gtk-goto-first-ltr" + !insertmacro InstallTangoIcon "actions\gtk-goto-last-ltr" + !insertmacro InstallTangoIcon "actions\gtk-goto-last-ltr" + !insertmacro InstallTangoIcon "actions\gtk-home" + !insertmacro InstallTangoIcon "actions\gtk-indent-ltr" + !insertmacro InstallTangoIcon "actions\gtk-indent-rtl" + !insertmacro InstallTangoIcon "actions\gtk-italic" + !insertmacro InstallTangoIcon "actions\gtk-jump-to-ltr" + !insertmacro InstallTangoIcon "actions\gtk-jump-to-ltr" + !insertmacro InstallTangoIcon "actions\gtk-media-next-ltr" + !insertmacro InstallTangoIcon "actions\gtk-media-next-rtl" + !insertmacro InstallTangoIcon "actions\gtk-media-previous-ltr" + !insertmacro InstallTangoIcon "actions\gtk-media-previous-rtl" + !insertmacro InstallTangoIcon "actions\gtk-open" + !insertmacro InstallTangoIcon "actions\gtk-paste" + !insertmacro InstallTangoIcon "actions\gtk-print" + !insertmacro InstallTangoIcon "actions\gtk-properties" + !insertmacro InstallTangoIcon "actions\gtk-redo-ltr" + !insertmacro InstallTangoIcon "actions\gtk-refresh" + !insertmacro InstallTangoIcon "actions\gtk-remove" + !insertmacro InstallTangoIcon "actions\gtk-save" + !insertmacro InstallTangoIcon "actions\gtk-save-as" + !insertmacro InstallTangoIcon "actions\gtk-select-all" + !insertmacro InstallTangoIcon "actions\gtk-stop" + !insertmacro InstallTangoIcon "actions\gtk-underline" + !insertmacro InstallTangoIcon "actions\gtk-undo-ltr" + !insertmacro InstallTangoIcon "actions\stock_add-bookmark" + !insertmacro InstallTangoIcon "actions\stock_new-tab" + !insertmacro InstallTangoIcon "actions\stock_new-window" + !insertmacro InstallTangoIconSmall "animations\process-working" + !insertmacro InstallTangoIcon "apps\gnome-settings-theme" + !insertmacro InstallTangoIcon "apps\gtk-help" + !insertmacro InstallTangoIcon "apps\terminal" + !insertmacro InstallTangoIcon "apps\web-browser" + !insertmacro InstallTangoIcon "categories\gtk-preferences" + #!insertmacro InstallTangoIcon "cookie-manager" + #!insertmacro InstallTangoIcon "document-open-recent" + #!insertmacro InstallTangoIcon "extention" + #!insertmacro InstallTangoIcon "feed-panel" + #!insertmacro InstallTangoIcon "gtk-about" + #!insertmacro InstallTangoIcon "gtk-close" + #!insertmacro InstallTangoIcon "gtk-convert" + #!insertmacro InstallTangoIcon "gtk-dialog-authentication" + #!insertmacro InstallTangoIcon "gtk-dnd-multiple" + #!insertmacro InstallTangoIcon "gtk-edit" + #!insertmacro InstallTangoIcon "gtk-execute" + #!insertmacro InstallTangoIcon "gtk-file" + #!insertmacro InstallTangoIcon "gtk-index" + #!insertmacro InstallTangoIcon "gtk-info" + #!insertmacro InstallTangoIcon "gtk-ok" + #!insertmacro InstallTangoIcon "gtk-orientation-portait" + #!insertmacro InstallTangoIcon "gtk-quit" + #!insertmacro InstallTangoIcon "gtk-select-color" + #!insertmacro InstallTangoIcon "gtk-select-font" + #!insertmacro InstallTangoIcon "gtk-sort-ascending" + #!insertmacro InstallTangoIcon "gtk-spell-check" + #!insertmacro InstallTangoIcon "gtk-undelete" + #!insertmacro InstallTangoIcon "gtk-yes" + #!insertmacro InstallTangoIcon "gtk-zoom-100" + #!insertmacro InstallTangoIcon "gtk-zoom-in" + #!insertmacro InstallTangoIcon "gtk-zoom-out" + !insertmacro InstallTangoIcon "mimetypes\gnome-mime-application-x-shockwave-flash" + !insertmacro InstallTangoIcon "mimetypes\gnome-mime-image" + !insertmacro InstallTangoIcon "mimetypes\package" + !insertmacro InstallTangoIcon "mimetypes\stock_script" + !insertmacro InstallTangoIcon "mimetypes\vcard" + #!insertmacro InstallTangoIcon "news-feed" + #!insertmacro InstallTangoIcon "place-holder" + !insertmacro InstallTangoIcon "places\gnome-stock-trash" + !insertmacro InstallTangoIcon "places\gtk-directory" + !insertmacro InstallTangoIcon "places\gtk-network" + !insertmacro InstallTangoIcon "status\gtk-dialog-error" + !insertmacro InstallTangoIcon "status\gtk-dialog-info" + !insertmacro InstallTangoIcon "status\gtk-dialog-warning" + !insertmacro InstallTangoIcon "status\gtk-missing-image" + !insertmacro InstallTangoIcon "status\network-offline" + #!insertmacro InstallTangoIcon "stock_bookmark" + #!insertmacro InstallTangoIcon "stock_mail-send" + #!insertmacro InstallTangoIcon "tab-panel" +SectionEnd + +Section "Desktop Shortcuts" SEC03 + SectionIn 1 + CreateShortCut "$DESKTOP\Midori.lnk" "${PRODUCT_EXE}" + CreateShortCut "$QUICKLAUNCH\Midori.lnk" "${PRODUCT_EXE}" +SectionEnd + +Section "Default Browser" SEC05 + SectionIn 1 + StrCpy $DefaultBrowser "yes" +SectionEnd + +Section -AdditionalIcons + SetOutPath $INSTDIR + !insertmacro MUI_STARTMENU_WRITE_BEGIN ${PRODUCT_NAME} + WriteIniStr "$INSTDIR\Website.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}" + CreateShortCut "$SMPROGRAMS\$StartmenuFolder\Website.lnk" "${PRODUCT_EXE}" \ + "${PRODUCT_WEB_SITE}" "${PRODUCT_EXE}" + CreateShortCut "$SMPROGRAMS\$StartmenuFolder\Uninstall.lnk" "${UNINSTALL_EXE}" + CreateShortCut "$SMPROGRAMS\$StartmenuFolder\Make Default.lnk" "${UNINSTALL_EXE}" \ + "/S /MAKEDEFAULT" "${PRODUCT_EXE}" + !insertmacro MUI_STARTMENU_WRITE_END +SectionEnd + +Section -Post + WriteUninstaller "${UNINSTALL_EXE}" + WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" Path "$INSTDIR" + WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "StartMenu" "$SMPROGRAMS\$StartmenuFolder" + ${if} $Answer == "yes" ; if user is admin + WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" + WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "UninstallString" "${UNINSTALL_EXE}" + WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayIcon" "${PRODUCT_EXE}" + WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" + WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" + WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "URLUpdateInfo" "${PRODUCT_WEB_SITE}" + WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" + WriteRegDWORD SHCTX "${PRODUCT_UNINST_KEY}" "NoModify" 0x00000001 + WriteRegDWORD SHCTX "${PRODUCT_UNINST_KEY}" "NoRepair" 0x00000001 + + WriteRegStr HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE" "" "${PRODUCT_NAME}" + WriteRegStr HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\DefaultIcon" "" "${PRODUCT_EXE},0" + WriteRegStr HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\shell\open\command" "" "${PRODUCT_EXE}" + WriteRegStr HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "HideIconsCommand" '"${UNINSTALL_EXE}" /S /HIDE' + WriteRegDWORD HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "IconsVisible" 0x00000000 + WriteRegStr HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "ReinstallCommand" '"${UNINSTALL_EXE}" /S /MAKEDEFAULT' + WriteRegStr HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "ShowIconsCommand" '"${UNINSTALL_EXE}" /S /SHOW' + ${endif} + + ${if} $DefaultBrowser == "yes" + ${if} $Answer == "yes" ; if user is admin + WriteRegDWORD HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "IconsVisible" 0x00000001 + ${endif} + WriteRegStr HKCU "${PRODUCT_BROWER_KEY}" "" "MIDORI.EXE" + WriteRegStr HKCR "http\DefaultIcon" "" "${PRODUCT_EXE},0" + WriteRegStr HKCR "http\shell\open\command" "" '${PRODUCT_EXE} "%1"' + WriteRegStr HKCR "https\DefaultIcon" "" "${PRODUCT_EXE},0" + WriteRegStr HKCR "https\shell\open\command" "" '${PRODUCT_EXE} "%1"' + ${endif} +SectionEnd + +Section Uninstall + Delete "$INSTDIR\Website.url" + Delete "${UNINSTALL_EXE}" + Delete "$INSTDIR\COPYING" + Delete "$INSTDIR\AUTHORS" + Delete "$INSTDIR\Midori.lnk" + + ; delete start menu entry + ReadRegStr $0 SHCTX "${PRODUCT_UNINST_KEY}" "StartMenu" + RMDir /r "$0" + + Delete "$QUICKLAUNCH\Midori.lnk" + Delete "$DESKTOP\Midori.lnk" + + RMDir /r "$INSTDIR\bin" + RMDir /r "$INSTDIR\etc" + RMDir /r "$INSTDIR\lib" + RMDir /r "$INSTDIR\share" + RMDir "$INSTDIR" + + DeleteRegKey SHCTX "${PRODUCT_UNINST_KEY}" + DeleteRegKey HKCU "${PRODUCT_UNINST_KEY}" + DeleteRegKey SHCTX "${PRODUCT_DIR_REGKEY}" + DeleteRegKey HKCU "${PRODUCT_DIR_REGKEY}" + DeleteRegKey HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE" + + SetAutoClose true +SectionEnd + +;;;;;;;;;;;;;;;;;;;;;;;;; +; Section descriptions ; +;;;;;;;;;;;;;;;;;;;;;;;;; +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN +!insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "Required program files. You cannot skip these files." +!insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "Various translations of Midori's interface." +!insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "Create shortcuts for Midori on the desktop and in the Quicklaunch Bar" +!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Available plugins like 'Advertisement Blocker', 'Form history filler' and 'Mouse Gestures'." +!insertmacro MUI_DESCRIPTION_TEXT ${SEC05} "Make Midori the default browser." +!insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "User manual of the Midori application." +!insertmacro MUI_DESCRIPTION_TEXT ${SEC07} "Better looking icons from the Tango icon theme." +!insertmacro MUI_FUNCTION_DESCRIPTION_END + +;;;;;;;;;;;;;;;;;;;;; +; helper functions ; +;;;;;;;;;;;;;;;;;;;;; + +; (from http://jabref.svn.sourceforge.net/viewvc/jabref/trunk/jabref/src/windows/nsis/setup.nsi) +!macro IsUserAdmin Result UName + ClearErrors + UserInfo::GetName + IfErrors Win9x + Pop $0 + StrCpy ${UName} $0 + UserInfo::GetAccountType + Pop $1 + ${if} $1 == "Admin" + StrCpy ${Result} "yes" + ${else} + StrCpy ${Result} "no" + ${endif} + Goto done + +Win9x: + StrCpy ${Result} "yes" +done: +!macroend + +; (from http://nsis.sourceforge.net/GetOptions) +Function un.GetOptions + !define GetOptions `!insertmacro GetOptionsCall` + + !macro GetOptionsCall _PARAMETERS _OPTION _RESULT + Push `${_PARAMETERS}` + Push `${_OPTION}` + Call un.GetOptions + Pop ${_RESULT} + !macroend + + Exch $1 + Exch + Exch $0 + Exch + Push $2 + Push $3 + Push $4 + Push $5 + Push $6 + Push $7 + ClearErrors + + StrCpy $2 $1 '' 1 + StrCpy $1 $1 1 + StrLen $3 $2 + StrCpy $7 0 + + begin: + StrCpy $4 -1 + StrCpy $6 '' + + quote: + IntOp $4 $4 + 1 + StrCpy $5 $0 1 $4 + StrCmp $5$7 '0' notfound + StrCmp $5 '' trimright + StrCmp $5 '"' 0 +7 + StrCmp $6 '' 0 +3 + StrCpy $6 '"' + goto quote + StrCmp $6 '"' 0 +3 + StrCpy $6 '' + goto quote + StrCmp $5 `'` 0 +7 + StrCmp $6 `` 0 +3 + StrCpy $6 `'` + goto quote + StrCmp $6 `'` 0 +3 + StrCpy $6 `` + goto quote + StrCmp $5 '`' 0 +7 + StrCmp $6 '' 0 +3 + StrCpy $6 '`' + goto quote + StrCmp $6 '`' 0 +3 + StrCpy $6 '' + goto quote + StrCmp $6 '"' quote + StrCmp $6 `'` quote + StrCmp $6 '`' quote + StrCmp $5 $1 0 quote + StrCmp $7 0 trimleft trimright + + trimleft: + IntOp $4 $4 + 1 + StrCpy $5 $0 $3 $4 + StrCmp $5 '' notfound + StrCmp $5 $2 0 quote + IntOp $4 $4 + $3 + StrCpy $0 $0 '' $4 + StrCpy $4 $0 1 + StrCmp $4 ' ' 0 +3 + StrCpy $0 $0 '' 1 + goto -3 + StrCpy $7 1 + goto begin + + trimright: + StrCpy $0 $0 $4 + StrCpy $4 $0 1 -1 + StrCmp $4 ' ' 0 +3 + StrCpy $0 $0 -1 + goto -3 + StrCpy $3 $0 1 + StrCpy $4 $0 1 -1 + StrCmp $3 $4 0 end + StrCmp $3 '"' +3 + StrCmp $3 `'` +2 + StrCmp $3 '`' 0 end + StrCpy $0 $0 -1 1 + goto end + + notfound: + SetErrors + StrCpy $0 '' + + end: + Pop $7 + Pop $6 + Pop $5 + Pop $4 + Pop $3 + Pop $2 + Pop $1 + Exch $0 +FunctionEnd + +Function .onInit + StrCpy "$StartmenuFolder" "Midori" + + ; (from http://jabref.svn.sourceforge.net/viewvc/jabref/trunk/jabref/src/windows/nsis/setup.nsi) + ; If the user does *not* have administrator privileges, abort + StrCpy $Answer "" + StrCpy $UserName "" + !insertmacro IsUserAdmin $Answer $UserName ; macro from LyXUtils.nsh + ${if} $Answer == "yes" + SetShellVarContext all ; set that e.g. shortcuts will be created for all users + ${else} + SetShellVarContext current + ; TODO is this really what we want? $PROGRAMFILES is not much better because + ; probably the unprivileged user can't write it anyways + StrCpy $INSTDIR "$PROFILE\$(^Name)" + ${endif} + + ; prevent running multiple instances of the installer + System::Call 'kernel32::CreateMutexA(i 0, i 0, t "midori_installer") i .r1 ?e' + Pop $R0 + StrCmp $R0 0 +3 + MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK + Abort + ; warn about a new install over an existing installation + ReadRegStr $R0 SHCTX "${PRODUCT_UNINST_KEY}" "UninstallString" + StrCmp $R0 "" finish + + MessageBox MB_YESNO|MB_ICONEXCLAMATION \ + "Midori has already been installed. $\nDo you want to remove the previous version before installing $(^Name) ?" \ + /SD IDYES IDYES remove IDNO finish + +remove: + ; run the uninstaller + ClearErrors + ; we read the installation path of the old installation from the Registry + ReadRegStr $UNINSTDIR SHCTX "${PRODUCT_DIR_REGKEY}" "Path" + IfSilent dosilent nonsilent +dosilent: + ExecWait '$R0 /S _?=$UNINSTDIR' ;Do not copy the uninstaller to a temp file + Goto finish +nonsilent: + ExecWait '$R0 _?=$UNINSTDIR' ;Do not copy the uninstaller to a temp file +finish: +FunctionEnd + +Function un.onInit + StrCpy $Answer "" + !insertmacro IsUserAdmin $Answer $UserName + ${if} $Answer == "yes" + SetShellVarContext all + ${else} + SetShellVarContext current + ${endif} + + ${GetOptions} "$CMDLINE" "/MAKEDEFAULT" $0 + IfErrors 0 +2 + goto makedefault_next + + WriteRegStr HKCU "${PRODUCT_BROWER_KEY}" "" "MIDORI.EXE" + WriteRegStr HKCR "http\DefaultIcon" "" "${PRODUCT_EXE},0" + WriteRegStr HKCR "http\shell\open\command" "" '${PRODUCT_EXE} "%1"' + WriteRegStr HKCR "https\DefaultIcon" "" "${PRODUCT_EXE},0" + WriteRegStr HKCR "https\shell\open\command" "" '${PRODUCT_EXE} "%1"' + Abort +makedefault_next: + + ${GetOptions} "$CMDLINE" "/SHOW" $0 + IfErrors 0 +2 + goto show_next + + ${if} $Answer == "yes" ; if user is admin + WriteRegDWORD HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "IconsVisible" 0x00000001 + ${endif} + CreateShortCut "$DESKTOP\Midori.lnk" "${PRODUCT_EXE}" + CreateShortCut "$QUICKLAUNCH\Midori.lnk" "${PRODUCT_EXE}" + Abort +show_next: + + ${GetOptions} "$CMDLINE" "/HIDE" $0 + IfErrors 0 +2 + goto hide_next + + ${if} $Answer == "yes" ; if user is admin + WriteRegDWORD HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "IconsVisible" 0x00000000 + ${endif} + Delete "$QUICKLAUNCH\Midori.lnk" + Delete "$DESKTOP\Midori.lnk" + Abort +hide_next: + + ; If the user does *not* have administrator privileges, abort + ${if} $Answer != "yes" + ; check if the Midori has been installed with admin permisions + ReadRegStr $0 HKLM "${PRODUCT_UNINST_KEY}" "Publisher" + ${if} $0 != "" + MessageBox MB_OK|MB_ICONSTOP "You need administrator privileges to uninstall Midori!" \ + /SD IDOK + Abort + ${endif} + ${endif} +FunctionEnd + +Function OnDirLeave + ClearErrors + SetOutPath "$INSTDIR" ; what about IfError creating $INSTDIR? + GetTempFileName $1 "$INSTDIR" ; creates tmp file (or fails) + FileOpen $0 "$1" "w" ; error to open? + FileWriteByte $0 "0" + IfErrors notPossible possible + +notPossible: + RMDir "$INSTDIR" ; removes folder if empty + MessageBox MB_OK "The given directory is not writeable. Please choose another one!" /SD IDOK + Abort +possible: + FileClose $0 + Delete "$1" +FunctionEnd Binary files /tmp/hnprLcaoKe/midori-0.2.8/win32/makedist/midori.ico and /tmp/1hDe3mfscy/midori-0.4.6/win32/makedist/midori.ico differ diff -Nru midori-0.2.8/win32/x86-mingw32-opensuse/crossconfig.sh midori-0.4.6/win32/x86-mingw32-opensuse/crossconfig.sh --- midori-0.2.8/win32/x86-mingw32-opensuse/crossconfig.sh 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/win32/x86-mingw32-opensuse/crossconfig.sh 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,29 @@ +#!/bin/sh + +# Copyright (C) 2010-2011 Peter de Ridder +# +# 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. + +export MINGW_PREFIX=~/dev/mingw/mingw32 +export PATH=$MINGW_PREFIX/bin:$PATH +export PKG_CONFIG_PATH=$MINGW_PREFIX/lib/pkgconfig +export PKG_CONFIG_LIBDIR= +export MINGW_BUILD=`gcc -dumpmachine` +export MINGW_TARGET=i386-mingw32 + +find_compiler () +{ + export CC=$( find /usr/bin -iname *mingw32*gcc ) +} + +find_compiler +if [ "$CC" != "" ]; then + CC=${CC} ./configure --prefix=$MINGW_PREFIX $@ +else + echo "Cannot find cross-complier! Please install mingw version of gcc compiler." +fi diff -Nru midori-0.2.8/win32/x86-mingw32-opensuse/install.sh midori-0.4.6/win32/x86-mingw32-opensuse/install.sh --- midori-0.2.8/win32/x86-mingw32-opensuse/install.sh 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/win32/x86-mingw32-opensuse/install.sh 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,94 @@ +#!/bin/sh + +# Copyright (C) 2010-2011 Peter de Ridder +# +# 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. + +# config variables +REPO_URL=http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_11.4 +REPO_ARCH=noarch +DOWNLOAD_PATH=~/dev/mingw/packages/opensuse +BUILD_PATH=~/tmp/opensuse +INSTALL_PATH=~/dev/mingw/mingw32 + +if [[ "$1" == "update" ]] +then + UPDATE=yes +fi + +which xmlgrep 2> /dev/null && HAVE_XMLGREP=1 || HAVE_XMLGREP=0 +if [[ "$HAVE_XMLGREP" == "0" ]]; then + echo -e "\nPlease install xmlclitools http://robur.slu.se/jensl/xmlclitools\n" + exit +fi + +# create download and build directory +mkdir -p $DOWNLOAD_PATH +mkdir -p $BUILD_PATH + +rm $DOWNLOAD_PATH/repomd.xml +wget -nc $REPO_URL/repodata/repomd.xml -P $DOWNLOAD_PATH || exit 1 +OTHER_FILE=`xmlgrep -c -f $DOWNLOAD_PATH/repomd.xml repomd.data:type=other.location | sed 's/.*href="\([^"]*\)".*/\1/'` + +wget -nc $REPO_URL/$OTHER_FILE -O $DOWNLOAD_PATH/other.xml.gz || exit 1 +rm $DOWNLOAD_PATH/other.xml +#gunzip -N $DOWNLOAD_PATH/`basename $OTHER_FILE` +gunzip -N $DOWNLOAD_PATH/other.xml + +rm packages.version +touch packages.version + +# download all packages +while read line +do + VERSION=`xmlgrep -c -f $DOWNLOAD_PATH/other.xml otherdata.package:name="$line":arch="$REPO_ARCH" | awk -F\< '{print $2}' |sed -e 'h' -e 's/^.*ver="\([^"]*\)".*$/\1/p' -e 'g' -e 's/^.*rel="\([^"]*\)".*$/\1/' | sed -e N -e 's/\n/-/' | sort -V -r | head -n 1` + FILE=$line-$VERSION.$REPO_ARCH.rpm + test "$UPDATE" == yes || echo $FILE >> packages.version + if [ ! -f $DOWNLOAD_PATH/$FILE ] + then + test "$UPDATE" == yes && echo $FILE >> packages.version + wget -nc $REPO_URL/$REPO_ARCH/$FILE -P $DOWNLOAD_PATH + fi +done < packages.list + +# convert and install packages +while read line +do + pushd $BUILD_PATH + # extract rpm + rpm2cpio $DOWNLOAD_PATH/$line | cpio -i -d + + if [ -d $BUILD_PATH/usr/i686-pc-ming32/sys-root/mingw ] + then + # convert pkgconfig files + if [ -d $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig ] + then + sed -i -e 's@^prefix=.*@prefix='$INSTALL_PATH'@' -e 's@/usr/i686-pc-mingw32/sys-root/mingw@${prefix}@' $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig/*.pc + fi + # install the package + cp -rf $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/* $INSTALL_PATH/ + fi + + if [ -d $BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw ] + then + # convert pkgconfig files + if [ -d $BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig ] + then + sed -i -e 's@^prefix=.*@prefix='$INSTALL_PATH'@' -e 's@/usr/i686-w64-mingw32/sys-root/mingw@${prefix}@' $BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig/*.pc + fi + # install the package + cp -rf $BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw/* $INSTALL_PATH/ + fi + + # remove the extracted file + rm -rf $BUILD_PATH/usr + popd +done < packages.version + +# remove build directory +rm -rf $BUILD_PATH diff -Nru midori-0.2.8/win32/x86-mingw32-opensuse/packages.list midori-0.4.6/win32/x86-mingw32-opensuse/packages.list --- midori-0.2.8/win32/x86-mingw32-opensuse/packages.list 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.4.6/win32/x86-mingw32-opensuse/packages.list 2012-05-14 22:13:42.000000000 +0000 @@ -0,0 +1,89 @@ +This file is licensed under the terms of the LGPL 2.1, see the file COPYING. + +mingw32-atk +mingw32-atk-devel +mingw32-cairo-devel +mingw32-dbus-1 +mingw32-dbus-1-glib +mingw32-dbus-1-glib-devel +mingw32-enchant +mingw32-enchant-devel +mingw32-fontconfig +mingw32-fontconfig-devel +mingw32-freetype +mingw32-freetype-devel +mingw32-gcc-c++ +mingw32-gcc +mingw32-gdb +mingw32-gdk-pixbuf +mingw32-gdk-pixbuf-devel +mingw32-gettext-runtime +mingw32-gettext-tools +mingw32-glib2 +mingw32-glib2-devel +mingw32-glib-networking +mingw32-gst-plugins-base-devel +mingw32-gstreamer-devel +mingw32-gtk2 +mingw32-gtk2-devel +mingw32-hunspell +mingw32-hunspell-devel +mingw32-libexpat +mingw32-libexpat-devel +mingw32-libgcc +mingw32-libgcrypt +mingw32-libgcrypt-devel +mingw32-libcairo2 +mingw32-libgeoclue +mingw32-libgeoclue-devel +mingw32-libgnutls +mingw32-libgnutls-devel +mingw32-libgpg-error +mingw32-libgpg-error-devel +mingw32-libgstinterfaces +mingw32-libgstreamer +mingw32-libidn +mingw32-libidn-devel +mingw32-libintl +mingw32-libintl-devel +mingw32-libjasper +mingw32-libjasper-devel +mingw32-libjpeg +mingw32-libjpeg-devel +mingw32-libopenssl +mingw32-libopenssl-devel +mingw32-libpng +mingw32-libpng-devel +mingw32-libsoup +mingw32-libsoup-devel +mingw32-libstdc++ +mingw32-libsqlite +mingw32-libsqlite-devel +mingw32-libtasn1 +mingw32-libtasn1-devel +mingw32-libtiff +mingw32-libtiff-devel +mingw32-libwebkitgtk +mingw32-libwebkitgtk-devel +mingw32-webkit-tools +mingw32-libxml2 +mingw32-libxml2-devel +mingw32-libxslt +mingw32-libxslt-devel +mingw32-pango +mingw32-pango-devel +mingw32-pixman +mingw32-pixman-devel +mingw32-pthreads +mingw32-pthreads-devel +mingw32-libproxy +mingw32-libmodman +mingw32-shared-mime-info +mingw32-shared-mime-info-devel +mingw32-win_iconv +mingw32-win_iconv-devel +mingw32-zlib +mingw32-zlib-devel +mingw32-libunique +mingw32-libunique-devel +mingw32-libffi diff -Nru midori-0.2.8/wscript midori-0.4.6/wscript --- midori-0.2.8/wscript 2010-09-19 21:22:41.000000000 +0000 +++ midori-0.4.6/wscript 2012-05-14 22:13:42.000000000 +0000 @@ -10,7 +10,7 @@ except: WAFVERSION='1.0.0' if WAFVERSION[:3] != '1.5': - print 'Incompatible Waf, use 1.5' + print ('Incompatible Waf, use 1.5') sys.exit (1) import Build @@ -28,22 +28,24 @@ from Configure import find_program_impl major = 0 -minor = 2 -micro = 8 +minor = 4 +micro = 6 APPNAME = 'midori' -VERSION = str (major) + '.' + str (minor) + '.' + str (micro) +VERSION = VERSION_FULL = str (major) + '.' + str (minor) + '.' + str (micro) +VERSION_SUFFIX = ' (%s)' % VERSION try: if os.path.isdir ('.git'): git = Utils.cmd_output (['git', 'describe'], silent=True) if git: - VERSION = git.strip () + VERSION_FULL = git.strip () + VERSION_SUFFIX = VERSION_FULL.replace (VERSION, '') except: pass srcdir = '.' -blddir = '_build_' +blddir = '_build' # recognized by ack def option_enabled (option): if getattr (Options.options, 'enable_' + option): @@ -60,6 +62,9 @@ return cc.find ('mingw') != -1# or cc.find ('wine') != -1 return False +def is_win32 (env): + return is_mingw (env) or Options.platform == 'win32' + # Compile Win32 res files to (resource) object files def rc_file(self, node): rctask = self.create_task ('winrc') @@ -87,29 +92,21 @@ conf.define (defname, dirvalue) return dirvalue + def check_version (given_version, major, minor, micro): + if '.' in given_version: + given_major, given_minor, given_micro = given_version.split ('.') + else: + given_major, given_minor, given_micro = given_version + return int(given_major) > major or \ + int(given_major) == major and int(given_minor) > minor or \ + int(given_major) == major and int(given_minor) == minor and int(given_micro) >= micro + conf.check_tool ('compiler_cc') - if option_enabled ('vala'): - if find_program_impl (conf.env, 'valac'): - conf.check_tool ('vala') - else: - conf.check_message ('program', 'valac', False, False) - Utils.pprint ('RED', 'Vala is required for some extensions.') - Utils.pprint ('RED', 'Pass --disable-vala to not build with Vala.') - sys.exit (1) + conf.check_tool ('vala') conf.check_tool ('glib2') - - if option_enabled ('userdocs'): - conf.find_program ('rst2html.py', var='RST2HTML') - # debian renames the executable, check that as well :( - if not conf.env['RST2HTML']: - conf.find_program ('rst2html', var='RST2HTML') - if conf.env['RST2HTML']: - user_docs = 'yes' - else: - option_checkfatal ('userdocs', 'user documentation') - user_docs = 'N/A' - else: - user_docs = 'no ' + if not check_version (conf.env['VALAC_VERSION'], 0, 14, 0): + Utils.pprint ('RED', 'Vala 0.14.0 or later is required.') + sys.exit (1) if option_enabled ('nls'): conf.check_tool ('intltool') @@ -127,7 +124,7 @@ else: icons = 'no ' - if is_mingw (conf.env) or Options.platform == 'win32': + if is_win32 (conf.env): conf.find_program ('windres', var='WINRC') conf.env['platform'] = 'win32' @@ -159,6 +156,9 @@ 'MDATADIR') conf.undefine ('DATADIR') dirname_default ('DOCDIR', os.path.join (conf.env['MDATADIR'], 'doc')) + if not APPNAME in conf.env['DOCDIR']: + conf.env['DOCDIR'] += '/' + APPNAME + conf.define ('DOCDIR', conf.env['DOCDIR']) if option_enabled ('apidocs'): conf.find_program ('gtkdoc-scan', var='GTKDOC_SCAN') @@ -182,12 +182,18 @@ return conf.env['HAVE_' + var] if option_enabled ('unique'): - check_pkg ('unique-1.0', '0.9', False) + if option_enabled('gtk3'): unique_pkg = 'unique-3.0' + else: unique_pkg = 'unique-1.0' + check_pkg (unique_pkg, '0.9', False) unique = ['N/A', 'yes'][conf.env['HAVE_UNIQUE'] == 1] if unique != 'yes': option_checkfatal ('unique', 'single instance') + conf.define ('UNIQUE_VERSION', 'No') + else: + conf.define ('UNIQUE_VERSION', conf.check_cfg (modversion=unique_pkg)) else: unique = 'no ' + conf.define ('UNIQUE_VERSION', 'No') conf.define ('HAVE_UNIQUE', [0,1][unique == 'yes']) if option_enabled ('libnotify'): @@ -195,14 +201,37 @@ libnotify = ['N/A','yes'][conf.env['HAVE_LIBNOTIFY'] == 1] if libnotify != 'yes': option_checkfatal ('libnotify', 'notifications') + conf.define ('LIBNOTIFY_VERSION', 'No') + else: + conf.define ('LIBNOTIFY_VERSION', conf.check_cfg (modversion='libnotify')) else: libnotify = 'no ' + conf.define ('LIBNOTIFY_VERSION', 'No') conf.define ('HAVE_LIBNOTIFY', [0,1][libnotify == 'yes']) + if option_enabled ('granite'): + if not option_enabled ('gtk3'): + if getattr (Options.options, 'enable_granite'): + Utils.pprint ('RED', 'Granite requires --enable-gtk3') + sys.exit (1) + else: + granite = 'no (requires --enable-gtk3)' + else: + check_pkg ('granite', '0.1', False) + granite = ['N/A', 'yes'][conf.env['HAVE_GRANITE'] == 1] + if granite != 'yes': + option_checkfatal ('granite', 'new notebook, pop-overs') + conf.define ('GRANITE_VERSION', 'No') + else: + conf.define ('GRANITE_VERSION', conf.check_cfg (modversion='granite')) + else: + granite = 'no ' + conf.define ('GRANITE_VERSION', 'No') + conf.check (lib='m', mandatory=True) check_pkg ('gmodule-2.0', '2.8.0', False) check_pkg ('gthread-2.0', '2.8.0', False) - check_pkg ('gio-2.0', '2.16.0') + check_pkg ('gio-2.0', '2.22.0') args = '' if Options.platform == 'win32': args = '--define-variable=target=win32' @@ -212,29 +241,35 @@ conf.check (header_name='X11/extensions/scrnsaver.h', includes='/usr/X11R6/include', mandatory=False) conf.check (lib='Xss', libpath='/usr/X11R6/lib', mandatory=False) - 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') - conf.define ('HAVE_LIBSOUP_2_25_2', 1) - check_pkg ('libsoup-2.4', '2.27.90', False, var='LIBSOUP_2_27_90') - check_pkg ('libsoup-2.4', '2.29.3', False, var='LIBSOUP_2_29_3') - check_pkg ('libsoup-2.4', '2.29.91', False, var='LIBSOUP_2_29_91') + if option_enabled ('gtk3'): + check_pkg ('gtk+-3.0', '3.0.0', var='GTK', mandatory=False) + check_pkg ('webkitgtk-3.0', '1.1.17', var='WEBKIT', mandatory=False) + if not conf.env['HAVE_GTK'] or not conf.env['HAVE_WEBKIT']: + Utils.pprint ('RED', 'GTK+3 was not found.\n' \ + 'Pass --disable-gtk3 to build without GTK+3.') + sys.exit (1) + if check_version (conf.check_cfg (modversion='webkitgtk-3.0'), 1, 5, 1): + check_pkg ('javascriptcoregtk-3.0', '1.5.1', args=args) + conf.env.append_value ('VALAFLAGS', '-D HAVE_GTK3') + else: + check_pkg ('gtk+-2.0', '2.10.0', var='GTK') + check_pkg ('webkit-1.0', '1.1.17', args=args) + if check_version (conf.check_cfg (modversion='webkit-1.0'), 1, 5, 1): + check_pkg ('javascriptcoregtk-1.0', '1.5.1', args=args) + conf.env['HAVE_GTK3'] = option_enabled ('gtk3') + check_pkg ('libsoup-2.4', '2.27.90') + conf.define ('LIBSOUP_VERSION', conf.check_cfg (modversion='libsoup-2.4')) + if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 3): + conf.define ('HAVE_LIBSOUP_2_29_3', 1) + if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 91): + conf.define ('HAVE_LIBSOUP_2_29_91', 1) + if check_version (conf.env['LIBSOUP_VERSION'], 2, 33, 4): + conf.define ('HAVE_LIBSOUP_2_33_4', 1) + if check_version (conf.env['LIBSOUP_VERSION'], 2, 37, 1): + conf.define ('HAVE_LIBSOUP_2_37_1', 1) check_pkg ('libxml-2.0', '2.6') check_pkg ('sqlite3', '3.0', True, var='SQLITE') - if conf.env['HAVE_LIBSOUP_2_27_90']: - idn = 'yes' - conf.define ('HAVE_LIBIDN', 0) - else: - if option_enabled ('libidn'): - check_pkg ('libidn', '1.0', False) - idn = ['N/A','yes'][conf.env['HAVE_LIBIDN'] == 1] - if idn != 'yes': - option_checkfatal ('libidn', 'international domain names') - else: - idn = 'no ' - conf.define ('HAVE_LIBIDN', [0,1][idn == 'yes']) - if option_enabled ('hildon'): if check_pkg ('hildon-1', mandatory=False, var='HILDON'): check_pkg ('libosso', var='HILDON') @@ -258,8 +293,6 @@ if not conf.env['HAVE_UNIQUE']: if Options.platform == 'win32': conf.check (lib='ws2_32') - check_pkg ('openssl', mandatory=False) - conf.define ('USE_SSL', [0,1][conf.env['HAVE_OPENSSL'] == 1]) conf.define ('HAVE_NETDB_H', [0,1][conf.check (header_name='netdb.h')]) conf.check (header_name='sys/wait.h') conf.check (header_name='sys/select.h') @@ -272,16 +305,15 @@ else: conf.check (header_name='signal.h') - conf.define ('PACKAGE_VERSION', VERSION) conf.define ('PACKAGE_NAME', APPNAME) - conf.define ('PACKAGE_BUGREPORT', 'http://www.twotoasts.de/bugs') + conf.define ('PACKAGE_BUGREPORT', 'https://bugs.launchpad.net/midori') conf.define ('GETTEXT_PACKAGE', APPNAME) + conf.define ('MIDORI_VERSION', VERSION) conf.define ('MIDORI_MAJOR_VERSION', major) conf.define ('MIDORI_MINOR_VERSION', minor) conf.define ('MIDORI_MICRO_VERSION', micro) - conf.write_config_header ('config.h') conf.env.append_value ('CCFLAGS', '-DHAVE_CONFIG_H -include config.h'.split ()) debug_level = Options.options.debug_level compiler = conf.env['CC_NAME'] @@ -290,6 +322,15 @@ sys.exit (1) elif debug_level == '': debug_level = 'debug' + + if debug_level == 'full': + conf.define ('PACKAGE_VERSION', '%s (debug)' % VERSION_FULL) + conf.env.append_value ('CCFLAGS', '-DMIDORI_VERSION_SUFFIX="%s (debug)"' % VERSION_SUFFIX) + else: + conf.define ('PACKAGE_VERSION', VERSION_FULL) + conf.env.append_value ('CCFLAGS', '-DMIDORI_VERSION_SUFFIX="%s"' % VERSION_SUFFIX) + conf.write_config_header ('config.h') + if compiler == 'gcc': if debug_level == 'none': if 'CCFLAGS' in os.environ: @@ -308,7 +349,7 @@ '-Wno-missing-field-initializers ' '-Wredundant-decls -Wmissing-noreturn ' '-Wshadow -Wpointer-arith -Wcast-align ' - '-Winline -Wformat-security ' + '-Winline -Wformat-security -fno-common ' '-Winit-self -Wundef -Wdeclaration-after-statement ' '-Wmissing-format-attribute -Wnested-externs ' # -DGSEAL_ENABLE @@ -317,18 +358,19 @@ '-DGTK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED ' '-DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE'.split ()) if debug_level == 'full': - conf.env.append_value ('VALAFLAGS', '--enable-checking'.split ()) + conf.env.append_value ('VALAFLAGS', '--debug --enable-checking'.split ()) + elif debug_level == 'debug': + conf.env.append_value ('VALAFLAGS', '--debug'.split ()) elif debug_level == 'none': conf.env.append_value ('VALAFLAGS', '--disable-assert') - print ''' + conf.env.append_value ('VALAFLAGS', '--enable-deprecated') + print (''' Localization: %(nls)s (intltool) Icon optimizations: %(icons)s (rsvg-convert) Notifications: %(libnotify)s (libnotify) - IDN support: %(idn)s (libidn or libsoup 2.27.90) - User documentation: %(user_docs)s (docutils) API documentation: %(api_docs)s (gtk-doc) - ''' % locals () + ''' % locals ()) if unique == 'yes' and conf.check_cfg (modversion='unique-1.0') == '1.0.4': Utils.pprint ('RED', 'unique 1.0.4 found, this version is erroneous.') Utils.pprint ('RED', 'Please use an older or newer version.') @@ -340,8 +382,9 @@ if group == None: group = opt option_ = option.replace ('-', '_') - group.add_option ('--enable-' + option, action='store_true', - default=False, help='Enable ' + desc, dest='enable_' + option_) + group.add_option ('--enable-' + option, action='store_true', default=False, + help='Enable ' + desc + ' [Default: ' + str (not disable) + ']', + dest='enable_' + option_) group.add_option ('--disable-' + option, action='store_true', default=disable, help='Disable ' + desc, dest='disable_' + option_) @@ -365,17 +408,16 @@ group.add_option ('--update-po', action='store_true', default=False, help='Update localization files', dest='update_po') add_enable_option ('docs', 'informational text files', group) - add_enable_option ('userdocs', 'user documentation', group) add_enable_option ('apidocs', 'API documentation', group, disable=True) group = opt.add_option_group ('Optional features', '') - add_enable_option ('unique', 'single instance support', group) - add_enable_option ('vala', 'Vala support', group) - add_enable_option ('libidn', 'international domain name support', group) + add_enable_option ('unique', 'single instance support', group, disable=is_win32 (os.environ)) add_enable_option ('libnotify', 'notification support', group) + add_enable_option ('granite', 'new notebook, pop-overs', group) add_enable_option ('addons', 'building of extensions', group) add_enable_option ('tests', 'building of tests', group, disable=True) add_enable_option ('hildon', 'Maemo integration', group, disable=not is_maemo ()) + add_enable_option ('gtk3', 'GTK+3 and WebKitGTK+3 support', group, disable=True) # Provided for compatibility opt.add_option ('--build', help='Ignored') @@ -415,25 +457,12 @@ bld.add_group () if bld.env['docs']: - bld.install_files ('${DOCDIR}/' + APPNAME + '/', \ - 'AUTHORS COPYING ChangeLog EXPAT README') + bld.install_files ('${DOCDIR}/', \ + 'AUTHORS COPYING ChangeLog EXPAT README data/faq.html data/faq.css') # Install default configuration bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + '/', 'data/search') - if bld.env['RST2HTML']: - # FIXME: Build only if needed - Utils.check_dir (blddir) - Utils.check_dir (blddir + '/docs') - Utils.check_dir (blddir + '/docs/user') - os.chdir (blddir + '/docs/user') - command = bld.env['RST2HTML'] + ' -stg ' + \ - '--stylesheet=../../../docs/user/midori.css ' + \ - '../../../docs/user/midori.txt ' + 'midori.html' - Utils.exec_command (command) - os.chdir ('../../..') - bld.install_files ('${DOCDIR}/midori/user/', blddir + '/docs/user/midori.html') - if bld.env['INTLTOOL']: obj = bld.new_task_gen ('intltool_po') obj.podir = 'po' @@ -441,9 +470,11 @@ if bld.env['GTKDOC_SCAN'] and Options.commands['build']: bld.add_subdirs ('docs/api') - bld.install_files ('${DOCDIR}/midori/api/', blddir + '/docs/api/*') + bld.install_files ('${DOCDIR}/api/', blddir + '/docs/api/*') - if not is_mingw (bld.env) and Options.platform != 'win32': + for desktop in [APPNAME + '.desktop', APPNAME + '-private.desktop']: + if is_win32 (bld.env): + break if bld.env['HAVE_HILDON']: appdir = '${MDATADIR}/applications/hildon' bld.install_files ('${MDATADIR}/dbus-1/services', @@ -452,14 +483,13 @@ appdir = '${MDATADIR}/applications' if bld.env['INTLTOOL']: obj = bld.new_task_gen ('intltool_in') - obj.source = 'data/' + APPNAME + '.desktop.in' + obj.source = 'data/' + desktop + '.in' obj.install_path = appdir obj.flags = ['-d', '-c'] - bld.install_files (appdir, 'data/' + APPNAME + '.desktop') + bld.install_files (appdir, 'data/' + desktop) else: folder = os.path.abspath (blddir + '/default/data') Utils.check_dir (folder) - desktop = APPNAME + '.desktop' pre = open ('data/' + desktop + '.in') after = open (folder + '/' + desktop, 'w') try: @@ -488,32 +518,23 @@ 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') + for res_file in ['about.css', 'error.html', 'close.png']: + bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/' + res_file) + bld.install_as ( \ + '${MDATADIR}/' + APPNAME + '/res/speeddial-head-%s.html' % VERSION, \ + 'data/speeddial-head.html') 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 bld.env['platform'] == 'win32': - extensions = os.listdir ('data/extensions') - for extension in extensions: - folder = 'lib' + extension + '.dll' - source = 'data/extensions/' + extension + '/config' - if os.path.exists (source): - bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + \ - '/extensions/' + folder, source) - elif Options.platform == 'linux': + if 1: 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}/xdg/' + APPNAME + \ - '/extensions/' + folder, source) + '/extensions/' + extension, source) if Options.commands['check'] or bld.env['tests']: bld.add_subdirs ('tests') @@ -566,7 +587,7 @@ size_old = 0 subprocess.call (['intltool-update', '-p', '-g', APPNAME]) size_new = os.stat (APPNAME + '.pot').st_size - if size_new <> size_old: + if size_new != size_old: Utils.pprint ('YELLOW', "Updated po template.") try: command = 'intltool-update -r -g %s' % APPNAME @@ -611,7 +632,8 @@ command += ' wine cmd /k "PATH=%PATH%;' + Build.bld.env['PREFIX'] + os.sep + 'bin' + ' && ' + APPNAME + '.exe"' else: command += ' ' + relfolder + os.sep + APPNAME + os.sep + APPNAME - print command + print (command) Utils.exec_command (command) - except Exception, msg: + except Exception: + msg = sys.exc_info()[1] # Python 2/3 compatibility Utils.pprint ('RED', "Failed to run application: " + str (msg))